♻️Refactor: 동호회 생성과 채팅방 생성 같은 요청 안에서 로직 처리

Author: imjuyongp

assets/stomp-test.html

@@ -413,7 +413,7 @@
         }
 
         const socket = new SockJS(
-            "http://localhost:8080/ws",
+            "http://localhost:8080/ws-stomp",
             null,
             { transports: ["xhr-streaming", "xhr-polling"] } // ✅ opCode=7 우회
         );
@@ -442,7 +442,7 @@
         }
 
         const rid = roomIdValue();
-        const dest = `/topic/chat/rooms/${rid}`;
+        const dest = `/sub/chat/rooms/${rid}`;
         $("roomTitle").textContent = `room: ${rid}`;
 
         currentSub = stompClient.subscribe(dest, (frame) => {
@@ -459,10 +459,10 @@
                 });
             }
         });
-        stompClient.send("/app/chat.join", {}, JSON.stringify({
+        stompClient.send("/pub/chat.join", {}, JSON.stringify({
             roomId: Number(roomIdValue()),
-            userId: myUserId(),
-            nickname: myNickname()
+            senderUserId: myUserId(),
+            senderNickname: myNickname()
         }));
         setSub("subscribed: " + dest);
         debug("[SUBSCRIBED] " + dest);
@@ -490,7 +490,7 @@
             content: text
         };
 
-        stompClient.send("/app/chat.send", {}, JSON.stringify(payload));
+        stompClient.send("/pub/chat.send", {}, JSON.stringify(payload));
         debug("[SENT] " + JSON.stringify(payload));
 
         contentEl.value = "";
@@ -501,10 +501,10 @@
 
         // 🔽 여기 먼저
         if (stompClient && stompClient.connected) {
-            stompClient.send("/app/chat.leave", {}, JSON.stringify({
+            stompClient.send("/pub/chat.leave", {}, JSON.stringify({
                 roomId: Number(roomIdValue()),
-                userId: myUserId(),
-                nickname: myNickname()
+                senderUserId: myUserId(),
+                senderNickname: myNickname()
             }));
         }
 

src/main/java/com/be/sportizebe/domain/auth/dto/request/LoginRequest.java

@@ -1,14 +1,17 @@
 package com.be.sportizebe.domain.auth.dto.request;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;
 
 public record LoginRequest(
     @NotBlank(message = "아이디를 입력해주세요.")
     @Email(message = "아이디는 이메일 형식만 지원합니다.")
+    @Schema(description = "사용자 아이디(이메일 형식)", example = "user@example.com")
     String username,
 
     @NotBlank(message = "비밀번호를 입력해주세요.")
+    @Schema(description = "비밀번호", example = "password123")
     String password
 ) {
 }

src/main/java/com/be/sportizebe/domain/chat/service/ChatRoomService.java

@@ -3,6 +3,7 @@
 import com.be.sportizebe.domain.chat.entity.ChatRoom;
 import com.be.sportizebe.domain.chat.exception.ChatErrorCode;
 import com.be.sportizebe.domain.chat.repository.ChatRoomRepository;
+import com.be.sportizebe.domain.club.entity.Club;
 import com.be.sportizebe.domain.post.entity.Post;
 import com.be.sportizebe.domain.user.entity.User;
 import com.be.sportizebe.global.exception.CustomException;
@@ -19,10 +20,11 @@ public class ChatRoomService {
     private final ChatRoomRepository chatRoomRepository;
 
     @Transactional
-    public ChatRoom createGroup(String name) {
+    public ChatRoom createGroup(Club club) {
         ChatRoom room = ChatRoom.builder()
-                .chatRoomType(ChatRoom.ChatRoomType.GROUP)
-                .build();
+          .chatRoomType(ChatRoom.ChatRoomType.GROUP)
+          .club(club)
+        .build();
         return chatRoomRepository.save(room);
     }
 

src/main/java/com/be/sportizebe/domain/club/controller/ClubController.java

@@ -27,10 +27,9 @@ public class ClubController {
   @PostMapping("/{sportType}")
   @Operation(summary = "동호회 생성", description = "종목별 동호회를 생성합니다. 생성한 사용자가 동호회장이 됩니다.")
   public ResponseEntity<BaseResponse<ClubResponse>> createClub(
-      @Parameter(description = "종목 (SOCCER, BASKETBALL)") @PathVariable SportType sportType,
       @RequestBody @Valid ClubCreateRequest request,
       @AuthenticationPrincipal User user) {
-    ClubResponse response = clubService.createClub(sportType, request, user);
+    ClubResponse response = clubService.createClub(request, user);
     return ResponseEntity.status(HttpStatus.CREATED)
         .body(BaseResponse.success("동호회 생성 성공", response));
   }

src/main/java/com/be/sportizebe/domain/club/dto/request/ClubCreateRequest.java

@@ -3,22 +3,22 @@
 import com.be.sportizebe.domain.club.entity.Club;
 import com.be.sportizebe.domain.user.entity.SportType;
 import com.be.sportizebe.domain.user.entity.User;
+import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 
 public record ClubCreateRequest(
   @NotBlank(message = "동호회 이름은 필수 입니다.")
-  String name,
-  String introduce,
-  Integer maxMembers) {
+  @Schema(description = "동호회 이름", example = "축구 동호회") String name,
+  @Schema(description = "동호회 소개", example = "매주 토요일 축구합니다") String introduce,
+  @Schema(description = "최대 정원", example = "20") Integer maxMembers) {
   // 관련 종목은 파라미터로 받음
   // TODO : S3 세팅 후 imgUrl은 multipartform으로 변경
 
-  public Club toEntity(SportType sportType, User user) {
+  public Club toEntity(User user) {
     return Club.builder()
       .name(name)
       .introduce(introduce)
       .maxMembers(maxMembers)
-      .sportType(sportType)
       .leader(user)
       .build();
   }

src/main/java/com/be/sportizebe/domain/club/dto/response/ClubResponse.java

@@ -11,7 +11,6 @@ public record ClubResponse(
     @Schema(description = "동호회 ID", example = "1") Long clubId,
     @Schema(description = "동호회 이름", example = "축구 동호회") String name,
     @Schema(description = "동호회 소개", example = "매주 토요일 축구합니다") String introduce,
-    @Schema(description = "종목", example = "SOCCER") SportType sportType,
     @Schema(description = "최대 정원", example = "20") Integer maxMembers,
     @Schema(description = "동호회장 닉네임", example = "닉네임") String leaderNickname) {
 
@@ -20,7 +19,6 @@ public static ClubResponse from(Club club) {
         .clubId(club.getId())
         .name(club.getName())
         .introduce(club.getIntroduce())
-        .sportType(club.getSportType())
         .maxMembers(club.getMaxMembers())
         .leaderNickname(club.getLeader().getNickname())
         .build();

src/main/java/com/be/sportizebe/domain/club/entity/Club.java

@@ -25,15 +25,11 @@ public class Club extends BaseTimeEntity {
   private Long id;
 
   @Column(nullable = false, unique = true)
-  private String name; // 동호회 이름
+  private String name; // 동호회 이름 == 단테 채팅방 이름
 
   @Column(columnDefinition = "TEXT")
   private String introduce; // 동호회 소개글
 
-  @Enumerated(EnumType.STRING)
-  @Column(nullable = false)
-  private SportType sportType; // 동호회의 종목
-
   @Column(nullable = false)
   private Integer maxMembers; // 최대 정원
 

src/main/java/com/be/sportizebe/domain/club/service/ClubService.java

@@ -6,5 +6,5 @@
 import com.be.sportizebe.domain.user.entity.User;
 
 public interface ClubService {
-  ClubResponse createClub(SportType sportType, ClubCreateRequest request, User user); // 동호회 생성
+  ClubResponse createClub(ClubCreateRequest request, User user); // 동호회 생성
 }

src/main/java/com/be/sportizebe/domain/club/service/ClubServiceImpl.java

@@ -1,5 +1,6 @@
 package com.be.sportizebe.domain.club.service;
 
+import com.be.sportizebe.domain.chat.service.ChatRoomService;
 import com.be.sportizebe.domain.club.dto.request.ClubCreateRequest;
 import com.be.sportizebe.domain.club.dto.response.ClubResponse;
 import com.be.sportizebe.domain.club.entity.Club;
@@ -20,17 +21,18 @@
 public class ClubServiceImpl implements ClubService {
 
   private final ClubRepository clubRepository;
+  private final ChatRoomService chatRoomService;
   private final ClubMemberRepository clubMemberRepository;
 
   @Override
   @Transactional
-  public ClubResponse createClub(SportType sportType, ClubCreateRequest request, User user) {
+  public ClubResponse createClub(ClubCreateRequest request, User user) {
     if (clubRepository.existsByName(request.name())) {
       throw new CustomException(ClubErrorCode.CLUB_NAME_DUPLICATED);
     }
 
-
-    Club club = request.toEntity(sportType, user);
+    // 동호회 엔티티 생성
+    Club club = request.toEntity(user);
     clubRepository.save(club);
 
     ClubMember leaderMember = ClubMember.builder()
@@ -40,6 +42,9 @@ public ClubResponse createClub(SportType sportType, ClubCreateRequest request, U
         .build();
     clubMemberRepository.save(leaderMember);
 
+    // 동호회 단체 채팅방 생성
+    chatRoomService.createGroup(club);
+
     return ClubResponse.from(club);
   }
 }