feat delete user

Author: kwonhee1

src/main/java/NextLevel/demo/follow/FollowRepository.java

@@ -2,6 +2,7 @@
 
 import NextLevel.demo.user.entity.UserEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
@@ -43,9 +44,11 @@ public interface FollowRepository extends JpaRepository<FollowEntity, Long> {
             "group by follow")
     List<ResponseFollowDto> gerFollowList(@Param("userId") Long userId);
 
+    @Modifying
     @Query("delete from FollowEntity f where f.user.id = :userId")
     void deleteFollowByUserId(@Param("userId") Long userId);
 
+    @Modifying
     @Query("delete from FollowEntity f where f.target.id = :userId")
     void deleteFollowerByUserId(@Param("userId") Long userId);
 

src/main/java/NextLevel/demo/project/project/service/ProjectDeleteService.java

@@ -75,10 +75,10 @@ public void deleteProject(Long id, Long userId, ImgPath imgPath) {
     }
 
     @Transactional
-    public void deleteAllProjectByUser(UserEntity user) {
+    public void deleteAllProjectByUser(UserEntity user, ImgPath imgPath) {
         List<ProjectEntity> projectList = projectRepository.findAllByUserId(user.getId());
         projectList.forEach(project -> {
-            deleteProject(project.getId(), user.getId(), null);
+            deleteProject(project.getId(), user.getId(), imgPath);
         });
     }
 

src/main/java/NextLevel/demo/social/repository/SocialLikeRepository.java

@@ -4,12 +4,14 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.Optional;
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
 public interface SocialLikeRepository extends JpaRepository<SocialLikeEntity, Long> {
     Optional<SocialLikeEntity> findByUserIdAndSocialId(Long userId, Long socialId);
 
+    @Modifying
     @Query("delete from SocialLikeEntity sl where sl.user.id = :userId")
     void deleteAllByUser(@Param("userId")Long userId);
 }

src/main/java/NextLevel/demo/social/service/SocialService.java

@@ -155,15 +155,14 @@ private void deleteImgs(Long socialId, List<ImgEntity> imgs, ImgPath imgPath) {
         imgs.forEach(img->imgService.deleteImg(img, imgPath));
     }
 
-@Transactional
-    public void deleteAllByUser(UserEntity user) {
+    public void deleteAllByUser(UserEntity user, ImgPath imgPath) {
         // delete all social like by user
         socialLikeRepository.deleteAllByUser(user.getId());
 
         // delete all social
         List<SocialEntity> socialList = socialRepository.findAllByUserId(user.getId());
         socialList.forEach(social->{
-            delete(social.getId(), user.getId(), null);
+            delete(social.getId(), user.getId(), imgPath);
         });
     }
 

src/main/java/NextLevel/demo/user/controller/UserController.java

@@ -7,6 +7,7 @@
 import NextLevel.demo.user.dto.user.request.RequestUpdateUserInfoDto;
 import NextLevel.demo.user.dto.user.response.ResponseUserInfoDetailDto;
 import NextLevel.demo.user.entity.UserEntity;
+import NextLevel.demo.user.service.UserDeleteService;
 import NextLevel.demo.user.service.UserValidateService;
 import NextLevel.demo.user.service.LikeService;
 import NextLevel.demo.user.service.UserService;
@@ -19,7 +20,9 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -35,6 +38,7 @@ public class UserController {
     private final LikeService likeService;
     private final JWTUtil jwtUtil;
     private final UserValidateService userValidateService;
+    private final UserDeleteService userDeleteService;
 
     @GetMapping
     public ResponseEntity<?> getUserInfo() {
@@ -92,4 +96,10 @@ public ResponseEntity<?> like(@RequestBody @Valid LikeDto dto) {
         return ResponseEntity.status(HttpStatus.OK).body(new SuccessResponse("success", null));
     }
 
+    @DeleteMapping("/{userId}")
+    public ResponseEntity<?> deleteUser(@PathVariable("userId") Long userId) {
+        userDeleteService.deleteUser(userId, null);
+        return ResponseEntity.status(HttpStatus.OK).body(new SuccessResponse("success", null));
+    }
+
 }

src/main/java/NextLevel/demo/user/entity/UserEntity.java

@@ -63,7 +63,7 @@ public class UserEntity extends BasedEntity {
     @Column(length=5, columnDefinition = "char(6)")
     private String role = UserRole.SOCIAL.name();
 
-    @ManyToOne(fetch = FetchType.LAZY, optional = true)
+    @ManyToOne(fetch = FetchType.LAZY, optional = true, cascade = {})
     @JoinColumn(name = "img_id", nullable = true)
     private ImgEntity img;
 

src/main/java/NextLevel/demo/user/entity/UserHistoryEntity.java

@@ -1,5 +1,6 @@
 package NextLevel.demo.user.entity;
 
+import NextLevel.demo.BasedEntity;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
@@ -17,7 +18,7 @@
 @NoArgsConstructor
 @Builder
 @AllArgsConstructor
-public class UserHistoryEntity {
+public class UserHistoryEntity extends BasedEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;

src/main/java/NextLevel/demo/user/repository/UserHistoryRepository.java

@@ -1,10 +1,12 @@
 package NextLevel.demo.user.repository;
 
+import NextLevel.demo.user.entity.UserEntity;
 import NextLevel.demo.user.entity.UserHistoryEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
 @Repository
 public interface UserHistoryRepository extends JpaRepository<UserHistoryEntity, Long> {
 
+    void deleteAllByUser(UserEntity user);
 }

src/main/java/NextLevel/demo/user/service/UserDeleteService.java

@@ -2,13 +2,17 @@
 
 import NextLevel.demo.follow.FollowService;
 import NextLevel.demo.funding.service.FundingRollbackService;
+import NextLevel.demo.img.entity.ImgEntity;
 import NextLevel.demo.img.service.ImgPath;
 import NextLevel.demo.img.service.ImgService;
 import NextLevel.demo.img.service.ImgTransaction;
 import NextLevel.demo.project.project.service.ProjectDeleteService;
 import NextLevel.demo.social.service.SocialService;
 import NextLevel.demo.user.entity.UserEntity;
+import NextLevel.demo.user.repository.UserHistoryRepository;
 import NextLevel.demo.user.repository.UserRepository;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -24,31 +28,40 @@ public class UserDeleteService {
     private final SocialService socialService;
     private final ProjectDeleteService projectDeleteService;
     private final ImgService imgService;
+    private final UserHistoryRepository userHistoryRepository;
+
+    @PersistenceContext
+    private EntityManager entityManager;
 
     @Transactional
     @ImgTransaction
     public void deleteUser(Long userId, ImgPath imgPath) {
         UserEntity user = userValidateService.findUserWithUserId(userId);
 
         // project 삭제
-        projectDeleteService.deleteAllProjectByUser(user);
+        projectDeleteService.deleteAllProjectByUser(user, imgPath);
 
         // funding 삭제
         fundingRollbackService.rollbackByUser(user);
 
         // social삭제
-        socialService.deleteAllByUser(user);
+        socialService.deleteAllByUser(user, imgPath);
 
         // follow (user like)삭제
         followService.deleteFollowByUserId(user);
 
-        // img 삭제
-        imgService.deleteImg(user.getImg(), imgPath);
+        // user history
+        userHistoryRepository.deleteAllByUser(user);
 
         // coupon -> cascade
         //user_detail삭제 -> cascade 적용
 
+        ImgEntity img = user.getImg();
+
         //user 삭제
         userRepository.delete(user);
+        entityManager.flush();
+
+        imgService.deleteImg(img, imgPath);
     }
 }