Feat search questioning

.github/workflows/trivy.yml

@@ -22,6 +22,8 @@ jobs:
           distribution: 'temurin'
       - name: Run Trivy vulnerability scanner
         uses: aquasecurity/[email protected]
+        env:
+          TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db:2
         with:
           format: 'table'
           scan-type: 'repo'

platine-management-api/src/main/java/fr/insee/survey/datacollectionmanagement/constants/Constants.java

@@ -31,6 +31,8 @@ private Constants() {
     //API QUESTIONING DOMAIN
     public static final String API_QUESTIONINGS = "/api/questionings";
     public static final String API_QUESTIONINGS_ID = "/api/questionings/{id}";
+    public static final String API_QUESTIONINGS_SEARCH = "/api/questionings/search";
+
     public static final String API_SURVEY_UNITS ="/api/survey-units";
     public static final String API_SURVEY_UNITS_ID = "/api/survey-units/{id}";
     public static final String API_SURVEY_UNITS_ID_QUESTIONINGS = "/api/survey-units/{id}/questionings";
@@ -41,6 +43,8 @@ private Constants() {
     public static final String API_QUESTIONING_ID_QUESTIONING_EVENTS = "/api/questionings/{id}/questioning-events";
     public static final String API_QUESTIONING_QUESTIONING_EVENTS_ID = "/api/questionings/questioning-events/{id}";
     public static final String API_QUESTIONING_ID_QUESTIONING_COMMUNICATIONS = "/api/questionings/{id}/questioning-communications";
+    public static final String API_QUESTIONING_ID_COMMENT = "/api/questionings/{id}/comment";
+
 
     public static final String API_MAIN_CONTACT = "/api/main-contact";
 

platine-management-api/src/main/java/fr/insee/survey/datacollectionmanagement/query/controller/QuestioningController.java

@@ -45,22 +45,6 @@ public class QuestioningController {
 
     private final ModelMapper modelMapper;
 
-    @Operation(summary = "Search for a questioning by id")
-    @GetMapping(value = Constants.API_QUESTIONINGS_ID, produces = "application/json")
-    @ApiResponses(value = {
-            @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = QuestioningDto.class))),
-            @ApiResponse(responseCode = "404", description = "Not found"),
-            @ApiResponse(responseCode = "400", description = "Bad Request")
-    })
-    public ResponseEntity<?> getQuestioning(@PathVariable("id") Long id) {
-
-        Questioning questioning = questioningService.findbyId(id);
-        try {
-            return new ResponseEntity<>(convertToDto(questioning), HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("Error", HttpStatus.BAD_REQUEST);
-        }
-    }
 
     @Operation(summary = "Create or update questioning")
     @PostMapping(value = Constants.API_QUESTIONINGS, produces = "application/json", consumes = "application/json")

platine-management-api/src/main/java/fr/insee/survey/datacollectionmanagement/query/controller/SearchQuestioningController.java

@@ -0,0 +1,54 @@
+package fr.insee.survey.datacollectionmanagement.query.controller;
+
+import fr.insee.survey.datacollectionmanagement.configuration.auth.user.AuthorityPrivileges;
+import fr.insee.survey.datacollectionmanagement.constants.Constants;
+import fr.insee.survey.datacollectionmanagement.query.dto.QuestioningDetailsDto;
+import fr.insee.survey.datacollectionmanagement.query.dto.SearchQuestioningDto;
+import fr.insee.survey.datacollectionmanagement.questioning.service.QuestioningService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@PreAuthorize(AuthorityPrivileges.HAS_MANAGEMENT_PRIVILEGES)
+@Slf4j
+@Tag(name = "2 - Questioning", description = "Enpoints to create, update, delete and find entities around the questionings")
+@RequiredArgsConstructor
+public class SearchQuestioningController {
+
+    private final QuestioningService questioningService;
+
+    @Operation(summary = "Multi-criteria search questionings")
+    @GetMapping(value = Constants.API_QUESTIONINGS_SEARCH, produces = "application/json")
+    public Page<SearchQuestioningDto> searchQuestionings(
+            @RequestParam(required = false) String searchParam,
+            @RequestParam(defaultValue = "0") Integer page,
+            @RequestParam(defaultValue = "20") Integer pageSize) {
+        log.info(
+                "Search questionings with param {} page = {} pageSize = {}", searchParam, page, pageSize);
+
+        Pageable pageable = PageRequest.of(page, pageSize);
+
+        return questioningService.searchQuestioning(searchParam, pageable);
+
+    }
+
+    @Operation(summary = "Get questioning details")
+    @GetMapping(value = Constants.API_QUESTIONINGS_ID, produces = "application/json")
+    public QuestioningDetailsDto getQuestioning (@PathVariable("id") Long id) {
+
+        return questioningService.getQuestioningDetails(id);
+
+    }
+
+
+}

platine-management-api/src/main/java/fr/insee/survey/datacollectionmanagement/questioning/controller/QuestioningCommentController.java

@@ -0,0 +1,67 @@
+package fr.insee.survey.datacollectionmanagement.questioning.controller;
+
+import fr.insee.survey.datacollectionmanagement.configuration.auth.user.AuthorityPrivileges;
+import fr.insee.survey.datacollectionmanagement.constants.Constants;
+import fr.insee.survey.datacollectionmanagement.questioning.domain.Questioning;
+import fr.insee.survey.datacollectionmanagement.questioning.domain.QuestioningComment;
+import fr.insee.survey.datacollectionmanagement.questioning.dto.QuestioningCommentInputDto;
+import fr.insee.survey.datacollectionmanagement.questioning.dto.QuestioningCommentOutputDto;
+import fr.insee.survey.datacollectionmanagement.questioning.service.QuestioningCommentService;
+import fr.insee.survey.datacollectionmanagement.questioning.service.QuestioningService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.modelmapper.ModelMapper;
+import org.springframework.http.HttpStatus;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+import java.util.Set;
+
+@RestController
+@PreAuthorize(AuthorityPrivileges.HAS_MANAGEMENT_PRIVILEGES)
+@Tag(name = "2 - Questioning", description = "Enpoints to create, update, delete and find entities around the questionings")
+@Slf4j
+@RequiredArgsConstructor
+@Validated
+public class QuestioningCommentController {
+
+    private final QuestioningService questioningService;
+    private final QuestioningCommentService questioningCommentService;
+    private final ModelMapper modelMapper;
+
+
+    @Operation(summary = "Create a questioning comment")
+    @PostMapping(value = Constants.API_QUESTIONING_ID_COMMENT, produces = "application/json", consumes = "application/json")
+    @ResponseStatus(HttpStatus.CREATED)
+    @ApiResponses(value = {
+            @ApiResponse(responseCode = "201", description = "Created", content = @Content(schema = @Schema(implementation = QuestioningCommentInputDto.class))),
+            @ApiResponse(responseCode = "400", description = "Bad request"),
+            @ApiResponse(responseCode = "404", description = "Not found")
+    })
+    public QuestioningCommentOutputDto postQuestioningComment(@PathVariable Long id, @Valid @RequestBody QuestioningCommentInputDto questioningCommentDto) {
+
+        Questioning questioning = questioningService.findbyId(id);
+        QuestioningComment questioningComment = questioningCommentService.convertToEntity(questioningCommentDto);
+        questioningComment.setDate(new Date());
+        QuestioningComment newQuestioningComment = questioningCommentService.saveQuestioningComment(questioningComment);
+        Set<QuestioningComment> setQuestioningComments = questioning.getQuestioningComments();
+        setQuestioningComments.add(newQuestioningComment);
+        questioning.setQuestioningComments(setQuestioningComments);
+        questioningService.saveQuestioning(questioning);
+        return questioningCommentService.convertToOutputDto(newQuestioningComment);
+
+    }
+
+
+
+
+}

platine-management-api/src/main/java/fr/insee/survey/datacollectionmanagement/questioning/controller/QuestioningCommunicationController.java

@@ -5,20 +5,18 @@
 import fr.insee.survey.datacollectionmanagement.questioning.domain.Questioning;
 import fr.insee.survey.datacollectionmanagement.questioning.domain.QuestioningCommunication;
 import fr.insee.survey.datacollectionmanagement.questioning.dto.QuestioningCommunicationDto;
+import fr.insee.survey.datacollectionmanagement.questioning.service.QuestioningCommunicationService;
 import fr.insee.survey.datacollectionmanagement.questioning.service.QuestioningService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.modelmapper.ModelMapper;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.text.ParseException;
+import java.util.List;
 import java.util.Set;
 
 @RestController
@@ -30,27 +28,16 @@ public class QuestioningCommunicationController {
 
     private final QuestioningService questioningService;
 
-    private final ModelMapper modelMapper;
+    private final QuestioningCommunicationService questioningCommunicationService;
 
     @Operation(summary = "Search for questioning communications by questioning id")
     @GetMapping(value = Constants.API_QUESTIONING_ID_QUESTIONING_COMMUNICATIONS, produces = "application/json")
-    public ResponseEntity<?> findQuestioningCommunicationsByQuestioningId(@PathVariable("id") Long id) {
+    public List<QuestioningCommunicationDto> findQuestioningCommunicationsByQuestioningId(@PathVariable("id") Long id) {
         Questioning questioning = questioningService.findbyId(id);
         Set<QuestioningCommunication> setQe = questioning.getQuestioningCommunications();
-        return ResponseEntity.status(HttpStatus.OK)
-                .body(setQe.stream()
-                        .map(this::convertToDto).toList());
+        return setQe.stream().map(questioningCommunicationService::convertToDto).toList();
 
     }
 
 
-    private QuestioningCommunicationDto convertToDto(QuestioningCommunication questioningCommunication) {
-        return modelMapper.map(questioningCommunication, QuestioningCommunicationDto.class);
-    }
-
-    private QuestioningCommunication convertToEntity(QuestioningCommunicationDto questioningCommunicationDto) throws ParseException {
-        return modelMapper.map(questioningCommunicationDto, QuestioningCommunication.class);
-    }
-
-
 }

platine-management-api/src/main/java/fr/insee/survey/datacollectionmanagement/questioning/controller/QuestioningEventController.java

@@ -47,8 +47,6 @@ public class QuestioningEventController {
 
     private final UploadService uploadService;
 
-    private final ModelMapper modelMapper;
-
     @Operation(summary = "Search for a questioning event by questioning id")
     @GetMapping(value = Constants.API_QUESTIONING_ID_QUESTIONING_EVENTS, produces = "application/json")
     @ApiResponses(value = {
@@ -61,7 +59,7 @@ public ResponseEntity<?> findQuestioningEventsByQuestioning(@PathVariable("id")
         Set<QuestioningEvent> setQe = questioning.getQuestioningEvents();
         return ResponseEntity.status(HttpStatus.OK)
                 .body(setQe.stream()
-                        .map(this::convertToDto).toList());
+                        .map(questioningEventService::convertToDto).toList());
 
     }
 
@@ -76,7 +74,7 @@ public ResponseEntity<?> postQuestioningEvent(@Parameter(description = "question
         Questioning questioning = questioningService.findbyId(id);
 
         try {
-            QuestioningEvent questioningEvent = convertToEntity(questioningEventDto);
+            QuestioningEvent questioningEvent = questioningEventService.convertToEntity(questioningEventDto);
             QuestioningEvent newQuestioningEvent = questioningEventService.saveQuestioningEvent(questioningEvent);
             Set<QuestioningEvent> setQuestioningEvents = questioning.getQuestioningEvents();
             setQuestioningEvents.add(newQuestioningEvent);
@@ -86,7 +84,7 @@ public ResponseEntity<?> postQuestioningEvent(@Parameter(description = "question
             responseHeaders.set(HttpHeaders.LOCATION,
                     ServletUriComponentsBuilder.fromCurrentRequest().toUriString());
             return ResponseEntity.status(HttpStatus.CREATED).headers(responseHeaders)
-                    .body(convertToDto(newQuestioningEvent));
+                    .body(questioningEventService.convertToDto(newQuestioningEvent));
 
         } catch (ParseException e) {
             log.error(e.getMessage(),e);
@@ -123,13 +121,6 @@ public ResponseEntity<?> deleteQuestioningEvent(@PathVariable("id") Long id) {
         }
     }
 
-    private QuestioningEventDto convertToDto(QuestioningEvent questioningEvent) {
-        return modelMapper.map(questioningEvent, QuestioningEventDto.class);
-    }
-
-    private QuestioningEvent convertToEntity(QuestioningEventDto questioningEventDto) throws ParseException {
-        return modelMapper.map(questioningEventDto, QuestioningEvent.class);
-    }
 
     class QuestioningEventPage extends PageImpl<QuestioningEventDto> {
 

platine-management-api/src/main/java/fr/insee/survey/datacollectionmanagement/questioning/controller/SurveyUnitCommentController.java

@@ -5,6 +5,7 @@
 import fr.insee.survey.datacollectionmanagement.questioning.domain.SurveyUnit;
 import fr.insee.survey.datacollectionmanagement.questioning.domain.SurveyUnitComment;
 import fr.insee.survey.datacollectionmanagement.questioning.dto.SurveyUnitCommentInputDto;
+import fr.insee.survey.datacollectionmanagement.questioning.dto.SurveyUnitCommentOutputDto;
 import fr.insee.survey.datacollectionmanagement.questioning.service.SurveyUnitCommentService;
 import fr.insee.survey.datacollectionmanagement.questioning.service.SurveyUnitService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -46,22 +47,21 @@ public class SurveyUnitCommentController {
             @ApiResponse(responseCode = "400", description = "Bad request"),
             @ApiResponse(responseCode = "404", description = "Not found")
     })
-    public void postSurveyUnitComment(@PathVariable String id, @Valid @RequestBody SurveyUnitCommentInputDto surveyUnitCommentDto) {
+    public SurveyUnitCommentOutputDto postSurveyUnitComment(@PathVariable String id, @Valid @RequestBody SurveyUnitCommentInputDto surveyUnitCommentDto) {
 
         SurveyUnit surveyUnit = surveyUnitService.findbyId(id);
-        SurveyUnitComment surveyUnitComment = convertToEntity(surveyUnitCommentDto);
+        SurveyUnitComment surveyUnitComment = surveyUnitCommentService.convertToEntity(surveyUnitCommentDto);
         surveyUnitComment.setDate(new Date());
         SurveyUnitComment newSurveyUnitComment = surveyUnitCommentService.saveSurveyUnitComment(surveyUnitComment);
         Set<SurveyUnitComment> setSurveyUnitComments = surveyUnit.getSurveyUnitComments();
         setSurveyUnitComments.add(newSurveyUnitComment);
         surveyUnit.setSurveyUnitComments(setSurveyUnitComments);
         surveyUnitService.saveSurveyUnit(surveyUnit);
+        return surveyUnitCommentService.convertToOutputDto(surveyUnit);
 
     }
 
-    private SurveyUnitComment convertToEntity(SurveyUnitCommentInputDto surveyUnitCommentDto) {
-        return modelMapper.map(surveyUnitCommentDto, SurveyUnitComment.class);
-    }
+
 
 
 }

platine-management-api/src/test/java/fr/insee/survey/datacollectionmanagement/questioning/controller/QuestionningControllerTest.java

@@ -3,7 +3,6 @@
 import fr.insee.survey.datacollectionmanagement.configuration.AuthenticationUserProvider;
 import fr.insee.survey.datacollectionmanagement.constants.AuthorityRoleEnum;
 import fr.insee.survey.datacollectionmanagement.constants.Constants;
-import fr.insee.survey.datacollectionmanagement.questioning.domain.Questioning;
 import fr.insee.survey.datacollectionmanagement.questioning.service.QuestioningService;
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -13,11 +12,9 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.http.HttpStatus;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.transaction.annotation.Transactional;
 
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
@@ -40,23 +37,6 @@ void init() {
         SecurityContextHolder.getContext().setAuthentication(AuthenticationUserProvider.getAuthenticatedUser("test", AuthorityRoleEnum.ADMIN));
     }
 
-    @Test
-    @Transactional
-    void getQuestioningOk() throws Exception {
-        Questioning questioning = questioningService.findBySurveyUnitIdSu("100000001").stream().findFirst().get();
-        Long id = questioning.getQuestioningAccreditations().stream().findFirst().get().getId();
-        String json = createJson(id).toString();
-        this.mockMvc.perform(get(Constants.API_QUESTIONINGS_ID, id)).andDo(print()).andExpect(status().isOk())
-                .andExpect(content().json(json, false));
-    }
-
-    @Test
-    void getQuestioningNotFound() throws Exception {
-        String id = "300";
-        this.mockMvc.perform(get(Constants.API_QUESTIONINGS_ID, id)).andDo(print())
-                .andExpect(status().is(HttpStatus.NOT_FOUND.value()));
-
-    }
 
     @Test
     void getQuestioningsBySurveyUnit() throws Exception {

platine-management-db/src/main/java/fr/insee/survey/datacollectionmanagement/questioning/domain/Questioning.java

@@ -33,6 +33,9 @@ public class Questioning {
     @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
     private Set<QuestioningCommunication> questioningCommunications;
 
+    @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
+    private Set<QuestioningComment> questioningComments;
+
     @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
     @NonNull
     private SurveyUnit surveyUnit;

platine-management-db/src/main/java/fr/insee/survey/datacollectionmanagement/questioning/domain/QuestioningComment.java

@@ -0,0 +1,20 @@
+package fr.insee.survey.datacollectionmanagement.questioning.domain;
+
+import jakarta.persistence.*;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+@Entity
+@Getter
+@Setter
+public class QuestioningComment {
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "quest_comment_seq")
+    private Long id;
+    @Column(length = 2000)
+    private String comment;
+    private String author;
+    private Date date;
+}

platine-management-db/src/main/java/fr/insee/survey/datacollectionmanagement/questioning/repository/QuestioningCommentRepository.java

@@ -0,0 +1,8 @@
+package fr.insee.survey.datacollectionmanagement.questioning.repository;
+
+import fr.insee.survey.datacollectionmanagement.questioning.domain.QuestioningComment;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface QuestioningCommentRepository extends JpaRepository<QuestioningComment, Long> {
+
+}