Merge pull request #859 from bounswe/main

Deploy recent changes 26.11.2023 16.43
bounswe · Nov 26, 2023 · f0eadb8 · f0eadb8
2 parents 3a1a952 + 4bd6753
commit f0eadb8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/app/backend/src/main/java/com/app/gamereview/controller/ProfileController.java b/app/backend/src/main/java/com/app/gamereview/controller/ProfileController.java
@@ -41,12 +41,12 @@ public ResponseEntity<List<GetLastActivitiesResponseDto>> getReviews(@RequestHea
     }
 
     @PostMapping("/get")
-    public ResponseEntity<ProfilePageResponseDto> getProfile(@RequestParam String id, @RequestHeader(name = HttpHeaders.AUTHORIZATION, required = false) String Authorization) {
+    public ResponseEntity<ProfilePageResponseDto> getProfile(@RequestParam String userId, @RequestHeader(name = HttpHeaders.AUTHORIZATION, required = false) String Authorization) {
         String email;
         if (JwtUtil.validateToken(Authorization)) email = JwtUtil.extractSubject(Authorization);
         else email = "";
 
-        ProfilePageResponseDto profile = profileService.getProfile(id, email);
+        ProfilePageResponseDto profile = profileService.getProfile(userId, email);
         return ResponseEntity.ok(profile);
     }
 

diff --git a/app/backend/src/main/java/com/app/gamereview/service/ProfileService.java b/app/backend/src/main/java/com/app/gamereview/service/ProfileService.java
@@ -205,11 +205,11 @@ public Profile removeGameFromProfile(String id, ProfileUpdateGameRequestDto requ
         return profileRepository.save(editedProfile);
     }
 
-    public ProfilePageResponseDto getProfile(String id, String email) {
-        Optional<Profile> optionalProfile = profileRepository.findById(id);
+    public ProfilePageResponseDto getProfile(String userId, String email) {
+        Optional<Profile> optionalProfile = profileRepository.findByUserIdAndIsDeletedFalse(userId);
 
         if (optionalProfile.isEmpty() || optionalProfile.get().getIsDeleted()) {
-            throw new ResourceNotFoundException("The profile with the given id is not found.");
+            throw new ResourceNotFoundException("The profile for the given user id is not found.");
         }
 
         Profile profile = optionalProfile.get();