refactor : common 모듈 web 의존성 제거

- File 도메인 웹 의존 제거

application/app-api/src/main/java/core/startup/mealtoktok/MealTokTokApplication.java

@@ -1,5 +1,9 @@
 package core.startup.mealtoktok;
 
+import java.util.TimeZone;
+
+import jakarta.annotation.PostConstruct;
+
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
@@ -9,4 +13,9 @@ public class MealTokTokApplication {
     public static void main(String[] args) {
         SpringApplication.run(MealTokTokApplication.class, args);
     }
+
+    @PostConstruct
+    void started() {
+        TimeZone.setDefault(TimeZone.getTimeZone("Asia/Seoul"));
+    }
 }

application/app-api/src/main/java/core/startup/mealtoktok/api/auth/AuthApi.java

@@ -9,9 +9,9 @@
 
 import core.startup.mealtoktok.api.auth.dto.OAuthLoginResponse;
 import core.startup.mealtoktok.api.auth.dto.SignUpRequest;
+import core.startup.mealtoktok.api.global.dto.Response;
 import core.startup.mealtoktok.api.global.security.JwtTokenizer;
 import core.startup.mealtoktok.api.user.dto.AvailabilityResponse;
-import core.startup.mealtoktok.common.dto.Response;
 import core.startup.mealtoktok.domain.auth.AuthService;
 import core.startup.mealtoktok.domain.auth.JwtTokens;
 import core.startup.mealtoktok.domain.auth.OAuthTokens;

application/app-api/src/main/java/core/startup/mealtoktok/api/auth/AuthApiDocs.java

@@ -4,8 +4,8 @@
 
 import core.startup.mealtoktok.api.auth.dto.OAuthLoginResponse;
 import core.startup.mealtoktok.api.auth.dto.SignUpRequest;
+import core.startup.mealtoktok.api.global.dto.Response;
 import core.startup.mealtoktok.api.user.dto.AvailabilityResponse;
-import core.startup.mealtoktok.common.dto.Response;
 import core.startup.mealtoktok.domain.auth.OAuthTokens;
 
 import io.swagger.v3.oas.annotations.Operation;

application/app-api/src/main/java/core/startup/mealtoktok/api/dishstore/DishApi.java

@@ -17,7 +17,7 @@
 import core.startup.mealtoktok.api.dishstore.request.DishRequest;
 import core.startup.mealtoktok.api.dishstore.request.SearchDish;
 import core.startup.mealtoktok.api.dishstore.response.DishResponse;
-import core.startup.mealtoktok.common.dto.Response;
+import core.startup.mealtoktok.api.global.dto.Response;
 import core.startup.mealtoktok.domain.dishstore.DishService;
 import core.startup.mealtoktok.domain.dishstore.TargetDish;
 import core.startup.mealtoktok.domain.dishstore.TargetDishCategory;

application/app-api/src/main/java/core/startup/mealtoktok/api/dishstore/DishApiDocs.java

@@ -5,13 +5,14 @@
 import core.startup.mealtoktok.api.dishstore.request.DishRequest;
 import core.startup.mealtoktok.api.dishstore.request.SearchDish;
 import core.startup.mealtoktok.api.dishstore.response.DishResponse;
-import core.startup.mealtoktok.common.dto.Response;
+import core.startup.mealtoktok.api.global.dto.Response;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
 @Tag(name = "반찬 API")
 public interface DishApiDocs {
+
     @Operation(summary = "반찬 생성")
     Response<Void> createDish(Long storeId, Long categoryId, DishRequest request);
 

application/app-api/src/main/java/core/startup/mealtoktok/api/dishstore/DishCategoryApi.java

@@ -15,7 +15,7 @@
 
 import core.startup.mealtoktok.api.dishstore.request.DishCategoryRequest;
 import core.startup.mealtoktok.api.dishstore.response.DishCategoryResponse;
-import core.startup.mealtoktok.common.dto.Response;
+import core.startup.mealtoktok.api.global.dto.Response;
 import core.startup.mealtoktok.domain.dishstore.DishCategoryService;
 import core.startup.mealtoktok.domain.dishstore.TargetDishCategory;
 

application/app-api/src/main/java/core/startup/mealtoktok/api/dishstore/DishCategoryApiDocs.java

@@ -4,7 +4,7 @@
 
 import core.startup.mealtoktok.api.dishstore.request.DishCategoryRequest;
 import core.startup.mealtoktok.api.dishstore.response.DishCategoryResponse;
-import core.startup.mealtoktok.common.dto.Response;
+import core.startup.mealtoktok.api.global.dto.Response;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

application/app-api/src/main/java/core/startup/mealtoktok/api/dishstore/DishStoreApi.java

@@ -15,7 +15,7 @@
 
 import core.startup.mealtoktok.api.dishstore.request.DishStoreRequest;
 import core.startup.mealtoktok.api.dishstore.response.DishStoreResponse;
-import core.startup.mealtoktok.common.dto.Response;
+import core.startup.mealtoktok.api.global.dto.Response;
 import core.startup.mealtoktok.domain.dishstore.DishStore;
 import core.startup.mealtoktok.domain.dishstore.DishStoreService;
 import core.startup.mealtoktok.domain.dishstore.TargetDishStore;

application/app-api/src/main/java/core/startup/mealtoktok/api/dishstore/DishStoreApiDocs.java

@@ -4,7 +4,7 @@
 
 import core.startup.mealtoktok.api.dishstore.request.DishStoreRequest;
 import core.startup.mealtoktok.api.dishstore.response.DishStoreResponse;
-import core.startup.mealtoktok.common.dto.Response;
+import core.startup.mealtoktok.api.global.dto.Response;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

application/app-api/src/main/java/core/startup/mealtoktok/api/fulldining/FullDingingApi.java

@@ -12,7 +12,7 @@
 import lombok.RequiredArgsConstructor;
 
 import core.startup.mealtoktok.api.fulldining.dto.FullDiningResponse;
-import core.startup.mealtoktok.common.dto.Response;
+import core.startup.mealtoktok.api.global.dto.Response;
 import core.startup.mealtoktok.domain.fulldining.CollectingState;
 import core.startup.mealtoktok.domain.fulldining.FullDining;
 import core.startup.mealtoktok.domain.fulldining.FullDiningId;

application/app-api/src/main/java/core/startup/mealtoktok/api/fulldining/FullDiningApiDocs.java

@@ -3,7 +3,7 @@
 import java.util.List;
 
 import core.startup.mealtoktok.api.fulldining.dto.FullDiningResponse;
-import core.startup.mealtoktok.common.dto.Response;
+import core.startup.mealtoktok.api.global.dto.Response;
 import core.startup.mealtoktok.domain.fulldining.CollectingState;
 import core.startup.mealtoktok.domain.user.User;
 

application/app-api/src/main/java/core/startup/mealtoktok/api/global/web/CursorArgumentResolver.java → application/app-api/src/main/java/core/startup/mealtoktok/api/global/config/CursorArgumentResolver.java

@@ -1,4 +1,4 @@
-package core.startup.mealtoktok.api.global.web;
+package core.startup.mealtoktok.api.global.config;
 
 import java.util.ArrayList;
 import java.util.List;

application/app-api/src/main/java/core/startup/mealtoktok/api/global/web/SwaggerConfig.java → application/app-api/src/main/java/core/startup/mealtoktok/api/global/config/SwaggerConfig.java

@@ -1,4 +1,4 @@
-package core.startup.mealtoktok.api.global.web;
+package core.startup.mealtoktok.api.global.config;
 
 import org.springdoc.core.models.GroupedOpenApi;
 import org.springframework.context.annotation.Bean;

application/app-api/src/main/java/core/startup/mealtoktok/api/global/web/TomcatWebConfig.java → application/app-api/src/main/java/core/startup/mealtoktok/api/global/config/TomcatWebConfig.java

@@ -1,4 +1,4 @@
-package core.startup.mealtoktok.api.global.web;
+package core.startup.mealtoktok.api.global.config;
 
 import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
 import org.springframework.boot.web.server.WebServerFactoryCustomizer;

application/app-api/src/main/java/core/startup/mealtoktok/api/global/web/WebConfig.java → application/app-api/src/main/java/core/startup/mealtoktok/api/global/config/WebConfig.java

@@ -1,4 +1,4 @@
-package core.startup.mealtoktok.api.global.web;
+package core.startup.mealtoktok.api.global.config;
 
 import java.util.List;
 

common/src/main/java/core/startup/mealtoktok/common/dto/Response.java → application/app-api/src/main/java/core/startup/mealtoktok/api/global/dto/Response.java

@@ -1,4 +1,4 @@
-package core.startup.mealtoktok.common.dto;
+package core.startup.mealtoktok.api.global.dto;
 
 import static com.fasterxml.jackson.annotation.JsonInclude.*;
 

application/app-api/src/main/java/core/startup/mealtoktok/api/global/exception/GlobalControllerAdvice.java

@@ -8,7 +8,7 @@
 
 import lombok.extern.slf4j.Slf4j;
 
-import core.startup.mealtoktok.common.dto.Response;
+import core.startup.mealtoktok.api.global.dto.Response;
 import core.startup.mealtoktok.common.exception.CustomException;
 import core.startup.mealtoktok.common.exception.ErrorReason;
 

application/app-api/src/main/java/core/startup/mealtoktok/api/global/util/FileMapper.java

@@ -1,11 +1,12 @@
 package core.startup.mealtoktok.api.global.util;
 
+import java.io.IOException;
 import java.util.Collections;
 import java.util.List;
 
 import org.springframework.web.multipart.MultipartFile;
 
-import core.startup.mealtoktok.common.dto.File;
+import core.startup.mealtoktok.domain.global.File;
 
 public class FileMapper {
 
@@ -14,6 +15,16 @@ public static List<File> toFiles(List<MultipartFile> files) {
             return Collections.emptyList();
         }
 
-        return files.stream().map(File::from).toList();
+        return files.stream()
+                .filter(file -> file != null && !file.isEmpty())
+                .map(
+                        file -> {
+                            try {
+                                return File.of(file.getContentType(), file.getInputStream());
+                            } catch (IOException e) {
+                                throw new RuntimeException(e);
+                            }
+                        })
+                .toList();
     }
 }

application/app-api/src/main/java/core/startup/mealtoktok/api/meal/MealApi.java

@@ -14,9 +14,9 @@
 
 import lombok.RequiredArgsConstructor;
 
+import core.startup.mealtoktok.api.global.dto.Response;
 import core.startup.mealtoktok.api.meal.dto.MealDishResponse;
 import core.startup.mealtoktok.api.meal.dto.MealRequest;
-import core.startup.mealtoktok.common.dto.Response;
 import core.startup.mealtoktok.domain.meal.MealAndDishes;
 import core.startup.mealtoktok.domain.meal.MealOwner;
 import core.startup.mealtoktok.domain.meal.MealService;

application/app-api/src/main/java/core/startup/mealtoktok/api/meal/MealApiDocs.java

@@ -2,9 +2,9 @@
 
 import java.util.List;
 
+import core.startup.mealtoktok.api.global.dto.Response;
 import core.startup.mealtoktok.api.meal.dto.MealDishResponse;
 import core.startup.mealtoktok.api.meal.dto.MealRequest;
-import core.startup.mealtoktok.common.dto.Response;
 import core.startup.mealtoktok.domain.user.User;
 
 import io.swagger.v3.oas.annotations.Operation;

application/app-api/src/main/java/core/startup/mealtoktok/api/meal/dto/MealRequest.java

@@ -6,6 +6,7 @@
 import core.startup.mealtoktok.domain.meal.MealInfo;
 
 public record MealRequest(String mealName, int mealPrice, List<Long> dishIds) {
+
     public MealContent toContent() {
         return MealContent.of(MealInfo.of(mealName, mealPrice), dishIds);
     }

application/app-api/src/main/java/core/startup/mealtoktok/api/mealdelivery/MealDeliveryApi.java

@@ -10,10 +10,10 @@
 
 import lombok.RequiredArgsConstructor;
 
+import core.startup.mealtoktok.api.global.dto.Response;
 import core.startup.mealtoktok.api.mealdelivery.dto.MealDeliveryResponse;
 import core.startup.mealtoktok.common.annotation.CursorDefault;
 import core.startup.mealtoktok.common.dto.Cursor;
-import core.startup.mealtoktok.common.dto.Response;
 import core.startup.mealtoktok.common.dto.SliceResult;
 import core.startup.mealtoktok.domain.mealdelivery.DeliveryState;
 import core.startup.mealtoktok.domain.mealdelivery.MealDeliveryId;

application/app-api/src/main/java/core/startup/mealtoktok/api/mealdelivery/MealDeliveryApiDocs.java

@@ -2,9 +2,9 @@
 
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 
+import core.startup.mealtoktok.api.global.dto.Response;
 import core.startup.mealtoktok.api.mealdelivery.dto.MealDeliveryResponse;
 import core.startup.mealtoktok.common.dto.Cursor;
-import core.startup.mealtoktok.common.dto.Response;
 import core.startup.mealtoktok.common.dto.SliceResult;
 import core.startup.mealtoktok.domain.mealdelivery.DeliveryState;
 import core.startup.mealtoktok.domain.mealdelivery.MealDeliverySearchCond;

application/app-api/src/main/java/core/startup/mealtoktok/api/order/OrderApi.java

@@ -11,12 +11,12 @@
 
 import lombok.RequiredArgsConstructor;
 
+import core.startup.mealtoktok.api.global.dto.Response;
 import core.startup.mealtoktok.api.order.dto.MealOrderRequest;
 import core.startup.mealtoktok.api.order.dto.OrderCancelRequest;
 import core.startup.mealtoktok.api.order.dto.OrderResponse;
 import core.startup.mealtoktok.common.annotation.CursorDefault;
 import core.startup.mealtoktok.common.dto.Cursor;
-import core.startup.mealtoktok.common.dto.Response;
 import core.startup.mealtoktok.common.dto.SliceResult;
 import core.startup.mealtoktok.domain.order.Order;
 import core.startup.mealtoktok.domain.order.OrderId;

application/app-api/src/main/java/core/startup/mealtoktok/api/order/OrderApiDocs.java

@@ -1,10 +1,10 @@
 package core.startup.mealtoktok.api.order;
 
+import core.startup.mealtoktok.api.global.dto.Response;
 import core.startup.mealtoktok.api.order.dto.MealOrderRequest;
 import core.startup.mealtoktok.api.order.dto.OrderCancelRequest;
 import core.startup.mealtoktok.api.order.dto.OrderResponse;
 import core.startup.mealtoktok.common.dto.Cursor;
-import core.startup.mealtoktok.common.dto.Response;
 import core.startup.mealtoktok.common.dto.SliceResult;
 import core.startup.mealtoktok.domain.order.OrderId;
 import core.startup.mealtoktok.domain.order.OrderSearchCond;

application/app-api/src/main/java/core/startup/mealtoktok/api/payment/PaymentApi.java

@@ -6,10 +6,10 @@
 
 import lombok.RequiredArgsConstructor;
 
+import core.startup.mealtoktok.api.global.dto.Response;
 import core.startup.mealtoktok.api.payment.dto.PaymentFailReason;
 import core.startup.mealtoktok.api.payment.dto.PaymentRequest;
 import core.startup.mealtoktok.api.payment.dto.PaymentResponse;
-import core.startup.mealtoktok.common.dto.Response;
 import core.startup.mealtoktok.domain.payment.PaymentService;
 
 @RestController

application/app-api/src/main/java/core/startup/mealtoktok/api/payment/PaymentApiDocs.java

@@ -1,9 +1,9 @@
 package core.startup.mealtoktok.api.payment;
 
+import core.startup.mealtoktok.api.global.dto.Response;
 import core.startup.mealtoktok.api.payment.dto.PaymentFailReason;
 import core.startup.mealtoktok.api.payment.dto.PaymentRequest;
 import core.startup.mealtoktok.api.payment.dto.PaymentResponse;
-import core.startup.mealtoktok.common.dto.Response;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

application/app-api/src/main/java/core/startup/mealtoktok/api/user/UserApi.java

@@ -14,10 +14,10 @@
 import lombok.RequiredArgsConstructor;
 
 import core.startup.mealtoktok.api.auth.dto.SignUpRequest.AddressInfoRequest;
+import core.startup.mealtoktok.api.global.dto.Response;
 import core.startup.mealtoktok.api.user.dto.AvailabilityResponse;
 import core.startup.mealtoktok.api.user.dto.DeliveryAddressResponse;
 import core.startup.mealtoktok.api.user.dto.UserResponse;
-import core.startup.mealtoktok.common.dto.Response;
 import core.startup.mealtoktok.domain.user.TargetDeliveryAddress;
 import core.startup.mealtoktok.domain.user.User;
 import core.startup.mealtoktok.domain.user.UserId;

application/app-api/src/main/java/core/startup/mealtoktok/api/user/UserApiDocs.java

@@ -5,10 +5,10 @@
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 
 import core.startup.mealtoktok.api.auth.dto.SignUpRequest.AddressInfoRequest;
+import core.startup.mealtoktok.api.global.dto.Response;
 import core.startup.mealtoktok.api.user.dto.AvailabilityResponse;
 import core.startup.mealtoktok.api.user.dto.DeliveryAddressResponse;
 import core.startup.mealtoktok.api.user.dto.UserResponse;
-import core.startup.mealtoktok.common.dto.Response;
 import core.startup.mealtoktok.domain.user.User;
 import core.startup.mealtoktok.domain.user.UserId;
 

common/build.gradle

@@ -1,6 +1,6 @@
 bootJar { enabled = false }
 
 dependencies {
-    //spring-web
-    implementation 'org.springframework.boot:spring-boot-starter-web'
+    //spring-context
+    implementation 'org.springframework:spring-context'
 }

common/src/main/java/core/startup/mealtoktok/common/exception/CustomException.java

@@ -1,7 +1,5 @@
 package core.startup.mealtoktok.common.exception;
 
-import org.springframework.http.HttpStatus;
-
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -12,8 +10,8 @@ public abstract class CustomException extends RuntimeException {
     protected final BaseErrorCode errorCode;
     protected final String sourceLayer;
 
-    public HttpStatus getStatus() {
-        return HttpStatus.valueOf(errorCode.getErrorReason().status());
+    public Integer getStatus() {
+        return errorCode.getErrorReason().status();
     }
 
     public String getMessage() {

common/src/main/java/core/startup/mealtoktok/common/exception/WebException.java

@@ -5,10 +5,6 @@
 @Getter
 public class WebException extends CustomException {
 
-    public WebException(BaseErrorCode errorCode, String message) {
-        super(errorCode, message);
-    }
-
     public WebException(BaseErrorCode errorCode) {
         super(errorCode, "웹 계층 예외");
     }

domain/src/main/java/core/startup/mealtoktok/domain/global/File.java

@@ -0,0 +1,10 @@
+package core.startup.mealtoktok.domain.global;
+
+import java.io.InputStream;
+
+public record File(String contentType, InputStream inputStream) {
+
+    public static File of(String contentType, InputStream inputStream) {
+        return new File(contentType, inputStream);
+    }
+}