hostsharing/hs.hsadmin.ng
6
0
Fork 0
Code Pull Requests 2 Activity

create relation with holder- and contact-data, and search for contact emailAddress + relation mark #136

Merged
hsh-michaelhoennig merged 12 commits from feature/create-relation-with-holder-and-contact-data into master 2024-12-13 14:09:03 +01:00
Conversation 0 Commits 12 Files Changed 18 +4 -3
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ee0e59bd55 - Show all commits

7
src/main/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactController.java
View File

@ -44,9 +44,10 @@ public class HsOfficeContactController implements HsOfficeContactsApi {
context.define(currentSubject, assumedRoles); context.define(currentSubject, assumedRoles);
validate("caption, emailAddress").atMaxOne(caption, emailAddress); validate("caption, emailAddress").atMaxOne(caption, emailAddress);
final var entities = caption != null final var entities = emailAddress != null
? contactRepo.findContactByOptionalCaptionLike(caption) ? contactRepo.findContactByEmailAddress(emailAddress)
: contactRepo.findContactByEmailAddress(emailAddress); : contactRepo.findContactByOptionalCaptionLike(caption);
final var resources = mapper.mapList(entities, HsOfficeContactResource.class); final var resources = mapper.mapList(entities, HsOfficeContactResource.class);
return ResponseEntity.ok(resources); return ResponseEntity.ok(resources);