Merge remote-tracking branch 'origin/main'

Giggle-projects · Aug 13, 2023 · cd911b6 · cd911b6
2 parents 50fd2cd + 8d8aeb6
commit cd911b6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/main/java/se/ton/t210/controller/EvaluationItemController.java b/src/main/java/se/ton/t210/controller/EvaluationItemController.java
@@ -29,8 +29,9 @@ private ResponseEntity<ApplicationTypeNamesResponse> getApplicationTypeNames() {
     }
 
     @GetMapping("/api/evaluation/items")
-    public ResponseEntity<List<EvaluationItemResponse>> items(ApplicationType applicationType) {
-        final List<EvaluationItemResponse> responses = evaluationItemService.items(applicationType);
+    public ResponseEntity<List<EvaluationItemResponse>> items() {
+        final Member member = new Member(1l, "name", "email", "password", Gender.MALE, ApplicationType.PoliceOfficerMale);
+        final List<EvaluationItemResponse> responses = evaluationItemService.items(member.getApplicationType());
         return ResponseEntity.ok(responses);
     }
 

diff --git a/src/main/java/se/ton/t210/dto/EvaluationItemResponse.java b/src/main/java/se/ton/t210/dto/EvaluationItemResponse.java
@@ -9,11 +9,11 @@
 public class EvaluationItemResponse {
 
     private final Long evaluationItemId;
-    private final String evaluationName;
+    private final String evaluationItemName;
 
-    public EvaluationItemResponse(Long evaluationItemId, String evaluationName) {
+    public EvaluationItemResponse(Long evaluationItemId, String evaluationItemName) {
         this.evaluationItemId = evaluationItemId;
-        this.evaluationName = evaluationName;
+        this.evaluationItemName = evaluationItemName;
     }
 
     public static List<EvaluationItemResponse> listOf(List<EvaluationItem> items) {