Feat/#7

build.gradle

@@ -26,12 +26,9 @@ repositories {
 dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
 	implementation 'org.springframework.boot:spring-boot-starter-web'
-//	implementation 'org.springframework.boot:spring-boot-starter-security'
 	implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.3'
 	implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.3'
 	implementation 'org.springframework.boot:spring-boot-starter'
-//	implementation 'org.springframework.boot:spring-boot-starter-tomcat'
-//	implementation 'com.auth0:java-jwt:4.2.1'
 	compileOnly 'org.projectlombok:lombok'
 	runtimeOnly 'com.mysql:mysql-connector-j'
 	annotationProcessor 'org.projectlombok:lombok'

src/main/java/com/greenpoint/server/auth/controller/UserController.java

@@ -48,6 +48,7 @@ public ResponseEntity<LoginResponse> getLogin(@RequestParam("code") String code)
         return ResponseEntity.ok(loginResponse);
     }
 
+
     @PostMapping("/makeAccount")
     public ResponseEntity<AccountResponse> makeAccount(@RequestBody HashMap<String, String> param) {
         Boolean result;
@@ -74,6 +75,4 @@ public String deleteAccount(HttpSession session, @RequestParam("token") String t
         }
         return resultCode;
     }
-
-}
-
+}

src/main/java/com/greenpoint/server/auth/model/OauthToken.java

@@ -1,16 +1 @@
-//package com.greenpoint.server.auth.model;
-//
-//
-//import lombok.Data;
-//
-//@Data //(2)
-//public class OauthToken { //(1)
-//    private String access_token;
-//    private String token_type;
-//    private String refresh_token;
-//    private int expires_in;
-//    private String scope;
-//    private int refresh_token_expires_in;
-//
-//}}
-//
+

src/main/java/com/greenpoint/server/auth/repository/UserRepository.java

@@ -1,10 +1,11 @@
-package com.greenpoint.server.auth.repository;
-
-import com.greenpoint.server.customer.model.Customer;
-import org.springframework.data.jpa.repository.JpaRepository;
-
-public interface UserRepository extends JpaRepository<Customer, Long> {
-
-
-}
+//
+//package com.greenpoint.server.auth.repository;
+//
+//import com.greenpoint.server.customer.model.Customer;
+//import org.springframework.data.jpa.repository.JpaRepository;
+//
+//public interface UserRepository extends JpaRepository<Customer, Long> {
+//
+//
+//}
 

src/main/java/com/greenpoint/server/auth/service/UserService.java

@@ -1,10 +1,9 @@
+
 package com.greenpoint.server.auth.service;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.greenpoint.server.auth.model.KakaoProfile;
-import com.greenpoint.server.auth.repository.UserRepository;
 import com.greenpoint.server.customer.model.Customer;
 import com.greenpoint.server.customer.repository.CustomerRepository;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,6 +13,7 @@
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.client.RestTemplate;
 
+
 import java.sql.SQLOutput;
 
 import javax.servlet.http.HttpSession;
@@ -23,7 +23,8 @@
 @Service
 public class UserService {
     @Autowired
-    CustomerRepository customerRepository;
+    private CustomerRepository customerRepository;
+
 
     public Object[] saveUser(String token) {
 
@@ -50,6 +51,7 @@ public Object[] saveUser(String token) {
             Customer newUser = Customer.from(token, name.substring(1, name.length() - 1), imageUrl.substring(1, imageUrl.length() - 1));
             obArr[0] = newUser;
             obArr[1] = false;
+//            customerRepository.save(newUser);
             return obArr;
         }
 

src/main/java/com/greenpoint/server/common/BaseEntity.java

@@ -19,6 +19,7 @@
 @NoArgsConstructor
 @Getter
 public abstract class BaseEntity {
+
     @CreatedDate
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Seoul")
     @Column(updatable = false)

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

@@ -16,14 +16,13 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @Where(clause = "deleted = false")
-@SQLDelete(sql = "UPDATE customer SET deleted = true Where kakaoToken = ?")
+@SQLDelete(sql = "UPDATE customer SET deleted = true Where id = ?")
 public class Customer extends BaseEntity {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
-//    @Id
     @Column(unique = true)
     private String kakaoToken;
 

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

@@ -2,16 +2,25 @@
 
 import com.greenpoint.server.customer.model.Customer;
 import com.greenpoint.server.customer.repository.CustomerRepository;
+import com.greenpoint.server.exception.CustomerNotFoundException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 @Service
 public class CustomerService {
 
+
     @Autowired
     private CustomerRepository customerRepository;
-    public Customer findById(Long customerId) {
-        Customer customer = customerRepository.findById(customerId).get();
-        return customer;
+
+    @Transactional
+    public Customer findById(Long id) {
+//        Customer ret = customerRepository.findById(id).orElseThrow(CustomerNotFoundException::new);
+        Customer ret = customerRepository.findById(id).get();
+        return ret;
     }
+
+
+
 }

src/main/java/com/greenpoint/server/exception/CustomerNotFoundException.java

@@ -0,0 +1,10 @@
+package com.greenpoint.server.exception;
+
+import org.springframework.http.HttpStatus;
+
+public class CustomerNotFoundException extends GlobalException {
+    public CustomerNotFoundException() {
+        super("존재하지 않는 유저입니다.", HttpStatus.BAD_REQUEST);
+    }
+}
+

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

@@ -1,5 +1,6 @@
 package com.greenpoint.server.history.controller;
-
+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.HistoryRequest;
 import com.greenpoint.server.history.model.HistoryResponse;
@@ -22,19 +23,22 @@ public class HistoryController {
     private HistoryService historyService;
     @Autowired
     private StoreService storeService;
+    @Autowired
+    private CustomerService customerService;
 
+    @GetMapping(value = "/history/{id}")
+    public ResponseEntity<List<HistoryResponse>> findAllById(@PathVariable Long customerId){
+        List<HistoryResponse> res = historyService.findAllById(customerId);
+        return ResponseEntity.ok(res);
+    }
 
-//    @GetMapping(value = "/history/{token}")
-//    public ResponseEntity<List<HistoryResponse>> findAllHistoryByCustomer(){
-//
-//
-//    }
 
 
     @PostMapping(value="/history")
     public ResponseEntity<Long> addHistory(@RequestBody HistoryRequest request){
-        Store store = storeService.findById(request.getStoreId());
-        Long res = historyService.create(History.from(store, request));
+        Customer customer = customerService.findById(request.getCustomerId());
+        Store store = storeService.findStoreById(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

@@ -33,7 +33,7 @@ public class History extends BaseEntity {
 
 
     public static History from(Store store, HistoryRequest request){
-        return History.builder()
+                return History.builder()
                 .customerId(request.getCustomerId())
                 .store(store)
                 .cost(request.getCost())

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

@@ -1,14 +1,11 @@
 package com.greenpoint.server.history.model;
 
-import com.greenpoint.server.store.model.Store;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.CascadeType;
-import javax.persistence.FetchType;
-import javax.persistence.ManyToOne;
 
 @Getter
 @Builder
@@ -21,13 +18,14 @@ public class HistoryResponse {
     private int usedPoint;
     private int currentPoint;
 
-//    public HistoryResponse from(History history){
-//        return HistoryResponse.builder()
-//                .storeName(history.getStore().getName())
-//                .savedPoint(history.getSavedPoint())
-//                .usedPoint(history.getUsedPoint())
-//                .currentPoint(history.)
-//                .build();
-//    }
+
+
+    public static HistoryResponse from(History history){
+        return HistoryResponse.builder()
+                .storeName(history.getStore().getName())
+                .savedPoint(history.getSavedPoint())
+                .usedPoint(history.getUsedPoint())
+                .build();
+    }
 
 }

src/main/java/com/greenpoint/server/history/repository/HistoryRepository.java

@@ -2,7 +2,15 @@
 
 
 import com.greenpoint.server.history.model.History;
+import com.greenpoint.server.history.model.HistoryResponse;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+
+import java.util.Arrays;
+import java.util.List;
 
 public interface HistoryRepository extends JpaRepository<History, Long> {
+
+    @Query("select h from History h where h.customerId = :cid")
+    List<History> findAllById(Long cid);
 }

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

@@ -3,28 +3,36 @@
 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 org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 public class HistoryService {
 
     @Autowired
     private HistoryRepository historyRepository;
 
-    @Autowired
-    private CustomerService customerService;
+
+
 
     @Transactional
-    public Long create(History history){
+    public Long create(History history, Customer customer){
         History res = historyRepository.save(history);
-        Customer customer = customerService.findById(history.getCustomerId());
         customer.addpoint(history.getSavedPoint());
         customer.usepoint(history.getUsedPoint());
         return res.getId();
     }
 
 
+    @Transactional
+    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/controller/LevelController.java

@@ -1,6 +1,13 @@
 package com.greenpoint.server.level.controller;
 
+import com.greenpoint.server.level.model.Level;
+import com.greenpoint.server.level.model.LevelRequest;
+import com.greenpoint.server.level.service.LevelService;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -9,4 +16,13 @@
 @RequestMapping("/api")
 public class LevelController {
 
+    @Autowired
+    private LevelService levelService;
+
+    @PostMapping(value="/level")
+    public ResponseEntity<Level> create(@RequestBody LevelRequest request){
+        Level res = levelService.create(Level.from(request));
+        return ResponseEntity.ok(res);
+    }
+
 }

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

@@ -2,10 +2,7 @@
 
 import com.greenpoint.server.common.BaseEntity;
 import com.greenpoint.server.customer.model.Customer;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
+import lombok.*;
 import org.hibernate.annotations.SQLDelete;
 import org.hibernate.annotations.Where;
 
@@ -14,6 +11,7 @@
 @Entity
 @Getter
 @Setter
+@Builder
 @NoArgsConstructor
 @AllArgsConstructor
 @Where(clause = "deleted = false")
@@ -26,4 +24,10 @@ public class Level extends BaseEntity{
     private String name;
     private String image;
 
+    public static Level from(LevelRequest request) {
+        return Level.builder()
+                .name(request.getName())
+                .image(request.getImage())
+                .build();
+    }
 }

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

@@ -0,0 +1,14 @@
+package com.greenpoint.server.level.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+public class LevelRequest {
+    public String name;
+    public String image;
+}