[화살] 화살 연관 로직 수정(#68)

be/src/main/java/yeonba/be/arrow/controller/ArrowController.java

@@ -4,16 +4,15 @@
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import java.time.LocalDate;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 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.RequestAttribute;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
-import yeonba.be.arrow.dto.UserArrowsResponse;
-import yeonba.be.arrow.dto.request.ArrowSendRequest;
+import yeonba.be.arrow.dto.response.UserArrowsResponse;
 import yeonba.be.arrow.service.ArrowService;
 import yeonba.be.util.CustomResponse;
 
@@ -38,47 +37,45 @@ public ResponseEntity<CustomResponse<UserArrowsResponse>> arrows(
     }
 
     @Operation(summary = "출석 체크", description = "출석 체크를 통해 사용자가 10개의 화살을 획득할 수 있습니다.")
-    @ApiResponse(responseCode = "202", description = "출석 체크 정상 처리")
+    @ApiResponse(responseCode = "200", description = "출석 체크 정상 처리")
     @PostMapping("/daily-check")
     public ResponseEntity<CustomResponse<Void>> dailyCheck(
         @RequestAttribute("userId") long userId) {
 
-        arrowService.dailyCheck(userId);
+        LocalDate dailyCheckDay = LocalDate.now();
+        arrowService.dailyCheck(userId, dailyCheckDay);
 
         return ResponseEntity
-            .accepted()
+            .ok()
             .body(new CustomResponse<>());
     }
 
-    @Operation(summary = "화살 보내기", description = "다른 사용자에게 화살을 보낼 수 있습니다.")
-    @ApiResponse(responseCode = "202", description = "화살 전송 정상 처리")
+    @Operation(summary = "화살 보내기", description = "다른 사용자에게 화살을 1개 보낼 수 있습니다.")
+    @ApiResponse(responseCode = "200", description = "화살 전송 정상 처리")
     @PostMapping("/users/{userId}/arrow")
     public ResponseEntity<CustomResponse<Void>> sendArrow(
         @RequestAttribute("userId") long senderId,
         @Parameter(description = "화살 받는 사용자 ID", example = "1")
-        @PathVariable("userId") long receiverId,
-        @RequestBody ArrowSendRequest request) {
+        @PathVariable("userId") long receiverId) {
 
-        arrowService.sendArrow(
-            senderId,
-            receiverId,
-            request);
+        arrowService.sendArrow(senderId, receiverId);
 
         return ResponseEntity
-            .accepted()
+            .ok()
             .body(new CustomResponse<>());
     }
 
     @Operation(summary = "화살 충전", description = "광고 시청시 화살 5개를 충전할 수 있습니다.")
-    @ApiResponse(responseCode = "202", description = "화살 충전 정상 처리")
+    @ApiResponse(responseCode = "200", description = "화살 충전 정상 처리")
     @PostMapping("/users/arrows")
     public ResponseEntity<CustomResponse<Void>> chargeArrows(
         @RequestAttribute("userId") long userId) {
 
-        arrowService.chargeArrows(userId);
+        LocalDate chargeDay = LocalDate.now();
+        arrowService.chargeArrows(userId, chargeDay);
 
         return ResponseEntity
-            .accepted()
+            .ok()
             .body(new CustomResponse<>());
     }
 }

be/src/main/java/yeonba/be/arrow/dto/UserArrowsResponse.java → be/src/main/java/yeonba/be/arrow/dto/response/UserArrowsResponse.java

@@ -1,4 +1,4 @@
-package yeonba.be.arrow.dto;
+package yeonba.be.arrow.dto.response;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
@@ -8,9 +8,9 @@
 @AllArgsConstructor
 public class UserArrowsResponse {
 
-  @Schema(
-      type = "number",
-      description = "사용자 화살 개수",
-      example = "10")
-  private int arrows;
+    @Schema(
+        type = "number",
+        description = "사용자 화살 개수",
+        example = "10")
+    private int arrows;
 }

be/src/main/java/yeonba/be/arrow/entity/ArrowTransaction.java

@@ -3,6 +3,8 @@
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EntityListeners;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
@@ -14,6 +16,7 @@
 import lombok.NoArgsConstructor;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+import yeonba.be.arrow.enums.ArrowTransactionType;
 import yeonba.be.user.entity.User;
 
 @Table(name = "arrows_transactions")
@@ -38,23 +41,30 @@ public class ArrowTransaction {
     @Column(nullable = false)
     private int arrows;
 
+    @Enumerated(EnumType.STRING)
+    private ArrowTransactionType type;
+
     @CreatedDate
     @Column(nullable = false)
     private LocalDateTime createdAt;
 
     public ArrowTransaction(
+        ArrowTransactionType type,
         User receiver,
         int arrows) {
 
+        this.type = type;
         this.receiver = receiver;
         this.arrows = arrows;
     }
 
     public ArrowTransaction(
+        ArrowTransactionType type,
         User sender,
         User receiver,
         int arrows) {
 
+        this.type = type;
         this.sender = sender;
         this.receiver = receiver;
         this.arrows = arrows;

be/src/main/java/yeonba/be/arrow/enums/ArrowTransactionType.java

@@ -0,0 +1,17 @@
+package yeonba.be.arrow.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum ArrowTransactionType {
+
+    DAILY_CHECK("출석 체크"),
+
+    REWARDS_FOR_WATCHING_ADVERTISEMENTS("광고 시청 통한 화살 획득"),
+
+    USER_TO_USER("사용자간 송수신");
+
+    private final String description;
+}

be/src/main/java/yeonba/be/arrow/repository/ArrowTransactionRepository.java

@@ -9,5 +9,5 @@
 public interface ArrowTransactionRepository extends JpaRepository<ArrowTransaction, Long>,
     ArrowTransactionRepositoryCustom {
 
-  boolean existsBySenderAndReceiver(User sentUser, User receivedUser);
+    boolean existsBySenderAndReceiver(User sender, User receiver);
 }

be/src/main/java/yeonba/be/arrow/repository/ArrowTransactionRepositoryImpl.java

@@ -1,6 +1,7 @@
 package yeonba.be.arrow.repository;
 
 import static yeonba.be.arrow.entity.QArrowTransaction.arrowTransaction;
+import static yeonba.be.arrow.enums.ArrowTransactionType.REWARDS_FOR_WATCHING_ADVERTISEMENTS;
 import static yeonba.be.user.entity.QUser.user;
 
 import com.querydsl.jpa.impl.JPAQueryFactory;
@@ -20,8 +21,9 @@ public boolean canChargeByAdvertisement(long userId, LocalDateTime today) {
                 queryFactory
                     .select(arrowTransaction.count())
                     .from(arrowTransaction)
-                    .innerJoin(arrowTransaction.sender, user)
+                    .innerJoin(arrowTransaction.receiver, user)
                     .where(
+                        arrowTransaction.type.eq(REWARDS_FOR_WATCHING_ADVERTISEMENTS),
                         arrowTransaction.sender.isNull(),
                         arrowTransaction.receiver.id.eq(userId),
                         arrowTransaction.createdAt.after(today)

be/src/main/java/yeonba/be/arrow/service/ArrowService.java

@@ -1,52 +1,56 @@
 package yeonba.be.arrow.service;
 
+import static yeonba.be.arrow.enums.ArrowTransactionType.DAILY_CHECK;
+import static yeonba.be.arrow.enums.ArrowTransactionType.REWARDS_FOR_WATCHING_ADVERTISEMENTS;
+import static yeonba.be.arrow.enums.ArrowTransactionType.USER_TO_USER;
+
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.Objects;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import yeonba.be.arrow.dto.UserArrowsResponse;
-import yeonba.be.arrow.dto.request.ArrowSendRequest;
+import yeonba.be.arrow.dto.response.UserArrowsResponse;
 import yeonba.be.arrow.entity.ArrowTransaction;
 import yeonba.be.arrow.repository.ArrowCommand;
 import yeonba.be.arrow.repository.ArrowQuery;
 import yeonba.be.exception.ArrowException;
 import yeonba.be.exception.GeneralException;
+import yeonba.be.exception.UserException;
 import yeonba.be.user.entity.User;
 import yeonba.be.user.repository.user.UserQuery;
 
 @Service
 @RequiredArgsConstructor
 public class ArrowService {
 
-    private final int DAILY_CHECK_ARROW_COUNT = 10;
-    private final int ADVERTISEMENT_ARROW_COUNT = 5;
     private final UserQuery userQuery;
     private final ArrowCommand arrowCommand;
     private final ArrowQuery arrowQuery;
 
-    /*
-      출석 체크는 다음 과정을 거쳐 이뤄진다.
-      1. 사용자 최종 접속 일시를 통해 이미 출석 체크하였는지 확인
-      2. 화살 송수신 내역 저장
-      3. 사용자 최종 접속 일시 갱신
-      4. 사용자 화살 개수 증가
-     */
     @Transactional
-    public void dailyCheck(long userId) {
+    public void dailyCheck(long userId, LocalDate dailyCheckDay) {
 
         User dailyCheckUser = userQuery.findById(userId);
 
-        LocalDateTime dailyCheckedAt = LocalDateTime.now();
-        dailyCheckUser.validateDailyCheck(dailyCheckedAt.toLocalDate());
+        // 휴면 상태 사용자는 출석 체크 불가
+        if (dailyCheckUser.isInactive()) {
+            throw new GeneralException(UserException.INACTIVE_USER);
+        }
+
+        // 처음 가입한 사용자는 최종 접속 일시가 null, 이 경우 출석 체크를 그냥 진행함
+        if (!Objects.isNull(dailyCheckUser.getLastAccessedAt())) {
+            dailyCheckUser.validateDailyCheck(dailyCheckDay);
+        }
 
+        int dailyCheckArrows = 10;
         ArrowTransaction arrowTransaction = new ArrowTransaction(
+            DAILY_CHECK,
             dailyCheckUser,
-            DAILY_CHECK_ARROW_COUNT);
+            dailyCheckArrows);
         arrowCommand.save(arrowTransaction);
 
-        dailyCheckUser.updateLastAccessedAt(dailyCheckedAt);
-        dailyCheckUser.plusArrow(DAILY_CHECK_ARROW_COUNT);
+        dailyCheckUser.plusArrow(dailyCheckArrows);
     }
 
     @Transactional(readOnly = true)
@@ -57,54 +61,58 @@ public UserArrowsResponse getUserArrows(long userId) {
         return new UserArrowsResponse(user.getArrow());
     }
 
-    /*
-    화살 보내기 비즈니스 로직은 다음 과정을 거친다.
-    1. 자기 자신에게 화살을 보내는 상황 검증
-    2. 화살을 보낸 사용자에게 또 보내는 상황 검증
-    3. 화살 내역 저장
-    4. 보내는 사용자 화살 감소, 화살이 부족할 경우 예외 발생
-    5. 받는 사용자 화살 증가
-   */
     @Transactional
-    public void sendArrow(
-        long senderId,
-        long receiverId,
-        ArrowSendRequest request) {
+    public void sendArrow(long senderId, long receiverId) {
 
         User sender = userQuery.findById(senderId);
         User receiver = userQuery.findById(receiverId);
 
+        // 휴면 상태에선 화살을 보낼 수 없음
+        if (sender.isInactive()) {
+            throw new GeneralException(UserException.INACTIVE_USER);
+        }
+
+        // 휴면 상태인 사용자에게 화살을 보낼 수 없음
+        if (receiver.isInactive()) {
+            throw new GeneralException(ArrowException.CAN_NOT_SEND_ARROW_TO_INACTIVE_USER);
+        }
+
+        // 자기 자신에게 화살을 보낼 수 없음
         sender.validateNotSameUser(receiver);
 
+        // 같은 성별 사용자에게 화살을 보낼 수 없음
+        sender.validateSameGender(receiver);
+
+        // 이미 화살을 보낸 사용자에게 화살을 보낼 수 없음
         if (arrowQuery.isArrowTransactionExist(sender, receiver)) {
             throw new GeneralException(ArrowException.ALREADY_SENT_ARROW_USER);
         }
 
-        int arrows = request.getArrows();
-        ArrowTransaction arrowTransaction = new ArrowTransaction(
-            sender,
-            receiver,
-            arrows);
+        // 화살은 1개만 보낼 수 있음
+        int sendArrow = 1;
+        ArrowTransaction arrowTransaction =
+            new ArrowTransaction(USER_TO_USER, sender, receiver, sendArrow);
         arrowCommand.save(arrowTransaction);
 
-        sender.minusArrow(arrows);
-        receiver.plusArrow(arrows);
+        sender.minusArrow(sendArrow);
+        receiver.plusArrow(sendArrow);
     }
 
     @Transactional
-    public void chargeArrows(long userId) {
+    public void chargeArrows(long userId, LocalDate chargeDay) {
 
-        User user = userQuery.findById(userId);
+        User arrowChargeUser = userQuery.findById(userId);
 
-        LocalDateTime today = LocalDate.now().atStartOfDay();
-        arrowQuery.validateAdvertisementArrowCount(userId, today);
+        LocalDateTime chargeDayStartTime = chargeDay.atStartOfDay();
+        arrowQuery.validateAdvertisementArrowCount(userId, chargeDayStartTime);
 
+        int chargeArrows = 5;
         ArrowTransaction arrowTransaction = new ArrowTransaction(
-            user,
-            ADVERTISEMENT_ARROW_COUNT);
+            REWARDS_FOR_WATCHING_ADVERTISEMENTS,
+            arrowChargeUser,
+            chargeArrows);
 
         arrowCommand.save(arrowTransaction);
-        user.plusArrow(ADVERTISEMENT_ARROW_COUNT);
+        arrowChargeUser.plusArrow(chargeArrows);
     }
-
 }