fix: allow no date when updating visibility

InseeFr · Oct 7, 2024 · 540b847 · 540b847
1 parent dd797be
commit 540b847
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 73 deletions.
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
 
 	<groupId>fr.insee.pearljam</groupId>
 	<artifactId>pearljam-back-office</artifactId>
-	<version>5.1.7</version>
+	<version>5.1.8</version>
 	<name>Pearl-Jam-Back-Office</name>
 	<description>Back-office services for PearlJam</description>
 

diff --git a/src/main/java/fr/insee/pearljam/api/campaign/dto/input/VisibilityCampaignUpdateDto.java b/src/main/java/fr/insee/pearljam/api/campaign/dto/input/VisibilityCampaignUpdateDto.java
@@ -1,7 +1,6 @@
 package fr.insee.pearljam.api.campaign.dto.input;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
-import fr.insee.pearljam.api.web.annotation.AtLeastOneDateValid;
 import fr.insee.pearljam.domain.campaign.model.Visibility;
 import jakarta.validation.constraints.NotBlank;
 import org.springframework.lang.NonNull;
@@ -19,7 +18,6 @@
  * @param endDate                     End date of the visibility
  */
 @JsonInclude(JsonInclude.Include.NON_NULL)
-@AtLeastOneDateValid
 public record VisibilityCampaignUpdateDto(
 		Long managementStartDate,
 		Long interviewerStartDate,

diff --git a/src/main/java/fr/insee/pearljam/api/campaign/dto/input/VisibilityUpdateDto.java b/src/main/java/fr/insee/pearljam/api/campaign/dto/input/VisibilityUpdateDto.java
@@ -1,7 +1,6 @@
 package fr.insee.pearljam.api.campaign.dto.input;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
-import fr.insee.pearljam.api.web.annotation.AtLeastOneDateValid;
 import fr.insee.pearljam.domain.campaign.model.Visibility;
 import lombok.NonNull;
 
@@ -16,7 +15,6 @@
  * @param endDate                     End date of the visibility
  */
 @JsonInclude(JsonInclude.Include.NON_NULL)
-@AtLeastOneDateValid
 public record VisibilityUpdateDto(
         Long managementStartDate,
         Long interviewerStartDate,

diff --git a/.../java/fr/insee/pearljam/api/web/annotation/AtLeastOneDateCampaignVisibilityValidator.java b/.../java/fr/insee/pearljam/api/web/annotation/AtLeastOneDateCampaignVisibilityValidator.java
diff --git a/src/main/java/fr/insee/pearljam/api/web/annotation/AtLeastOneDateValid.java b/src/main/java/fr/insee/pearljam/api/web/annotation/AtLeastOneDateValid.java
diff --git a/src/main/java/fr/insee/pearljam/api/web/annotation/AtLeastOneDateVisibilityValidator.java b/src/main/java/fr/insee/pearljam/api/web/annotation/AtLeastOneDateVisibilityValidator.java
diff --git a/src/test/java/fr/insee/pearljam/api/campaign/controller/CampaignControllerUpdateTest.java b/src/test/java/fr/insee/pearljam/api/campaign/controller/CampaignControllerUpdateTest.java
@@ -107,17 +107,6 @@ void testUpdateCampaign05() throws Exception {
         testUpdateExceptions(HttpStatus.NOT_FOUND, VisibilityNotFoundException.MESSAGE);
     }
 
-    @Test
-    @DisplayName("Should return bad request when visibility has no date set")
-    void testUpdateCampaign06() throws Exception {
-        VisibilityCampaignUpdateDto visibility = generateVisibility("ou-id",
-                null, null,
-                null, null,
-                null, null,
-                true, "mail", "tel");
-        testUpdateExceptions(visibility, HttpStatus.BAD_REQUEST, ExceptionControllerAdvice.INVALID_PARAMETERS_MESSAGE);
-    }
-
     @Test
     @DisplayName("Should return conflict when invalidating update")
     void testUpdateCampaign07() throws Exception {

diff --git a/src/test/java/fr/insee/pearljam/api/campaign/controller/VisibilityControllerTest.java b/src/test/java/fr/insee/pearljam/api/campaign/controller/VisibilityControllerTest.java
@@ -7,7 +7,6 @@
 import fr.insee.pearljam.api.utils.JsonTestHelper;
 import fr.insee.pearljam.api.utils.MockMvcTestUtils;
 import fr.insee.pearljam.api.utils.dummy.AuthenticationUserFakeService;
-import fr.insee.pearljam.api.web.exception.ExceptionControllerAdvice;
 import fr.insee.pearljam.domain.campaign.model.Visibility;
 import fr.insee.pearljam.domain.exception.CampaignNotFoundException;
 import fr.insee.pearljam.domain.exception.VisibilityHasInvalidDatesException;
@@ -137,19 +136,6 @@ void testUpdateVisibility03() throws Exception {
                 .andExpect(MockMvcTestUtils.apiErrorMatches(HttpStatus.CONFLICT, updatePath, VisibilityHasInvalidDatesException.MESSAGE));
     }
 
-    @Test
-    @DisplayName("Should return bad request when visibility has no date set")
-    void testUpdateVisibility04() throws Exception {
-        VisibilityUpdateDto visibility = generateUpdateVisibility(
-                null, null,
-                null, null,
-                null, null);
-        mockMvc.perform(put(updatePath)
-                        .content(JsonTestHelper.toJson(visibility))
-                        .contentType(MediaType.APPLICATION_JSON))
-                .andExpect(MockMvcTestUtils.apiErrorMatches(HttpStatus.BAD_REQUEST, updatePath, ExceptionControllerAdvice.INVALID_PARAMETERS_MESSAGE));
-    }
-
     private VisibilityUpdateDto generateUpdateVisibility() {
         return generateUpdateVisibility(1721683250000L, 1721683251000L,
                 1721683252000L, 1721683253000L,