Merge pull request #362 from bounswe/change-muscle-groups-for-feedback

Changed muscle groups for feedback
bounswe · Dec 16, 2024 · 8def347 · 8def347
2 parents c0c6dd6 + c269dc1
commit 8def347
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 8 deletions.
diff --git a/backend/demo-group7/src/main/java/com/group7/demo/dtos/FeedbackRequest.java b/backend/demo-group7/src/main/java/com/group7/demo/dtos/FeedbackRequest.java
@@ -1,6 +1,6 @@
 package com.group7.demo.dtos;
 
-import com.group7.demo.models.enums.BodyPart;
+import com.group7.demo.models.enums.FeedbackMuscle;
 import lombok.Data;
 
 @Data
@@ -10,7 +10,7 @@ public class FeedbackRequest {
 
     private Long userId;
 
-    private BodyPart bodyPart;
+    private FeedbackMuscle feedbackMuscle;
 
     private int weekNumber;
 

diff --git a/backend/demo-group7/src/main/java/com/group7/demo/dtos/FeedbackResponse.java b/backend/demo-group7/src/main/java/com/group7/demo/dtos/FeedbackResponse.java
@@ -1,6 +1,6 @@
 package com.group7.demo.dtos;
 
-import com.group7.demo.models.enums.BodyPart;
+import com.group7.demo.models.enums.FeedbackMuscle;
 import lombok.Builder;
 import lombok.Data;
 
@@ -16,7 +16,7 @@ public class FeedbackResponse {
 
     private String username; // User's username
 
-    private BodyPart bodyPart;
+    private FeedbackMuscle feedbackMuscle;
 
     private int weekNumber;
 

diff --git a/backend/demo-group7/src/main/java/com/group7/demo/dtos/mapper/Mapper.java b/backend/demo-group7/src/main/java/com/group7/demo/dtos/mapper/Mapper.java
@@ -213,7 +213,7 @@ public FeedbackResponse mapToFeedbackResponse(Feedback feedback) {
                 .id(feedback.getId())
                 .trainingProgramTitle(feedback.getTrainingProgram().getTitle()) // Map training program title
                 .username(feedback.getUser().getUsername()) // Map user's username
-                .bodyPart(feedback.getBodyPart()) // Map body part
+                .feedbackMuscle(feedback.getFeedbackMuscle()) // Map body part
                 .weekNumber(feedback.getWeekNumber()) // Map week number
                 .workoutNumber(feedback.getWorkoutNumber()) // Map workout number
                 .exerciseNumber(feedback.getExerciseNumber()) // Map exercise number

diff --git a/backend/demo-group7/src/main/java/com/group7/demo/models/Feedback.java b/backend/demo-group7/src/main/java/com/group7/demo/models/Feedback.java
@@ -1,7 +1,7 @@
 package com.group7.demo.models;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.group7.demo.models.enums.BodyPart;
+import com.group7.demo.models.enums.FeedbackMuscle;
 import jakarta.persistence.*;
 import lombok.*;
 import java.time.LocalDateTime;
@@ -28,7 +28,7 @@ public class Feedback {
     private User user;
 
     @Enumerated(EnumType.STRING)
-    private BodyPart bodyPart;
+    private FeedbackMuscle feedbackMuscle;
 
     private int weekNumber;
 

diff --git a/backend/demo-group7/src/main/java/com/group7/demo/models/enums/FeedbackMuscle.java b/backend/demo-group7/src/main/java/com/group7/demo/models/enums/FeedbackMuscle.java
@@ -0,0 +1,33 @@
+package com.group7.demo.models.enums;
+
+public enum FeedbackMuscle {
+    TRAPEZIUS,
+    UPPER_BACK,
+    LOWER_BACK,
+
+    /* Chest */
+    CHEST,
+
+    /* Arms */
+    BICEPS,
+    TRICEPS,
+    FOREARM,
+    BACK_DELTOIDS,
+    FRONT_DELTOIDS,
+
+    /* Abs */
+    ABS,
+    OBLIQUES,
+
+    /* Legs */
+    ADDUCTOR,
+    HAMSTRING,
+    QUADRICEPS,
+    ABDUCTORS,
+    CALVES,
+    GLUTEAL,
+
+    /* Head */
+    HEAD,
+    NECK
+}
diff --git a/backend/demo-group7/src/main/java/com/group7/demo/services/FeedbackService.java b/backend/demo-group7/src/main/java/com/group7/demo/services/FeedbackService.java
@@ -52,7 +52,7 @@ public FeedbackResponse addFeedback(FeedbackRequest feedbackRequest, HttpServlet
         Feedback feedback = Feedback.builder()
                 .trainingProgram(trainingProgram)
                 .user(user)
-                .bodyPart(feedbackRequest.getBodyPart())
+                .feedbackMuscle(feedbackRequest.getFeedbackMuscle())
                 .weekNumber(feedbackRequest.getWeekNumber())
                 .workoutNumber(feedbackRequest.getWorkoutNumber())
                 .exerciseNumber(feedbackRequest.getExerciseNumber())