From ab5aa155b2973a00d6c234c50d40706374ea0d32 Mon Sep 17 00:00:00 2001 From: woosung1223 Date: Tue, 1 Oct 2024 12:15:22 +0900 Subject: [PATCH] =?UTF-8?q?:art:=20refactor:=20=EA=B7=B8=EB=A3=B9=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=20=EC=8B=9C=20=EA=B4=80=EB=A0=A8=20=EB=A1=A4?= =?UTF-8?q?=EB=A7=81=ED=8E=98=EC=9D=B4=ED=8D=BC=20=EC=97=AD=EC=8B=9C=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C=ED=95=98=EB=8F=84=EB=A1=9D=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../slvtwn/khu/toyouserver/application/UserService.java | 9 +++++++-- .../toyouserver/persistance/RollingPaperRepository.java | 3 +++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/slvtwn/khu/toyouserver/application/UserService.java b/src/main/java/slvtwn/khu/toyouserver/application/UserService.java index f7ff715..b4449b7 100644 --- a/src/main/java/slvtwn/khu/toyouserver/application/UserService.java +++ b/src/main/java/slvtwn/khu/toyouserver/application/UserService.java @@ -20,6 +20,7 @@ import slvtwn.khu.toyouserver.persistance.EventRepository; import slvtwn.khu.toyouserver.persistance.GroupRepository; import slvtwn.khu.toyouserver.persistance.MemberRepository; +import slvtwn.khu.toyouserver.persistance.RollingPaperRepository; import slvtwn.khu.toyouserver.persistance.UserRepository; @RequiredArgsConstructor @@ -33,6 +34,7 @@ public class UserService { private final MemberRepository memberRepository; private final GroupRepository groupRepository; private final EventRepository eventRepository; + private final RollingPaperRepository rollingPaperRepository; public UserResponse getProfile(Long userId) { User user = userRepository.findById(userId) @@ -77,7 +79,7 @@ public void updateUser(Long userId, UserUpdateRequest request) { user.updateInfo(request.name(), request.birthday(), request.introduction(), request.imageUrl()); createBirthdayEvents(user); - updateUserGroups(user, request.groups()); + changeUserGroups(user, request.groups()); } private void createBirthdayEvents(User user) { @@ -98,9 +100,12 @@ private static List generatePeriodicalBirthdayEvents(User user) { return events; } - private void updateUserGroups(User user, List groupRequests) { + private void changeUserGroups(User user, List groupRequests) { List members = memberRepository.findByUser(user); + + rollingPaperRepository.deleteAllByMemberIn(members); memberRepository.deleteAll(members); + saveMembersWithNewGroups(user, groupRequests); } diff --git a/src/main/java/slvtwn/khu/toyouserver/persistance/RollingPaperRepository.java b/src/main/java/slvtwn/khu/toyouserver/persistance/RollingPaperRepository.java index 3579858..10e6154 100644 --- a/src/main/java/slvtwn/khu/toyouserver/persistance/RollingPaperRepository.java +++ b/src/main/java/slvtwn/khu/toyouserver/persistance/RollingPaperRepository.java @@ -6,6 +6,7 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import slvtwn.khu.toyouserver.domain.Member; import slvtwn.khu.toyouserver.domain.RollingPaper; public interface RollingPaperRepository extends JpaRepository { @@ -14,4 +15,6 @@ public interface RollingPaperRepository extends JpaRepository findAllByMembersAfterCursor(@Param("memberIds") List memberIds, @Param("targetId") Long targetId, Pageable pageable); + + void deleteAllByMemberIn(List members); }