refactor: 포인트 도메인 리펙토링

src/main/java/com/kau/capstone/entity/member/repository/MemberRepository.java

@@ -2,22 +2,22 @@
 
 import com.kau.capstone.entity.member.Member;
 import com.kau.capstone.v1.member.exception.MemberNotFoundException;
-import java.util.Optional;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
+import java.util.Optional;
+
 public interface MemberRepository extends JpaRepository<Member, Long> {
 
     Optional<Member> findByPlatformId(String platformId);
 
-    @Modifying
-    @Query("UPDATE Member m SET m.refreshToken = :refreshToken WHERE m.id = :memberId")
-    void updateRefreshTokenByMemberId(@Param("memberId") Long memberId,
-        @Param("refreshToken") String refreshToken);
-
-    default Member getById(long id) {
+    default Member getById(long id){
         return findById(id).orElseThrow(MemberNotFoundException::new);
     }
+
+    @Modifying
+    @Query("UPDATE Member m SET m.refreshToken = :refreshToken WHERE m.id = :memberId")
+    void updateRefreshTokenByMemberId(@Param("memberId") Long memberId, @Param("refreshToken") String refreshToken);
 }

src/main/java/com/kau/capstone/entity/point/History.java

@@ -1,6 +1,8 @@
 package com.kau.capstone.entity.point;
 
 import com.kau.capstone.entity.member.Member;
+import com.kau.capstone.v2.point.dto.request.DepositPointReqV2;
+import com.kau.capstone.v2.point.dto.request.PayPointReqV2;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
@@ -9,7 +11,6 @@
 import jakarta.persistence.ManyToOne;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.Comment;
@@ -18,8 +19,6 @@
 
 @Entity
 @Getter
-@Builder
-@AllArgsConstructor
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class History {
 
@@ -33,11 +32,6 @@ public class History {
     @JoinColumn(name = "point_id")
     private Point point;
 
-    @ManyToOne
-    @Comment("사용자 연결")
-    @JoinColumn(name = "member_id")
-    private Member member;
-
     @Comment("적립/결제 후의 총 포인트")
     private Long totalPoint;
 
@@ -48,5 +42,25 @@ public class History {
     private String name;
 
     @Comment("적립/결제 일자")
-    private LocalDateTime date;
+    private LocalDateTime date = LocalDateTime.now();
+
+    private History(Point point, Long totalPoint, Long changePoint, String name) {
+        this.point = point;
+        this.totalPoint = totalPoint;
+        this.changePoint = changePoint;
+        this.name = name;
+    }
+
+    public static History of(Point point, PayPointReqV2 req, PointType type) {
+        return new History(point, point.getAmount(), -req.point(), type.description);
+    }
+
+    public static History of(Point point, DepositPointReqV2 req, PointType type) {
+        return new History(point, point.getAmount(), req.point(), type.description);
+    }
+
+    @Deprecated
+    public static History of(Member member, Point point, Long changePoint, String name){
+        return new History(point, point.getAmount(), changePoint, name);
+    }
 }

src/main/java/com/kau/capstone/entity/point/Point.java

@@ -15,31 +15,33 @@
 
 @Entity
 @Getter
-@Builder
-@AllArgsConstructor
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class Point {
-
     @Id
     @Comment("포인트 식별자")
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
+    private long id;
 
     @OneToOne(mappedBy = "point")
     private Member member;
 
     @Comment("포인트 값")
-    private Long amount;
+    private long amount;
 
-    public void connectMember(Member member) {
+    private Point(Member member) {
         this.member = member;
+        this.amount = 0L;
+    }
+
+    public static Point of(Member member) {
+        return new Point(member);
     }
 
-    public void payment(Long payPoint) {
+    public void payment(long payPoint) {
         this.amount -= payPoint;
     }
 
-    public void deposit(Long depositPoint) {
+    public void deposit(long depositPoint) {
         this.amount += depositPoint;
     }
 }

src/main/java/com/kau/capstone/entity/point/PointType.java

@@ -0,0 +1,24 @@
+package com.kau.capstone.entity.point;
+
+import lombok.Getter;
+
+@Getter
+public enum PointType {
+    PAYMENT_POINT("포인트 결제"),
+    EARN_POINT("포인트 적립");
+
+    final String description;
+
+    PointType(String description) {
+        this.description = description;
+    }
+
+    public static PointType getPointType(String description) {
+        for (PointType pointType : PointType.values()) {
+            if (pointType.description.equals(description)) {
+                return pointType;
+            }
+        }
+        return null;
+    }
+}

src/main/java/com/kau/capstone/entity/point/repository/HistoryRepository.java

@@ -10,6 +10,7 @@
 
 public interface HistoryRepository extends JpaRepository<History, Long> {
 
-    @Query("SELECT h FROM History h WHERE h.member = :member ORDER BY h.id DESC ")
+    @Query("SELECT h FROM History h WHERE h.point.member = :member ORDER BY h.id DESC ")
     List<History> findHistoriesByMember(@Param("member") Member member);
+
 }

src/main/java/com/kau/capstone/entity/point/repository/PointRepository.java

@@ -1,7 +1,20 @@
 package com.kau.capstone.entity.point.repository;
 
+import com.kau.capstone.entity.member.Member;
 import com.kau.capstone.entity.point.Point;
+import com.kau.capstone.v2.point.exception.PointNotFoundExceptionV2;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.Optional;
 
 public interface PointRepository extends JpaRepository<Point, Long> {
+
+    @Query("SELECT p FROM Point p WHERE p.member = :member")
+    Optional<Point> findByMember(@Param("member") Member member);
+
+    default Point getByMember(Member member){
+        return findByMember(member).orElseThrow(PointNotFoundExceptionV2::new);
+    };
 }

src/main/java/com/kau/capstone/v1/member/service/MemberService.java

@@ -55,16 +55,12 @@ public SignUserDto findOrCreateMember(String site, UserInfoDto userInfoDto) {
     }
 
     private SignUserDto save(String site, UserInfoDto userInfoDto) {
-        // 포인트, 멤버 연결
-        Point point = Point.builder()
-                .amount(0L)
-                .build();
-        pointRepository.save(point);
 
         Member member = MemberMapper.toMember(site, userInfoDto);
         memberRepository.save(member);
 
-        point.connectMember(member);
+        Point point = Point.of(member);
+
         member.connectPoint(point);
 
         // 리워드 내용 초기 세팅 (모두 미달성으로 표기하기 위해)

src/main/java/com/kau/capstone/v1/point/dto/DeliveryFeeRequest.java

@@ -1,6 +1,6 @@
 package com.kau.capstone.v1.point.dto;
 
 public record DeliveryFeeRequest(
-        Long deliveryFee
+        long deliveryFee
 ) {
 }

src/main/java/com/kau/capstone/v1/point/dto/EarnPointRequest.java

@@ -1,6 +1,6 @@
 package com.kau.capstone.v1.point.dto;
 
 public record EarnPointRequest(
-        Long point
+        long point
 ) {
 }

src/main/java/com/kau/capstone/v1/point/dto/HistoryResponse.java

@@ -5,7 +5,6 @@
 
 import java.util.List;
 
-@Builder
 public record HistoryResponse(
         List<OneHistoryResponse> history
 ) {
@@ -15,8 +14,6 @@ public static HistoryResponse toResponse(List<History> histories) {
                 .map(OneHistoryResponse::toResponse)
                 .toList();
 
-        return HistoryResponse.builder()
-                .history(responses)
-                .build();
+        return new HistoryResponse(responses);
     }
 }

src/main/java/com/kau/capstone/v1/point/dto/OneHistoryResponse.java

@@ -5,7 +5,6 @@
 
 import java.time.format.DateTimeFormatter;
 
-@Builder
 public record OneHistoryResponse(
         Long id,
         Long totalPoint,
@@ -17,12 +16,12 @@ public record OneHistoryResponse(
     public static final String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss";
 
     public static OneHistoryResponse toResponse(History history) {
-        return OneHistoryResponse.builder()
-                .id(history.getId())
-                .totalPoint(history.getTotalPoint())
-                .changePoint(history.getChangePoint())
-                .name(history.getName())
-                .date(DateTimeFormatter.ofPattern(DATE_FORMAT).format(history.getDate()))
-                .build();
+        return new OneHistoryResponse(
+                history.getId(),
+                history.getTotalPoint(),
+                history.getChangePoint(),
+                history.getName(),
+                DateTimeFormatter.ofPattern(DATE_FORMAT).format(history.getDate())
+        );
     }
 }

src/main/java/com/kau/capstone/v1/point/dto/PayPointRequest.java

@@ -1,6 +1,6 @@
 package com.kau.capstone.v1.point.dto;
 
 public record PayPointRequest(
-        Long point
+        long point
 ) {
 }

src/main/java/com/kau/capstone/v1/point/service/PointService.java

@@ -4,11 +4,11 @@
 import com.kau.capstone.entity.alarm.AlarmDetail;
 import com.kau.capstone.entity.alarm.repository.AlarmRepository;
 import com.kau.capstone.entity.food.Food;
+import com.kau.capstone.entity.member.repository.MemberRepository;
 import com.kau.capstone.v1.food.exception.FoodNotFoundException;
 import com.kau.capstone.entity.food.repository.FoodRepository;
 import com.kau.capstone.entity.member.Member;
 import com.kau.capstone.v1.member.exception.PointNotEnoughException;
-import com.kau.capstone.entity.member.repository.MemberRepository;
 import com.kau.capstone.v1.point.dto.EarnPointRequest;
 import com.kau.capstone.v1.point.dto.HistoryResponse;
 import com.kau.capstone.v1.point.dto.PayPointRequest;
@@ -23,7 +23,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Objects;
 
@@ -45,7 +44,7 @@ public class PointService {
     private final RewardRepository rewardRepository;
     private final AlarmRepository alarmRepository;
 
-    public void processPointPayment(Long memberId, PayPointRequest request) {
+    public void processPointPayment(long memberId, PayPointRequest request) {
         Member member = memberRepository.getById(memberId);
 
         Point point = member.getPoint();
@@ -58,7 +57,7 @@ public void processPointPayment(Long memberId, PayPointRequest request) {
         save(member, point, -request.point(), PAYMENT_POINT);
     }
 
-    public void processPointEarn(Long memberId, EarnPointRequest request) {
+    public void processPointEarn(long memberId, EarnPointRequest request) {
         Member member = memberRepository.getById(memberId);
 
         Point point = member.getPoint();
@@ -67,7 +66,7 @@ public void processPointEarn(Long memberId, EarnPointRequest request) {
         save(member, point, request.point(), EARN_POINT);
     }
 
-    public HistoryResponse getPointHistory(Long memberId) {
+    public HistoryResponse getPointHistory(long memberId) {
         Member member = memberRepository.getById(memberId);
 
         List<History> histories = historyRepository.findHistoriesByMember(member);
@@ -76,18 +75,11 @@ public HistoryResponse getPointHistory(Long memberId) {
     }
 
     public void save(Member member, Point point, Long changePoint, String name) {
-        History history = History.builder()
-                .member(member)
-                .point(point)
-                .totalPoint(point.getAmount())
-                .changePoint(changePoint)
-                .name(name)
-                .date(LocalDateTime.now())
-                .build();
+        History history = History.of(member, point, changePoint, name);
         historyRepository.save(history);
     }
 
-    public void processPointPaymentForFood(Long memberId, Long foodId, Long deliveryFee) {
+    public void processPointPaymentForFood(long memberId, Long foodId, Long deliveryFee) {
         Member member = memberRepository.getById(memberId);
         Point point = member.getPoint();
 
@@ -113,7 +105,7 @@ public void processPointPaymentForFood(Long memberId, Long foodId, Long delivery
         }
     }
 
-    public void processPointEarnForReward(Long memberId, Long rewardId) {
+    public void processPointEarnForReward(long memberId, Long rewardId) {
         Member member = memberRepository.getById(memberId);
         Point point = member.getPoint();