Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,13 @@

import com.ourmenu.backend.domain.cache.application.CacheService;
import com.ourmenu.backend.domain.cache.dto.GetCacheInfoResponse;
import com.ourmenu.backend.domain.cache.dto.GetMenuFolderIconResponse;
import com.ourmenu.backend.domain.cache.dto.GetMenuPinResponse;
import com.ourmenu.backend.domain.cache.dto.GetTagResponse;
import com.ourmenu.backend.global.response.ApiResponse;
import com.ourmenu.backend.global.response.util.ApiUtil;
import io.swagger.v3.oas.annotations.tags.Tag;
import java.util.List;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
Expand All @@ -22,4 +26,25 @@ public ApiResponse<GetCacheInfoResponse> getCacheInfo() {

return ApiUtil.success(response);
}

@GetMapping("api/cache-data/menu-folder-icons")
public ApiResponse<List<GetMenuFolderIconResponse>> getMenuFolderIconsResponse() {
List<GetMenuFolderIconResponse> response = cacheService.getMenuFolderIcons();

return ApiUtil.success(response);
}

@GetMapping("api/cache-data/menu-pins")
public ApiResponse<List<GetMenuPinResponse>> getMenuPinResponse() {
List<GetMenuPinResponse> response = cacheService.getMenuPins();

return ApiUtil.success(response);
}

@GetMapping("api/cache-data/tags")
public ApiResponse<List<GetTagResponse>> getTagResponse() {
List<GetTagResponse> response = cacheService.getTags();

return ApiUtil.success(response);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
import com.ourmenu.backend.domain.cache.domain.MenuFolderIcon;
import com.ourmenu.backend.domain.cache.domain.MenuPin;
import com.ourmenu.backend.domain.cache.dto.GetCacheInfoResponse;
import com.ourmenu.backend.domain.cache.dto.GetMenuFolderIconResponse;
import com.ourmenu.backend.domain.cache.dto.GetMenuPinResponse;
import com.ourmenu.backend.domain.cache.dto.GetTagResponse;
import com.ourmenu.backend.domain.cache.dto.SimpleHomeImgResponse;
import com.ourmenu.backend.domain.cache.dto.SimpleMenuFolderIconResponse;
import com.ourmenu.backend.domain.cache.dto.SimpleMenuPinResponse;
Expand All @@ -29,6 +32,31 @@ public GetCacheInfoResponse getCacheInfo() {
return GetCacheInfoResponse.of(menuFolderIconInfo, menuPinInfo, homeImgInfo, tagInfo);
}


public List<GetMenuFolderIconResponse> getMenuFolderIcons() {
List<SimpleMenuFolderIconResponse> menuFolderIconsInfo = getMenuFolderIconInfo();

return menuFolderIconsInfo.stream()
.map(GetMenuFolderIconResponse::from)
.toList();
}

public List<GetMenuPinResponse> getMenuPins() {
List<SimpleMenuPinResponse> menuPinsInfo = getMenuPinInfo();

return menuPinsInfo.stream()
.map(GetMenuPinResponse::from)
.toList();
}

public List<GetTagResponse> getTags() {
List<SimpleTagImgResponse> tagsImgInfo = getTagImgInfo();

return tagsImgInfo.stream()
.map(GetTagResponse::from)
.toList();
}

private List<SimpleMenuFolderIconResponse> getMenuFolderIconInfo() {
return Arrays.stream(MenuFolderIcon.values())
.map(menuFolderIcon -> {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package com.ourmenu.backend.domain.cache.dto;

import com.ourmenu.backend.domain.cache.domain.MenuFolderIcon;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;

@AllArgsConstructor(access = AccessLevel.PRIVATE)
@Builder(access = AccessLevel.PRIVATE)
@Getter
public class GetMenuFolderIconResponse {

private MenuFolderIcon menuFolderIcon;
private String menuFolderIconUrl;

public static GetMenuFolderIconResponse from(SimpleMenuFolderIconResponse simpleMenuFolderIconResponse) {
return GetMenuFolderIconResponse.builder()
.menuFolderIcon(simpleMenuFolderIconResponse.getMenuFolderIcon())
.menuFolderIconUrl(simpleMenuFolderIconResponse.getMenuFolderIconUrl())
.build();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package com.ourmenu.backend.domain.cache.dto;

import com.ourmenu.backend.domain.cache.domain.MenuPin;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;

@AllArgsConstructor(access = AccessLevel.PRIVATE)
@Builder(access = AccessLevel.PRIVATE)
@Getter
public class GetMenuPinResponse {

private MenuPin menuPin;
private String menuPinAddImgUrl;
private String menuPinAddDisableImgUrl;

public static GetMenuPinResponse from(SimpleMenuPinResponse simpleMenuPinResponse) {
return GetMenuPinResponse.builder()
.menuPin(simpleMenuPinResponse.getMenuPin())
.menuPinAddImgUrl(simpleMenuPinResponse.getMenuPinAddImgUrl())
.menuPinAddDisableImgUrl(simpleMenuPinResponse.getMenuPinAddDisableImgUrl())
.build();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package com.ourmenu.backend.domain.cache.dto;

import com.ourmenu.backend.domain.tag.domain.Tag;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;

@AllArgsConstructor(access = AccessLevel.PRIVATE)
@Builder(access = AccessLevel.PRIVATE)
@Getter
public class GetTagResponse {

private Tag tag;
private String orangeTagImgUrl;
private String whiteTagImgUrl;

public static GetTagResponse from(SimpleTagImgResponse simpleTagImgResponse) {
return GetTagResponse.builder()
.tag(simpleTagImgResponse.getTag())
.orangeTagImgUrl(simpleTagImgResponse.getOrangeTagImgUrl())
.whiteTagImgUrl(simpleTagImgResponse.getWhiteTagImgUrl())
.build();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public ApiResponse<SaveMenuResponse> saveMenu(@ModelAttribute SaveMenuRequest re
@AuthenticationPrincipal CustomUserDetails userDetails) {
request.initList();
SimpleSearchDto simpleSearchDto = searchService.getSearchDto(request.getIsCrawled(), request.getStoreId());
MenuDto menuDto = MenuDto.of(request, request.getMenuFolderImgs(), userDetails, simpleSearchDto);
MenuDto menuDto = MenuDto.of(request, request.getMenuImgs(), userDetails, simpleSearchDto);
SaveMenuResponse response = menuService.saveMenu(menuDto);
return ApiUtil.success(response);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
@Getter
public class SaveMenuRequest {

List<MultipartFile> menuFolderImgs;
List<MultipartFile> menuImgs;
private String menuTitle;
private int menuPrice;
private MenuPin menuPin;
Expand All @@ -27,8 +27,8 @@ public class SaveMenuRequest {
* request 에 null 들어오는 경우에 대해서 request 초기화 swagger 를 위한 메서드
*/
public void initList() {
if (menuFolderImgs == null) {
menuFolderImgs = new ArrayList<>();
if (menuImgs == null) {
menuImgs = new ArrayList<>();
}
if (menuFolderIds == null) {
menuFolderIds = new ArrayList<>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
sessionManagementConfigurer.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
.logout(AbstractHttpConfigurer::disable)
.authorizeHttpRequests(authorize -> authorize
.requestMatchers("/api/users/sign-up", "/api/users/sign-in", "/api/users/auth/kakao", "/api/users/reissue-token")
.requestMatchers("/api/users/sign-up", "/api/users/sign-in", "/api/users/auth/kakao",
"/api/users/reissue-token")
.permitAll()
.requestMatchers("/api/emails/**").permitAll()
.requestMatchers("/swagger-ui/**", "/swagger-resources/**", "/v3/api-docs/**").permitAll()
Expand Down Expand Up @@ -68,6 +69,7 @@ public WebSecurityCustomizer webSecurityCustomizer() {
"/api/users/sign-in",
"/api/users/reissue-token",
"/api/cache-data",
"/api/cache-data/**",
"/api/emails/**",
"/swagger-ui/**",
"/swagger-resources/**",
Expand Down
Loading