Skip to content

Commit

Permalink
Merge pull request #20 from 1223v/category
Browse files Browse the repository at this point in the history
Fix: 주문리스트 카테고리 추가
  • Loading branch information
1223v authored Dec 3, 2023
2 parents 0f9d69a + cb79e96 commit 39af272
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
//== URL별 권한 관리 옵션 ==//
.authorizeHttpRequests((authz) -> authz
.requestMatchers(
"/jwt-test",
"/api/v1/jwt-test",
"/oauth2/**",
"/login",
"/api/v1/auth"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,16 @@

import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2;

@Log4j2
@RestController
@RequiredArgsConstructor
@RequestMapping("/api/v1")
public class CeoController {

private final CeoService ceoServiceImpl;

@GetMapping("/jwt-test")
public String jwtTest() {
return "jwtTest 요청 성공";
}

/**
* 사용자 인증 체크
* 인증체크 후 사용자 정보를 반환합니다.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ private void invalidateRefreshTokenCookie(HttpServletResponse response) {
refreshTokenCookie.setPath("/api/v1/refresh/token"); // 기존과 동일한 경로 설정
refreshTokenCookie.setMaxAge(0); // 만료 시간을 0으로 설정하여 즉시 만료
response.addCookie(refreshTokenCookie);

}

private CeoInfo getCeoInfo(Long id) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
public class FoodieDto {
private String name;
private Long count;
private List<String> options;
private List<OptionDto> options;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package com.readyvery.readyverydemo.src.order.dto;

import lombok.Builder;
import lombok.Getter;

@Getter
@Builder
public class OptionDto {
private String name;
private Long price;
private String category;
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import org.springframework.stereotype.Component;

import com.readyvery.readyverydemo.domain.CartItem;
import com.readyvery.readyverydemo.domain.CartOption;
import com.readyvery.readyverydemo.domain.Order;

@Component
Expand Down Expand Up @@ -45,7 +46,15 @@ private FoodieDto cartItemToFoodieDto(CartItem cartItem) {
.name(cartItem.getFoodie().getName())
.count(cartItem.getCount())
.options(
cartItem.getCartOptions().stream().map(cartOption -> cartOption.getFoodieOption().getName()).toList())
cartItem.getCartOptions().stream().map(this::cartItemToOptionDto).toList())
.build();
}

private OptionDto cartItemToOptionDto(CartOption cartOption) {
return OptionDto.builder()
.name(cartOption.getFoodieOption().getName())
.price(cartOption.getFoodieOption().getPrice())
.category(cartOption.getFoodieOption().getFoodieOptionCategory().getName())
.build();
}

Expand Down

0 comments on commit 39af272

Please sign in to comment.