Merge branch 'dev' of https://github.com/Tea-Bliss/BE_Tea_Bliss into dev

Tea-Bliss · Jun 21, 2024 · b935cb7 · b935cb7
2 parents 40b2e10 + 9caefc3
commit b935cb7
Show file tree

Hide file tree

Showing 15 changed files with 120 additions and 102 deletions.
diff --git a/src/main/java/store/teabliss/basket/controller/BasketController.java b/src/main/java/store/teabliss/basket/controller/BasketController.java
@@ -5,11 +5,13 @@
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 import store.teabliss.basket.dto.BasketDto;
 import store.teabliss.basket.dto.DeleteBasketDto;
 import store.teabliss.basket.entity.Basket;
 import store.teabliss.basket.service.BasketService;
+import store.teabliss.member.entity.MemberDetails;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -24,9 +26,9 @@ public class BasketController {
 
     @GetMapping("")
     @Operation(summary = "장바구니 검색", description = "")
-    public ResponseEntity<?> basket(@RequestParam String email) {
+    public ResponseEntity<?> basket(@AuthenticationPrincipal MemberDetails memberDetails) {
 
-        List<Basket> list = basketService.getbasket(email);
+        List<Basket> list = basketService.getbasket(memberDetails.getMemberId());
 
         if (list.size()>0){
             return ResponseEntity.ok(list);
@@ -38,10 +40,10 @@ public ResponseEntity<?> basket(@RequestParam String email) {
 
     @PostMapping("")
     @Operation(summary = "장바구니 저장",description = "")
-    public ResponseEntity<?> postbasket(@RequestBody BasketDto basketDto){
+    public ResponseEntity<?> postbasket(@RequestBody BasketDto basketDto,@AuthenticationPrincipal MemberDetails memberDetails){
 
 
-        boolean baskets=basketService.postBaskets(basketDto);
+        boolean baskets=basketService.postBaskets(basketDto,memberDetails.getMemberId());
 
         if (baskets){
             return ResponseEntity.ok("장바구니 등록 완료!");
@@ -53,11 +55,12 @@ public ResponseEntity<?> postbasket(@RequestBody BasketDto basketDto){
     }
 
 
-    @PatchMapping("")
+    @PatchMapping("/{id}")
     @Operation(summary = "장바구니 수정",description = "")
-    public ResponseEntity<?> patchbasket(@RequestParam("id") Long id,@RequestBody BasketDto basketDto){
+    public ResponseEntity<?> patchbasket(@PathVariable(name="id") Long id,@RequestBody BasketDto basketDto
+    ,@AuthenticationPrincipal MemberDetails memberDetails){
 
-        boolean baskets=basketService.patchBaskets(id,basketDto);
+        boolean baskets=basketService.patchBaskets(id,basketDto,memberDetails.getMemberId());
 
         if (baskets){
             return ResponseEntity.ok("장바구니 수정 완료!");
@@ -68,9 +71,9 @@ public ResponseEntity<?> patchbasket(@RequestParam("id") Long id,@RequestBody Ba
 
     @DeleteMapping("")
     @Operation(summary = "장바구니 하나만 삭제",description = "")
-    public ResponseEntity<?> deletebasket(@RequestBody DeleteBasketDto deleteBasketDto){
+    public ResponseEntity<?> deletebasket(@RequestBody DeleteBasketDto deleteBasketDto,@AuthenticationPrincipal MemberDetails memberDetails){
 
-        boolean baskets=basketService.deleteBaskets(deleteBasketDto);
+        boolean baskets=basketService.deleteBaskets(deleteBasketDto,memberDetails.getMemberId());
 
         if (baskets){
             return ResponseEntity.ok("장바구니 삭제 완료!");
@@ -82,19 +85,15 @@ public ResponseEntity<?> deletebasket(@RequestBody DeleteBasketDto deleteBasketD
 
     @DeleteMapping("/selecteddelete")
     @Operation(summary = "장바구니  선택 삭제",description = "")
-    public ResponseEntity<?> deletebasket(@RequestBody ArrayList<DeleteBasketDto> deleteBasketDto){
+    public ResponseEntity<?> deletebasket(@RequestBody ArrayList<DeleteBasketDto> deleteBasketDto,@AuthenticationPrincipal MemberDetails memberDetails){
 
 
         for (DeleteBasketDto dto :deleteBasketDto) {
-            boolean baskets = basketService.deleteBaskets(dto);
+            boolean baskets = basketService.deleteBaskets(dto,memberDetails.getMemberId());
         }
 
         return ResponseEntity.ok("삭제 완료되었습니다.");
     }
 
 
-
-
-
-
 }
diff --git a/src/main/java/store/teabliss/basket/dto/BasketDto.java b/src/main/java/store/teabliss/basket/dto/BasketDto.java
@@ -9,9 +9,6 @@
 
 public class BasketDto {
 
-    private String email;//유저 아이디=이메일형식이라 그런거임 ㅇㅇ
-
-
     private String product;
 
     private Long quantity;

diff --git a/src/main/java/store/teabliss/basket/dto/DeleteBasketDto.java b/src/main/java/store/teabliss/basket/dto/DeleteBasketDto.java
@@ -12,5 +12,4 @@ public class DeleteBasketDto {
 
     private Long id;
 
-    private String email;
 }
diff --git a/src/main/java/store/teabliss/basket/entity/Basket.java b/src/main/java/store/teabliss/basket/entity/Basket.java
@@ -14,7 +14,7 @@ public class Basket {
 
     private Long id;
 
-    private String email;
+    private Long memId;
 
     private String img;
 

diff --git a/src/main/java/store/teabliss/basket/mapper/BasketMapper.java b/src/main/java/store/teabliss/basket/mapper/BasketMapper.java
@@ -12,11 +12,11 @@
 @Mapper
 public interface BasketMapper {
 
-     List<Basket> getbasket(String email);
+     List<Basket> getbasket(Long memberId);
 
-     void update(Long id,Basket basket);
+     void update(Basket basket);
 
-     boolean delete(Long id,String email);
+     boolean delete(Long id,Long memberId);
 
      void save(Basket basket);
 }
diff --git a/src/main/java/store/teabliss/basket/service/BasketService.java b/src/main/java/store/teabliss/basket/service/BasketService.java
@@ -9,6 +9,7 @@
 import store.teabliss.basket.mapper.BasketMapper;
 import store.teabliss.member.entity.Member;
 import store.teabliss.member.exception.NotFoundMemberByEmailException;
+import store.teabliss.member.exception.NotFoundMemberByIdException;
 import store.teabliss.member.mapper.MemberMapper;
 import store.teabliss.tea.entity.Tea;
 import store.teabliss.tea.mapper.TeaMapper;
@@ -26,26 +27,26 @@ public class BasketService {
     private final MemberMapper memberMapper;
 
 
-    public List<Basket> getbasket(String email){
+    public List<Basket> getbasket(Long memId){
 
-        List<Basket> list=basketMapper.getbasket(email);
+        List<Basket> list=basketMapper.getbasket(memId);
 
         return list;
 
 
     }
 
 
-    public boolean postBaskets(BasketDto basketDto){
+    public boolean postBaskets(BasketDto basketDto,Long memId){
 
             Tea tea = teaMapper.search(basketDto.getProduct());
 
-            Optional<Member> memberOpt=memberMapper.findByEmail(basketDto.getEmail());
+            Optional<Member> memberOpt=memberMapper.findById(memId);
 
             if (memberOpt.isPresent()){
 
                 Basket basket = Basket.builder()
-                        .email(basketDto.getEmail())
+                        .memId(memId)
                         .img(tea.getImg())
                         .name(tea.getName())
                         .nameEng(tea.getNameEng())
@@ -57,24 +58,23 @@ public boolean postBaskets(BasketDto basketDto){
                 basketMapper.save(basket);
                 return true;
             }else {
-                throw new NotFoundMemberByEmailException("User with ID " + basketDto.getEmail() + " not found");
+                return false;
             }
 
 
 
     }
 
-    public boolean patchBaskets(Long id,BasketDto basketDto){
+    public boolean patchBaskets(Long id,BasketDto basketDto,Long memId){
 
-        Optional<Member> memberOpt=memberMapper.findByEmail(basketDto.getEmail());
+        Optional<Member> memberOpt=memberMapper.findById(memId);
         Tea tea = teaMapper.search(basketDto.getProduct());
 
-
-
         if (memberOpt.isPresent()) {
 
             Basket basket = Basket.builder()
-                    .email(basketDto.getEmail())
+                    .id(id)
+                    .memId(memId)
                     .img(tea.getImg())
                     .name(tea.getName())
                     .nameEng(tea.getNameEng())
@@ -85,29 +85,28 @@ public boolean patchBaskets(Long id,BasketDto basketDto){
                     .build();
 
 
-            basketMapper.update(id,basket);
+            basketMapper.update(basket);
 
             return true;
 
         }else {
-            throw new NotFoundMemberByEmailException("User with ID " + basketDto.getEmail() + " not found");
+            return false;
         }
     }
 
-    public boolean deleteBaskets(DeleteBasketDto deleteBasketDto){
+    public boolean deleteBaskets(DeleteBasketDto deleteBasketDto,Long memId){
 
-        Optional<Member> memberOpt=memberMapper.findByEmail(deleteBasketDto.getEmail());
+        Optional<Member> memberOpt=memberMapper.findById(memId);
 
         if (memberOpt.isPresent()) {
 
-            String UserId = deleteBasketDto.getEmail();
             Long id = deleteBasketDto.getId();
 
-            boolean result = basketMapper.delete(id,UserId);
+            boolean result = basketMapper.delete(id,memId);
 
             return result;
         } else {
-            throw new NotFoundMemberByEmailException("User with ID " + deleteBasketDto.getEmail() + " not found");
+            return false;
         }
     }
 

diff --git a/src/main/java/store/teabliss/tea/controller/TeaController.java b/src/main/java/store/teabliss/tea/controller/TeaController.java
@@ -102,7 +102,7 @@ public ResponseEntity<?> lowcost(@RequestParam("page") int page,@RequestParam("l
 
     }
 
-    @GetMapping("all")
+    @GetMapping("/all")
     @Operation(summary = "모두 조회", description = "모든 차를 조회하는 로직입니다.")
     public ResponseEntity<?> all(@RequestParam("page") int page,@RequestParam("limit") int limit ){
 
@@ -117,9 +117,9 @@ public ResponseEntity<?> all(@RequestParam("page") int page,@RequestParam("limit
 
 
     }
-    @GetMapping("findtea")
+    @GetMapping("/findtea/{id}")
     @Operation(summary = "티 상세 조회", description = "차 하나만 조회하는 로직")
-    public ResponseEntity<TeaSearchDto> responseid(@RequestParam("id") int id){
+    public ResponseEntity<TeaSearchDto> responseid(@PathVariable(name="id") int id){
 
 
         TeaSearchDto tea=teaService.find(id);
@@ -129,7 +129,7 @@ public ResponseEntity<TeaSearchDto> responseid(@RequestParam("id") int id){
 
     }
 
-    @GetMapping("category")
+    @GetMapping("/category")
     @Operation(summary = "카테고리 조회", description = "차 하나만 조회하는 로직")
     public ResponseEntity<?> category(@RequestParam("page") int page,@RequestParam("limit") int limit,@RequestParam("category") String categroy){
 
@@ -144,7 +144,7 @@ public ResponseEntity<?> category(@RequestParam("page") int page,@RequestParam("
         return ResponseEntity.ok(response);
     }
 
-    @GetMapping("season")
+    @GetMapping("/season")
     @Operation(summary = "시즌별 조회", description = "차 하나만 조회하는 로직")
     public ResponseEntity<?> season(@RequestParam("page") int page,@RequestParam("limit") int limit,@RequestParam("season") String season){
 
@@ -160,7 +160,7 @@ public ResponseEntity<?> season(@RequestParam("page") int page,@RequestParam("li
 
     }
 
-    @GetMapping("caffeine")
+    @GetMapping("/caffeine")
     @Operation(summary = "카페인 조회", description = "차 하나만 조회하는 로직")
     public ResponseEntity<?> caffeine(@RequestParam("page") int page,@RequestParam("limit") int limit,@RequestParam("caffeine") boolean caffeine){
 
@@ -174,9 +174,9 @@ public ResponseEntity<?> caffeine(@RequestParam("page") int page,@RequestParam("
 
     }
 
-    @DeleteMapping("delete/{id}")
+    @DeleteMapping("/delete/{id}")
     @Operation(summary = "완성차 삭제 ", description = "차 하나만 조회하는 로직")
-    public ResponseEntity<?> teaDelete(@PathVariable int id){
+    public ResponseEntity<?> teaDelete(@PathVariable(name="id") int id){
 
         boolean delete=teaService.deletetea(id);
         if (delete) {
@@ -188,11 +188,10 @@ public ResponseEntity<?> teaDelete(@PathVariable int id){
 
     @PatchMapping("patch/{id}")
     @Operation(summary = "완성차 수정 ", description = "차 하나만 조회하는 로직")
-    public ResponseEntity<?> teaPatch(TeaPatchDto teaPatchDto){
+    public ResponseEntity<?> teaPatch(@PathVariable(name="id") Long id,@RequestBody TeaPatchDto teaPatchDto){
 
 
-
-        boolean patch=teaService.patchtea(teaPatchDto);
+        boolean patch=teaService.patchtea(id,teaPatchDto);
 
         if (patch) {
             return ResponseEntity.ok("수정되었습니다.");

diff --git a/src/main/java/store/teabliss/tea/dto/TeaDto.java b/src/main/java/store/teabliss/tea/dto/TeaDto.java
@@ -1,15 +1,13 @@
 package store.teabliss.tea.dto;
 
 
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.Email;
-import jakarta.validation.constraints.NotEmpty;
+
 import lombok.Getter;
 import lombok.Setter;
 
-import java.sql.Timestamp;
+
 import java.util.ArrayList;
-import java.util.Date;
+
 
 @Getter
 @Setter

diff --git a/src/main/java/store/teabliss/tea/dto/TeaPatchDto.java b/src/main/java/store/teabliss/tea/dto/TeaPatchDto.java
@@ -3,12 +3,12 @@
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.ArrayList;
+
 @Getter
 @Setter
 public class TeaPatchDto {
 
-    private Long id ;
-
     private Long price;
     private String  category ;
 
@@ -17,6 +17,15 @@ public class TeaPatchDto {
     private boolean caffeine;
     private String description;
     private String img;
+
     private Long inventory ;
 
+    private ArrayList<Long> ingredient;
+
+    private ArrayList<Long> flavor;
+
+    private String saleStatus;
+
+    private String season;
+
 }
diff --git a/src/main/java/store/teabliss/tea/entity/TeaFlavor.java b/src/main/java/store/teabliss/tea/entity/TeaFlavor.java
@@ -1,6 +1,7 @@
 package store.teabliss.tea.entity;
 
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -9,6 +10,7 @@
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
+@Builder
 public class TeaFlavor {
 
     private Long teaId;

diff --git a/src/main/java/store/teabliss/tea/entity/TeaIngredient.java b/src/main/java/store/teabliss/tea/entity/TeaIngredient.java
@@ -2,6 +2,7 @@
 
 
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -10,6 +11,7 @@
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
+@Builder
 public class TeaIngredient {
 
     private Long teaId;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,5 +12,4 @@ public class DeleteBasketDto {

		private Long id;

		private String email;
		}