[feat] 가격대 전체 카테고리 추가 (#242)

* [feat] change store category sequence * [feat] delete unnecessary code * [feat] add PriceCategory Converter * [refac] move webConfig and related class * [feat] delete unnecessary log
Team-Hankki · Jan 6, 2025 · d21b4a3 · d21b4a3
1 parent 14c225d
commit d21b4a3
Show file tree

Hide file tree

Showing 14 changed files with 48 additions and 21 deletions.
diff --git a/src/main/java/org/hankki/hankkiserver/api/auth/controller/AuthController.java b/src/main/java/org/hankki/hankkiserver/api/auth/controller/AuthController.java
@@ -3,7 +3,7 @@
 import jakarta.annotation.Nullable;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
-import org.hankki.hankkiserver.auth.UserId;
+import org.hankki.hankkiserver.api.common.annotation.UserId;
 import org.hankki.hankkiserver.api.dto.HankkiResponse;
 import org.hankki.hankkiserver.common.code.CommonSuccessCode;
 import org.hankki.hankkiserver.api.auth.service.AuthService;

diff --git a/src/main/java/org/hankki/hankkiserver/api/common/PriceCategoryConverter.java b/src/main/java/org/hankki/hankkiserver/api/common/PriceCategoryConverter.java
@@ -0,0 +1,19 @@
+package org.hankki.hankkiserver.api.common;
+
+import lombok.extern.slf4j.Slf4j;
+import org.hankki.hankkiserver.api.store.parameter.PriceCategory;
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.stereotype.Component;
+
+@Component
+@Slf4j
+public class PriceCategoryConverter implements Converter<String, PriceCategory> {
+
+    @Override
+    public PriceCategory convert(String source) {
+        if (source.toUpperCase().equals(PriceCategory.ALL.toString())) {
+            return null;
+        }
+        return PriceCategory.valueOf(source.toUpperCase());
+    }
+}
diff --git a/...kiserver/auth/UserIdArgumentResolver.java → ...er/api/common/UserIdArgumentResolver.java b/...kiserver/auth/UserIdArgumentResolver.java → ...er/api/common/UserIdArgumentResolver.java
@@ -1,5 +1,6 @@
-package org.hankki.hankkiserver.auth;
+package org.hankki.hankkiserver.api.common;
 
+import org.hankki.hankkiserver.api.common.annotation.UserId;
 import org.springframework.core.MethodParameter;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Component;

diff --git a/...er/api/advice/GlobalExceptionHandler.java → ...common/advice/GlobalExceptionHandler.java b/...er/api/advice/GlobalExceptionHandler.java → ...common/advice/GlobalExceptionHandler.java
@@ -1,4 +1,4 @@
-package org.hankki.hankkiserver.api.advice;
+package org.hankki.hankkiserver.api.common.advice;
 
 import jakarta.validation.ConstraintViolationException;
 import lombok.extern.slf4j.Slf4j;

diff --git a/...nkkiserver/api/advice/ResponseAdvice.java → ...ver/api/common/advice/ResponseAdvice.java b/...nkkiserver/api/advice/ResponseAdvice.java → ...ver/api/common/advice/ResponseAdvice.java
@@ -1,4 +1,4 @@
-package org.hankki.hankkiserver.api.advice;
+package org.hankki.hankkiserver.api.common.advice;
 
 import org.hankki.hankkiserver.api.dto.HankkiResponse;
 import org.springframework.core.MethodParameter;
@@ -19,10 +19,8 @@ public boolean supports(MethodParameter returnType, Class converterType) {
 
     @Override
     public Object beforeBodyWrite(Object body, MethodParameter returnType, MediaType selectedContentType, Class selectedConverterType, ServerHttpRequest request, ServerHttpResponse response) {
-        if (returnType.getParameterType() == HankkiResponse.class) {
-            HttpStatus status = HttpStatus.valueOf(((HankkiResponse<?>) body).getCode());
-            response.setStatusCode(status);
-        }
+        HttpStatus status = HttpStatus.valueOf(((HankkiResponse<?>) body).getCode());
+        response.setStatusCode(status);
         return body;
     }
 }
diff --git a/.../org/hankki/hankkiserver/auth/UserId.java → ...iserver/api/common/annotation/UserId.java b/.../org/hankki/hankkiserver/auth/UserId.java → ...iserver/api/common/annotation/UserId.java
@@ -1,4 +1,4 @@
-package org.hankki.hankkiserver.auth;
+package org.hankki.hankkiserver.api.common.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/...i/hankkiserver/auth/config/WebConfig.java → ...ki/hankkiserver/api/config/WebConfig.java b/...i/hankkiserver/auth/config/WebConfig.java → ...ki/hankkiserver/api/config/WebConfig.java
@@ -1,8 +1,10 @@
-package org.hankki.hankkiserver.auth.config;
+package org.hankki.hankkiserver.api.config;
 
 import lombok.RequiredArgsConstructor;
-import org.hankki.hankkiserver.auth.UserIdArgumentResolver;
+import org.hankki.hankkiserver.api.common.PriceCategoryConverter;
+import org.hankki.hankkiserver.api.common.UserIdArgumentResolver;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.format.FormatterRegistry;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
@@ -18,4 +20,9 @@ public class WebConfig implements WebMvcConfigurer {
     public void addArgumentResolvers(List<HandlerMethodArgumentResolver> resolvers) {
         resolvers.add(userIdArgumentResolver);
     }
+
+    @Override
+    public void addFormatters(FormatterRegistry registry) {
+        registry.addConverter(new PriceCategoryConverter());
+    }
 }
diff --git a/src/main/java/org/hankki/hankkiserver/api/favorite/controller/FavoriteController.java b/src/main/java/org/hankki/hankkiserver/api/favorite/controller/FavoriteController.java
@@ -14,7 +14,7 @@
 import org.hankki.hankkiserver.api.favorite.service.response.FavoriteOwnershipGetResponse;
 import org.hankki.hankkiserver.api.favorite.service.response.FavoriteSharedGetResponse;
 import org.hankki.hankkiserver.api.favorite.service.response.FavoritesWithStatusGetResponse;
-import org.hankki.hankkiserver.auth.UserId;
+import org.hankki.hankkiserver.api.common.annotation.UserId;
 import org.hankki.hankkiserver.common.code.CommonSuccessCode;
 import org.springframework.web.bind.annotation.*;
 

diff --git a/src/main/java/org/hankki/hankkiserver/api/menu/controller/MenuController.java b/src/main/java/org/hankki/hankkiserver/api/menu/controller/MenuController.java
@@ -13,7 +13,7 @@
 import org.hankki.hankkiserver.api.menu.service.response.MenusGetResponse;
 import org.hankki.hankkiserver.api.menu.service.response.MenusPostResponse;
 import org.hankki.hankkiserver.api.store.controller.request.MenuPostRequest;
-import org.hankki.hankkiserver.auth.UserId;
+import org.hankki.hankkiserver.api.common.annotation.UserId;
 import org.hankki.hankkiserver.common.code.CommonSuccessCode;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;

diff --git a/src/main/java/org/hankki/hankkiserver/api/store/controller/StoreController.java b/src/main/java/org/hankki/hankkiserver/api/store/controller/StoreController.java
@@ -12,7 +12,7 @@
 import org.hankki.hankkiserver.api.store.service.StoreQueryService;
 import org.hankki.hankkiserver.api.store.service.command.*;
 import org.hankki.hankkiserver.api.store.service.response.*;
-import org.hankki.hankkiserver.auth.UserId;
+import org.hankki.hankkiserver.api.common.annotation.UserId;
 import org.hankki.hankkiserver.common.code.CommonSuccessCode;
 import org.hankki.hankkiserver.domain.store.model.StoreCategory;
 import org.springframework.web.bind.annotation.*;

diff --git a/src/main/java/org/hankki/hankkiserver/api/store/parameter/PriceCategory.java b/src/main/java/org/hankki/hankkiserver/api/store/parameter/PriceCategory.java
@@ -7,10 +7,12 @@
 @RequiredArgsConstructor
 public enum PriceCategory {
 
+    ALL("전체", 0, 0),
     K6("6000원 이하", 6000, 0),
     K8("6000~8000원", 8000, 6000);
 
     private final String name;
     private final int maxPrice;
     private final int minPrice;
+
 }
diff --git a/...ava/org/hankki/hankkiserver/api/universitystore/controller/UniversityStoreController.java b/...ava/org/hankki/hankkiserver/api/universitystore/controller/UniversityStoreController.java
@@ -5,7 +5,7 @@
 import org.hankki.hankkiserver.api.universitystore.controller.request.UniviersityStoreCreateRequest;
 import org.hankki.hankkiserver.api.universitystore.service.UniversityStoreCommandService;
 import org.hankki.hankkiserver.api.universitystore.service.command.UniversityStorePostCommand;
-import org.hankki.hankkiserver.auth.UserId;
+import org.hankki.hankkiserver.api.common.annotation.UserId;
 import org.hankki.hankkiserver.common.code.CommonSuccessCode;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

diff --git a/src/main/java/org/hankki/hankkiserver/api/user/controller/UserController.java b/src/main/java/org/hankki/hankkiserver/api/user/controller/UserController.java
@@ -12,7 +12,7 @@
 import org.hankki.hankkiserver.api.user.service.response.UserNicknameResponse;
 import org.hankki.hankkiserver.api.user.service.response.UserStoresReportedGetResponse;
 import org.hankki.hankkiserver.api.user.service.response.UserUniversityFindResponse;
-import org.hankki.hankkiserver.auth.UserId;
+import org.hankki.hankkiserver.api.common.annotation.UserId;
 import org.hankki.hankkiserver.common.code.CommonSuccessCode;
 import org.springframework.web.bind.annotation.*;
 

diff --git a/src/main/java/org/hankki/hankkiserver/domain/store/model/StoreCategory.java b/src/main/java/org/hankki/hankkiserver/domain/store/model/StoreCategory.java
@@ -7,16 +7,16 @@
 @RequiredArgsConstructor
 public enum StoreCategory {
 
+    ALL("전체"),
     KOREAN("한식"),
-    CHINESE("중식"),
     JAPANESE("일식"),
+    CHINESE("중식"),
     WESTERN("양식"),
-    CONVENIENCEFOOD("간편식"),
+    FASTFOOD("패스트푸드"),
     BUNSIK("분식"),
+    CONVENIENCEFOOD("간편식"),
     SALADSANDWICH("샐러드"),
-    FASTFOOD("패스트푸드"),
-    WORLD("세계음식"),
-    ALL("전체");
+    WORLD("세계음식");
 
     private final String name;
     private String url;