feat: [#114]: 충돌 해결 및 모임찜, 모임찜 삭제

src/main/java/org/rf/rfserver/config/BaseResponseStatus.java

@@ -29,6 +29,7 @@ public enum BaseResponseStatus {
     INVALID_TOKEN(false, 2013, "유효하지 않은 토큰입니다."),
     INVALID_LOGIN_IR_OR_PASSWORD(false, 2014, "아이디 또는 비밀번호가 일치하지 않습니다"),
     NOT_OWNER(false, 2015, "모임장이 아니면 강퇴할 수 없습니다"),
+    NOT_FAVORITE_PARTY(false, 2016, "해당 유저는 이 모임을 찜하지 않았습니다"),
 
 
     /**

src/main/java/org/rf/rfserver/domain/FavoriteParty.java

@@ -0,0 +1,30 @@
+package org.rf.rfserver.domain;
+
+import jakarta.persistence.*;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@Entity
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class FavoriteParty {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @ManyToOne
+    private User user;
+    @ManyToOne
+    private Party party;
+
+    public FavoriteParty(User user, Party party) {
+        this.user = user;
+        this.party = party;
+        user.getFavoriteParties().add(this);
+    }
+
+    public void deleteFavoriteParty() {
+        user.getFavoriteParties().remove(this);
+    }
+}

src/main/java/org/rf/rfserver/domain/User.java

@@ -50,12 +50,15 @@ public class User extends BaseEntity implements UserDetails {
     private LifeStyle lifeStyle;
     @OneToMany(mappedBy = "user")
     private List<UserParty> userParties;
+    @OneToMany(mappedBy = "user")
+    private List<FavoriteParty> favoriteParties;
 
     @OneToMany(mappedBy = "blockerUser")
     @JsonManagedReference // 이 엔티티를 직렬화 할 때 관련된 BlockParty 엔티티를 포함
     private List<BlockParty> blockedParties;
 
 
+
     @Builder
     public User(String loginId, String password, int entrance, University university, String nickName
             , Country country, List<Language> interestingLanguages, String introduce, Mbti mbti

src/main/java/org/rf/rfserver/party/controller/FavoritePartyController.java

@@ -0,0 +1,30 @@
+package org.rf.rfserver.party.controller;
+
+import lombok.RequiredArgsConstructor;
+import org.rf.rfserver.config.BaseException;
+import org.rf.rfserver.config.BaseResponse;
+import org.rf.rfserver.party.dto.favoriteparty.FavoritePartyReq;
+import org.rf.rfserver.party.dto.favoriteparty.FavoritePartyRes;
+import org.rf.rfserver.party.service.FavoritePartyService;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/favoriteParty")
+public class FavoritePartyController {
+
+    private final FavoritePartyService favoritePartyService;
+
+    @PostMapping("/favorite")
+    public BaseResponse<FavoritePartyRes> toggleFavoriteParty(@RequestBody FavoritePartyReq favoritePartyReq) {
+        try {
+            return new BaseResponse<>(favoritePartyService.favoriteParty(favoritePartyReq));
+
+        } catch (BaseException e) {
+            return new BaseResponse<>(e.getStatus());
+        }
+    }
+}

src/main/java/org/rf/rfserver/party/controller/PartyController.java

@@ -7,11 +7,14 @@
 
 import org.rf.rfserver.constant.Interest;
 import org.rf.rfserver.constant.PreferAges;
+import org.rf.rfserver.party.dto.favoriteparty.FavoritePartyReq;
+import org.rf.rfserver.party.dto.favoriteparty.FavoritePartyRes;
 import org.rf.rfserver.party.dto.party.*;
 import org.rf.rfserver.party.dto.partyjoin.PostApproveJoinRes;
 import org.rf.rfserver.party.dto.partyjoin.PostDenyJoinRes;
 import org.rf.rfserver.party.dto.partyjoinapply.PostJoinApplicationReq;
 import org.rf.rfserver.party.dto.partyjoinapply.PostJoinApplicationRes;
+import org.rf.rfserver.party.repository.FavoritePartyRepository;
 import org.rf.rfserver.party.service.PartyService;
 
 import org.rf.rfserver.config.PageDto;
@@ -185,5 +188,4 @@ public BaseResponse<PageDto<List<GetInterestPartyRes>>> recommendPersonalParties
             return new BaseResponse<>(e.getStatus());
         }
     }
-
 }

src/main/java/org/rf/rfserver/party/dto/favoriteparty/FavoritePartyReq.java

@@ -0,0 +1,13 @@
+package org.rf.rfserver.party.dto.favoriteparty;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor
+public class FavoritePartyReq {
+    Long userId;
+    Long partyId;
+    Boolean isFavorite;
+}

src/main/java/org/rf/rfserver/party/dto/favoriteparty/FavoritePartyRes.java

@@ -0,0 +1,12 @@
+package org.rf.rfserver.party.dto.favoriteparty;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+@AllArgsConstructor
+public class FavoritePartyRes {
+    Boolean done;
+}

src/main/java/org/rf/rfserver/party/repository/FavoritePartyRepository.java

@@ -0,0 +1,12 @@
+package org.rf.rfserver.party.repository;
+
+import org.rf.rfserver.domain.FavoriteParty;
+import org.rf.rfserver.domain.Party;
+import org.rf.rfserver.domain.User;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.Optional;
+
+public interface FavoritePartyRepository extends JpaRepository<FavoriteParty, Long> {
+    Optional<FavoriteParty> findByUserAndParty(User user, Party party);
+}

src/main/java/org/rf/rfserver/party/service/FavoritePartyService.java

@@ -0,0 +1,46 @@
+package org.rf.rfserver.party.service;
+
+import lombok.RequiredArgsConstructor;
+import org.rf.rfserver.config.BaseException;
+import org.rf.rfserver.config.BaseResponseStatus;
+import org.rf.rfserver.domain.FavoriteParty;
+import org.rf.rfserver.domain.Party;
+import org.rf.rfserver.domain.User;
+import org.rf.rfserver.party.dto.favoriteparty.FavoritePartyReq;
+import org.rf.rfserver.party.dto.favoriteparty.FavoritePartyRes;
+import org.rf.rfserver.party.repository.FavoritePartyRepository;
+import org.rf.rfserver.user.service.UserService;
+import org.springframework.stereotype.Service;
+
+import static org.rf.rfserver.config.BaseResponseStatus.*;
+
+@RequiredArgsConstructor
+@Service
+public class FavoritePartyService {
+    private final FavoritePartyRepository favoritePartyRepository;
+    private final UserService userService;
+    private final PartyService partyService;
+
+    public FavoritePartyRes favoriteParty(FavoritePartyReq favoritePartyReq) throws BaseException {
+        User user = userService.findUserById(favoritePartyReq.getUserId());
+        Party party = partyService.findPartyById(favoritePartyReq.getPartyId());
+        if(favoritePartyReq.getIsFavorite()) {
+            return addFavoriteParty(user, party);
+        }
+        return deleteFavoriteParty(user, party);
+    }
+
+    public FavoritePartyRes addFavoriteParty(User user, Party party) {
+        FavoriteParty favoriteParty = new FavoriteParty(user, party);
+        favoritePartyRepository.save(favoriteParty);
+        return new FavoritePartyRes(true);
+    }
+
+    public FavoritePartyRes deleteFavoriteParty(User user, Party party) throws BaseException {
+        FavoriteParty favoriteParty = favoritePartyRepository.findByUserAndParty(user, party)
+                .orElseThrow(() -> new BaseException(NOT_FAVORITE_PARTY));
+        favoriteParty.deleteFavoriteParty();
+        favoritePartyRepository.delete(favoriteParty);
+        return new FavoritePartyRes(true);
+    }
+}

src/main/java/org/rf/rfserver/party/service/PartyService.java

@@ -11,11 +11,14 @@
 import org.rf.rfserver.constant.PushNotificationType;
 import org.rf.rfserver.constant.PreferAges;
 import org.rf.rfserver.domain.*;
+import org.rf.rfserver.party.dto.favoriteparty.FavoritePartyReq;
+import org.rf.rfserver.party.dto.favoriteparty.FavoritePartyRes;
 import org.rf.rfserver.party.dto.party.*;
 import org.rf.rfserver.party.dto.partyjoin.PostApproveJoinRes;
 import org.rf.rfserver.party.dto.partyjoin.PostDenyJoinRes;
 import org.rf.rfserver.party.dto.partyjoinapply.PostJoinApplicationReq;
 import org.rf.rfserver.party.dto.partyjoinapply.PostJoinApplicationRes;
+import org.rf.rfserver.party.repository.FavoritePartyRepository;
 import org.rf.rfserver.party.repository.PartyJoinApplicationRepository;
 import org.rf.rfserver.party.repository.PartyRepository;
 import org.rf.rfserver.party.repository.UserPartyRepository;
@@ -52,6 +55,8 @@ public class PartyService {
     private final S3Uploader s3Uploader;
     private final PartyidUseridService partyidUseridService;
     private final ApnsService apnsService;
+    private final FavoritePartyRepository favoritePartyRepository;
+
 
     public PostPartyRes createParty(PostPartyReq postPartyReq, MultipartFile file) throws BaseException {
         try {
@@ -211,7 +216,7 @@ public PostApproveJoinRes approveJoin(Long partyJoinApplicationId) throws BaseEx
         return new PostApproveJoinRes(partyJoinApplicationId);
     }
 
-    public void makeUserParty(User user, Party party) throws BaseException {
+    public void makeUserParty(User user, Party party) {
         UserParty userParty = new UserParty(party, user);
         userPartyRepository.save(userParty);
         partyidUseridService.setPartyidUserid(party.getId(), user.getId());