feat admin coupon : controller 하드 코딩 추후 refactoring

Author: kwonhee1

src/main/java/NextLevel/demo/admin/coupon/AdminCouponController.java

@@ -0,0 +1,60 @@
+package NextLevel.demo.admin.coupon;
+
+import NextLevel.demo.common.SuccessResponse;
+import NextLevel.demo.funding.dto.request.RequestAddCouponDto;
+import NextLevel.demo.funding.dto.response.ResponseCouponDto;
+import NextLevel.demo.funding.service.CouponService;
+import NextLevel.demo.user.entity.UserEntity;
+import NextLevel.demo.user.repository.UserRepository;
+import NextLevel.demo.user.service.UserValidateService;
+import NextLevel.demo.util.jwt.JWTUtil;
+import jakarta.validation.Valid;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.GetMapping;
+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.RequestParam;
+
+@RequestMapping("/admin/coupon")
+@Controller
+@RequiredArgsConstructor
+public class AdminCouponController {
+
+    private final CouponService couponService;
+    private final UserValidateService validateService;
+    private final UserRepository userRepository;
+
+    @PostMapping
+    public ResponseEntity addCoupon(@RequestBody @Valid RequestAddCouponDto dto) {
+        if(dto.getUserId()==null)
+            dto.setUserId(JWTUtil.getUserIdFromSecurityContext());
+        couponService.addCoupon(dto);
+        return ResponseEntity.ok().body(new SuccessResponse("success", null));
+    }
+
+    @GetMapping
+    public ResponseEntity getUserCoupon(@RequestParam("userId")Long userId) {
+        validateService.findUserWithUserId(userId);
+        return ResponseEntity.ok().body(new SuccessResponse("success", couponService.couponList(userId).stream().map(
+                ResponseCouponDto::of).toList()));
+    }
+
+    @PostMapping("/all")
+    @Transactional
+    public ResponseEntity addCouponAll(@RequestBody @Valid RequestAddCouponDto dto) {
+        List<UserEntity> userList = userRepository.findAll();
+        for(UserEntity user : userList) {
+            dto.setUserId(user.getId());
+            couponService.addCoupon(dto);
+        }
+
+        return ResponseEntity.ok().body(new SuccessResponse("success", null));
+    }
+
+}

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

@@ -1,6 +1,7 @@
 package NextLevel.demo.admin.user;
 
 import NextLevel.demo.common.SuccessResponse;
+import NextLevel.demo.funding.dto.request.RequestAddCouponDto;
 import NextLevel.demo.user.dto.user.request.RequestUpdateUserInfoDto;
 import NextLevel.demo.util.jwt.JWTUtil;
 import jakarta.validation.Valid;
@@ -11,6 +12,7 @@
 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;
 import org.springframework.web.bind.annotation.RequestMapping;

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

@@ -25,8 +25,8 @@ public class AdminUserService {
     private final UserRepository userRepository;
     private final UserDeleteService userDeleteService;
 
-    public List<ResponseUserInfoDetailDto> getUserList(Pageable pageable) {
-        return userRepository.findAll(pageable).stream().map(ResponseUserInfoDetailDto::of).toList();
+    public List<ResponseFullUserInfoDto> getUserList(Pageable pageable) {
+        return userRepository.findAll(pageable).stream().map(ResponseFullUserInfoDto::of).toList();
     }
 
     public ResponseUserInfoDetailDto getUserInfo(Long userId) {

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

@@ -0,0 +1,57 @@
+package NextLevel.demo.admin.user;
+
+import NextLevel.demo.img.ImgDto;
+import NextLevel.demo.user.entity.UserDetailEntity;
+import NextLevel.demo.user.entity.UserEntity;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class ResponseFullUserInfoDto {
+
+    private Long id;
+
+    private String name;
+    private String nickName;
+    private int point;
+    private String address;
+    private String number;
+    private String areaNumber;
+
+    private String email;
+    private String socialProvider;
+
+    private ImgDto img;
+
+    private String role;
+
+    public static ResponseFullUserInfoDto of(UserEntity userFullEntity) {
+        UserDetailEntity detail = userFullEntity.getUserDetail();
+
+        ResponseFullUserInfoDto dto = new ResponseFullUserInfoDto(userFullEntity.getId(), userFullEntity.getName(), userFullEntity.getNickName(), userFullEntity.getPoint(),
+                userFullEntity.getAddress(), userFullEntity.getNumber(), userFullEntity.getAreaNumber(), detail.getEmail(),
+                detail.getSocialProvider(), userFullEntity.getRole());
+
+        dto.img = new ImgDto(userFullEntity.getImg());
+
+        return dto;
+    }
+
+    private ResponseFullUserInfoDto(Long userId, String name, String nickName, int point, String address,
+                                      String number, String areaNumber, String email, String socialProvider, String role) {
+        this.id = userId;
+        this.name = name;
+        this.nickName = nickName;
+        this.point = point;
+        this.address = address;
+        this.number = number;
+        this.areaNumber = areaNumber;
+        this.email = email;
+        this.socialProvider = socialProvider;
+        this.role = role;
+    }
+
+}

src/main/java/NextLevel/demo/funding/controller/CouponController.java

@@ -21,14 +21,6 @@ public class CouponController {
 
     private final CouponService couponService;
 
-    @PostMapping("/admin/coupon/add")
-    public ResponseEntity addCoupon(@RequestBody @Valid RequestAddCouponDto dto) {
-        if(dto.getUserId()==null)
-            dto.setUserId(JWTUtil.getUserIdFromSecurityContext());
-        couponService.addCoupon(dto);
-        return ResponseEntity.ok().body(new SuccessResponse("success", null));
-    }
-
     @GetMapping("/social/coupon")
     public ResponseEntity getCoupon() {
         List<ResponseCouponDto> coupons =

src/main/java/NextLevel/demo/funding/service/CouponService.java

@@ -23,7 +23,7 @@ public class CouponService {
 
     @Transactional
     public void addCoupon(RequestAddCouponDto dto) {
-        UserEntity user = userValidateService.getUserInfoWithAccessToken(dto.getUserId());
+        UserEntity user = userValidateService.findUserWithUserId(dto.getUserId());
         couponRepository.save(dto.toEntity(user));
     }