Feat/home

.github/workflows/cd.yml

@@ -2,7 +2,7 @@ name: Backend CD # actions 이름
 
 on:
   push:
-    branches: [ feat/error-fix ]
+    branches: [ feat/home ]
 
 jobs:
   deploy:

api-module/src/main/java/com/likelion/apimodule/cart/application/CartFindUseCase.java

@@ -40,6 +40,7 @@ public List<CartInfo> findAllCarts(String accessToken) {
             Store store = storeQueryService.findStoreById(menu.getStore().getId());
 
             CartInfo cartInfo = new CartInfo(
+                    cart.getId(),
                     store.getName(),
                     menu.getName(),
                     menu.getPrice(),

api-module/src/main/java/com/likelion/apimodule/cart/application/CartSaveUseCase.java

@@ -1,8 +1,11 @@
 package com.likelion.apimodule.cart.application;
 
 import com.likelion.apimodule.cart.dto.CartSaveReq;
+import com.likelion.apimodule.cart.dto.CartUpdateReq;
 import com.likelion.apimodule.security.util.JwtUtil;
 import com.likelion.coremodule.cart.domain.Cart;
+import com.likelion.coremodule.cart.exception.CartErrorCode;
+import com.likelion.coremodule.cart.exception.CartException;
 import com.likelion.coremodule.cart.service.CartQueryService;
 import com.likelion.coremodule.menu.domain.Menu;
 import com.likelion.coremodule.menu.service.MenuQueryService;
@@ -12,6 +15,8 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
+
 @Service
 @RequiredArgsConstructor
 @Transactional
@@ -22,15 +27,35 @@ public class CartSaveUseCase {
     private final UserQueryService userQueryService;
     private final MenuQueryService menuQueryService;
 
+    public Integer findMyCartCount(Long userId, Long menuId) {
+        return cartQueryService.findCartByUserIdAndMenuId(userId, menuId);
+    }
+
     public void saveMyCart(String accessToken, CartSaveReq saveReq) {
 
         String email = jwtUtil.getEmail(accessToken);
         User user = userQueryService.findByEmail(email);
 
         Menu menu = menuQueryService.findMenuById(saveReq.menuId());
 
-        final Cart cart = Cart.builder().user(user).menu(menu).quantity(saveReq.quantity()).build();
-        cartQueryService.saveCart(cart);
+        if (findMyCartCount(user.getUserId(), menu.getId()) >= 1) {
+            throw new CartException(CartErrorCode.NO_CART_INFO);
+        } else {
+            final Cart cart = Cart.builder().user(user).menu(menu).quantity(saveReq.quantity()).build();
+            cartQueryService.saveCart(cart);
+        }
+    }
+
+    public void updateMyCart(String accessToken, List<CartUpdateReq> updateReqs) {
+
+        String email = jwtUtil.getEmail(accessToken);
+        User user = userQueryService.findByEmail(email);
+
+        for (CartUpdateReq req : updateReqs) {
+
+            Cart cart = cartQueryService.findCartByUserIdAndCartId(user.getUserId(), req.cartId());
+            cart.setCartQuantity(req.quantity());
+        }
     }
 
     public void deleteMyCart(String accessToken, Long cartId) {

api-module/src/main/java/com/likelion/apimodule/cart/dto/CartInfo.java

@@ -1,6 +1,7 @@
 package com.likelion.apimodule.cart.dto;
 
 public record CartInfo(
+        Long cartid, // cart
         String storeName, // store
         String menuName, // menu
         Integer price, // menu

api-module/src/main/java/com/likelion/apimodule/cart/dto/CartUpdateReq.java

@@ -0,0 +1,7 @@
+package com.likelion.apimodule.cart.dto;
+
+public record CartUpdateReq(
+        Long cartId,
+        Integer quantity
+) {
+}

api-module/src/main/java/com/likelion/apimodule/cart/presentation/CartController.java

@@ -4,6 +4,7 @@
 import com.likelion.apimodule.cart.application.CartSaveUseCase;
 import com.likelion.apimodule.cart.dto.CartInfo;
 import com.likelion.apimodule.cart.dto.CartSaveReq;
+import com.likelion.apimodule.cart.dto.CartUpdateReq;
 import com.likelion.commonmodule.exception.common.ApplicationResponse;
 import com.likelion.commonmodule.security.util.AuthConsts;
 import io.swagger.v3.oas.annotations.Operation;
@@ -64,6 +65,25 @@ public ApplicationResponse<String> saveMyCart(@RequestHeader(AuthConsts.ACCESS_T
         return ApplicationResponse.ok("장바구니 저장 완료");
     }
 
+    // 장바구니 추가
+    @PutMapping
+    @ApiResponses(
+            value = {
+                    @ApiResponse(
+                            responseCode = "200",
+                            description = "나의 장바구니 추가 성공",
+                            useReturnTypeSchema = true
+                    )
+            }
+    )
+    @Operation(summary = "나의 장바구니 추가 API", description = "나의 장바구니 추가 API 입니다.")
+    public ApplicationResponse<String> updateMyCart(@RequestHeader(AuthConsts.ACCESS_TOKEN_HEADER) String accessToken,
+                                                    @RequestBody List<CartUpdateReq> updateReqs) {
+
+        cartSaveUseCase.updateMyCart(accessToken, updateReqs);
+        return ApplicationResponse.ok("장바구니 수량 수정 완료");
+    }
+
     // 장바구니 삭제
     @DeleteMapping("{cartId}/delete")
     @ApiResponses(

api-module/src/main/java/com/likelion/apimodule/home/application/HomeFindUseCase.java

@@ -0,0 +1,94 @@
+package com.likelion.apimodule.home.application;
+
+import com.likelion.apimodule.home.dto.HomeInfo;
+import com.likelion.apimodule.home.dto.HotListHome;
+import com.likelion.apimodule.home.dto.VisitListHome;
+import com.likelion.apimodule.security.util.JwtUtil;
+import com.likelion.coremodule.market.domain.Market;
+import com.likelion.coremodule.market.domain.MarketQrVisit;
+import com.likelion.coremodule.market.service.HomeQueryService;
+import com.likelion.coremodule.market.service.MarketQueryService;
+import com.likelion.coremodule.store.domain.Store;
+import com.likelion.coremodule.store.domain.StoreVisit;
+import com.likelion.coremodule.store.service.StoreQueryService;
+import com.likelion.coremodule.user.application.UserQueryService;
+import com.likelion.coremodule.user.domain.User;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+public class HomeFindUseCase {
+
+    private final HomeQueryService homeQueryService;
+    private final MarketQueryService marketQueryService;
+    private final StoreQueryService storeQueryService;
+    private final JwtUtil jwtUtil;
+    private final UserQueryService userQueryService;
+
+    public HomeInfo findMarketLists(String accessToken) {
+
+        String email = jwtUtil.getEmail(accessToken);
+        User user = userQueryService.findByEmail(email);
+
+        List<Market> marketList = marketQueryService.findAllMarkets();
+
+        List<VisitListHome> visitListHomeList = new ArrayList<>();
+        List<HotListHome> hotListHomeList = new ArrayList<>();
+
+        for (Market market : marketList) {
+            List<Store> storeList = storeQueryService.findStoresByMarketId(market.getId());
+            int totalStoreVisits = 0;
+
+            for (Store store : storeList) {
+                List<StoreVisit> storeVisitList = storeQueryService.findStoreVisitsByUserIdAndStoreId(user.getUserId(), store.getId());
+                totalStoreVisits += storeVisitList.size();
+            }
+
+            VisitListHome visitListHome = new VisitListHome(
+                    market.getName(),
+                    market.getLocation(),
+                    storeList.size(),
+                    totalStoreVisits,
+                    market.getCreatedAt().toLocalDate()
+            );
+            visitListHomeList.add(visitListHome);
+
+            MarketQrVisit marketQrVisit = marketQueryService.findMarketVisit(market.getId());
+
+            HotListHome hotListHome = new HotListHome(
+                    market.getName(),
+                    market.getLocation(),
+                    marketQrVisit.getQrVisit()
+            );
+            hotListHomeList.add(hotListHome);
+        }
+
+        // VisitListHome 리스트를 날짜 기준으로 정렬
+        visitListHomeList.sort(Comparator.comparing(VisitListHome::visitDate));
+        // HotListHome 리스트를 qrVisit 순으로 정렬
+        hotListHomeList.sort(Comparator.comparingInt(HotListHome::totalQrVisit));
+
+        return new HomeInfo(visitListHomeList, hotListHomeList);
+    }
+
+    public String findNearestMarket(Integer xloc, Integer yloc) {
+        List<Market> marketList = marketQueryService.findAllMarkets();
+        String nearestMarketName = null;
+        double shortestDistance = Double.MAX_VALUE;
+
+        for (Market market : marketList) {
+            double distance = Math.sqrt(Math.pow(market.getXloc() - xloc, 2) + Math.pow(market.getYloc() - yloc, 2));
+            if (distance < shortestDistance) {
+                shortestDistance = distance;
+                nearestMarketName = market.getName();
+            }
+        }
+        return nearestMarketName;
+    }
+
+}

api-module/src/main/java/com/likelion/apimodule/home/application/HomeSaveUseCase.java

@@ -0,0 +1,39 @@
+package com.likelion.apimodule.home.application;
+
+import com.likelion.apimodule.security.util.JwtUtil;
+import com.likelion.coremodule.market.domain.Market;
+import com.likelion.coremodule.market.domain.MarketQrVisit;
+import com.likelion.coremodule.market.service.HomeQueryService;
+import com.likelion.coremodule.market.service.MarketQueryService;
+import com.likelion.coremodule.store.domain.Store;
+import com.likelion.coremodule.store.domain.StoreVisit;
+import com.likelion.coremodule.store.service.StoreQueryService;
+import com.likelion.coremodule.user.application.UserQueryService;
+import com.likelion.coremodule.user.domain.User;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class HomeSaveUseCase {
+
+    private final HomeQueryService homeQueryService;
+    private final UserQueryService userQueryService;
+    private final StoreQueryService storeQueryService;
+    private final MarketQueryService marketQueryService;
+    private final JwtUtil jwtUtil;
+
+    public void updateQrVisit(String accessToken, Long storeId) {
+
+        String email = jwtUtil.getEmail(accessToken);
+        User user = userQueryService.findByEmail(email);
+
+        Store store = storeQueryService.findStoreById(storeId);
+        Market market = marketQueryService.findMarket(store.getMarket().getId());
+
+        // 방문여부 업데이트
+        storeQueryService.saveVisitYn(store, user);
+        // qr 조회수 증가
+        homeQueryService.updateQrVisit(user, market);
+    }
+}

api-module/src/main/java/com/likelion/apimodule/home/dto/HomeInfo.java

@@ -0,0 +1,9 @@
+package com.likelion.apimodule.home.dto;
+
+import java.util.List;
+
+public record HomeInfo(
+        List<VisitListHome> visitListHomeList,
+        List<HotListHome> hotListHomeList
+) {
+}

api-module/src/main/java/com/likelion/apimodule/home/dto/HotListHome.java

@@ -0,0 +1,8 @@
+package com.likelion.apimodule.home.dto;
+
+public record HotListHome(
+        String marketName,
+        String location,
+        Integer totalQrVisit
+) {
+}

api-module/src/main/java/com/likelion/apimodule/home/dto/TotalSumCompare.java

@@ -0,0 +1,7 @@
+package com.likelion.apimodule.home.dto;
+
+public record TotalSumCompare(
+        String name,
+        Integer sum
+) {
+}

api-module/src/main/java/com/likelion/apimodule/home/dto/VisitListHome.java

@@ -0,0 +1,12 @@
+package com.likelion.apimodule.home.dto;
+
+import java.time.LocalDate;
+
+public record VisitListHome(
+        String marketName,
+        String location,
+        Integer visitedStore,
+        Integer totalStore,
+        LocalDate visitDate
+) {
+}

api-module/src/main/java/com/likelion/apimodule/home/presentation/HomeController.java

@@ -0,0 +1,84 @@
+package com.likelion.apimodule.home.presentation;
+
+import com.likelion.apimodule.home.application.HomeFindUseCase;
+import com.likelion.apimodule.home.application.HomeSaveUseCase;
+import com.likelion.apimodule.home.dto.HomeInfo;
+import com.likelion.commonmodule.exception.common.ApplicationResponse;
+import com.likelion.commonmodule.security.util.AuthConsts;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/v1/home")
+@Validated
+@Tag(name = "Home", description = "Home 관련 API")
+public class HomeController {
+
+    private final HomeFindUseCase homeFindUseCase;
+    private final HomeSaveUseCase homeSaveUseCase;
+
+    // qr 시 시장 조회수 증가
+    @PostMapping("/{storeId}/qrvisit")
+    public ApplicationResponse<String> updateQrVisit(@RequestHeader(AuthConsts.ACCESS_TOKEN_HEADER) String accessToken,
+                                                     @PathVariable Long storeId) {
+
+        homeSaveUseCase.updateQrVisit(accessToken, storeId);
+        return ApplicationResponse.ok("qr 조회수 증가 + 방문 상태 변경");
+    }
+
+    // 시장 리스트 나열
+    @GetMapping
+    @ApiResponses(
+            value = {
+                    @ApiResponse(
+                            responseCode = "200",
+                            description = "시장 정보 확인 성공",
+                            useReturnTypeSchema = true
+                    )
+            }
+    )
+    @Operation(summary = "시장 정보 확인 API", description = "시장 정보 확인 API 입니다.")
+    public ApplicationResponse<HomeInfo> findHomeInfo(@RequestHeader(AuthConsts.ACCESS_TOKEN_HEADER) String accessToken) {
+
+        final HomeInfo marketLists = homeFindUseCase.findMarketLists(accessToken);
+        return ApplicationResponse.ok(marketLists);
+    }
+
+    // 시장 리스트 검색
+//    @GetMapping
+//    @ApiResponses(
+//            value = {
+//                    @ApiResponse(
+//                            responseCode = "200",
+//                            description = "시장 리스트 검색 성공",
+//                            useReturnTypeSchema = true
+//                    )
+//            }
+//    )
+//    @Operation(summary = "시장 리스트 검색 API", description = "시장 리스트 검색 API 입니다.")
+//    public ApplicationResponse
+
+    // 가까운 시장 확인
+    @GetMapping("/nearmarket")
+    @ApiResponses(
+            value = {
+                    @ApiResponse(
+                            responseCode = "200",
+                            description = "시장 정보 확인 성공",
+                            useReturnTypeSchema = true
+                    )
+            }
+    )
+    @Operation(summary = "시장 정보 확인 API", description = "시장 정보 확인 API 입니다.")
+    public ApplicationResponse<String> findNearestMarket(@RequestParam Integer xloc, @RequestParam Integer yloc) {
+
+        String nearestMarket = homeFindUseCase.findNearestMarket(xloc, yloc);
+        return ApplicationResponse.ok(nearestMarket);
+    }
+}