release: 서버 배포

src/main/java/com/example/sharemind/admin/application/AdminService.java

@@ -16,6 +16,8 @@
 public interface AdminService {
     List<ConsultGetUnpaidResponse> getUnpaidConsults();
 
+    List<ConsultGetUnpaidResponse> getPaidConsults();
+
     SmsGetResponse updateConsultIsPaid(Long consultId);
     List<CounselorGetProfileResponse> getPendingCounselors();
 
@@ -31,6 +33,8 @@ public interface AdminService {
 
     List<PostGetUnpaidPrivateResponse> getUnpaidPrivatePosts();
 
+    List<PostGetUnpaidPrivateResponse> getPaidPrivatePosts();
+
     void updatePostIsPaid(Long postId);
 
     List<CustomerGetByNicknameOrEmailResponse> getCustomersByNicknameOrEmail(String keyword);

src/main/java/com/example/sharemind/admin/application/AdminServiceImpl.java

@@ -75,6 +75,13 @@ public List<ConsultGetUnpaidResponse> getUnpaidConsults() {
                 .toList();
     }
 
+    @Override
+    public List<ConsultGetUnpaidResponse> getPaidConsults() {
+        return consultService.getPaidConsults().stream()
+                .map(ConsultGetUnpaidResponse::of)
+                .toList();
+    }
+
     @Transactional
     public SmsGetResponse updateConsultIsPaid(Long consultId) {
         Consult consult = consultService.getConsultByConsultId(consultId);
@@ -177,6 +184,13 @@ public List<PostGetUnpaidPrivateResponse> getUnpaidPrivatePosts() {
                 .toList();
     }
 
+    @Override
+    public List<PostGetUnpaidPrivateResponse> getPaidPrivatePosts() {
+        return postService.getPaidPrivatePosts().stream()
+                .map(PostGetUnpaidPrivateResponse::of)
+                .toList();
+    }
+
     @Transactional
     @Override
     public void updatePostIsPaid(Long postId) {

src/main/java/com/example/sharemind/admin/dto/response/ConsultGetUnpaidResponse.java

@@ -39,10 +39,13 @@ public class ConsultGetUnpaidResponse {
     @Schema(description = "상담 신청 일시")
     private final LocalDateTime createdAt;
 
+    @Schema(description = "상담 상태")
+    private final String consultStatus;
+
     @Builder
     public ConsultGetUnpaidResponse(Long consultId, String customerName, String customerEmail,
             String counselorName, String counselorEmail, String counselorPhoneNumber,
-            String consultType, Long cost, LocalDateTime createdAt) {
+            String consultType, Long cost, LocalDateTime createdAt, String consultStatus) {
         this.consultId = consultId;
         this.customerName = customerName;
         this.customerEmail = customerEmail;
@@ -52,6 +55,7 @@ public ConsultGetUnpaidResponse(Long consultId, String customerName, String cust
         this.consultType = consultType;
         this.cost = cost;
         this.createdAt = createdAt;
+        this.consultStatus = consultStatus;
     }
 
 
@@ -69,6 +73,7 @@ public static ConsultGetUnpaidResponse of(Consult consult) {
                 .consultType(consult.getConsultType().getDisplayName())
                 .cost(consult.getCost())
                 .createdAt(consult.getCreatedAt())
+                .consultStatus(consult.getConsultStatus().toString())
                 .build();
     }
 }

src/main/java/com/example/sharemind/admin/dto/response/PostGetUnpaidPrivateResponse.java

@@ -28,15 +28,19 @@ public class PostGetUnpaidPrivateResponse {
     @Schema(description = "상담 신청 일시")
     private final LocalDateTime createdAt;
 
+    @Schema(description = "상담 상태")
+    private final String postStatus;
+
     @Builder
     public PostGetUnpaidPrivateResponse(Long postId, String customerName, String customerEmail,
-            Long cost, Boolean isPublic, LocalDateTime createdAt) {
+            Long cost, Boolean isPublic, LocalDateTime createdAt, String postStatus) {
         this.postId = postId;
         this.customerName = customerName;
         this.customerEmail = customerEmail;
         this.cost = cost;
         this.isPublic = isPublic;
         this.createdAt = createdAt;
+        this.postStatus = postStatus;
     }
 
     public static PostGetUnpaidPrivateResponse of(Post post) {
@@ -49,6 +53,7 @@ public static PostGetUnpaidPrivateResponse of(Post post) {
                 .cost(post.getCost())
                 .isPublic(post.getIsPublic())
                 .createdAt(post.getCreatedAt())
+                .postStatus(post.getPostStatus().toString())
                 .build();
     }
 }

src/main/java/com/example/sharemind/admin/presentation/AdminController.java

@@ -43,6 +43,15 @@ public ResponseEntity<List<ConsultGetUnpaidResponse>> getUnpaidConsults() {
         return ResponseEntity.ok(adminService.getUnpaidConsults());
     }
 
+    @Operation(summary = "결제 상담(편지/채팅) 리스트 조회", description = "결제 여부(isPaid)가 true인 consult 리스트 조회")
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "조회 성공")
+    })
+    @GetMapping("/paid-consults")
+    public ResponseEntity<List<ConsultGetUnpaidResponse>> getPaidConsults() {
+        return ResponseEntity.ok(adminService.getPaidConsults());
+    }
+
     @Operation(summary = "상담(편지/채팅) 결제 여부 수정", description = "결제 여부(isPaid)가 false인 consult를 true로 수정")
     @ApiResponses({
             @ApiResponse(responseCode = "200", description = "수정 성공, resultCode로 sms api 발송 여부가 전달됩니다."),
@@ -172,6 +181,15 @@ public ResponseEntity<List<PostGetUnpaidPrivateResponse>> getUnpaidPrivatePosts(
         return ResponseEntity.ok(adminService.getUnpaidPrivatePosts());
     }
 
+    @Operation(summary = "결제 일대다 상담 리스트 조회", description = "결제 여부(isPaid)가 true인 일대다 상담 리스트 조회")
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "조회 성공")
+    })
+    @GetMapping("/paid-posts")
+    public ResponseEntity<List<PostGetUnpaidPrivateResponse>> getPaidPrivatePosts() {
+        return ResponseEntity.ok(adminService.getPaidPrivatePosts());
+    }
+
     @Operation(summary = "일대다 비공개 상담 결제 여부 수정", description = "결제 여부(isPaid)가 false인 일대다 상담을 true로 수정")
     @ApiResponses({
             @ApiResponse(responseCode = "200", description = "수정 성공"),

src/main/java/com/example/sharemind/consult/application/ConsultService.java

@@ -17,6 +17,8 @@ public interface ConsultService {
 
     List<Consult> getUnpaidConsults();
 
+    List<Consult> getPaidConsults();
+
     List<Consult> getConsultsByCustomerIdAndConsultTypeAndIsPaid(Long customerId, ConsultType consultType);
 
     List<Consult> getConsultsByCounselorIdAndConsultTypeAndIsPaid(Long counselorId, ConsultType consultType);

src/main/java/com/example/sharemind/consult/application/ConsultServiceImpl.java

@@ -83,6 +83,11 @@ public List<Consult> getUnpaidConsults() {
         return consultRepository.findAllByIsPaidIsFalseAndIsActivatedIsTrue();
     }
 
+    @Override
+    public List<Consult> getPaidConsults() {
+        return consultRepository.findAllByIsPaidIsTrueAndIsActivatedIsTrueOrderByCreatedAtDesc();
+    }
+
     @Override
     public List<Consult> getConsultsByCustomerIdAndConsultTypeAndIsPaid(Long customerId, ConsultType consultType) {
         return consultRepository.findByCustomerIdAndConsultTypeAndIsPaid(customerId, consultType);

src/main/java/com/example/sharemind/consult/repository/ConsultRepository.java

@@ -19,6 +19,9 @@ public interface ConsultRepository extends JpaRepository<Consult, Long> {
     @Query("SELECT c FROM Consult c JOIN FETCH c.payment p WHERE p.isPaid = false AND c.isActivated = true")
     List<Consult> findAllByIsPaidIsFalseAndIsActivatedIsTrue();
 
+    @Query("SELECT c FROM Consult c JOIN FETCH c.payment p WHERE p.isPaid = true AND c.isActivated = true ORDER BY c.createdAt DESC")
+    List<Consult> findAllByIsPaidIsTrueAndIsActivatedIsTrueOrderByCreatedAtDesc();
+
     @Query("SELECT chat.chatId FROM Consult c JOIN c.chat chat " +
             "WHERE c.customer.customerId = :customerId AND c.isActivated = true AND c.consultStatus != 'FINISH'")
     List<Long> findChatIdsByCustomerId(Long customerId); //todo: 쿼리 최적화 필요

src/main/java/com/example/sharemind/counselor/domain/Settlement.java

@@ -86,7 +86,7 @@ public void updateCompleteMonth(Long amount) {
     }
 
     public void updateCompleteAll(Long amount) {
-        this.completeAll = amount;
+        this.completeAll += amount;
     }
 
     public void clearAll() {

src/main/java/com/example/sharemind/global/constants/Constants.java

@@ -19,7 +19,7 @@ public class Constants {
     public static final Boolean IS_CHAT = true;
     public static final Boolean IS_LETTER = false;
 
-    public static final Long FEE = 1000L;
+    public static final Double FEE = 0.2;
 
     public static final Long MAX_COMMENTS = 5L;
 }

src/main/java/com/example/sharemind/payment/application/PaymentService.java

@@ -4,7 +4,7 @@
 import com.example.sharemind.customer.domain.Customer;
 import com.example.sharemind.payment.domain.Payment;
 import com.example.sharemind.payment.dto.response.PaymentGetCounselorHomeResponse;
-import com.example.sharemind.payment.dto.response.PaymentGetCounselorResponse;
+import com.example.sharemind.payment.dto.response.PaymentGetCounselorResponses;
 import com.example.sharemind.payment.dto.response.PaymentGetCustomerResponse;
 
 import java.util.List;
@@ -20,7 +20,7 @@ public interface PaymentService {
 
     List<Payment> getRefundWaitingPayments();
 
-    List<PaymentGetCounselorResponse> getPaymentsByCounselor(Long paymentId, String status, String sort, Long customerId);
+    PaymentGetCounselorResponses getPaymentsByCounselor(Long paymentId, String status, String sort, Long customerId);
 
     void updateSettlementOngoingByCounselor(Long paymentId, Long customerId);
 

src/main/java/com/example/sharemind/payment/application/PaymentServiceImpl.java

@@ -12,6 +12,7 @@
 import com.example.sharemind.payment.domain.Payment;
 import com.example.sharemind.payment.dto.response.PaymentGetCounselorHomeResponse;
 import com.example.sharemind.payment.dto.response.PaymentGetCounselorResponse;
+import com.example.sharemind.payment.dto.response.PaymentGetCounselorResponses;
 import com.example.sharemind.payment.dto.response.PaymentGetCustomerResponse;
 import com.example.sharemind.payment.exception.PaymentErrorCode;
 import com.example.sharemind.payment.exception.PaymentException;
@@ -27,8 +28,6 @@
 import java.time.LocalDateTime;
 import java.util.List;
 
-import static com.example.sharemind.global.constants.Constants.FEE;
-
 @Service
 @Transactional(readOnly = true)
 @RequiredArgsConstructor
@@ -97,7 +96,7 @@ public List<Payment> getRefundWaitingPayments() {
     }
 
     @Override
-    public List<PaymentGetCounselorResponse> getPaymentsByCounselor(Long paymentId, String status,
+    public PaymentGetCounselorResponses getPaymentsByCounselor(Long paymentId, String status,
             String sort, Long customerId) {
         Counselor counselor = counselorService.getCounselorByCustomerId(customerId);
         PaymentCounselorStatus counselorStatus = PaymentCounselorStatus.getPaymentCounselorStatusByName(
@@ -138,16 +137,15 @@ public List<PaymentGetCounselorResponse> getPaymentsByCounselor(Long paymentId,
         }
 
         Pageable pageable = PageRequest.of(DEFAULT_PAGE_NUMBER, PAYMENT_COUNSELOR_PAGE_SIZE);
-        Long finalTotal = total;
         Page<PaymentGetCounselorResponse> page =
                 (paymentId == 0 ?
                         paymentRepository.findAllByCounselorAndCounselorStatusAndUpdatedAtIsBefore(
                                 counselor, counselorStatus, sortTime, pageable) :
                         paymentRepository.findAllByPaymentIdLessThanAndCounselorAndCounselorStatusAndUpdatedAtIsBefore(
                                 paymentId, counselor, counselorStatus, sortTime, pageable))
-                        .map(payment -> PaymentGetCounselorResponse.of(payment, finalTotal));
+                        .map(PaymentGetCounselorResponse::of);
 
-        return page.getContent();
+        return PaymentGetCounselorResponses.of(total, page.getContent());
     }
 
     @Transactional
@@ -213,7 +211,7 @@ public void updateSettlement(Counselor counselor) {
         paymentRepository.findAllByConsultCounselorAndCounselorStatusAndIsActivatedIsTrue(counselor,
                         PaymentCounselorStatus.SETTLEMENT_WAITING)
                 .forEach(payment -> {
-                    Long amount = payment.getConsult().getCost() - FEE;
+                    Long amount = payment.getConsult().getCost() - payment.getFee();
                     settlement.updateWaitingAll(amount);
                     if (payment.getUpdatedAt().isAfter(LocalDateTime.now().minusWeeks(1))) {
                         settlement.updateWaitingWeek(amount);
@@ -225,7 +223,7 @@ public void updateSettlement(Counselor counselor) {
         paymentRepository.findAllByConsultCounselorAndCounselorStatusAndIsActivatedIsTrue(counselor,
                         PaymentCounselorStatus.SETTLEMENT_ONGOING)
                 .forEach(payment -> {
-                    Long amount = payment.getConsult().getCost() - FEE;
+                    Long amount = payment.getConsult().getCost() - payment.getFee();
                     settlement.updateOngoingAll(amount);
                     if (payment.getUpdatedAt().isAfter(LocalDateTime.now().minusWeeks(1))) {
                         settlement.updateOngoingWeek(amount);
@@ -237,7 +235,7 @@ public void updateSettlement(Counselor counselor) {
         paymentRepository.findAllByConsultCounselorAndCounselorStatusAndIsActivatedIsTrue(counselor,
                         PaymentCounselorStatus.SETTLEMENT_COMPLETE)
                 .forEach(payment -> {
-                    Long amount = payment.getConsult().getCost() - FEE;
+                    Long amount = payment.getConsult().getCost() - payment.getFee();
                     settlement.updateCompleteAll(amount);
                     if (payment.getUpdatedAt().isAfter(LocalDateTime.now().minusWeeks(1))) {
                         settlement.updateCompleteWeek(amount);

src/main/java/com/example/sharemind/payment/domain/Payment.java

@@ -39,6 +39,9 @@ public class Payment extends BaseEntity {
     @Column
     private String method;
 
+    @Column(nullable = false)
+    private Long fee;
+
     @Column(name = "is_paid", nullable = false)
     private Boolean isPaid;
 
@@ -53,13 +56,17 @@ public class Payment extends BaseEntity {
     @Column(name = "approved_at")
     private LocalDateTime approvedAt;
 
+    @Column(name = "settled_at")
+    private LocalDateTime settledAt;
+
     @OneToOne(mappedBy = "payment", optional = false)
     private Consult consult;
 
     @Builder
     public Payment(String customerPhoneNumber, Consult consult) {
         this.customerPhoneNumber = customerPhoneNumber;
         this.consult = consult;
+        this.fee = Math.round(consult.getCost() * FEE);
         this.isPaid = false;
         updateBothStatusNone();
     }
@@ -110,7 +117,7 @@ public void updateCounselorStatusSettlementWaiting() {
 
     public void updateCounselorStatusSettlementOngoing() {
         Settlement settlement = this.consult.getCounselor().getSettlement();
-        long amount = this.consult.getCost() - FEE;
+        long amount = this.consult.getCost() - this.fee;
         if (this.getUpdatedAt().isAfter(LocalDateTime.now().minusWeeks(1))) {
             settlement.updateWaitingWeek(-amount);
         }
@@ -127,7 +134,7 @@ public void updateCounselorStatusSettlementOngoing() {
 
     public void updateCounselorStatusSettlementComplete() {
         Settlement settlement = this.consult.getCounselor().getSettlement();
-        long amount = this.consult.getCost() - FEE;
+        long amount = this.consult.getCost() - this.fee;
         if (this.getUpdatedAt().isAfter(LocalDateTime.now().minusWeeks(1))) {
             settlement.updateOngoingWeek(-amount);
         }
@@ -140,6 +147,7 @@ public void updateCounselorStatusSettlementComplete() {
         settlement.updateCompleteAll(amount);
 
         this.counselorStatus = PaymentCounselorStatus.SETTLEMENT_COMPLETE;
+        this.settledAt = LocalDateTime.now();
     }
 
     public void checkUpdateAuthorityByCustomer(Long customerId) {