[Refactor] Payment, point내 변수명 및 폴더 위치 정렬 #142

beyond-sw-camp · Aug 8, 2024 · c2d4a43 · c2d4a43
1 parent 73f60c9
commit c2d4a43
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/src/main/java/com/gamja/tiggle/exchange/adapter/out/persistence/JpaExchangeRepository.java b/src/main/java/com/gamja/tiggle/exchange/adapter/out/persistence/JpaExchangeRepository.java
@@ -3,6 +3,7 @@
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 import java.util.List;
 
@@ -20,4 +21,9 @@ public interface JpaExchangeRepository extends JpaRepository<ExchangeEntity,Long
                 "WHERE e.reservation2.user.id = :userId"
         )
         List<ExchangeEntity> findExchangeByUser (Long userId, Pageable page);
+
+        @Query("SELECT COUNT(r) FROM ReservationEntity r " +
+                "JOIN r.user u " +
+                "WHERE u.id = :userId")
+        Long countReservationsByUserId(@Param("userId") Long userId);
 }
diff --git a/src/main/java/com/gamja/tiggle/payment/adapter/out/persistence/PaymentEntity.java b/src/main/java/com/gamja/tiggle/payment/adapter/out/persistence/PaymentEntity.java
@@ -29,10 +29,6 @@ public class PaymentEntity {
     private String payType;
     private Boolean verify;
 
-    //@ManyToOne
-    //@JoinColumn(name = "user_id")
-    //private User user;
-
     @OneToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "reservation_id")
     private ReservationEntity reservationEntity;

diff --git a/...apter/out/verify/PointHistoryAdapter.java → .../out/persistence/PointHistoryAdapter.java b/...apter/out/verify/PointHistoryAdapter.java → .../out/persistence/PointHistoryAdapter.java
@@ -1,8 +1,6 @@
-package com.gamja.tiggle.point.adapter.out.verify;
+package com.gamja.tiggle.point.adapter.out.persistence;
 
 import com.gamja.tiggle.common.BaseException;
-import com.gamja.tiggle.point.adapter.out.persistence.JpaPointRepository;
-import com.gamja.tiggle.point.adapter.out.persistence.PointEntity;
 import com.gamja.tiggle.point.application.port.out.PointHistoryPort;
 import com.gamja.tiggle.point.domain.GetOrUse;
 import com.gamja.tiggle.point.domain.PointHistory;
@@ -22,11 +20,11 @@ public class PointHistoryAdapter implements PointHistoryPort {
     private final JpaUserRepository jpaUserRepository;
 
     @Override
-    public List<PointHistory> findPointHistorybyUserId(Long userId, GetOrUse method) {
+    public List<PointHistory> findPointHistorybyUserId(Long userId, GetOrUse useType) {
         List<PointHistory> pointHistoryList = new ArrayList<>();
 
         List<PointEntity> pointEntityList = jpaPointRepository.findAllByUserEntity_Id(userId);
-        if (method.equals(GetOrUse.ALL)){
+        if (useType.equals(GetOrUse.ALL)){
             for (PointEntity p : pointEntityList){
                 PointHistory pointHistory = PointHistory.builder()
                         .id(p.getId())
@@ -43,7 +41,7 @@ public List<PointHistory> findPointHistorybyUserId(Long userId, GetOrUse method)
         }
         else {
             for (PointEntity p : pointEntityList) {
-                if (p.getGetOrUse().equals(method)) {
+                if (p.getGetOrUse().equals(useType)) {
                     PointHistory pointHistory = PointHistory.builder()
                             .id(p.getId())
                             .userId(p.getUserEntity().getId())