[#19] (#20)

src/main/java/com/greenpoint/server/customer/model/Customer.java

@@ -43,9 +43,14 @@ public void insertUserToken(String token){
     }
 
 
-    public void addpoint(int savedPoint) {
+    public int addpoint(int savedPoint) {
         this.point = this.point + savedPoint;
         this.totalPoint = this.totalPoint + savedPoint;
+        int grade;
+        if(this.totalPoint >= 1000000) grade = 3;
+        else if(this.totalPoint >= 100000) grade = 2;
+        else grade = 1;
+        return grade;
     }
 
     public void usepoint(int usedPoint) {
@@ -76,4 +81,7 @@ public static Customer from (String nickname , String contact) {
     }
 
 
+    public void upgrade(Level level) {
+        this.level = level;
+    }
 }

src/main/java/com/greenpoint/server/history/model/History.java

@@ -27,6 +27,7 @@ public class History extends BaseEntity {
 
     @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
     private Store store;
+
     private int cost;
     private int savedPoint;
     private int usedPoint;

src/main/java/com/greenpoint/server/history/service/HistoryService.java

@@ -1,10 +1,11 @@
 package com.greenpoint.server.history.service;
 
 import com.greenpoint.server.customer.model.Customer;
-import com.greenpoint.server.customer.service.CustomerService;
 import com.greenpoint.server.history.model.History;
 import com.greenpoint.server.history.model.HistoryResponse;
 import com.greenpoint.server.history.repository.HistoryRepository;
+import com.greenpoint.server.level.model.Level;
+import com.greenpoint.server.level.service.LevelService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -17,14 +18,24 @@ public class HistoryService {
     @Autowired
     private HistoryRepository historyRepository;
 
+    @Autowired
+    private LevelService levelService;
+
 
 
 
     @Transactional
     public Long create(History history, Customer customer){
         History res = historyRepository.save(history);
-        customer.addpoint(history.getSavedPoint());
+
+        int grade = customer.getLevel().getGrade();
         customer.usepoint(history.getUsedPoint());
+        int newgrade = customer.addpoint(history.getSavedPoint());
+        if(newgrade > grade){
+            Level level = levelService.findByGrade(newgrade);
+            customer.upgrade(level);
+        }
+
         return res.getId();
     }
 
@@ -34,5 +45,4 @@ public List<HistoryResponse> findAllById(Long customerId) {
         List<History> histories = historyRepository.findAllById(customerId);
         return histories.stream().map(HistoryResponse::from).collect(Collectors.toList());
     }
-
 }

src/main/java/com/greenpoint/server/level/model/Level.java

@@ -21,11 +21,15 @@ public class Level extends BaseEntity{
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
+    private int grade;
+    private int lpoint;
     private String name;
     private String image;
 
     public static Level from(LevelRequest request) {
         return Level.builder()
+                .grade(request.getGrade())
+                .lpoint(request.getLpoint())
                 .name(request.getName())
                 .image(request.getImage())
                 .build();

src/main/java/com/greenpoint/server/level/model/LevelRequest.java

@@ -9,6 +9,8 @@
 @NoArgsConstructor
 @AllArgsConstructor
 public class LevelRequest {
+    private int grade;
+    private int lpoint;
     public String name;
     public String image;
 }

src/main/java/com/greenpoint/server/level/repository/LevelRepository.java

@@ -3,6 +3,9 @@
 
 import com.greenpoint.server.level.model.Level;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 
 public interface LevelRepository extends JpaRepository<Level, Long> {
+    @Query("select l from Level l where l.grade = :newgrade")
+    Level findByGrade(int newgrade);
 }

src/main/java/com/greenpoint/server/level/service/LevelService.java

@@ -18,4 +18,8 @@ public Level create(Level level){
         return ret;
     }
 
+    public Level findByGrade(int newgrade) {
+        Level ret = levelRepository.findByGrade(newgrade);
+        return ret;
+    }
 }