fix: improve manytoone relations in db (no link tables)

platine-management-api/src/main/java/fr/insee/survey/datacollectionmanagement/contact/controller/AddressController.java

@@ -16,8 +16,6 @@
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -26,8 +24,6 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
 
-import java.util.List;
-
 @RestController
 @PreAuthorize(AuthorityPrivileges.HAS_MANAGEMENT_PRIVILEGES)
 @Tag(name = "1 - Contacts", description = "Enpoints to create, update, delete and find contacts")
@@ -93,13 +89,4 @@ public ResponseEntity<AddressDto> putAddress(@PathVariable("id") String id,
 
     }
 
-    class AddressPage extends PageImpl<AddressDto> {
-
-        private static final long serialVersionUID = -5570255373624396569L;
-
-        public AddressPage(List<AddressDto> content, Pageable pageable, long total) {
-            super(content, pageable, total);
-        }
-    }
-
 }

platine-management-api/src/main/java/fr/insee/survey/datacollectionmanagement/contact/controller/ContactController.java

@@ -9,8 +9,6 @@
 import fr.insee.survey.datacollectionmanagement.contact.dto.ContactDto;
 import fr.insee.survey.datacollectionmanagement.contact.dto.SearchContactDto;
 import fr.insee.survey.datacollectionmanagement.contact.enums.ContactParamEnum;
-import fr.insee.survey.datacollectionmanagement.contact.enums.GenderEnum;
-import fr.insee.survey.datacollectionmanagement.contact.service.AddressService;
 import fr.insee.survey.datacollectionmanagement.contact.service.ContactService;
 import fr.insee.survey.datacollectionmanagement.contact.util.PayloadUtil;
 import fr.insee.survey.datacollectionmanagement.contact.validation.ValidContactParam;
@@ -30,7 +28,6 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.modelmapper.ModelMapper;
 import org.springframework.data.domain.*;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
@@ -54,14 +51,11 @@
 public class ContactController {
 
     private final ContactService contactService;
-
-    private final AddressService addressService;
-
+
     private final ViewService viewService;
 
     private final QuestioningAccreditationService questioningAccreditationService;
 
-    private final ModelMapper modelMapper;
 
     /**
      * @deprecated
@@ -75,7 +69,7 @@ public ContactPage getContacts(
             @RequestParam(defaultValue = "identifier") String sort) {
         Pageable pageable = PageRequest.of(page, size, Sort.by(sort));
         Page<Contact> pageC = contactService.findAll(pageable);
-        List<ContactDto> listC = pageC.stream().map(this::convertToDto).toList();
+        List<ContactDto> listC = pageC.stream().map(contactService::convertToDto).toList();
         return new ContactPage(listC, pageable, pageC.getTotalElements());
     }
 
@@ -86,7 +80,7 @@ public ContactDetailsDto getContact(@PathVariable("id") String id) {
         String idContact = StringUtils.upperCase(id);
         Contact contact = contactService.findByIdentifier(idContact);
         List<String> listCampaigns = viewService.findDistinctCampaignByIdentifier(idContact);
-        return convertToContactDetailsDto(contact, listCampaigns);
+        return contactService.convertToContactDetailsDto(contact, listCampaigns);
 
 
     }
@@ -101,28 +95,22 @@ public ResponseEntity<ContactDto> putContact(@PathVariable("id") String id,
         if (!contactDto.getIdentifier().equalsIgnoreCase(id)) {
             throw new NotMatchException("id and contact identifier don't match");
         }
-        Contact contact;
         HttpHeaders responseHeaders = new HttpHeaders();
         responseHeaders.set(HttpHeaders.LOCATION, ServletUriComponentsBuilder.fromCurrentRequest()
-                .buildAndExpand(contactDto.getIdentifier()).toUriString());
+                .buildAndExpand(id).toUriString());
 
         JsonNode payload = PayloadUtil.getPayloadAuthor(auth.getName());
-
+        HttpStatus httpStatus = HttpStatus.OK;
         try {
-            contact = convertToEntity(contactDto);
-            if (contactDto.getAddress() != null)
-                contact.setAddress(addressService.convertToEntity(contactDto.getAddress()));
-            Contact contactUpdate = contactService.updateContactAddressEvent(contact, payload);
-            return ResponseEntity.ok().headers(responseHeaders).body(convertToDto(contactUpdate));
+            contactService.findByIdentifier(id);
         } catch (NotFoundException e) {
             log.info("Creating contact with the identifier {}", contactDto.getIdentifier());
-            contact = convertToEntityNewContact(contactDto);
-            if (contactDto.getAddress() != null)
-                contact.setAddress(addressService.convertToEntity(contactDto.getAddress()));
-            Contact contactCreate = contactService.createContactAddressEvent(contact, payload);
-            viewService.createView(id, null, null);
-            return ResponseEntity.status(HttpStatus.CREATED).headers(responseHeaders).body(convertToDto(contactCreate));
+            httpStatus = HttpStatus.CREATED;
         }
+        Contact contact = contactService.updateOrCreateContact(id, contactDto, payload);
+
+
+        return ResponseEntity.status(httpStatus).headers(responseHeaders).body(contactService.convertToDto(contact));
 
     }
 
@@ -157,56 +145,46 @@ public Page<SearchContactDto> searchContacts(
             @RequestParam(required = true) String searchParam,
             @RequestParam(required = false) @Valid @ValidContactParam String searchType,
             @RequestParam(defaultValue = "0") Integer page,
-            @RequestParam(defaultValue = "10") Integer pageSize,
-            @RequestParam(defaultValue = "identifier") String sort) {
+            @RequestParam(defaultValue = "10") Integer pageSize) {
 
         log.info(
                 "Search contact by {} with param = {} page = {} pageSize = {}", searchType, searchParam, page, pageSize);
 
-        Pageable pageable = PageRequest.of(page, pageSize, Sort.by(sort));
+        Pageable pageable = PageRequest.of(page, pageSize);
 
         switch (ContactParamEnum.fromValue(searchType)) {
             case ContactParamEnum.IDENTIFIER:
-                return contactService.searchContactByIdentifier(searchParam, pageable);
+                return contactService.searchContactByIdentifier(searchParam.toUpperCase(), pageable);
             case ContactParamEnum.NAME:
-                return contactService.searchContactByName(searchParam, pageable);
+                return contactService.searchContactByName(searchParam.toUpperCase(), pageable);
             case ContactParamEnum.EMAIL:
-                return contactService.searchContactByEmail(searchParam, pageable);
+                return contactService.searchContactByEmail(searchParam.toUpperCase(), pageable);
         }
         return new PageImpl<>(Collections.emptyList());
 
     }
 
-    private ContactDto convertToDto(Contact contact) {
-        ContactDto contactDto = modelMapper.map(contact, ContactDto.class);
-        contactDto.setCivility(contact.getGender().name());
-        return contactDto;
-    }
+    @GetMapping(path = Constants.API_CONTACTS_SEARCH+"/V2", produces = "application/json")
+    @Operation(summary = "Search contact by parameter (identifier, email, name, firstName lastName)")
+    @ApiResponses(value = {
+            @ApiResponse(responseCode = "200", description = "OK", content = @Content(array = @ArraySchema(schema = @Schema(implementation = SearchContactDto.class)))),
+            @ApiResponse(responseCode = "400", description = "Bad Request")
+    })
+    public Page<SearchContactDto> searchContactByParam(
+            @RequestParam(required = true) String searchParam,
+            @RequestParam(defaultValue = "0") Integer page,
+            @RequestParam(defaultValue = "10") Integer pageSize) {
 
-    private ContactDetailsDto convertToContactDetailsDto(Contact contact, List<String> listCampaigns) {
-        ContactDetailsDto contactDetailsDto = modelMapper.map(contact, ContactDetailsDto.class);
-        contactDetailsDto.setCivility(contact.getGender());
-        contactDetailsDto.setListCampaigns(listCampaigns);
-        return contactDetailsDto;
-    }
+        log.info(
+                "Search contact with param = {} page = {} pageSize = {}", searchParam, page, pageSize);
 
-    private Contact convertToEntity(ContactDto contactDto) {
-        Contact contact = modelMapper.map(contactDto, Contact.class);
-        contact.setGender(GenderEnum.valueOf(contactDto.getCivility()));
-        Contact oldContact = contactService.findByIdentifier(contactDto.getIdentifier());
-        contact.setComment(oldContact.getComment());
-        contact.setAddress(oldContact.getAddress());
-        contact.setContactEvents(oldContact.getContactEvents());
+        Pageable pageable = PageRequest.of(page, pageSize);
 
-        return contact;
-    }
+        return contactService.searchContactByParam(searchParam.toUpperCase(), pageable);
 
-    private Contact convertToEntityNewContact(ContactDto contactDto) {
-        Contact contact = modelMapper.map(contactDto, Contact.class);
-        contact.setGender(GenderEnum.valueOf(contactDto.getCivility()));
-        return contact;
     }
 
+
     static class ContactPage extends PageImpl<ContactDto> {
 
         @Serial