Merge branch 'main' of https://github.com/Hooking-CEOS/Hooking_BE_v2

Hooking-CEOS · Feb 12, 2024 · 07f8f98 · 07f8f98
2 parents 03ce143 + 3398ad0
commit 07f8f98
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/src/main/java/shop/hooking/hooking/controller/BrandController.java b/src/main/java/shop/hooking/hooking/controller/BrandController.java
@@ -28,7 +28,7 @@ public ResponseEntity<List<BrandResDto.BrandDto>> showAllBrand() {
     }
 
 
-    //브랜드 상세 조회
+    //브랜드 상세 조회 - 수정
     @Operation(summary = "브랜드 상세 조회하기")
     @GetMapping("/{brand_id}/{index}")
     public ResponseEntity<BrandResDto.BrandDetailDto> getOneBrand(HttpServletRequest httpRequest, @PathVariable Long brand_id, @PathVariable int index) {

diff --git a/src/main/java/shop/hooking/hooking/global/jwt/OAuth2SuccessHandler.java b/src/main/java/shop/hooking/hooking/global/jwt/OAuth2SuccessHandler.java
@@ -73,7 +73,7 @@ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletRespo
             // 기본적으로 로컬 개발 환경으로 설정
             targetUrl ="https://hooking.me/oath-processor"; // 로컬 환경
         }
-// 쿼리 파라미터를 추가하여 targetUrl 생성
+        // 쿼리 파라미터를 추가하여 targetUrl 생성
         newtargetUrl = UriComponentsBuilder.fromUriString(targetUrl)
                 .queryParam("accessToken", accessToken)
                 .build().toUriString();
@@ -94,8 +94,6 @@ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletRespo
 //        refreshTokenCookie.setPath("/");
 //        response.addCookie(refreshTokenCookie);
 //
-////        targetUrl = UriComponentsBuilder.fromUriString(targetUrl)
-////                .build().toUriString();
 //        response.sendRedirect(targetUrl);
 //        log.info("타켓URl, 쿠키정보: " + targetUrl, accessTokenCookie, refreshTokenCookie);
 //        // getRedirectStrategy().sendRedirect(request,response, targetUrl);

diff --git a/src/main/java/shop/hooking/hooking/service/BrandService.java b/src/main/java/shop/hooking/hooking/service/BrandService.java
@@ -110,8 +110,7 @@ public BrandResDto.BrandDetailDto getOneBrand(Long id) {
         return brandDetailDto;
     }
 
-     public List<BrandResDto.cardDto> getLimitedCardsByIndex(List<BrandResDto.cardDto> cards, int index) {
-         int startIndex = index * 30;
+     public List<BrandResDto.cardDto> getLimitedCardsByIndex(List<BrandResDto.cardDto> cards, int startIndex) {
          int endIndex = Math.min(startIndex + 30, cards.size());
          if (startIndex >= endIndex) {
              throw new OutOfIndexException();