Merge feature/#34 into feature/#29

src/main/java/meltingpot/server/chat/service/ChatRoomService.java

@@ -13,7 +13,7 @@ public class ChatRoomService {
     private final ChatRoomUserRepository chatRoomUserRepository;
 
     public void updateAlarmStatus(Long userId, Long chatRoomId) {
-        ChatRoomUser chatRoomUser = chatRoomUserRepository.findChatRoomUserByUserIdAndChatRoomId(userId, chatRoomId)
+        ChatRoomUser chatRoomUser = chatRoomUserRepository.findChatRoomUserByAccountIdAndChatRoomId(userId, chatRoomId)
                 .orElseThrow(() -> new IllegalArgumentException("ChatRoomUser not found"));
         chatRoomUser.toggleAlarm();
         chatRoomUserRepository.save(chatRoomUser);

src/main/java/meltingpot/server/domain/entity/chat/ChatRoomUser.java

@@ -23,7 +23,7 @@ public class ChatRoomUser extends BaseEntity {
     private Alarm alarm;
 
     @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "user_id")
+    @JoinColumn(name = "account_id")
     private Account account;
 
     @ManyToOne(fetch = FetchType.LAZY)

src/main/java/meltingpot/server/domain/entity/party/Party.java

@@ -5,6 +5,7 @@
 import lombok.*;
 import meltingpot.server.domain.entity.Area;
 import meltingpot.server.domain.entity.Account;
+import meltingpot.server.domain.entity.chat.ChatRoom;
 import meltingpot.server.domain.entity.common.BaseEntity;
 import meltingpot.server.domain.entity.party.enums.PartyStatus;
 
@@ -60,17 +61,18 @@ public class Party extends BaseEntity {
     private int partyMinParticipant;
 
     @NotNull
+    @Column(name = "party_max_participant", nullable = false)
     private int partyMaxParticipant;
 
-    @NotNull
-    @Column(name = "part_max_participant", nullable = false)
-    private Integer partMaxParticipant;
-
     @OneToMany(mappedBy = "party", fetch = FetchType.EAGER, cascade = CascadeType.REMOVE)
     @Builder.Default
     private List<PartyContent> partyContents = new ArrayList<>();
 
     @OneToMany(mappedBy = "party", fetch = FetchType.EAGER, cascade = CascadeType.REMOVE)
     @Builder.Default
     private List<PartyParticipant> partyParticipants = new ArrayList<>();
+
+    @OneToOne(mappedBy = "party", fetch = FetchType.LAZY, cascade = CascadeType.REMOVE)
+    @Builder.Default
+    private ChatRoom chatRoom = null;
 }

src/main/java/meltingpot/server/domain/repository/chat/ChatRoomUserRepository.java

@@ -7,5 +7,5 @@
 
 public interface ChatRoomUserRepository extends JpaRepository<ChatRoomUser, Long> {
     int countChatRoomUsersByChatRoomId(Long chatRoomId);
-    Optional<ChatRoomUser> findChatRoomUserByUserIdAndChatRoomId(Long userId, Long chatRoomId);
+    Optional<ChatRoomUser> findChatRoomUserByAccountIdAndChatRoomId(Long userId, Long chatRoomId);
 }

src/main/java/meltingpot/server/domain/repository/party/PartyParticipantRepository.java

@@ -1,13 +1,7 @@
 package meltingpot.server.domain.repository.party;
 
-import meltingpot.server.domain.entity.party.Party;
 import meltingpot.server.domain.entity.party.PartyParticipant;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-import java.util.List;
-
 public interface PartyParticipantRepository extends JpaRepository<PartyParticipant, Long> {
-    int countByPartyId(Long partyId);
-    int countByUserId(Long userId);
-    List<PartyParticipant> findAllByUserId(Long userId);
 }

src/main/java/meltingpot/server/domain/repository/party/PartyRepository.java

@@ -4,6 +4,6 @@
 import meltingpot.server.domain.entity.party.PartyParticipant;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-public interface PartyRepository extends JpaRepository<Party, Long> {
+public interface PartyRepository extends JpaRepository<Party, Integer> {
     Party findByChatRoomId(Long chatRoomId);
 }

src/main/java/meltingpot/server/party/service/PartyService.java

@@ -5,8 +5,8 @@
 import meltingpot.server.domain.entity.party.PartyParticipant;
 import meltingpot.server.domain.entity.party.enums.ParticipantStatus;
 import meltingpot.server.domain.entity.party.enums.PartyStatus;
-import meltingpot.server.domain.repository.PartyParticipantRepository;
-import meltingpot.server.domain.repository.PartyRepository;
+import meltingpot.server.domain.repository.party.PartyParticipantRepository;
+import meltingpot.server.domain.repository.party.PartyRepository;
 import meltingpot.server.party.dto.PartyResponse;
 import meltingpot.server.util.ResponseCode;
 import org.springframework.stereotype.Service;