Feign통신연결 및 프론트 요구사항 반영

.gitignore

@@ -4,6 +4,7 @@ build/
 !gradle/wrapper/gradle-wrapper.jar
 !**/src/main/**/build/
 !**/src/test/**/build/
+data.sql
 
 ### STS ###
 .apt_generated

build.gradle

@@ -45,6 +45,8 @@ dependencies {
     annotationProcessor 'org.projectlombok:lombok'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     implementation "org.springframework.cloud:spring-cloud-starter-bus-kafka"
+    implementation 'org.springframework.kafka:spring-kafka'
+    implementation 'org.springframework.cloud:spring-cloud-starter-openfeign'
 
     runtimeOnly 'com.h2database:h2'
     runtimeOnly 'com.mysql:mysql-connector-j'
@@ -57,7 +59,11 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-data-redis'
     implementation("it.ozimov:embedded-redis:0.7.2")
 
-    implementation group: 'io.github.lotteon-maven', name: 'blooming-blooms-utils', version: '0.1.0-alpha1'
+    // testContainers
+    testImplementation "org.junit.jupiter:junit-jupiter:5.8.1"
+    testImplementation "org.testcontainers:junit-jupiter:1.16.3"
+
+    implementation group: 'io.github.lotteon-maven', name: 'blooming-blooms-utils', version: '25041622'
 }
 
 dependencyManagement {

src/main/java/kr/bb/store/client/ProductFeignClient.java

@@ -0,0 +1,20 @@
+package kr.bb.store.client;
+
+import bloomingblooms.domain.flower.FlowerDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+@FeignClient(name = "product-service")
+public interface ProductFeignClient {
+    @GetMapping
+    List<FlowerDto> getFlowers();
+
+    @GetMapping
+    String getProductThumbnail(@RequestParam(name="productId") Long productId);
+
+    @GetMapping
+    String getSubscriptionProductId(@RequestParam(name="storeId") Long storeId);
+}

src/main/java/kr/bb/store/client/StoreLikeFeignClient.java

@@ -0,0 +1,16 @@
+package kr.bb.store.client;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestHeader;
+
+import java.util.List;
+import java.util.Map;
+
+@FeignClient(name = "storeLike-service")
+public interface StoreLikeFeignClient {
+    @PostMapping
+    Map<Long,Boolean> getStoreLikes(@RequestHeader(value = "userId") Long userId,
+                                    List<Long> storeIds);
+
+}

src/main/java/kr/bb/store/client/StoreSubscriptionFeignClient.java

@@ -0,0 +1,15 @@
+package kr.bb.store.client;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestHeader;
+
+import java.util.List;
+import java.util.Map;
+
+@FeignClient(name = "storeSubscription-service")
+public interface StoreSubscriptionFeignClient {
+    @PostMapping
+    Map<Long,Boolean> getStoreSubscriptions(@RequestHeader(value = "userId") Long userId,
+                                            List<Long> storeIds);
+}

src/main/java/kr/bb/store/config/FeignConfig.java

@@ -0,0 +1,9 @@
+package kr.bb.store.config;
+
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.stereotype.Component;
+
+@EnableFeignClients(basePackages = "kr.bb.store")
+@Component
+public class FeignConfig {
+}

src/main/java/kr/bb/store/domain/cargo/controller/CargoController.java

@@ -7,10 +7,8 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
-@CrossOrigin(origins = "*")
 @RestController
 @RequiredArgsConstructor
-@RequestMapping("/api/stores")
 public class CargoController {
     private final CargoService cargoService;
 

src/main/java/kr/bb/store/domain/cargo/controller/CargoFeignController.java

@@ -1,6 +1,6 @@
 package kr.bb.store.domain.cargo.controller;
 
-import kr.bb.store.domain.cargo.controller.request.StockFeignRequest;
+import bloomingblooms.domain.flower.StockChangeDto;
 import kr.bb.store.domain.cargo.service.CargoService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
@@ -13,14 +13,14 @@
 public class CargoFeignController {
     private final CargoService cargoService;
     @PutMapping("/add")
-    public ResponseEntity<Void> addStock(@RequestBody StockFeignRequest stockFeignRequest) {
-        cargoService.plusStockCount(stockFeignRequest.getStoreId(), stockFeignRequest.getFlowerId(), stockFeignRequest.getStock());
+    public ResponseEntity<Void> addStock(@RequestBody StockChangeDto stockChangeDto) {
+        cargoService.plusStockCount(stockChangeDto.getStoreId(), stockChangeDto.getFlowerId(), stockChangeDto.getStock());
         return ResponseEntity.ok().build();
     }
 
     @PutMapping("/substract")
-    public ResponseEntity<Void> subtractStock(@RequestBody StockFeignRequest stockFeignRequest) {
-        cargoService.minusStockCount(stockFeignRequest.getStoreId(), stockFeignRequest.getFlowerId(), stockFeignRequest.getStock());
+    public ResponseEntity<Void> subtractStock(@RequestBody StockChangeDto stockChangeDto) {
+        cargoService.minusStockCount(stockChangeDto.getStoreId(), stockChangeDto.getFlowerId(), stockChangeDto.getStock());
         return ResponseEntity.ok().build();
     }
 }

src/main/java/kr/bb/store/domain/cargo/service/CargoService.java

@@ -1,8 +1,8 @@
 package kr.bb.store.domain.cargo.service;
 
 
+import bloomingblooms.domain.flower.FlowerDto;
 import kr.bb.store.domain.cargo.controller.response.RemainingStocksResponse;
-import kr.bb.store.domain.cargo.dto.FlowerDto;
 import kr.bb.store.domain.cargo.dto.StockInfoDto;
 import kr.bb.store.domain.cargo.dto.StockModifyDto;
 import kr.bb.store.domain.cargo.entity.FlowerCargo;
@@ -64,10 +64,10 @@ public RemainingStocksResponse getAllStocks(Long storeId) {
     @Transactional
     public void createBasicCargo(Store store, List<FlowerDto> flowers) {
         List<FlowerCargo> flowerCargos = flowers.stream()
-                .map(v -> FlowerCargo.builder()
-                        .id(makeKeys(store.getId(), v.getFlowerId()))
+                .map(flowerDto -> FlowerCargo.builder()
+                        .id(makeKeys(store.getId(), flowerDto.getFlowerId()))
                         .store(store)
-                        .flowerName(v.getFlowerName())
+                        .flowerName(flowerDto.getFlowerName())
                         .build()
                 )
                 .collect(Collectors.toList());

src/main/java/kr/bb/store/domain/coupon/controller/CouponController.java

@@ -2,6 +2,7 @@
 
 import kr.bb.store.domain.coupon.controller.request.CouponCreateRequest;
 import kr.bb.store.domain.coupon.controller.request.CouponEditRequest;
+import kr.bb.store.domain.coupon.controller.request.TotalAmountRequest;
 import kr.bb.store.domain.coupon.controller.response.CouponsForOwnerResponse;
 import kr.bb.store.domain.coupon.controller.response.CouponsForUserResponse;
 import kr.bb.store.domain.coupon.service.CouponService;
@@ -11,10 +12,8 @@
 
 import java.time.LocalDate;
 
-@CrossOrigin(origins = "*")
 @RestController
 @RequiredArgsConstructor
-@RequestMapping("/api/stores")
 public class CouponController {
     private final CouponService couponService;
 
@@ -70,16 +69,19 @@ public ResponseEntity<CouponsForUserResponse> storeCouponsForUser(@PathVariable
         return ResponseEntity.ok().body(couponService.getAllStoreCouponsForUser(userId, storeId, now));
     }
 
-    @GetMapping("/{storeId}/coupons/my")
+    @PostMapping("/{storeId}/coupons/payment")
     public ResponseEntity<CouponsForUserResponse> couponsInPaymentStep(@PathVariable Long storeId,
-                                               @RequestHeader(value = "userId") Long userId) {
+                                                                       @RequestHeader(value = "userId") Long userId,
+                                                                       @RequestBody TotalAmountRequest totalAmountRequest) {
 
-        return ResponseEntity.ok().body(couponService.getAvailableCouponsInPayment(userId, storeId));
+        LocalDate now = LocalDate.now();
+        return ResponseEntity.ok().body(couponService.getAvailableCouponsInPayment(totalAmountRequest, userId, storeId, now));
     }
 
-    @GetMapping("/coupons/list")
+    @GetMapping("/coupons/my")
     public ResponseEntity<CouponsForUserResponse> myCoupons(@RequestHeader(value = "userId") Long userId) {
 
-        return ResponseEntity.ok().body(couponService.getMyValidCoupons(userId));
+        LocalDate now = LocalDate.now();
+        return ResponseEntity.ok().body(couponService.getMyValidCoupons(userId, now));
     }
 }

src/main/java/kr/bb/store/domain/coupon/controller/CouponFeignController.java

@@ -10,7 +10,7 @@
 @CrossOrigin(origins = "*")
 @RestController
 @RequiredArgsConstructor
-@RequestMapping(("/coupons"))
+@RequestMapping(("stores/coupons"))
 public class CouponFeignController {
     private final CouponService couponService;
 
@@ -21,4 +21,11 @@ public ResponseEntity<Void> useCoupon(@PathVariable Long couponId, @PathVariable
 
         return ResponseEntity.ok().build();
     }
+
+    @GetMapping("/count")
+    public ResponseEntity<Integer> availableCouponCountOfUser(@RequestHeader(value = "userId") Long userId) {
+        LocalDate now = LocalDate.now();
+
+        return ResponseEntity.ok().body(couponService.getAvailableCouponCount(userId, now));
+    }
 }

src/main/java/kr/bb/store/domain/cargo/dto/FlowerDto.java → src/main/java/kr/bb/store/domain/coupon/controller/request/TotalAmountRequest.java

@@ -1,4 +1,4 @@
-package kr.bb.store.domain.cargo.dto;
+package kr.bb.store.domain.coupon.controller.request;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -9,7 +9,6 @@
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class FlowerDto {
-    private Long flowerId;
-    private String flowerName;
+public class TotalAmountRequest {
+    private Long totalAmount;
 }

src/main/java/kr/bb/store/domain/coupon/dto/CouponWithAvailabilityDto.java

@@ -0,0 +1,19 @@
+package kr.bb.store.domain.coupon.dto;
+
+import com.querydsl.core.annotations.QueryProjection;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDate;
+
+@Getter
+@NoArgsConstructor
+public class CouponWithAvailabilityDto extends CouponDto {
+    private Boolean isAvailable;
+
+    @QueryProjection
+    public CouponWithAvailabilityDto(Long couponId, String couponName, String storeName, Long discountPrice, LocalDate endDate, Long minPrice, Boolean isAvailable) {
+        super(couponId, couponName, storeName, discountPrice, endDate, minPrice);
+        this.isAvailable = isAvailable;
+    }
+}

src/main/java/kr/bb/store/domain/coupon/handler/CouponReader.java

@@ -2,6 +2,7 @@
 
 import kr.bb.store.domain.coupon.dto.CouponDto;
 import kr.bb.store.domain.coupon.dto.CouponForOwnerDto;
+import kr.bb.store.domain.coupon.dto.CouponWithAvailabilityDto;
 import kr.bb.store.domain.coupon.dto.CouponWithIssueStatusDto;
 import kr.bb.store.domain.coupon.entity.Coupon;
 import kr.bb.store.domain.coupon.exception.CouponNotFoundException;
@@ -33,11 +34,16 @@ public List<CouponWithIssueStatusDto> readStoreCouponsForUser(Long userId, Long
         return couponRepository.findStoreCouponsForUser(userId, storeId, now);
     }
 
-    public List<CouponDto> readAvailableCouponsInStore(Long userId, Long storeId, LocalDate readDate) {
-        return couponRepository.findAvailableCoupons(userId, storeId, readDate);
+    public List<CouponWithAvailabilityDto> readAvailableCouponsInStore(Long totalAmount, Long userId, Long storeId,
+                                                                       LocalDate readDate) {
+        return couponRepository.findAvailableCoupons(totalAmount, userId, storeId, readDate);
     }
 
     public List<CouponDto> readMyValidCoupons(Long userId, LocalDate readDate) {
         return couponRepository.findMyValidCoupons(userId, readDate);
     }
+
+    public Integer readMyValidCouponCount(Long userId, LocalDate readDate) {
+        return couponRepository.findMyValidCouponCount(userId, readDate);
+    }
 }