refactor: validation for contact dto

InseeFr · Nov 27, 2023 · 45e9f8f · 45e9f8f
1 parent 976fbcf
commit 45e9f8f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/...n/java/fr/insee/survey/datacollectionmanagement/contact/controller/ContactController.java b/...n/java/fr/insee/survey/datacollectionmanagement/contact/controller/ContactController.java
@@ -160,7 +160,7 @@ public ResponseEntity<?> deleteContact(@PathVariable("id") String id) {
             if (contact.isPresent()) {
                 contactService.deleteContactAddressEvent(contact.get());
 
-                viewService.findViewByIdentifier(id).stream().forEach(c -> viewService.deleteView(c));
+                viewService.findViewByIdentifier(id).stream().forEach(viewService::deleteView);
                 questioningAccreditationService.findByContactIdentifier(id).stream().forEach(acc -> {
                     Questioning questioning = questioningService.findbyId(acc.getQuestioning().getId()).get();
                     Set<QuestioningAccreditation> newSet = questioning.getQuestioningAccreditations();
@@ -182,7 +182,7 @@ public ResponseEntity<?> deleteContact(@PathVariable("id") String id) {
 
     private ContactDto convertToDto(Contact contact) {
         ContactDto contactDto = modelMapper.map(contact, ContactDto.class);
-        contactDto.setCivility(contact.getGender());
+        contactDto.setCivility(contact.getGender().name());
         return contactDto;
     }
 
@@ -196,7 +196,7 @@ private ContactFirstLoginDto convertToFirstLoginDto(Contact contact) {
 
     private Contact convertToEntity(ContactDto contactDto) throws ParseException, NoSuchElementException {
         Contact contact = modelMapper.map(contactDto, Contact.class);
-        contact.setGender(contactDto.getCivility());
+        contact.setGender(Contact.Gender.valueOf(contactDto.getCivility()));
         Optional<Contact> oldContact = contactService.findByIdentifier(contactDto.getIdentifier());
         if (oldContact.isEmpty()) {
             throw new NoSuchElementException();
@@ -210,7 +210,7 @@ private Contact convertToEntity(ContactDto contactDto) throws ParseException, No
 
     private Contact convertToEntityNewContact(ContactDto contactDto) {
         Contact contact = modelMapper.map(contactDto, Contact.class);
-        contact.setGender(contactDto.getCivility());
+        contact.setGender(Contact.Gender.valueOf(contactDto.getCivility()));
         return contact;
     }
 

diff --git a/src/main/java/fr/insee/survey/datacollectionmanagement/contact/dto/ContactDto.java b/src/main/java/fr/insee/survey/datacollectionmanagement/contact/dto/ContactDto.java
@@ -1,6 +1,5 @@
 package fr.insee.survey.datacollectionmanagement.contact.dto;
 
-import fr.insee.survey.datacollectionmanagement.contact.domain.Contact;
 import fr.insee.survey.datacollectionmanagement.contact.validation.ContactGenderValid;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Getter;
@@ -14,7 +13,7 @@ public class ContactDto{
     private String identifier;
     private String externalId;
     @ContactGenderValid
-    private Contact.Gender civility;
+    private String civility;
     private String lastName;
     private String firstName;
     private String function;

diff --git a/...n/java/fr/insee/survey/datacollectionmanagement/query/controller/WebclientController.java b/...n/java/fr/insee/survey/datacollectionmanagement/query/controller/WebclientController.java
@@ -589,7 +589,7 @@ private SupportDto convertToDto(Support support) {
 
     private ContactDto convertToDto(Contact contact) {
         ContactDto contactDto = modelMapper.map(contact, ContactDto.class);
-        contactDto.setCivility(contact.getGender());
+        contactDto.setCivility(contact.getGender().name());
         return contactDto;
     }