From 8ff30903910ba0324349b94046c700cac6e92665 Mon Sep 17 00:00:00 2001 From: julia-heo <100216331+julia-heo@users.noreply.github.com> Date: Fri, 3 May 2024 05:28:28 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=ED=9A=8C=EC=9B=90=20=ED=83=88=ED=87=B4?= =?UTF-8?q?=20api=20=EC=88=98=EC=A0=95=20(#83)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../once/domain/user/service/UserService.java | 31 ++++++++++++++----- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/src/main/java/ewha/lux/once/domain/user/service/UserService.java b/src/main/java/ewha/lux/once/domain/user/service/UserService.java index 5936ff1..71fe816 100644 --- a/src/main/java/ewha/lux/once/domain/user/service/UserService.java +++ b/src/main/java/ewha/lux/once/domain/user/service/UserService.java @@ -1,17 +1,15 @@ package ewha.lux.once.domain.user.service; -import ewha.lux.once.domain.card.entity.Card; -import ewha.lux.once.domain.card.entity.CardCompany; -import ewha.lux.once.domain.card.entity.CardType; -import ewha.lux.once.domain.card.entity.OwnedCard; +import ewha.lux.once.domain.card.entity.*; +import ewha.lux.once.domain.home.entity.Announcement; +import ewha.lux.once.domain.home.entity.ChatHistory; +import ewha.lux.once.domain.home.entity.FCMToken; +import ewha.lux.once.domain.home.entity.Favorite; import ewha.lux.once.domain.user.dto.*; import ewha.lux.once.domain.user.entity.Users; import ewha.lux.once.global.common.CustomException; import ewha.lux.once.global.common.ResponseCode; -import ewha.lux.once.global.repository.CardCompanyRepository; -import ewha.lux.once.global.repository.CardRepository; -import ewha.lux.once.global.repository.OwnedCardRepository; -import ewha.lux.once.global.repository.UsersRepository; +import ewha.lux.once.global.repository.*; import lombok.RequiredArgsConstructor; import org.springframework.security.core.userdetails.User; import org.springframework.security.core.userdetails.UserDetails; @@ -36,6 +34,11 @@ public class UserService implements UserDetailsService { private final CardRepository cardRepository; private final CardCompanyRepository cardCompanyRepository; private final OwnedCardRepository ownedCardRepository; + private final AnnouncementRepository announcementRepository; + private final ChatHistoryRepository chatHistoryRepository; + private final ConnectedCardCompanyRepository connectedCardCompanyRepository; + private final FavoriteRepository favoriteRepository; + private final FCMTokenRepository fcmTokenRepository; private final S3Uploader s3Uploader; public Users signup(SignupRequestDto request) throws CustomException, ParseException { @@ -94,6 +97,18 @@ public Users authenticate(SignInRequestDto request) throws CustomException { } public void deleteUsers(Users nowUser) throws CustomException { + List announcementList = announcementRepository.findAnnouncementByUsers(nowUser); + announcementRepository.deleteAll(announcementList); + List chatHistoryList = chatHistoryRepository.findByUsers(nowUser); + chatHistoryRepository.deleteAll(chatHistoryList); + List connectedCardCompanyList = connectedCardCompanyRepository.findAllByUsers(nowUser); + connectedCardCompanyRepository.deleteAll(connectedCardCompanyList); + List ownedCardList = ownedCardRepository.findOwnedCardByUsers(nowUser); + ownedCardRepository.deleteAll(ownedCardList); + List favoriteList = favoriteRepository.findAllByUsers(nowUser).get(); + favoriteRepository.deleteAll(favoriteList); + List fcmTokenList = fcmTokenRepository.findAllByUsers(nowUser); + fcmTokenRepository.deleteAll(fcmTokenList); usersRepository.delete(nowUser); return; }