Merge branch 'main' into DEAR-124

database/02_test_data.sql

@@ -50,9 +50,7 @@ VALUES (100001, 4),
        (100001, 2),
        (100001, 3),
        (100002, 1);
-INSERT INTO work_kind_survey (user_id, score, work_kind_id)
-VALUES (100001, 6, 1),
-       (100002, 7, 2);
+
 INSERT INTO emotion_survey (user_id, emotion_id)
 VALUES (100001, 1),
        (100002, 2);

src/main/java/ch/fhnw/deardevbackend/controller/InsightsController.java

@@ -1,13 +1,12 @@
 package ch.fhnw.deardevbackend.controller;
 
-import ch.fhnw.deardevbackend.dto.*;
+import ch.fhnw.deardevbackend.dto.insights.InsightDTO;
 import ch.fhnw.deardevbackend.services.InsightsService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
+
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
 
 
 @RestController
@@ -17,7 +16,7 @@ public class InsightsController {
     @Autowired
     private InsightsService insightsService;
 
-    // Overall
+
     @GetMapping("/{userId}/team/{teamId}/sprint/{sprint}")
     public ResponseEntity<InsightDTO> getInsightsByTeamAndSprint(@PathVariable Integer userId,
                                                                  @PathVariable Integer teamId,
@@ -26,16 +25,4 @@ public ResponseEntity<InsightDTO> getInsightsByTeamAndSprint(@PathVariable Integ
         return ResponseEntity.ok(insights);
     }
 
-    // happiness team vs personal
-    @GetMapping("/happiness/{userId}/team/{teamId}/sprint/{sprint}")
-    public ResponseEntity<List<HappinessInsightDTO>> getHappinessInsightsByTeam(
-            @PathVariable Integer userId, @PathVariable Integer teamId, @PathVariable String sprint) {
-        try {
-            List<HappinessInsightDTO> insights = insightsService.getHappinessInsightsByTeam(userId, teamId, sprint);
-            return ResponseEntity.ok(insights);
-        } catch (Exception e) {
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
-        }
-    }
-
 }

src/main/java/ch/fhnw/deardevbackend/dto/insights/EmotionInsightDTO.java

@@ -0,0 +1,13 @@
+package ch.fhnw.deardevbackend.dto.insights;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class EmotionInsightDTO {
+    private Integer emotionId;
+    private String emotionName;
+    private Long userCount;
+    private Long teamCount;
+}

src/main/java/ch/fhnw/deardevbackend/dto/HappinessInsightDTO.java → src/main/java/ch/fhnw/deardevbackend/dto/insights/HappinessInsightDTO.java

@@ -1,4 +1,4 @@
-package ch.fhnw.deardevbackend.dto;
+package ch.fhnw.deardevbackend.dto.insights;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -7,6 +7,6 @@
 @AllArgsConstructor
 public class HappinessInsightDTO {
     private String day;
-    private double userAverage;
-    private double teamAverage;
+    private Double userAverage;
+    private Double teamAverage;
 }

src/main/java/ch/fhnw/deardevbackend/dto/insights/InsightDTO.java

@@ -0,0 +1,17 @@
+package ch.fhnw.deardevbackend.dto.insights;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+public class InsightDTO {
+    private List<HappinessInsightDTO> happinessInsights;
+    private List<WorkKindInsightDTO> workKindInsights;
+    private List<EmotionInsightDTO> emotionInsights;
+    private List<WorkKindCountPerDayInsightDTO> workKindCountPerDayInsights;
+    private double userAverageHappiness;
+    private double teamAverageHappiness;
+}

src/main/java/ch/fhnw/deardevbackend/dto/insights/WorkKindCountPerDayInsightDTO.java

@@ -0,0 +1,12 @@
+package ch.fhnw.deardevbackend.dto.insights;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class WorkKindCountPerDayInsightDTO {
+    private Integer workKindCount;
+    private Double userAverageHappiness;
+    private Double teamAverageHappiness;
+}

src/main/java/ch/fhnw/deardevbackend/dto/WorkKindInsightDTO.java → src/main/java/ch/fhnw/deardevbackend/dto/insights/WorkKindInsightDTO.java

@@ -1,14 +1,15 @@
-package ch.fhnw.deardevbackend.dto;
+package ch.fhnw.deardevbackend.dto.insights;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
 @Data
 @AllArgsConstructor
 public class WorkKindInsightDTO {
-    private Integer teamId;
     private Integer workKindId;
     private String workKindName;
-    private Double averageHappiness;
-    private Long totalCount;
+    private Double userAverage;
+    private Long userCount;
+    private Double teamAverage;
+    private Long teamCount;
 }

src/main/java/ch/fhnw/deardevbackend/entities/EmotionSurvey.java

@@ -6,6 +6,8 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.time.LocalDateTime;
+
 @Entity
 @NoArgsConstructor
 @AllArgsConstructor
@@ -21,13 +23,8 @@ public class EmotionSurvey {
     private Integer userId;
 
     @Column(name = "submitted", columnDefinition = "TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP", insertable = false, updatable = false)
-    private String submitted;
+    private LocalDateTime submitted;
 
     @Column(name = "emotion_id")
     private Integer emotionId;
-
-
-
-
-
 }

src/main/java/ch/fhnw/deardevbackend/entities/WorkKindSurvey.java

@@ -6,6 +6,8 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.time.LocalDateTime;
+
 @Entity
 @NoArgsConstructor
 @AllArgsConstructor
@@ -21,7 +23,7 @@ public class WorkKindSurvey {
     private Integer userId;
 
     @Column(name = "submitted", columnDefinition = "TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP", insertable = false, updatable = false)
-    private String submitted;
+    private LocalDateTime submitted;
 
     @Column(name = "score")
     private Integer score;

src/main/java/ch/fhnw/deardevbackend/mapper/HappinessInsightMapper.java

@@ -2,7 +2,7 @@
 
 
 
-import ch.fhnw.deardevbackend.dto.HappinessInsightDTO;
+import ch.fhnw.deardevbackend.dto.insights.HappinessInsightDTO;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.factory.Mappers;

src/main/java/ch/fhnw/deardevbackend/mapper/SubmitEmotionSurveyMapper.java

@@ -11,7 +11,7 @@
 public interface SubmitEmotionSurveyMapper {
     SubmitEmotionSurveyMapper INSTANCE = Mappers.getMapper(SubmitEmotionSurveyMapper.class);
 
-    @Mapping(target = "submitted", expression = "java(java.time.OffsetDateTime.now().toString())")
+    @Mapping(target = "submitted", expression = "java(java.time.LocalDateTime.now())")
     EmotionSurvey toEmotionSurvey(SubmitEmotionSurveyDTO dto);
 }
 

src/main/java/ch/fhnw/deardevbackend/mapper/SubmitWorkKindSurveyMapper.java

@@ -12,7 +12,7 @@
 public interface SubmitWorkKindSurveyMapper {
     SubmitWorkKindSurveyMapper INSTANCE = Mappers.getMapper(SubmitWorkKindSurveyMapper.class);
 
-    @Mapping(target = "submitted", expression = "java(java.time.OffsetDateTime.now().toString())")
+    @Mapping(target = "submitted", expression = "java(java.time.LocalDateTime.now())")
    WorkKindSurvey toWorkKindSurvey(SubmitWorkKindSurveyDTO dto);
 }
 

src/main/java/ch/fhnw/deardevbackend/mapper/WorkKindInsightMapper.java

@@ -1,6 +1,6 @@
 package ch.fhnw.deardevbackend.mapper;
 
-import ch.fhnw.deardevbackend.dto.WorkKindInsightDTO;
+import ch.fhnw.deardevbackend.dto.insights.WorkKindInsightDTO;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.factory.Mappers;
@@ -9,10 +9,23 @@
 public interface WorkKindInsightMapper {
     WorkKindInsightMapper INSTANCE = Mappers.getMapper(WorkKindInsightMapper.class);
 
-    @Mapping(source = "teamId", target = "teamId")
     @Mapping(source = "workKindId", target = "workKindId")
     @Mapping(source = "workKindName", target = "workKindName")
-    @Mapping(source = "averageHappiness", target = "averageHappiness")
-    @Mapping(source = "totalCount", target = "totalCount")
-    WorkKindInsightDTO toDTO(Integer teamId, Integer workKindId, String workKindName, Double averageHappiness, Long totalCount);
+    @Mapping(source = "userAverage", target = "userAverage")
+    @Mapping(source = "userCount", target = "userCount")
+    @Mapping(source = "teamAverage", target = "teamAverage")
+    @Mapping(source = "teamCount", target = "teamCount")
+    WorkKindInsightDTO toDTO(Integer workKindId, String workKindName, Double userAverage, Long userCount, Double teamAverage, Long teamCount);
+
+    @Mapping(source = "workKindId", target = "workKindId")
+    @Mapping(source = "workKindName", target = "workKindName")
+    @Mapping(source = "userAverage", target = "userAverage")
+    @Mapping(source = "userCount", target = "userCount")
+    WorkKindInsightDTO toUserDTO(Integer workKindId, String workKindName, Double userAverage, Long userCount);
+
+    @Mapping(source = "workKindId", target = "workKindId")
+    @Mapping(source = "workKindName", target = "workKindName")
+    @Mapping(source = "teamAverage", target = "teamAverage")
+    @Mapping(source = "teamCount", target = "teamCount")
+    WorkKindInsightDTO toTeamDTO(Integer workKindId, String workKindName, Double teamAverage, Long teamCount);
 }