[#23]

src/main/java/com/greenpoint/server/customer/service/CustomerService.java

@@ -14,6 +14,9 @@ public class CustomerService {
     @Autowired
     private CustomerRepository customerRepository;
 
+
+
+
     @Transactional
     public Customer findById(Long id) {
 //        Customer ret = customerRepository.findById(id).orElseThrow(CustomerNotFoundException::new);

src/main/java/com/greenpoint/server/history/controller/HistoryController.java

@@ -28,15 +28,15 @@ public class HistoryController {
     private CustomerService customerService;
 
     @GetMapping(value = "/history/{id}")
-    public ResponseEntity<List<HistoryResponse>> findAllById(@PathVariable Long customerId){
-        List<HistoryResponse> res = historyService.findAllById(customerId);
+    public ResponseEntity<List<HistoryResponse>> findAllById(@PathVariable Long id){
+        List<HistoryResponse> res = historyService.findAllById(id);
         return ResponseEntity.ok(res);
     }
 
     @PostMapping(value="/history")
     public ResponseEntity<Long> addHistory(@RequestBody HistoryRequest request){
         Customer customer = customerService.findById(request.getCustomerId());
-        Store store = storeService.findStoreById(request.getStoreId());
+        Store store = storeService.findById(request.getStoreId());
         Long res = historyService.create(History.from(store, request), customer);
         return ResponseEntity.ok(res);
     }

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

@@ -3,6 +3,7 @@
 
 import com.greenpoint.server.common.BaseEntity;
 import com.greenpoint.server.customer.model.Customer;
+import com.greenpoint.server.customer.service.CustomerService;
 import com.greenpoint.server.store.model.Store;
 import lombok.*;
 import org.hibernate.annotations.SQLDelete;
@@ -29,6 +30,7 @@ public class History extends BaseEntity {
     private Store store;
 
     private int cost;
+    private int currentPoint;
     private int savedPoint;
     private int usedPoint;
 
@@ -43,5 +45,9 @@ public static History from(Store store, HistoryRequest request){
                 .build();
     }
 
+    public void pointCheck(Customer customer){
+        this.currentPoint = customer.getPoint();
+    }
+
 
 }

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

@@ -25,6 +25,7 @@ public static HistoryResponse from(History history){
                 .storeName(history.getStore().getName())
                 .savedPoint(history.getSavedPoint())
                 .usedPoint(history.getUsedPoint())
+                .currentPoint(history.getCurrentPoint())
                 .build();
     }
 

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

@@ -35,7 +35,7 @@ public Long create(History history, Customer customer){
             Level level = levelService.findByGrade(newgrade);
             customer.upgrade(level);
         }
-
+        res.pointCheck(customer);
         return res.getId();
     }
 

src/main/java/com/greenpoint/server/store/controller/StoreController.java

@@ -25,6 +25,18 @@ public ResponseEntity<List<Store>> findAll(){
         List<Store> res = storeService.findAll();
         return ResponseEntity.ok(res);
     }
+    @GetMapping(value="/store/{id}")
+    public ResponseEntity<Store> findById(@PathVariable Long id){
+        Store res = storeService.findById(id);
+        return ResponseEntity.ok(res);
+    }
+
+    @GetMapping(value="/store/three/{id}")
+    public ResponseEntity<List<Store>> findThreeById(@PathVariable Long id){
+        List<Store> res = storeService.findThreeById(id);
+        return ResponseEntity.ok(res);
+    }
+
     @PostMapping(value="/store")
     public ResponseEntity<Store> create(@RequestBody StoreRequest request){
         Store res = storeService.create(Store.from(request));

src/main/java/com/greenpoint/server/store/model/Store.java

@@ -37,6 +37,7 @@ public class Store extends BaseEntity {
 
     @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
     private StoreLevel storeLevel;
+
     public static Store from(StoreRequest request){
         return Store.builder()
                 .loginID(request.getLoginID())

src/main/java/com/greenpoint/server/store/repository/StoreRepository.java

@@ -2,7 +2,12 @@
 
 import com.greenpoint.server.store.model.Store;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+
+import java.util.List;
 
 public interface StoreRepository extends JpaRepository<Store, Long> {
 
+    @Query(nativeQuery = true, value ="select s from Store s where s.id = :id order by s. LIMIT 3")
+    List<Store> findThreeById(Long id);
 }

src/main/java/com/greenpoint/server/store/service/StoreService.java

@@ -18,7 +18,7 @@ public class StoreService {
 
 
     @Transactional(readOnly = true)
-    public Store findStoreById(Long storeId) {
+    public Store findById(Long storeId) {
         Store ret = storeRepository.findById(storeId).get();
         return ret;
     }
@@ -50,4 +50,10 @@ public Store update(Long id, StoreRequest request) {
     private Store findOne(Long id) {
         return storeRepository.findById(id).get();
     }
+
+
+    public List<Store> findThreeById(Long id) {
+        List<Store> ret = storeRepository.findThreeById(id);
+        return ret;
+    }
 }