diff --git a/backend/src/main/java/com/fmc/starterApp/controllers/CarverMatrixController.java b/backend/src/main/java/com/fmc/starterApp/controllers/CarverMatrixController.java index 49b22b9..23c89d7 100644 --- a/backend/src/main/java/com/fmc/starterApp/controllers/CarverMatrixController.java +++ b/backend/src/main/java/com/fmc/starterApp/controllers/CarverMatrixController.java @@ -17,8 +17,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import org.springframework.security.core.annotation.AuthenticationPrincipal; -import org.springframework.security.oauth2.jwt.Jwt; import com.fmc.starterApp.models.entity.CarverItem; import com.fmc.starterApp.models.entity.CarverMatrix; @@ -179,7 +177,7 @@ public ResponseEntity updateCarverMatrix(@PathVariable Long matrixId, @Reques public ResponseEntity searchCarverMatrices(@RequestParam Map searchParams, @AuthenticationPrincipal Jwt jwt) { try { // Get user's email from JWT token - String userEmail = jwt.getClaim("email"); + String userEmail = jwt.getClaim("email").toString().trim().toLowerCase(); if (userEmail == null || userEmail.isEmpty()) { return ResponseEntity.badRequest().body("User email not found in token"); } diff --git a/backend/src/main/java/com/fmc/starterApp/services/CarverMatrixService.java b/backend/src/main/java/com/fmc/starterApp/services/CarverMatrixService.java index 5151cf2..d37ab6a 100644 --- a/backend/src/main/java/com/fmc/starterApp/services/CarverMatrixService.java +++ b/backend/src/main/java/com/fmc/starterApp/services/CarverMatrixService.java @@ -179,6 +179,18 @@ public CarverMatrix createCarverMatrix(CarverMatrix matrix, Long userId) { matrix.setRoleBased(matrix.getRoleBased()); matrix.setFivePointScoring(matrix.getFivePointScoring()); + List participantList = new ArrayList<>(Arrays.asList(matrix.getParticipants())); + for(int i = 0; i hostList = new ArrayList<>(Arrays.asList(matrix.getHosts())); + for(int i = 0; i starterAppRole = new ArrayList<>();