[hotfix] merge 후 오류 수정

Team-Recordy · Jul 16, 2024 · 3677004 · 3677004
1 parent e198cdb
commit 3677004
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 16 deletions.
diff --git a/src/main/java/org/recordy/server/record/controller/RecordApi.java b/src/main/java/org/recordy/server/record/controller/RecordApi.java
@@ -5,7 +5,6 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import org.recordy.server.auth.security.UserId;
 import org.recordy.server.common.dto.response.CursorBasePaginatedResponse;
 import org.recordy.server.common.dto.response.PaginatedResponse;
 import org.recordy.server.auth.security.resolver.UserId;

diff --git a/src/main/java/org/recordy/server/record/controller/RecordController.java b/src/main/java/org/recordy/server/record/controller/RecordController.java
@@ -80,7 +80,7 @@ public ResponseEntity<CursorBasePaginatedResponse<RecordInfoWithBookmark>> getRe
 
         return ResponseEntity
                 .ok().
-                body(CursorBasePaginatedResponse.of(RecordInfoWithBookmark.of(records, bookmarks),recordInfoWithBookmark -> recordInfoWithBookmark.recordInfo().id()));
+                body(CursorBasePaginatedResponse.of(RecordInfoWithBookmark.of(records, bookmarks, userId),recordInfoWithBookmark -> recordInfoWithBookmark.recordInfo().id()));
     }
 
     @Override
@@ -96,7 +96,7 @@ public ResponseEntity<PaginatedResponse<RecordInfoWithBookmark>> getFamousRecord
 
         return ResponseEntity
                 .ok()
-                .body(PaginatedResponse.of(RecordInfoWithBookmark.of(records, bookmarks)));
+                .body(PaginatedResponse.of(RecordInfoWithBookmark.of(records, bookmarks, userId)));
     }
 
     @Override
@@ -124,7 +124,7 @@ public ResponseEntity<CursorBasePaginatedResponse<RecordInfoWithBookmark>> getRe
 
         return ResponseEntity
                 .ok()
-                .body(CursorBasePaginatedResponse.of(RecordInfoWithBookmark.of(records, bookmarks), recordInfoWithBookmark -> recordInfoWithBookmark.recordInfo()
+                .body(CursorBasePaginatedResponse.of(RecordInfoWithBookmark.of(records, bookmarks, userId), recordInfoWithBookmark -> recordInfoWithBookmark.recordInfo()
                         .id()));
     }
 
@@ -140,7 +140,7 @@ public ResponseEntity<CursorBasePaginatedResponse<RecordInfoWithBookmark>> getSu
 
         return ResponseEntity
                 .ok()
-                .body(CursorBasePaginatedResponse.of(RecordInfoWithBookmark.of(records, bookmarks), recordInfoWithBookmark -> recordInfoWithBookmark.recordInfo()
+                .body(CursorBasePaginatedResponse.of(RecordInfoWithBookmark.of(records, bookmarks, userId), recordInfoWithBookmark -> recordInfoWithBookmark.recordInfo()
                         .id()));
     }
 

diff --git a/src/main/java/org/recordy/server/record_stat/controller/RecordStatController.java b/src/main/java/org/recordy/server/record_stat/controller/RecordStatController.java
@@ -71,7 +71,7 @@ public ResponseEntity<CursorBasePaginatedResponse<RecordInfoWithBookmark>> getBo
 
         return ResponseEntity
                 .status(HttpStatus.OK)
-                .body(CursorBasePaginatedResponse.of(RecordInfoWithBookmark.of(records, bookmarks), recordInfoWithBookmark -> recordInfoWithBookmark.recordInfo()
+                .body(CursorBasePaginatedResponse.of(RecordInfoWithBookmark.of(records, bookmarks, userId), recordInfoWithBookmark -> recordInfoWithBookmark.recordInfo()
                         .id()));
     }
 }
diff --git a/src/main/java/org/recordy/server/user/controller/UserApi.java b/src/main/java/org/recordy/server/user/controller/UserApi.java
@@ -104,13 +104,7 @@ public ResponseEntity<CursorBasePaginatedResponse<UserInfoWithFollowing>> getSub
             responses = {
                     @ApiResponse(
                             responseCode = "200",
-                            description = "성공",
-                            content = @Content(
-                                    mediaType = MediaType.APPLICATION_JSON_VALUE,
-                                    schema = @Schema(
-                                            implementation = Preference.class
-                                    )
-                            )
+                            description = "성공"
                     )
             }
     )

diff --git a/src/main/java/org/recordy/server/user/controller/UserController.java b/src/main/java/org/recordy/server/user/controller/UserController.java
@@ -1,9 +1,7 @@
 package org.recordy.server.user.controller;
 
-import com.sun.security.auth.UserPrincipal;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
-import org.recordy.server.auth.security.UserId;
 import org.recordy.server.common.dto.response.CursorBasePaginatedResponse;
 import org.recordy.server.subscribe.repository.SubscribeRepository;
 import org.recordy.server.auth.security.resolver.UserId;
@@ -84,7 +82,7 @@ public ResponseEntity<CursorBasePaginatedResponse<UserInfoWithFollowing>> getSub
                 .status(HttpStatus.OK)
                 .body(CursorBasePaginatedResponse.of(UserInfoWithFollowing.of(users, following), userInfoWithFollowing -> userInfoWithFollowing.userInfo().id()));
         }
-    }
+
 
     @Override
     @GetMapping("/profile/{otherUserId}")