Merge pull request #62 from dnd-side-project/dev

gzhan0226 · web-flow · commit 4735a49cfd45 · 2025-08-25T10:55:27.000+09:00
main
diff --git a/chat-server/src/main/java/com/example/demo/controller/ChatController.java b/chat-server/src/main/java/com/example/demo/controller/ChatController.java
@@ -41,7 +41,7 @@ public void onMessage(@DestinationVariable String roomId, @Valid @Payload ChatIn
     @GetMapping("/chat/rooms/{roomId}/count")
     @Operation(
             summary = "채팅방 참여자 수 조회",
-            description = "해당 채팅방의 현재 참여자 수를 반환합니다.",
+            description = "해당 채팅방의 현재 참여자 수를 1회 반환합니다. (소켓 X)",
             responses = {
                     @ApiResponse(
                             responseCode = "200",
diff --git a/main-server/src/main/java/com/example/demo/domain/playlist/controller/PlaylistMyPageController.java b/main-server/src/main/java/com/example/demo/domain/playlist/controller/PlaylistMyPageController.java
@@ -8,6 +8,10 @@
 import com.example.demo.domain.playlist.dto.playlistdto.PlaylistResponse;
 import com.example.demo.domain.playlist.dto.playlistdto.PlaylistWithSongsResponse;
 import com.example.demo.domain.playlist.service.PlaylistMyPageService;
+import com.example.demo.domain.representative.entity.RepresentativePlaylist;
+import com.example.demo.domain.representative.service.RepresentativePlaylistService;
+import com.example.demo.domain.user.entity.Users;
+import com.example.demo.domain.user.service.UsersService;
 import com.example.demo.global.security.filter.CustomUserDetails;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -33,7 +37,9 @@
 public class PlaylistMyPageController {
 
     private final PlaylistMyPageService playlistMyPageService;
+    private final RepresentativePlaylistService representativePlaylistService;
     private final CdService cdService;
+    private final UsersService usersService;
 
     @Operation(
             summary = "임시 플레이리스트 저장(세션)",
@@ -75,8 +81,7 @@ public ResponseEntity<PlaylistWithSongsResponse> savePlaylist(
             throw new IllegalStateException("세션에 임시 저장된 플레이리스트가 없습니다.");
         }
 
-        PlaylistWithSongsResponse response = playlistMyPageService.savePlaylistWithSongs(user.getId(), request,
-                finalPlaylistRequest.theme());
+        PlaylistWithSongsResponse response = playlistMyPageService.savePlaylistWithSongs(user.getId(), request);
 
         cdService.saveCdItemList(response.playlistId(), finalPlaylistRequest.saveCdRequestDto().cdItems());
 
@@ -144,7 +149,6 @@ public ResponseEntity<List<PlaylistDetailResponse>> getPlaylistsByCreator(
     }
 
 
-
     @Operation(
             summary = "내 플레이리스트 상세 조회",
             description = "플레이리스트 상세 및 곡 목록, 좋아요/조회수 등 메타 정보를 반환합니다."
@@ -166,6 +170,27 @@ public ResponseEntity<PlaylistDetailResponse> getPlaylistDetail(
         return ResponseEntity.ok(response);
     }
 
+    @Operation(
+            summary = "공유된 링크로 플레이리스트 상세 조회",
+            description = "공유된 링크로 플레이리스트 상세 및 곡 목록, 좋아요/조회수 등 메타 정보를 반환합니다."
+    )
+    @ApiResponse(
+            responseCode = "200",
+            description = "플레이리스트 상세",
+            content = @Content(schema = @Schema(implementation = PlaylistDetailResponse.class))
+    )
+    @ApiResponse(responseCode = "404", description = "플레이리스트를 찾을 수 없음")
+    @GetMapping("/shared/{shareCode}")
+    public ResponseEntity<PlaylistDetailResponse> getSharedPlaylistDetail(
+            @Parameter(description = "플레이리스트 ID", example = "123")
+            @PathVariable String shareCode
+    ) {
+        Users user = usersService.findUserByShareCode(shareCode);
+        RepresentativePlaylist representativePlaylist = representativePlaylistService.findRepresentativePlaylistByUserId(user.getId());
+        PlaylistDetailResponse response = playlistMyPageService.getPlaylistDetail(user.getId(), representativePlaylist.getPlaylist().getId());
+        return ResponseEntity.ok(response);
+    }
+
     @Operation(
             summary = "내 플레이리스트 삭제",
             description = "플레이리스트를 삭제합니다."
diff --git a/main-server/src/main/java/com/example/demo/domain/playlist/dto/FinalPlaylistRequest.java b/main-server/src/main/java/com/example/demo/domain/playlist/dto/FinalPlaylistRequest.java
@@ -5,9 +5,6 @@
 
 @Schema(description = "플레이리스트 생성 요청 DTO")
 public record FinalPlaylistRequest(
-        @Schema(description = "플레이리스트 테마", example = "여름/운동/집중")
-        String theme,
-
         @Schema(description = "CD 저장")
         SaveCdRequestDto saveCdRequestDto) {
 }
diff --git a/main-server/src/main/java/com/example/demo/domain/playlist/service/PlaylistMyPageService.java b/main-server/src/main/java/com/example/demo/domain/playlist/service/PlaylistMyPageService.java
@@ -10,7 +10,7 @@
 
 public interface PlaylistMyPageService {
 
-    PlaylistWithSongsResponse savePlaylistWithSongs(String users, PlaylistCreateRequest request, String theme);
+    PlaylistWithSongsResponse savePlaylistWithSongs(String users, PlaylistCreateRequest request);
 
     List<PlaylistResponse> getMyPlaylistsSorted(String userId, PlaylistSortOption sortOption);
 
diff --git a/main-server/src/main/java/com/example/demo/domain/playlist/service/PlaylistMyPageServiceImpl.java b/main-server/src/main/java/com/example/demo/domain/playlist/service/PlaylistMyPageServiceImpl.java
@@ -12,6 +12,7 @@
 import com.example.demo.domain.playlist.dto.playlistdto.PlaylistWithSongsResponse;
 import com.example.demo.domain.playlist.entity.Playlist;
 import com.example.demo.domain.playlist.repository.PlaylistRepository;
+import com.example.demo.domain.playlist.util.ShareCodeGenerator;
 import com.example.demo.domain.representative.entity.RepresentativePlaylist;
 import com.example.demo.domain.representative.repository.RepresentativePlaylistRepository;
 import com.example.demo.domain.song.dto.SongMapper;
@@ -76,7 +77,7 @@ private void updateRepresentativePlaylist(Users user, Playlist playlist) {
 
     @Override
     @Transactional
-    public PlaylistWithSongsResponse savePlaylistWithSongs(String usersId, PlaylistCreateRequest request, String theme) {
+    public PlaylistWithSongsResponse savePlaylistWithSongs(String usersId, PlaylistCreateRequest request) {
         Playlist savedPlaylist = savePlaylist(usersId, request);
 
         List<Song> songsToSave = new ArrayList<>();
@@ -138,14 +139,23 @@ public void deletePlaylist(String userId, Long playlistId) {
 
     @Transactional
     public String sharePlaylist(String userId) {
-        boolean exists = representativePlaylistRepository.existsByUser_Id(userId);
-        if (!exists) {
-            throw new IllegalStateException("대표 플레이리스트가 설정되어 있지 않습니다.");
+        Users users = usersRepository.findById(userId)
+                .orElseThrow(() -> new UserException(UserErrorCode.USER_NOT_FOUND));
+
+        if (users.getShareCode() != null && !users.getShareCode().isBlank()) {
+            return users.getShareCode();
         }
-        return "/shared/" + userId;
+
+        String shareCode = ShareCodeGenerator.generate(userId);
+        users.assignShareCode(shareCode);
+
+        usersRepository.save(users);
+
+        return "/shared/" + shareCode;
     }
 
 
+
     @Override
     @Transactional
     public void updateRepresentative(String userId, Long playlistId) {
diff --git a/main-server/src/main/java/com/example/demo/domain/playlist/util/ShareCodeGenerator.java b/main-server/src/main/java/com/example/demo/domain/playlist/util/ShareCodeGenerator.java
@@ -1,12 +1,32 @@
 package com.example.demo.domain.playlist.util;
 
+import java.nio.ByteBuffer;
+import java.util.Base64;
 import java.util.UUID;
 
 public class ShareCodeGenerator {
-    public static String generate() {
-        return UUID.randomUUID()
-                .toString()
-                .replace("-", "")
-                .substring(0, 8);
+
+    private static final int LENGTH = 8; // 원하는 길이
+
+    public static String generate(String userId) {
+        if (userId == null || userId.isBlank()) {
+            throw new IllegalArgumentException("userId must be a non-empty UUID string");
+        }
+
+        UUID uuid = UUID.fromString(userId.trim());
+        byte[] bytes = toBytes(uuid);
+
+        String b64 = Base64.getUrlEncoder()
+                .withoutPadding()
+                .encodeToString(bytes);
+
+        return b64.substring(0, LENGTH);
+    }
+
+    private static byte[] toBytes(UUID uuid) {
+        ByteBuffer bb = ByteBuffer.allocate(16);
+        bb.putLong(uuid.getMostSignificantBits());
+        bb.putLong(uuid.getLeastSignificantBits());
+        return bb.array();
     }
 }
diff --git a/main-server/src/main/java/com/example/demo/domain/representative/service/RepresentativePlaylistService.java b/main-server/src/main/java/com/example/demo/domain/representative/service/RepresentativePlaylistService.java
@@ -0,0 +1,21 @@
+package com.example.demo.domain.representative.service;
+
+import com.example.common.error.code.PlaylistErrorCode;
+import com.example.common.error.exception.PlaylistException;
+import com.example.demo.domain.representative.entity.RepresentativePlaylist;
+import com.example.demo.domain.representative.repository.RepresentativePlaylistRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class RepresentativePlaylistService {
+
+    private final RepresentativePlaylistRepository representativePlaylistRepository;
+
+    public RepresentativePlaylist findRepresentativePlaylistByUserId(String userId) {
+        return representativePlaylistRepository.findByUser_Id(userId)
+                .orElseThrow(()-> new PlaylistException(PlaylistErrorCode.PLAYLIST_NOT_FOUND));
+    }
+
+}
diff --git a/main-server/src/main/java/com/example/demo/domain/user/entity/Users.java b/main-server/src/main/java/com/example/demo/domain/user/entity/Users.java
@@ -27,6 +27,10 @@ public class Users extends BaseTimeEntity {
 
     @Column(name = "username")
     private String username;
+
+    @Column(name = "share_code", unique = true)
+    private String shareCode;
+
 //
 //    @Column(name = "nickname")
 //    private String nickname;
@@ -36,6 +40,13 @@ public class Users extends BaseTimeEntity {
 
     private boolean enabled;
 
+    public void assignShareCode(String shareCode) {
+        if (this.shareCode != null) {
+            throw new IllegalStateException("이미 shareCode가 존재합니다.");
+        }
+        this.shareCode = shareCode;
+    }
+
     @Builder
     public Users(String kakaoId, String username, boolean enabled) {
         this.kakaoId = kakaoId;
diff --git a/main-server/src/main/java/com/example/demo/domain/user/repository/UsersRepository.java b/main-server/src/main/java/com/example/demo/domain/user/repository/UsersRepository.java
@@ -2,11 +2,15 @@
 
 import com.example.demo.domain.user.entity.Users;
 import java.util.List;
+import java.util.Optional;
+
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 
 public interface UsersRepository extends JpaRepository<Users, String> {
 
     @Query("SELECT u.id FROM Users u")
     List<String> findAllUserIds();
+
+    Optional<Users> findUsersByShareCode(String shareCode);
 }
diff --git a/main-server/src/main/java/com/example/demo/domain/user/service/UsersService.java b/main-server/src/main/java/com/example/demo/domain/user/service/UsersService.java
@@ -0,0 +1,20 @@
+package com.example.demo.domain.user.service;
+
+import com.example.common.error.code.UserErrorCode;
+import com.example.common.error.exception.UserException;
+import com.example.demo.domain.user.entity.Users;
+import com.example.demo.domain.user.repository.UsersRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class UsersService {
+
+    private final UsersRepository usersRepository;
+
+    public Users findUserByShareCode(String shareCode) {
+        return usersRepository.findUsersByShareCode(shareCode)
+                .orElseThrow(()-> new UserException(UserErrorCode.USER_NOT_FOUND));
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,6 @@`
`5`	`5`
`6`	`6`	`@Schema(description = "플레이리스트 생성 요청 DTO")`
`7`	`7`	`public record FinalPlaylistRequest(`
`8`		`- @Schema(description = "플레이리스트 테마", example = "여름/운동/집중")`
`9`		`- String theme,`
`10`		`-`
`11`	`8`	`@Schema(description = "CD 저장")`
`12`	`9`	`SaveCdRequestDto saveCdRequestDto) {`
`13`	`10`	`}`