diff --git a/src/main/java/com/example/demo/controller/SurveyController.java b/src/main/java/com/example/demo/controller/SurveyController.java index 09c323702ba48fa32008f8884fdc54e07198818a..8e9764cf3131e50cb15e07db82345371230cf705 100644 --- a/src/main/java/com/example/demo/controller/SurveyController.java +++ b/src/main/java/com/example/demo/controller/SurveyController.java @@ -10,6 +10,8 @@ import com.example.demo.service.token.TokenAuthorizationServiceImpl; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; +import java.util.List; + @RestController @CrossOrigin(origins = {"http://localhost:3000"}) @RequestMapping("/survey") @@ -32,6 +34,18 @@ public class SurveyController { return ResponseEntity.status(200).body(createdSurvey); } + @GetMapping("/{surveyId}") + public ResponseEntity<Survey> getSurvey(@PathVariable Long surveyId){ + Survey createdSurvey = this.surveyService.getSurvey(surveyId); + return ResponseEntity.status(200).body(createdSurvey); + } + + @GetMapping("/all") + public ResponseEntity<List<Survey>> getAllSurvey(){ + List<Survey> surveys = this.surveyService.getSurveys(); + return ResponseEntity.status(200).body(surveys); + } + @PostMapping("/reply/{answerId}") public ResponseEntity<Boolean> replyToSurvey( @RequestHeader("Authorization") String authorizationHeader, diff --git a/src/main/java/com/example/demo/service/survey/SurveyService.java b/src/main/java/com/example/demo/service/survey/SurveyService.java index f3bccf50a70462927b21d094390b795b6d20de2d..b90c02f1c2454054efd54470d13d46a10fa98e5a 100644 --- a/src/main/java/com/example/demo/service/survey/SurveyService.java +++ b/src/main/java/com/example/demo/service/survey/SurveyService.java @@ -3,7 +3,11 @@ package com.example.demo.service.survey; import com.example.demo.model.customer.Customer; import com.example.demo.model.survey.Survey; +import java.util.List; + public interface SurveyService { Survey createSurvey(Survey survey); Boolean replyToSurvey(Customer customer, Long answerId); + Survey getSurvey(Long surveyId); + List<Survey> getSurveys(); } diff --git a/src/main/java/com/example/demo/service/survey/SurveyServiceImpl.java b/src/main/java/com/example/demo/service/survey/SurveyServiceImpl.java index 9d2383defcacdf13b3a7acb4f3a7df8e94c06cbc..1eb33df9724dd8cdb6a29dacce48e548b5f99bfd 100644 --- a/src/main/java/com/example/demo/service/survey/SurveyServiceImpl.java +++ b/src/main/java/com/example/demo/service/survey/SurveyServiceImpl.java @@ -69,4 +69,15 @@ public class SurveyServiceImpl implements SurveyService{ surveyResponseRepository.save(surveyResponse); return true; } + + @Override + public Survey getSurvey(Long surveyId) { + Optional<Survey> survey = surveyRepository.findById(surveyId); + return survey.orElse(null); + } + + @Override + public List<Survey> getSurveys() { + return surveyRepository.findAll(); + } } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 4921166e36b45bafcf84316e147ce4afc25d0d7a..f38f6117d26a19907ef1cef4ea0d6f1170ab2fac 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1 +1 @@ -spring.profiles.active=dbclient +spring.profiles.active=dbembedded