fix: had survey unit questioning informations

InseeFr · Aug 7, 2024 · ba51614 · ba51614
1 parent 44a85b8
commit ba51614
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/...fr/insee/survey/datacollectionmanagement/questioning/controller/SurveyUnitController.java b/...fr/insee/survey/datacollectionmanagement/questioning/controller/SurveyUnitController.java
@@ -10,6 +10,7 @@
 import fr.insee.survey.datacollectionmanagement.questioning.dto.SurveyUnitDetailsDto;
 import fr.insee.survey.datacollectionmanagement.questioning.dto.SurveyUnitDto;
 import fr.insee.survey.datacollectionmanagement.questioning.service.SurveyUnitService;
+import fr.insee.survey.datacollectionmanagement.view.service.ViewService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.ArraySchema;
 import io.swagger.v3.oas.annotations.media.Content;
@@ -42,6 +43,7 @@
 public class SurveyUnitController {
 
     private final SurveyUnitService surveyUnitService;
+    private final ViewService viewService;
     private final ModelMapper modelMapper;
 
     @Operation(summary = "Search for a survey units, paginated")
@@ -51,7 +53,7 @@ public class SurveyUnitController {
             @ApiResponse(responseCode = "404", description = "Not found"),
             @ApiResponse(responseCode = "400", description = "Bad Request")
     })
-    @Deprecated
+    @Deprecated(since="2.6.0", forRemoval=true)
     public Page<SurveyUnitDto> getSurveyUnits(
             @RequestParam(defaultValue = "0") Integer page,
             @RequestParam(defaultValue = "20") Integer size,
@@ -87,7 +89,9 @@ public Page<SearchSurveyUnitDto> searchSurveyUnits(
     })
     public SurveyUnitDetailsDto findSurveyUnit(@PathVariable("id") String id) {
         SurveyUnit surveyUnit = surveyUnitService.findbyId(StringUtils.upperCase(id));
-        return convertToDetailsDto(surveyUnit);
+        SurveyUnitDetailsDto surveyUnitDetailsDto =  convertToDetailsDto(surveyUnit);
+        surveyUnitDetailsDto.setHasQuestionings(!viewService.findViewByIdSu(id).isEmpty());
+        return surveyUnitDetailsDto;
 
     }
 
@@ -132,7 +136,7 @@ public ResponseEntity<SurveyUnitDto> putSurveyUnit(@PathVariable("id") String id
             @ApiResponse(responseCode = "404", description = "Not found"),
             @ApiResponse(responseCode = "400", description = "Bad request")
     })
-    @Deprecated
+    @Deprecated(since="2.6.0", forRemoval=true)
     public void deleteSurveyUnit(@PathVariable("id") String id) {
         SurveyUnit surveyUnit = surveyUnitService.findbyId(StringUtils.upperCase(id));
 

diff --git a/...n/java/fr/insee/survey/datacollectionmanagement/questioning/dto/SurveyUnitDetailsDto.java b/...n/java/fr/insee/survey/datacollectionmanagement/questioning/dto/SurveyUnitDetailsDto.java
@@ -15,6 +15,7 @@ public class SurveyUnitDetailsDto {
     private String identificationCode;
     private String identificationName;
     private SurveyUnitAddressDto address;
+    private boolean hasQuestionings;
     private Set<SurveyUnitCommentOutputDto> comments;
 
 }