feat project delete

Author: kwonhee1

src/main/java/NextLevel/demo/admin/project/AdminProjectController.java

@@ -2,6 +2,7 @@
 
 import NextLevel.demo.common.SuccessResponse;
 import NextLevel.demo.project.project.service.ProjectDeleteService;
+import NextLevel.demo.util.jwt.JWTUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
@@ -31,7 +32,7 @@ public ResponseEntity updateProject() {
 
     @DeleteMapping("/{projectId}")
     public ResponseEntity removeProject(@PathVariable("projectId") Long projectId) {
-        projectDeleteService.deleteProject(projectId, null);
+        projectDeleteService.deleteProject(projectId, JWTUtil.getUserIdFromSecurityContext(), null);
         return ResponseEntity.ok().body(new SuccessResponse("success", null));
     }
 }

src/main/java/NextLevel/demo/admin/project/AdminProjectService.java

@@ -29,8 +29,8 @@ public void updateProject() {
 
     }
 
-    public void removeProject(Long projectId) {
-        projectDeleteService.deleteProject(projectId, null);
+    public void removeProject(Long projectId, Long userId) {
+        projectDeleteService.deleteProject(projectId, userId,null);
     }
 
 }

src/main/java/NextLevel/demo/admin/user/AdminUserController.java

@@ -1,6 +1,8 @@
 package NextLevel.demo.admin.user;
 
+import NextLevel.demo.common.SuccessResponse;
 import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Pageable;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -10,8 +12,10 @@
 @RequestMapping("/admin")
 public class AdminUserController {
 
-    public ResponseEntity getUserList() {
-        return null;
+    private final AdminUserService adminUserService;
+
+    public ResponseEntity getUserList(Pageable pageable) {
+        return ResponseEntity.ok().body(new SuccessResponse("success", adminUserService.getUserList(pageable)));
     }
 
     public ResponseEntity stopUser() {

src/main/java/NextLevel/demo/admin/user/AdminUserService.java

@@ -1,6 +1,10 @@
 package NextLevel.demo.admin.user;
 
+import NextLevel.demo.exception.CustomException;
+import NextLevel.demo.exception.ErrorCode;
+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.repository.UserRepository;
 import NextLevel.demo.user.service.UserService;
 import NextLevel.demo.user.service.UserValidateService;
@@ -9,6 +13,7 @@
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import org.springframework.transaction.annotation.Transactional;
 
 @Service
 @RequiredArgsConstructor
@@ -26,8 +31,14 @@ public void stopUser() {
         // not yet
     }
 
-    public void updateUser() {
-        // userService.update
+    @Transactional
+    public void updateUser(RequestUpdateUserInfoDto dto) {
+        UserEntity oldUser = userValidateService.getUserInfoWithAccessToken(dto.getId());
+
+        if(dto.getName().equals("nickName") && !userValidateService.checkNickNameIsNotExist(dto.getValue()))
+            throw new CustomException(ErrorCode.ALREADY_EXISTS_NICKNAME);
+
+        oldUser.updateUserInfo(dto.getName(), dto.getValue());
     }
 
     public void removeUser() {

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

@@ -43,4 +43,10 @@ public interface FollowRepository extends JpaRepository<FollowEntity, Long> {
             "group by follow")
     List<ResponseFollowDto> gerFollowList(@Param("userId") Long userId);
 
+    @Query("delete from FollowEntity f where f.user.id = :userId")
+    void deleteFollowByUserId(@Param("userId") Long userId);
+
+    @Query("delete from FollowEntity f where f.target.id = :userId")
+    void deleteFollowerByUserId(@Param("userId") Long userId);
+
 }

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

@@ -51,4 +51,9 @@ public List<ResponseFollowDto> followList(Long userId) {
         return followRepository.gerFollowList(userId);
     }
 
+    public void deleteFollowByUserId(UserEntity user) {
+        followRepository.deleteFollowByUserId(user.getId());
+        followRepository.deleteFollowerByUserId(user.getId());
+    }
+
 }

src/main/java/NextLevel/demo/funding/entity/CouponEntity.java

@@ -1,5 +1,6 @@
 package NextLevel.demo.funding.entity;
 
+import NextLevel.demo.BasedEntity;
 import NextLevel.demo.user.entity.UserEntity;
 import jakarta.persistence.*;
 import lombok.*;
@@ -10,7 +11,7 @@
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Builder
 @AllArgsConstructor
-public class CouponEntity {
+public class CouponEntity extends BasedEntity {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)

src/main/java/NextLevel/demo/img/service/ImgTransactionAop.java

@@ -32,8 +32,9 @@ public Object around(ProceedingJoinPoint joinPoint, ImgTransaction imgTransactio
             Object[] args = joinPoint.getArgs();
             Object lastParameter = args[args.length-1];
 
-            if(!(lastParameter instanceof ImgPath))
-                throw new MustLastParameterException("last parameter must be of type ImgPath.class");
+            // 추후 수정 필요! (귀찮!)
+//            if(!(lastParameter instanceof ImgPath))
+//                throw new MustLastParameterException("last parameter must be of type ImgPath.class");
 
             args[args.length-1] = path;
 

src/main/java/NextLevel/demo/notice/service/NoticeService.java

@@ -11,6 +11,8 @@
 import NextLevel.demo.notice.entity.NoticeImgEntity;
 import NextLevel.demo.notice.repository.NoticeImgRepository;
 import NextLevel.demo.notice.repository.NoticeRepository;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;

src/main/java/NextLevel/demo/project/community/service/ProjectCommunityAskService.java

@@ -61,8 +61,9 @@ public void delete(Long askId, Long userId) {
                 ()->{return new CustomException(ErrorCode.NOT_FOUND, "community");}
         );
 
-        if(! (ask.getUser().getId() == userId) || (ask.getProject().getId() == userId) ) // project validate service 를 통해야 하나?
-            throw new CustomException(ErrorCode.NOT_AUTHOR);
+        if(!ask.getUser().getId().equals(userId))
+            projectValidateService.validateAuthor(ask.getProject(), userId);
+
         projectCommunityAskRepository.deleteById(askId);
     }