From ab87f612b84f93a46a257d460396f9aff2bdfd83 Mon Sep 17 00:00:00 2001 From: alstn113 Date: Fri, 20 Dec 2024 13:11:49 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20=ED=8C=A8=ED=82=A4=EC=A7=80=20?= =?UTF-8?q?=EA=B5=AC=EC=A1=B0=20=EC=88=98=EC=A0=95=20ui=20->=20api,=20dto?= =?UTF-8?q?=20->=20request,=20response?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/{ui => api}/AuthController.java | 4 +-- .../fluffy/auth/application/AuthService.java | 4 +-- .../fluffy/auth/application/MemberMapper.java | 2 +- .../{dto => response}/MyInfoResponse.java | 2 +- .../{dto => response}/TokenResponse.java | 2 +- .../exam/{ui => api}/ExamController.java | 18 ++++++------- .../exam/{ui => api}/ExamStatusConverter.java | 2 +- .../exam/{ui => api}/ExamWebConfig.java | 2 +- .../request}/CreateExamWebRequest.java | 4 +-- .../request}/PublishExamWebRequest.java | 6 ++--- .../UpdateExamDescriptionWebRequest.java | 4 +-- .../UpdateExamQuestionsWebRequest.java | 6 ++--- .../request}/UpdateExamTitleWebRequest.java | 4 +-- .../fluffy/exam/application/ExamMapper.java | 6 ++--- .../exam/application/ExamQueryService.java | 4 +-- .../fluffy/exam/application/ExamService.java | 12 ++++----- .../exam/application/QuestionMapper.java | 26 +++++++++---------- .../application/QuestionOptionMapper.java | 4 +-- .../CreateExamAppRequest.java | 2 +- .../PublishExamAppRequest.java | 4 +-- .../UpdateExamDescriptionAppRequest.java | 2 +- .../UpdateExamQuestionsAppRequest.java | 4 +-- .../UpdateExamTitleAppRequest.java | 2 +- .../LongAnswerQuestionAppRequest.java | 2 +- .../question/MultipleChoiceAppRequest.java | 2 +- .../question/QuestionAppRequest.java | 2 +- .../question/QuestionOptionRequest.java | 2 +- .../ShortAnswerQuestionAppRequest.java | 2 +- .../SingleChoiceQuestionAppRequest.java | 2 +- .../TrueOrFalseQuestionAppRequest.java | 2 +- .../CreateExamResponse.java | 2 +- .../{dto => response}/ExamResponse.java | 2 +- .../ExamWithAnswersResponse.java | 2 +- .../global/web/AuthArgumentResolver.java | 2 +- .../oauth2/{ui => api}/OAuth2Controller.java | 4 +-- .../{ui => api}/OAuth2ProviderConverter.java | 2 +- .../oauth2/{ui => api}/OAuth2WebConfig.java | 2 +- .../oauth2/application/OAuth2Service.java | 2 +- .../{ui => api}/SubmissionController.java | 6 ++--- .../request}/SubmissionWebRequest.java | 6 ++--- .../application/SubmissionMapper.java | 14 +++++----- .../application/SubmissionQueryService.java | 2 +- .../application/SubmissionService.java | 2 +- .../QuestionResponseAppRequest.java | 2 +- .../SubmissionAppRequest.java | 2 +- .../SubmissionDetailResponse.java | 2 +- .../exam/ExamServiceIntegrationTest.java | 20 +++++++------- .../SubmissionServiceIntegrationTest.java | 4 +-- .../fluffy/unit/AbstractControllerTest.java | 8 +++--- .../src/test/resources/application-test.yml | 2 ++ 50 files changed, 115 insertions(+), 113 deletions(-) rename server/src/main/java/com/fluffy/auth/{ui => api}/AuthController.java (93%) rename server/src/main/java/com/fluffy/auth/application/{dto => response}/MyInfoResponse.java (72%) rename server/src/main/java/com/fluffy/auth/application/{dto => response}/TokenResponse.java (53%) rename server/src/main/java/com/fluffy/exam/{ui => api}/ExamController.java (88%) rename server/src/main/java/com/fluffy/exam/{ui => api}/ExamStatusConverter.java (93%) rename server/src/main/java/com/fluffy/exam/{ui => api}/ExamWebConfig.java (94%) rename server/src/main/java/com/fluffy/exam/{ui/dto => api/request}/CreateExamWebRequest.java (68%) rename server/src/main/java/com/fluffy/exam/{ui/dto => api/request}/PublishExamWebRequest.java (70%) rename server/src/main/java/com/fluffy/exam/{ui/dto => api/request}/UpdateExamDescriptionWebRequest.java (72%) rename server/src/main/java/com/fluffy/exam/{ui/dto => api/request}/UpdateExamQuestionsWebRequest.java (63%) rename server/src/main/java/com/fluffy/exam/{ui/dto => api/request}/UpdateExamTitleWebRequest.java (70%) rename server/src/main/java/com/fluffy/exam/application/{dto => request}/CreateExamAppRequest.java (71%) rename server/src/main/java/com/fluffy/exam/application/{dto => request}/PublishExamAppRequest.java (71%) rename server/src/main/java/com/fluffy/exam/application/{dto => request}/UpdateExamDescriptionAppRequest.java (78%) rename server/src/main/java/com/fluffy/exam/application/{dto => request}/UpdateExamQuestionsAppRequest.java (63%) rename server/src/main/java/com/fluffy/exam/application/{dto => request}/UpdateExamTitleAppRequest.java (77%) rename server/src/main/java/com/fluffy/exam/application/{dto => request}/question/LongAnswerQuestionAppRequest.java (69%) rename server/src/main/java/com/fluffy/exam/application/{dto => request}/question/MultipleChoiceAppRequest.java (77%) rename server/src/main/java/com/fluffy/exam/application/{dto => request}/question/QuestionAppRequest.java (94%) rename server/src/main/java/com/fluffy/exam/application/{dto => request}/question/QuestionOptionRequest.java (57%) rename server/src/main/java/com/fluffy/exam/application/{dto => request}/question/ShortAnswerQuestionAppRequest.java (74%) rename server/src/main/java/com/fluffy/exam/application/{dto => request}/question/SingleChoiceQuestionAppRequest.java (78%) rename server/src/main/java/com/fluffy/exam/application/{dto => request}/question/TrueOrFalseQuestionAppRequest.java (73%) rename server/src/main/java/com/fluffy/exam/application/{dto/question => response}/CreateExamResponse.java (54%) rename server/src/main/java/com/fluffy/exam/application/{dto => response}/ExamResponse.java (95%) rename server/src/main/java/com/fluffy/exam/application/{dto => response}/ExamWithAnswersResponse.java (95%) rename server/src/main/java/com/fluffy/oauth2/{ui => api}/OAuth2Controller.java (95%) rename server/src/main/java/com/fluffy/oauth2/{ui => api}/OAuth2ProviderConverter.java (93%) rename server/src/main/java/com/fluffy/oauth2/{ui => api}/OAuth2WebConfig.java (94%) rename server/src/main/java/com/fluffy/submission/{ui => api}/SubmissionController.java (92%) rename server/src/main/java/com/fluffy/submission/{ui/dto => api/request}/SubmissionWebRequest.java (62%) rename server/src/main/java/com/fluffy/submission/application/{dto => request}/QuestionResponseAppRequest.java (66%) rename server/src/main/java/com/fluffy/submission/application/{dto => request}/SubmissionAppRequest.java (80%) rename server/src/main/java/com/fluffy/submission/application/{dto => response}/SubmissionDetailResponse.java (95%) diff --git a/server/src/main/java/com/fluffy/auth/ui/AuthController.java b/server/src/main/java/com/fluffy/auth/api/AuthController.java similarity index 93% rename from server/src/main/java/com/fluffy/auth/ui/AuthController.java rename to server/src/main/java/com/fluffy/auth/api/AuthController.java index 181d36d..7b921d2 100644 --- a/server/src/main/java/com/fluffy/auth/ui/AuthController.java +++ b/server/src/main/java/com/fluffy/auth/api/AuthController.java @@ -1,7 +1,7 @@ -package com.fluffy.auth.ui; +package com.fluffy.auth.api; import com.fluffy.auth.application.AuthService; -import com.fluffy.auth.application.dto.MyInfoResponse; +import com.fluffy.auth.application.response.MyInfoResponse; import com.fluffy.global.web.Accessor; import com.fluffy.global.web.Auth; import com.fluffy.global.web.cookie.CookieManager; diff --git a/server/src/main/java/com/fluffy/auth/application/AuthService.java b/server/src/main/java/com/fluffy/auth/application/AuthService.java index 5d7dd73..a54abc0 100644 --- a/server/src/main/java/com/fluffy/auth/application/AuthService.java +++ b/server/src/main/java/com/fluffy/auth/application/AuthService.java @@ -1,7 +1,7 @@ package com.fluffy.auth.application; -import com.fluffy.auth.application.dto.MyInfoResponse; -import com.fluffy.auth.application.dto.TokenResponse; +import com.fluffy.auth.application.response.MyInfoResponse; +import com.fluffy.auth.application.response.TokenResponse; import com.fluffy.auth.domain.Member; import com.fluffy.auth.domain.MemberRepository; import com.fluffy.auth.domain.OAuth2Provider; diff --git a/server/src/main/java/com/fluffy/auth/application/MemberMapper.java b/server/src/main/java/com/fluffy/auth/application/MemberMapper.java index 015f563..d40cb90 100644 --- a/server/src/main/java/com/fluffy/auth/application/MemberMapper.java +++ b/server/src/main/java/com/fluffy/auth/application/MemberMapper.java @@ -1,6 +1,6 @@ package com.fluffy.auth.application; -import com.fluffy.auth.application.dto.MyInfoResponse; +import com.fluffy.auth.application.response.MyInfoResponse; import com.fluffy.auth.domain.Member; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; diff --git a/server/src/main/java/com/fluffy/auth/application/dto/MyInfoResponse.java b/server/src/main/java/com/fluffy/auth/application/response/MyInfoResponse.java similarity index 72% rename from server/src/main/java/com/fluffy/auth/application/dto/MyInfoResponse.java rename to server/src/main/java/com/fluffy/auth/application/response/MyInfoResponse.java index 857b696..20637fb 100644 --- a/server/src/main/java/com/fluffy/auth/application/dto/MyInfoResponse.java +++ b/server/src/main/java/com/fluffy/auth/application/response/MyInfoResponse.java @@ -1,4 +1,4 @@ -package com.fluffy.auth.application.dto; +package com.fluffy.auth.application.response; public record MyInfoResponse( Long id, diff --git a/server/src/main/java/com/fluffy/auth/application/dto/TokenResponse.java b/server/src/main/java/com/fluffy/auth/application/response/TokenResponse.java similarity index 53% rename from server/src/main/java/com/fluffy/auth/application/dto/TokenResponse.java rename to server/src/main/java/com/fluffy/auth/application/response/TokenResponse.java index ce1d0e3..a87d174 100644 --- a/server/src/main/java/com/fluffy/auth/application/dto/TokenResponse.java +++ b/server/src/main/java/com/fluffy/auth/application/response/TokenResponse.java @@ -1,4 +1,4 @@ -package com.fluffy.auth.application.dto; +package com.fluffy.auth.application.response; public record TokenResponse(String accessToken) { } diff --git a/server/src/main/java/com/fluffy/exam/ui/ExamController.java b/server/src/main/java/com/fluffy/exam/api/ExamController.java similarity index 88% rename from server/src/main/java/com/fluffy/exam/ui/ExamController.java rename to server/src/main/java/com/fluffy/exam/api/ExamController.java index 026b455..d479803 100644 --- a/server/src/main/java/com/fluffy/exam/ui/ExamController.java +++ b/server/src/main/java/com/fluffy/exam/api/ExamController.java @@ -1,17 +1,17 @@ -package com.fluffy.exam.ui; +package com.fluffy.exam.api; import com.fluffy.exam.application.ExamQueryService; import com.fluffy.exam.application.ExamService; -import com.fluffy.exam.application.dto.ExamResponse; -import com.fluffy.exam.application.dto.ExamWithAnswersResponse; -import com.fluffy.exam.application.dto.question.CreateExamResponse; +import com.fluffy.exam.application.response.ExamResponse; +import com.fluffy.exam.application.response.ExamWithAnswersResponse; +import com.fluffy.exam.application.response.CreateExamResponse; import com.fluffy.exam.domain.ExamStatus; import com.fluffy.exam.domain.dto.ExamSummaryDto; -import com.fluffy.exam.ui.dto.CreateExamWebRequest; -import com.fluffy.exam.ui.dto.PublishExamWebRequest; -import com.fluffy.exam.ui.dto.UpdateExamDescriptionWebRequest; -import com.fluffy.exam.ui.dto.UpdateExamQuestionsWebRequest; -import com.fluffy.exam.ui.dto.UpdateExamTitleWebRequest; +import com.fluffy.exam.api.request.CreateExamWebRequest; +import com.fluffy.exam.api.request.PublishExamWebRequest; +import com.fluffy.exam.api.request.UpdateExamDescriptionWebRequest; +import com.fluffy.exam.api.request.UpdateExamQuestionsWebRequest; +import com.fluffy.exam.api.request.UpdateExamTitleWebRequest; import com.fluffy.global.web.Accessor; import com.fluffy.global.web.Auth; import jakarta.validation.Valid; diff --git a/server/src/main/java/com/fluffy/exam/ui/ExamStatusConverter.java b/server/src/main/java/com/fluffy/exam/api/ExamStatusConverter.java similarity index 93% rename from server/src/main/java/com/fluffy/exam/ui/ExamStatusConverter.java rename to server/src/main/java/com/fluffy/exam/api/ExamStatusConverter.java index 8ef573f..a3d10ce 100644 --- a/server/src/main/java/com/fluffy/exam/ui/ExamStatusConverter.java +++ b/server/src/main/java/com/fluffy/exam/api/ExamStatusConverter.java @@ -1,4 +1,4 @@ -package com.fluffy.exam.ui; +package com.fluffy.exam.api; import com.fluffy.exam.domain.ExamStatus; import org.springframework.core.convert.converter.Converter; diff --git a/server/src/main/java/com/fluffy/exam/ui/ExamWebConfig.java b/server/src/main/java/com/fluffy/exam/api/ExamWebConfig.java similarity index 94% rename from server/src/main/java/com/fluffy/exam/ui/ExamWebConfig.java rename to server/src/main/java/com/fluffy/exam/api/ExamWebConfig.java index 0ef4dcc..f926e66 100644 --- a/server/src/main/java/com/fluffy/exam/ui/ExamWebConfig.java +++ b/server/src/main/java/com/fluffy/exam/api/ExamWebConfig.java @@ -1,4 +1,4 @@ -package com.fluffy.exam.ui; +package com.fluffy.exam.api; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Configuration; diff --git a/server/src/main/java/com/fluffy/exam/ui/dto/CreateExamWebRequest.java b/server/src/main/java/com/fluffy/exam/api/request/CreateExamWebRequest.java similarity index 68% rename from server/src/main/java/com/fluffy/exam/ui/dto/CreateExamWebRequest.java rename to server/src/main/java/com/fluffy/exam/api/request/CreateExamWebRequest.java index fe5f473..43077e0 100644 --- a/server/src/main/java/com/fluffy/exam/ui/dto/CreateExamWebRequest.java +++ b/server/src/main/java/com/fluffy/exam/api/request/CreateExamWebRequest.java @@ -1,6 +1,6 @@ -package com.fluffy.exam.ui.dto; +package com.fluffy.exam.api.request; -import com.fluffy.exam.application.dto.CreateExamAppRequest; +import com.fluffy.exam.application.request.CreateExamAppRequest; import com.fluffy.global.web.Accessor; public record CreateExamWebRequest(String title) { diff --git a/server/src/main/java/com/fluffy/exam/ui/dto/PublishExamWebRequest.java b/server/src/main/java/com/fluffy/exam/api/request/PublishExamWebRequest.java similarity index 70% rename from server/src/main/java/com/fluffy/exam/ui/dto/PublishExamWebRequest.java rename to server/src/main/java/com/fluffy/exam/api/request/PublishExamWebRequest.java index 847f6d7..23bfe24 100644 --- a/server/src/main/java/com/fluffy/exam/ui/dto/PublishExamWebRequest.java +++ b/server/src/main/java/com/fluffy/exam/api/request/PublishExamWebRequest.java @@ -1,7 +1,7 @@ -package com.fluffy.exam.ui.dto; +package com.fluffy.exam.api.request; -import com.fluffy.exam.application.dto.PublishExamAppRequest; -import com.fluffy.exam.application.dto.question.QuestionAppRequest; +import com.fluffy.exam.application.request.PublishExamAppRequest; +import com.fluffy.exam.application.request.question.QuestionAppRequest; import com.fluffy.global.web.Accessor; import java.time.LocalDateTime; import java.util.List; diff --git a/server/src/main/java/com/fluffy/exam/ui/dto/UpdateExamDescriptionWebRequest.java b/server/src/main/java/com/fluffy/exam/api/request/UpdateExamDescriptionWebRequest.java similarity index 72% rename from server/src/main/java/com/fluffy/exam/ui/dto/UpdateExamDescriptionWebRequest.java rename to server/src/main/java/com/fluffy/exam/api/request/UpdateExamDescriptionWebRequest.java index 4f0c9cb..2312e04 100644 --- a/server/src/main/java/com/fluffy/exam/ui/dto/UpdateExamDescriptionWebRequest.java +++ b/server/src/main/java/com/fluffy/exam/api/request/UpdateExamDescriptionWebRequest.java @@ -1,6 +1,6 @@ -package com.fluffy.exam.ui.dto; +package com.fluffy.exam.api.request; -import com.fluffy.exam.application.dto.UpdateExamDescriptionAppRequest; +import com.fluffy.exam.application.request.UpdateExamDescriptionAppRequest; import com.fluffy.global.web.Accessor; public record UpdateExamDescriptionWebRequest(String description) { diff --git a/server/src/main/java/com/fluffy/exam/ui/dto/UpdateExamQuestionsWebRequest.java b/server/src/main/java/com/fluffy/exam/api/request/UpdateExamQuestionsWebRequest.java similarity index 63% rename from server/src/main/java/com/fluffy/exam/ui/dto/UpdateExamQuestionsWebRequest.java rename to server/src/main/java/com/fluffy/exam/api/request/UpdateExamQuestionsWebRequest.java index 4a6ed8f..0519269 100644 --- a/server/src/main/java/com/fluffy/exam/ui/dto/UpdateExamQuestionsWebRequest.java +++ b/server/src/main/java/com/fluffy/exam/api/request/UpdateExamQuestionsWebRequest.java @@ -1,7 +1,7 @@ -package com.fluffy.exam.ui.dto; +package com.fluffy.exam.api.request; -import com.fluffy.exam.application.dto.UpdateExamQuestionsAppRequest; -import com.fluffy.exam.application.dto.question.QuestionAppRequest; +import com.fluffy.exam.application.request.UpdateExamQuestionsAppRequest; +import com.fluffy.exam.application.request.question.QuestionAppRequest; import com.fluffy.global.web.Accessor; import java.util.List; diff --git a/server/src/main/java/com/fluffy/exam/ui/dto/UpdateExamTitleWebRequest.java b/server/src/main/java/com/fluffy/exam/api/request/UpdateExamTitleWebRequest.java similarity index 70% rename from server/src/main/java/com/fluffy/exam/ui/dto/UpdateExamTitleWebRequest.java rename to server/src/main/java/com/fluffy/exam/api/request/UpdateExamTitleWebRequest.java index b6a46cf..e4c3d08 100644 --- a/server/src/main/java/com/fluffy/exam/ui/dto/UpdateExamTitleWebRequest.java +++ b/server/src/main/java/com/fluffy/exam/api/request/UpdateExamTitleWebRequest.java @@ -1,6 +1,6 @@ -package com.fluffy.exam.ui.dto; +package com.fluffy.exam.api.request; -import com.fluffy.exam.application.dto.UpdateExamTitleAppRequest; +import com.fluffy.exam.application.request.UpdateExamTitleAppRequest; import com.fluffy.global.web.Accessor; public record UpdateExamTitleWebRequest(String title) { diff --git a/server/src/main/java/com/fluffy/exam/application/ExamMapper.java b/server/src/main/java/com/fluffy/exam/application/ExamMapper.java index d297a0c..420e9c9 100644 --- a/server/src/main/java/com/fluffy/exam/application/ExamMapper.java +++ b/server/src/main/java/com/fluffy/exam/application/ExamMapper.java @@ -1,8 +1,8 @@ package com.fluffy.exam.application; -import com.fluffy.exam.application.dto.ExamResponse; -import com.fluffy.exam.application.dto.ExamWithAnswersResponse; -import com.fluffy.exam.application.dto.question.CreateExamResponse; +import com.fluffy.exam.application.response.ExamResponse; +import com.fluffy.exam.application.response.ExamWithAnswersResponse; +import com.fluffy.exam.application.response.CreateExamResponse; import com.fluffy.exam.domain.Exam; import java.util.List; import lombok.RequiredArgsConstructor; diff --git a/server/src/main/java/com/fluffy/exam/application/ExamQueryService.java b/server/src/main/java/com/fluffy/exam/application/ExamQueryService.java index 125cb26..e323b44 100644 --- a/server/src/main/java/com/fluffy/exam/application/ExamQueryService.java +++ b/server/src/main/java/com/fluffy/exam/application/ExamQueryService.java @@ -1,7 +1,7 @@ package com.fluffy.exam.application; -import com.fluffy.exam.application.dto.ExamResponse; -import com.fluffy.exam.application.dto.ExamWithAnswersResponse; +import com.fluffy.exam.application.response.ExamResponse; +import com.fluffy.exam.application.response.ExamWithAnswersResponse; import com.fluffy.exam.domain.Exam; import com.fluffy.exam.domain.ExamRepository; import com.fluffy.exam.domain.ExamStatus; diff --git a/server/src/main/java/com/fluffy/exam/application/ExamService.java b/server/src/main/java/com/fluffy/exam/application/ExamService.java index 72d508c..2277c2d 100644 --- a/server/src/main/java/com/fluffy/exam/application/ExamService.java +++ b/server/src/main/java/com/fluffy/exam/application/ExamService.java @@ -2,12 +2,12 @@ import com.fluffy.auth.domain.Member; import com.fluffy.auth.domain.MemberRepository; -import com.fluffy.exam.application.dto.CreateExamAppRequest; -import com.fluffy.exam.application.dto.PublishExamAppRequest; -import com.fluffy.exam.application.dto.UpdateExamDescriptionAppRequest; -import com.fluffy.exam.application.dto.UpdateExamQuestionsAppRequest; -import com.fluffy.exam.application.dto.UpdateExamTitleAppRequest; -import com.fluffy.exam.application.dto.question.CreateExamResponse; +import com.fluffy.exam.application.request.CreateExamAppRequest; +import com.fluffy.exam.application.request.PublishExamAppRequest; +import com.fluffy.exam.application.request.UpdateExamDescriptionAppRequest; +import com.fluffy.exam.application.request.UpdateExamQuestionsAppRequest; +import com.fluffy.exam.application.request.UpdateExamTitleAppRequest; +import com.fluffy.exam.application.response.CreateExamResponse; import com.fluffy.exam.domain.Exam; import com.fluffy.exam.domain.ExamRepository; import com.fluffy.exam.domain.Question; diff --git a/server/src/main/java/com/fluffy/exam/application/QuestionMapper.java b/server/src/main/java/com/fluffy/exam/application/QuestionMapper.java index 04614b6..766ee1c 100644 --- a/server/src/main/java/com/fluffy/exam/application/QuestionMapper.java +++ b/server/src/main/java/com/fluffy/exam/application/QuestionMapper.java @@ -1,18 +1,18 @@ package com.fluffy.exam.application; -import com.fluffy.exam.application.dto.ExamResponse.AnswerQuestionResponse; -import com.fluffy.exam.application.dto.ExamResponse.ChoiceQuestionResponse; -import com.fluffy.exam.application.dto.ExamResponse.QuestionResponse; -import com.fluffy.exam.application.dto.ExamWithAnswersResponse.AnswerQuestionWithAnswersResponse; -import com.fluffy.exam.application.dto.ExamWithAnswersResponse.ChoiceQuestionWithAnswersResponse; -import com.fluffy.exam.application.dto.ExamWithAnswersResponse.QuestionWithAnswersResponse; -import com.fluffy.exam.application.dto.question.LongAnswerQuestionAppRequest; -import com.fluffy.exam.application.dto.question.MultipleChoiceAppRequest; -import com.fluffy.exam.application.dto.question.QuestionAppRequest; -import com.fluffy.exam.application.dto.question.QuestionOptionRequest; -import com.fluffy.exam.application.dto.question.ShortAnswerQuestionAppRequest; -import com.fluffy.exam.application.dto.question.SingleChoiceQuestionAppRequest; -import com.fluffy.exam.application.dto.question.TrueOrFalseQuestionAppRequest; +import com.fluffy.exam.application.response.ExamResponse.AnswerQuestionResponse; +import com.fluffy.exam.application.response.ExamResponse.ChoiceQuestionResponse; +import com.fluffy.exam.application.response.ExamResponse.QuestionResponse; +import com.fluffy.exam.application.response.ExamWithAnswersResponse.AnswerQuestionWithAnswersResponse; +import com.fluffy.exam.application.response.ExamWithAnswersResponse.ChoiceQuestionWithAnswersResponse; +import com.fluffy.exam.application.response.ExamWithAnswersResponse.QuestionWithAnswersResponse; +import com.fluffy.exam.application.request.question.LongAnswerQuestionAppRequest; +import com.fluffy.exam.application.request.question.MultipleChoiceAppRequest; +import com.fluffy.exam.application.request.question.QuestionAppRequest; +import com.fluffy.exam.application.request.question.QuestionOptionRequest; +import com.fluffy.exam.application.request.question.ShortAnswerQuestionAppRequest; +import com.fluffy.exam.application.request.question.SingleChoiceQuestionAppRequest; +import com.fluffy.exam.application.request.question.TrueOrFalseQuestionAppRequest; import com.fluffy.exam.domain.Question; import com.fluffy.exam.domain.QuestionOption; import com.fluffy.exam.domain.QuestionType; diff --git a/server/src/main/java/com/fluffy/exam/application/QuestionOptionMapper.java b/server/src/main/java/com/fluffy/exam/application/QuestionOptionMapper.java index 1a62768..1ab8cb7 100644 --- a/server/src/main/java/com/fluffy/exam/application/QuestionOptionMapper.java +++ b/server/src/main/java/com/fluffy/exam/application/QuestionOptionMapper.java @@ -1,7 +1,7 @@ package com.fluffy.exam.application; -import com.fluffy.exam.application.dto.ExamResponse.ChoiceQuestionResponse.QuestionOptionResponse; -import com.fluffy.exam.application.dto.ExamWithAnswersResponse.ChoiceQuestionWithAnswersResponse.QuestionOptionWithAnswersResponse; +import com.fluffy.exam.application.response.ExamResponse.ChoiceQuestionResponse.QuestionOptionResponse; +import com.fluffy.exam.application.response.ExamWithAnswersResponse.ChoiceQuestionWithAnswersResponse.QuestionOptionWithAnswersResponse; import com.fluffy.exam.domain.QuestionOption; import java.util.List; import lombok.RequiredArgsConstructor; diff --git a/server/src/main/java/com/fluffy/exam/application/dto/CreateExamAppRequest.java b/server/src/main/java/com/fluffy/exam/application/request/CreateExamAppRequest.java similarity index 71% rename from server/src/main/java/com/fluffy/exam/application/dto/CreateExamAppRequest.java rename to server/src/main/java/com/fluffy/exam/application/request/CreateExamAppRequest.java index 85cccac..fd8414a 100644 --- a/server/src/main/java/com/fluffy/exam/application/dto/CreateExamAppRequest.java +++ b/server/src/main/java/com/fluffy/exam/application/request/CreateExamAppRequest.java @@ -1,4 +1,4 @@ -package com.fluffy.exam.application.dto; +package com.fluffy.exam.application.request; import com.fluffy.global.web.Accessor; diff --git a/server/src/main/java/com/fluffy/exam/application/dto/PublishExamAppRequest.java b/server/src/main/java/com/fluffy/exam/application/request/PublishExamAppRequest.java similarity index 71% rename from server/src/main/java/com/fluffy/exam/application/dto/PublishExamAppRequest.java rename to server/src/main/java/com/fluffy/exam/application/request/PublishExamAppRequest.java index 5112dde..347de3b 100644 --- a/server/src/main/java/com/fluffy/exam/application/dto/PublishExamAppRequest.java +++ b/server/src/main/java/com/fluffy/exam/application/request/PublishExamAppRequest.java @@ -1,6 +1,6 @@ -package com.fluffy.exam.application.dto; +package com.fluffy.exam.application.request; -import com.fluffy.exam.application.dto.question.QuestionAppRequest; +import com.fluffy.exam.application.request.question.QuestionAppRequest; import com.fluffy.global.web.Accessor; import java.time.LocalDateTime; import java.util.List; diff --git a/server/src/main/java/com/fluffy/exam/application/dto/UpdateExamDescriptionAppRequest.java b/server/src/main/java/com/fluffy/exam/application/request/UpdateExamDescriptionAppRequest.java similarity index 78% rename from server/src/main/java/com/fluffy/exam/application/dto/UpdateExamDescriptionAppRequest.java rename to server/src/main/java/com/fluffy/exam/application/request/UpdateExamDescriptionAppRequest.java index f29dbc0..c17b207 100644 --- a/server/src/main/java/com/fluffy/exam/application/dto/UpdateExamDescriptionAppRequest.java +++ b/server/src/main/java/com/fluffy/exam/application/request/UpdateExamDescriptionAppRequest.java @@ -1,4 +1,4 @@ -package com.fluffy.exam.application.dto; +package com.fluffy.exam.application.request; import com.fluffy.global.web.Accessor; diff --git a/server/src/main/java/com/fluffy/exam/application/dto/UpdateExamQuestionsAppRequest.java b/server/src/main/java/com/fluffy/exam/application/request/UpdateExamQuestionsAppRequest.java similarity index 63% rename from server/src/main/java/com/fluffy/exam/application/dto/UpdateExamQuestionsAppRequest.java rename to server/src/main/java/com/fluffy/exam/application/request/UpdateExamQuestionsAppRequest.java index da8ffb9..5b5ea1c 100644 --- a/server/src/main/java/com/fluffy/exam/application/dto/UpdateExamQuestionsAppRequest.java +++ b/server/src/main/java/com/fluffy/exam/application/request/UpdateExamQuestionsAppRequest.java @@ -1,6 +1,6 @@ -package com.fluffy.exam.application.dto; +package com.fluffy.exam.application.request; -import com.fluffy.exam.application.dto.question.QuestionAppRequest; +import com.fluffy.exam.application.request.question.QuestionAppRequest; import com.fluffy.global.web.Accessor; import java.util.List; diff --git a/server/src/main/java/com/fluffy/exam/application/dto/UpdateExamTitleAppRequest.java b/server/src/main/java/com/fluffy/exam/application/request/UpdateExamTitleAppRequest.java similarity index 77% rename from server/src/main/java/com/fluffy/exam/application/dto/UpdateExamTitleAppRequest.java rename to server/src/main/java/com/fluffy/exam/application/request/UpdateExamTitleAppRequest.java index aacfc53..9f0f504 100644 --- a/server/src/main/java/com/fluffy/exam/application/dto/UpdateExamTitleAppRequest.java +++ b/server/src/main/java/com/fluffy/exam/application/request/UpdateExamTitleAppRequest.java @@ -1,4 +1,4 @@ -package com.fluffy.exam.application.dto; +package com.fluffy.exam.application.request; import com.fluffy.global.web.Accessor; diff --git a/server/src/main/java/com/fluffy/exam/application/dto/question/LongAnswerQuestionAppRequest.java b/server/src/main/java/com/fluffy/exam/application/request/question/LongAnswerQuestionAppRequest.java similarity index 69% rename from server/src/main/java/com/fluffy/exam/application/dto/question/LongAnswerQuestionAppRequest.java rename to server/src/main/java/com/fluffy/exam/application/request/question/LongAnswerQuestionAppRequest.java index ee29769..7129c5a 100644 --- a/server/src/main/java/com/fluffy/exam/application/dto/question/LongAnswerQuestionAppRequest.java +++ b/server/src/main/java/com/fluffy/exam/application/request/question/LongAnswerQuestionAppRequest.java @@ -1,4 +1,4 @@ -package com.fluffy.exam.application.dto.question; +package com.fluffy.exam.application.request.question; public record LongAnswerQuestionAppRequest( String text, diff --git a/server/src/main/java/com/fluffy/exam/application/dto/question/MultipleChoiceAppRequest.java b/server/src/main/java/com/fluffy/exam/application/request/question/MultipleChoiceAppRequest.java similarity index 77% rename from server/src/main/java/com/fluffy/exam/application/dto/question/MultipleChoiceAppRequest.java rename to server/src/main/java/com/fluffy/exam/application/request/question/MultipleChoiceAppRequest.java index 3dacbe3..f4444dc 100644 --- a/server/src/main/java/com/fluffy/exam/application/dto/question/MultipleChoiceAppRequest.java +++ b/server/src/main/java/com/fluffy/exam/application/request/question/MultipleChoiceAppRequest.java @@ -1,4 +1,4 @@ -package com.fluffy.exam.application.dto.question; +package com.fluffy.exam.application.request.question; import java.util.List; diff --git a/server/src/main/java/com/fluffy/exam/application/dto/question/QuestionAppRequest.java b/server/src/main/java/com/fluffy/exam/application/request/question/QuestionAppRequest.java similarity index 94% rename from server/src/main/java/com/fluffy/exam/application/dto/question/QuestionAppRequest.java rename to server/src/main/java/com/fluffy/exam/application/request/question/QuestionAppRequest.java index 1a8f018..033fde2 100644 --- a/server/src/main/java/com/fluffy/exam/application/dto/question/QuestionAppRequest.java +++ b/server/src/main/java/com/fluffy/exam/application/request/question/QuestionAppRequest.java @@ -1,4 +1,4 @@ -package com.fluffy.exam.application.dto.question; +package com.fluffy.exam.application.request.question; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/server/src/main/java/com/fluffy/exam/application/dto/question/QuestionOptionRequest.java b/server/src/main/java/com/fluffy/exam/application/request/question/QuestionOptionRequest.java similarity index 57% rename from server/src/main/java/com/fluffy/exam/application/dto/question/QuestionOptionRequest.java rename to server/src/main/java/com/fluffy/exam/application/request/question/QuestionOptionRequest.java index 13d42e7..4847758 100644 --- a/server/src/main/java/com/fluffy/exam/application/dto/question/QuestionOptionRequest.java +++ b/server/src/main/java/com/fluffy/exam/application/request/question/QuestionOptionRequest.java @@ -1,4 +1,4 @@ -package com.fluffy.exam.application.dto.question; +package com.fluffy.exam.application.request.question; public record QuestionOptionRequest(String text, boolean isCorrect) { } diff --git a/server/src/main/java/com/fluffy/exam/application/dto/question/ShortAnswerQuestionAppRequest.java b/server/src/main/java/com/fluffy/exam/application/request/question/ShortAnswerQuestionAppRequest.java similarity index 74% rename from server/src/main/java/com/fluffy/exam/application/dto/question/ShortAnswerQuestionAppRequest.java rename to server/src/main/java/com/fluffy/exam/application/request/question/ShortAnswerQuestionAppRequest.java index 2156932..c9b020f 100644 --- a/server/src/main/java/com/fluffy/exam/application/dto/question/ShortAnswerQuestionAppRequest.java +++ b/server/src/main/java/com/fluffy/exam/application/request/question/ShortAnswerQuestionAppRequest.java @@ -1,4 +1,4 @@ -package com.fluffy.exam.application.dto.question; +package com.fluffy.exam.application.request.question; public record ShortAnswerQuestionAppRequest( diff --git a/server/src/main/java/com/fluffy/exam/application/dto/question/SingleChoiceQuestionAppRequest.java b/server/src/main/java/com/fluffy/exam/application/request/question/SingleChoiceQuestionAppRequest.java similarity index 78% rename from server/src/main/java/com/fluffy/exam/application/dto/question/SingleChoiceQuestionAppRequest.java rename to server/src/main/java/com/fluffy/exam/application/request/question/SingleChoiceQuestionAppRequest.java index c04768d..c0d180b 100644 --- a/server/src/main/java/com/fluffy/exam/application/dto/question/SingleChoiceQuestionAppRequest.java +++ b/server/src/main/java/com/fluffy/exam/application/request/question/SingleChoiceQuestionAppRequest.java @@ -1,4 +1,4 @@ -package com.fluffy.exam.application.dto.question; +package com.fluffy.exam.application.request.question; import java.util.List; diff --git a/server/src/main/java/com/fluffy/exam/application/dto/question/TrueOrFalseQuestionAppRequest.java b/server/src/main/java/com/fluffy/exam/application/request/question/TrueOrFalseQuestionAppRequest.java similarity index 73% rename from server/src/main/java/com/fluffy/exam/application/dto/question/TrueOrFalseQuestionAppRequest.java rename to server/src/main/java/com/fluffy/exam/application/request/question/TrueOrFalseQuestionAppRequest.java index bfb143e..7947c98 100644 --- a/server/src/main/java/com/fluffy/exam/application/dto/question/TrueOrFalseQuestionAppRequest.java +++ b/server/src/main/java/com/fluffy/exam/application/request/question/TrueOrFalseQuestionAppRequest.java @@ -1,4 +1,4 @@ -package com.fluffy.exam.application.dto.question; +package com.fluffy.exam.application.request.question; public record TrueOrFalseQuestionAppRequest( String text, diff --git a/server/src/main/java/com/fluffy/exam/application/dto/question/CreateExamResponse.java b/server/src/main/java/com/fluffy/exam/application/response/CreateExamResponse.java similarity index 54% rename from server/src/main/java/com/fluffy/exam/application/dto/question/CreateExamResponse.java rename to server/src/main/java/com/fluffy/exam/application/response/CreateExamResponse.java index be6b28f..48c80b4 100644 --- a/server/src/main/java/com/fluffy/exam/application/dto/question/CreateExamResponse.java +++ b/server/src/main/java/com/fluffy/exam/application/response/CreateExamResponse.java @@ -1,4 +1,4 @@ -package com.fluffy.exam.application.dto.question; +package com.fluffy.exam.application.response; public record CreateExamResponse(Long id, String title) { } diff --git a/server/src/main/java/com/fluffy/exam/application/dto/ExamResponse.java b/server/src/main/java/com/fluffy/exam/application/response/ExamResponse.java similarity index 95% rename from server/src/main/java/com/fluffy/exam/application/dto/ExamResponse.java rename to server/src/main/java/com/fluffy/exam/application/response/ExamResponse.java index 29526c8..71c8201 100644 --- a/server/src/main/java/com/fluffy/exam/application/dto/ExamResponse.java +++ b/server/src/main/java/com/fluffy/exam/application/response/ExamResponse.java @@ -1,4 +1,4 @@ -package com.fluffy.exam.application.dto; +package com.fluffy.exam.application.response; import java.time.LocalDateTime; import java.util.List; diff --git a/server/src/main/java/com/fluffy/exam/application/dto/ExamWithAnswersResponse.java b/server/src/main/java/com/fluffy/exam/application/response/ExamWithAnswersResponse.java similarity index 95% rename from server/src/main/java/com/fluffy/exam/application/dto/ExamWithAnswersResponse.java rename to server/src/main/java/com/fluffy/exam/application/response/ExamWithAnswersResponse.java index 13a3e15..ed1fcce 100644 --- a/server/src/main/java/com/fluffy/exam/application/dto/ExamWithAnswersResponse.java +++ b/server/src/main/java/com/fluffy/exam/application/response/ExamWithAnswersResponse.java @@ -1,4 +1,4 @@ -package com.fluffy.exam.application.dto; +package com.fluffy.exam.application.response; import java.time.LocalDateTime; import java.util.List; diff --git a/server/src/main/java/com/fluffy/global/web/AuthArgumentResolver.java b/server/src/main/java/com/fluffy/global/web/AuthArgumentResolver.java index d6b5bef..6d9fe3f 100644 --- a/server/src/main/java/com/fluffy/global/web/AuthArgumentResolver.java +++ b/server/src/main/java/com/fluffy/global/web/AuthArgumentResolver.java @@ -3,7 +3,7 @@ import static java.util.Objects.requireNonNull; import com.fluffy.auth.application.AuthService; -import com.fluffy.auth.application.dto.MyInfoResponse; +import com.fluffy.auth.application.response.MyInfoResponse; import com.fluffy.global.exception.BaseException; import com.fluffy.global.exception.UnauthorizedException; import com.fluffy.global.web.cookie.CookieManager; diff --git a/server/src/main/java/com/fluffy/oauth2/ui/OAuth2Controller.java b/server/src/main/java/com/fluffy/oauth2/api/OAuth2Controller.java similarity index 95% rename from server/src/main/java/com/fluffy/oauth2/ui/OAuth2Controller.java rename to server/src/main/java/com/fluffy/oauth2/api/OAuth2Controller.java index f6b1b68..48bfe82 100644 --- a/server/src/main/java/com/fluffy/oauth2/ui/OAuth2Controller.java +++ b/server/src/main/java/com/fluffy/oauth2/api/OAuth2Controller.java @@ -1,6 +1,6 @@ -package com.fluffy.oauth2.ui; +package com.fluffy.oauth2.api; -import com.fluffy.auth.application.dto.TokenResponse; +import com.fluffy.auth.application.response.TokenResponse; import com.fluffy.auth.domain.OAuth2Provider; import com.fluffy.global.web.cookie.CookieManager; import com.fluffy.oauth2.application.OAuth2Service; diff --git a/server/src/main/java/com/fluffy/oauth2/ui/OAuth2ProviderConverter.java b/server/src/main/java/com/fluffy/oauth2/api/OAuth2ProviderConverter.java similarity index 93% rename from server/src/main/java/com/fluffy/oauth2/ui/OAuth2ProviderConverter.java rename to server/src/main/java/com/fluffy/oauth2/api/OAuth2ProviderConverter.java index 9f12960..31df069 100644 --- a/server/src/main/java/com/fluffy/oauth2/ui/OAuth2ProviderConverter.java +++ b/server/src/main/java/com/fluffy/oauth2/api/OAuth2ProviderConverter.java @@ -1,4 +1,4 @@ -package com.fluffy.oauth2.ui; +package com.fluffy.oauth2.api; import com.fluffy.auth.domain.OAuth2Provider; import org.springframework.core.convert.converter.Converter; diff --git a/server/src/main/java/com/fluffy/oauth2/ui/OAuth2WebConfig.java b/server/src/main/java/com/fluffy/oauth2/api/OAuth2WebConfig.java similarity index 94% rename from server/src/main/java/com/fluffy/oauth2/ui/OAuth2WebConfig.java rename to server/src/main/java/com/fluffy/oauth2/api/OAuth2WebConfig.java index cb7d27f..3ced6d2 100644 --- a/server/src/main/java/com/fluffy/oauth2/ui/OAuth2WebConfig.java +++ b/server/src/main/java/com/fluffy/oauth2/api/OAuth2WebConfig.java @@ -1,4 +1,4 @@ -package com.fluffy.oauth2.ui; +package com.fluffy.oauth2.api; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Configuration; diff --git a/server/src/main/java/com/fluffy/oauth2/application/OAuth2Service.java b/server/src/main/java/com/fluffy/oauth2/application/OAuth2Service.java index 845dd4b..2220aac 100644 --- a/server/src/main/java/com/fluffy/oauth2/application/OAuth2Service.java +++ b/server/src/main/java/com/fluffy/oauth2/application/OAuth2Service.java @@ -1,7 +1,7 @@ package com.fluffy.oauth2.application; import com.fluffy.auth.application.AuthService; -import com.fluffy.auth.application.dto.TokenResponse; +import com.fluffy.auth.application.response.TokenResponse; import com.fluffy.auth.domain.OAuth2Provider; import com.fluffy.oauth2.domain.OAuth2UserInfo; import lombok.RequiredArgsConstructor; diff --git a/server/src/main/java/com/fluffy/submission/ui/SubmissionController.java b/server/src/main/java/com/fluffy/submission/api/SubmissionController.java similarity index 92% rename from server/src/main/java/com/fluffy/submission/ui/SubmissionController.java rename to server/src/main/java/com/fluffy/submission/api/SubmissionController.java index d368c15..7ece041 100644 --- a/server/src/main/java/com/fluffy/submission/ui/SubmissionController.java +++ b/server/src/main/java/com/fluffy/submission/api/SubmissionController.java @@ -1,12 +1,12 @@ -package com.fluffy.submission.ui; +package com.fluffy.submission.api; import com.fluffy.global.web.Accessor; import com.fluffy.global.web.Auth; import com.fluffy.submission.application.SubmissionQueryService; import com.fluffy.submission.application.SubmissionService; -import com.fluffy.submission.application.dto.SubmissionDetailResponse; +import com.fluffy.submission.application.response.SubmissionDetailResponse; import com.fluffy.submission.domain.dto.SubmissionSummaryDto; -import com.fluffy.submission.ui.dto.SubmissionWebRequest; +import com.fluffy.submission.api.request.SubmissionWebRequest; import jakarta.validation.Valid; import java.util.List; import lombok.RequiredArgsConstructor; diff --git a/server/src/main/java/com/fluffy/submission/ui/dto/SubmissionWebRequest.java b/server/src/main/java/com/fluffy/submission/api/request/SubmissionWebRequest.java similarity index 62% rename from server/src/main/java/com/fluffy/submission/ui/dto/SubmissionWebRequest.java rename to server/src/main/java/com/fluffy/submission/api/request/SubmissionWebRequest.java index 8171929..94a4224 100644 --- a/server/src/main/java/com/fluffy/submission/ui/dto/SubmissionWebRequest.java +++ b/server/src/main/java/com/fluffy/submission/api/request/SubmissionWebRequest.java @@ -1,8 +1,8 @@ -package com.fluffy.submission.ui.dto; +package com.fluffy.submission.api.request; import com.fluffy.global.web.Accessor; -import com.fluffy.submission.application.dto.QuestionResponseAppRequest; -import com.fluffy.submission.application.dto.SubmissionAppRequest; +import com.fluffy.submission.application.request.QuestionResponseAppRequest; +import com.fluffy.submission.application.request.SubmissionAppRequest; import java.util.List; public record SubmissionWebRequest(List questionResponses) { diff --git a/server/src/main/java/com/fluffy/submission/application/SubmissionMapper.java b/server/src/main/java/com/fluffy/submission/application/SubmissionMapper.java index aad7187..95a12af 100644 --- a/server/src/main/java/com/fluffy/submission/application/SubmissionMapper.java +++ b/server/src/main/java/com/fluffy/submission/application/SubmissionMapper.java @@ -5,13 +5,13 @@ import com.fluffy.exam.domain.Question; import com.fluffy.exam.domain.QuestionOption; import com.fluffy.global.exception.BadRequestException; -import com.fluffy.submission.application.dto.QuestionResponseAppRequest; -import com.fluffy.submission.application.dto.SubmissionAppRequest; -import com.fluffy.submission.application.dto.SubmissionDetailResponse; -import com.fluffy.submission.application.dto.SubmissionDetailResponse.AnswerBaseResponse; -import com.fluffy.submission.application.dto.SubmissionDetailResponse.ChoiceAnswerResponse; -import com.fluffy.submission.application.dto.SubmissionDetailResponse.ChoiceResponse; -import com.fluffy.submission.application.dto.SubmissionDetailResponse.TextAnswerResponse; +import com.fluffy.submission.application.request.QuestionResponseAppRequest; +import com.fluffy.submission.application.request.SubmissionAppRequest; +import com.fluffy.submission.application.response.SubmissionDetailResponse; +import com.fluffy.submission.application.response.SubmissionDetailResponse.AnswerBaseResponse; +import com.fluffy.submission.application.response.SubmissionDetailResponse.ChoiceAnswerResponse; +import com.fluffy.submission.application.response.SubmissionDetailResponse.ChoiceResponse; +import com.fluffy.submission.application.response.SubmissionDetailResponse.TextAnswerResponse; import com.fluffy.submission.domain.Answer; import com.fluffy.submission.domain.Choice; import com.fluffy.submission.domain.Submission; diff --git a/server/src/main/java/com/fluffy/submission/application/SubmissionQueryService.java b/server/src/main/java/com/fluffy/submission/application/SubmissionQueryService.java index 6bf2c3a..c6a2fb3 100644 --- a/server/src/main/java/com/fluffy/submission/application/SubmissionQueryService.java +++ b/server/src/main/java/com/fluffy/submission/application/SubmissionQueryService.java @@ -6,7 +6,7 @@ import com.fluffy.exam.domain.ExamRepository; import com.fluffy.global.exception.ForbiddenException; import com.fluffy.global.web.Accessor; -import com.fluffy.submission.application.dto.SubmissionDetailResponse; +import com.fluffy.submission.application.response.SubmissionDetailResponse; import com.fluffy.submission.domain.Submission; import com.fluffy.submission.domain.SubmissionRepository; import com.fluffy.submission.domain.dto.SubmissionSummaryDto; diff --git a/server/src/main/java/com/fluffy/submission/application/SubmissionService.java b/server/src/main/java/com/fluffy/submission/application/SubmissionService.java index 59374f3..41c3747 100644 --- a/server/src/main/java/com/fluffy/submission/application/SubmissionService.java +++ b/server/src/main/java/com/fluffy/submission/application/SubmissionService.java @@ -6,7 +6,7 @@ import com.fluffy.exam.domain.ExamRepository; import com.fluffy.global.exception.BadRequestException; import com.fluffy.global.redis.DistributedLock; -import com.fluffy.submission.application.dto.SubmissionAppRequest; +import com.fluffy.submission.application.request.SubmissionAppRequest; import com.fluffy.submission.domain.Submission; import com.fluffy.submission.domain.SubmissionRepository; import lombok.RequiredArgsConstructor; diff --git a/server/src/main/java/com/fluffy/submission/application/dto/QuestionResponseAppRequest.java b/server/src/main/java/com/fluffy/submission/application/request/QuestionResponseAppRequest.java similarity index 66% rename from server/src/main/java/com/fluffy/submission/application/dto/QuestionResponseAppRequest.java rename to server/src/main/java/com/fluffy/submission/application/request/QuestionResponseAppRequest.java index 1d0235c..90b9a6c 100644 --- a/server/src/main/java/com/fluffy/submission/application/dto/QuestionResponseAppRequest.java +++ b/server/src/main/java/com/fluffy/submission/application/request/QuestionResponseAppRequest.java @@ -1,4 +1,4 @@ -package com.fluffy.submission.application.dto; +package com.fluffy.submission.application.request; import java.util.List; diff --git a/server/src/main/java/com/fluffy/submission/application/dto/SubmissionAppRequest.java b/server/src/main/java/com/fluffy/submission/application/request/SubmissionAppRequest.java similarity index 80% rename from server/src/main/java/com/fluffy/submission/application/dto/SubmissionAppRequest.java rename to server/src/main/java/com/fluffy/submission/application/request/SubmissionAppRequest.java index 8f92e4b..8e434f9 100644 --- a/server/src/main/java/com/fluffy/submission/application/dto/SubmissionAppRequest.java +++ b/server/src/main/java/com/fluffy/submission/application/request/SubmissionAppRequest.java @@ -1,4 +1,4 @@ -package com.fluffy.submission.application.dto; +package com.fluffy.submission.application.request; import com.fluffy.global.web.Accessor; import java.util.List; diff --git a/server/src/main/java/com/fluffy/submission/application/dto/SubmissionDetailResponse.java b/server/src/main/java/com/fluffy/submission/application/response/SubmissionDetailResponse.java similarity index 95% rename from server/src/main/java/com/fluffy/submission/application/dto/SubmissionDetailResponse.java rename to server/src/main/java/com/fluffy/submission/application/response/SubmissionDetailResponse.java index 05f1350..dd4c8c1 100644 --- a/server/src/main/java/com/fluffy/submission/application/dto/SubmissionDetailResponse.java +++ b/server/src/main/java/com/fluffy/submission/application/response/SubmissionDetailResponse.java @@ -1,4 +1,4 @@ -package com.fluffy.submission.application.dto; +package com.fluffy.submission.application.response; import com.fluffy.submission.domain.dto.ParticipantDto; import java.time.LocalDateTime; diff --git a/server/src/test/java/com/fluffy/integration/exam/ExamServiceIntegrationTest.java b/server/src/test/java/com/fluffy/integration/exam/ExamServiceIntegrationTest.java index ac2391c..972c907 100644 --- a/server/src/test/java/com/fluffy/integration/exam/ExamServiceIntegrationTest.java +++ b/server/src/test/java/com/fluffy/integration/exam/ExamServiceIntegrationTest.java @@ -7,16 +7,16 @@ import com.fluffy.auth.domain.Member; import com.fluffy.auth.domain.MemberRepository; import com.fluffy.exam.application.ExamService; -import com.fluffy.exam.application.dto.CreateExamAppRequest; -import com.fluffy.exam.application.dto.UpdateExamQuestionsAppRequest; -import com.fluffy.exam.application.dto.question.CreateExamResponse; -import com.fluffy.exam.application.dto.question.LongAnswerQuestionAppRequest; -import com.fluffy.exam.application.dto.question.MultipleChoiceAppRequest; -import com.fluffy.exam.application.dto.question.QuestionAppRequest; -import com.fluffy.exam.application.dto.question.QuestionOptionRequest; -import com.fluffy.exam.application.dto.question.ShortAnswerQuestionAppRequest; -import com.fluffy.exam.application.dto.question.SingleChoiceQuestionAppRequest; -import com.fluffy.exam.application.dto.question.TrueOrFalseQuestionAppRequest; +import com.fluffy.exam.application.request.CreateExamAppRequest; +import com.fluffy.exam.application.request.UpdateExamQuestionsAppRequest; +import com.fluffy.exam.application.response.CreateExamResponse; +import com.fluffy.exam.application.request.question.LongAnswerQuestionAppRequest; +import com.fluffy.exam.application.request.question.MultipleChoiceAppRequest; +import com.fluffy.exam.application.request.question.QuestionAppRequest; +import com.fluffy.exam.application.request.question.QuestionOptionRequest; +import com.fluffy.exam.application.request.question.ShortAnswerQuestionAppRequest; +import com.fluffy.exam.application.request.question.SingleChoiceQuestionAppRequest; +import com.fluffy.exam.application.request.question.TrueOrFalseQuestionAppRequest; import com.fluffy.exam.domain.Exam; import com.fluffy.exam.domain.ExamRepository; import com.fluffy.exam.domain.QuestionRepository; diff --git a/server/src/test/java/com/fluffy/integration/submission/SubmissionServiceIntegrationTest.java b/server/src/test/java/com/fluffy/integration/submission/SubmissionServiceIntegrationTest.java index c16e5f4..4e60c53 100644 --- a/server/src/test/java/com/fluffy/integration/submission/SubmissionServiceIntegrationTest.java +++ b/server/src/test/java/com/fluffy/integration/submission/SubmissionServiceIntegrationTest.java @@ -12,8 +12,8 @@ import com.fluffy.global.web.Accessor; import com.fluffy.integration.AbstractIntegrationTest; import com.fluffy.submission.application.SubmissionService; -import com.fluffy.submission.application.dto.QuestionResponseAppRequest; -import com.fluffy.submission.application.dto.SubmissionAppRequest; +import com.fluffy.submission.application.request.QuestionResponseAppRequest; +import com.fluffy.submission.application.request.SubmissionAppRequest; import com.fluffy.submission.domain.Submission; import com.fluffy.submission.domain.SubmissionRepository; import java.util.List; diff --git a/server/src/test/java/com/fluffy/unit/AbstractControllerTest.java b/server/src/test/java/com/fluffy/unit/AbstractControllerTest.java index aea4765..a347219 100644 --- a/server/src/test/java/com/fluffy/unit/AbstractControllerTest.java +++ b/server/src/test/java/com/fluffy/unit/AbstractControllerTest.java @@ -1,16 +1,16 @@ package com.fluffy.unit; import com.fluffy.auth.application.AuthService; -import com.fluffy.auth.ui.AuthController; +import com.fluffy.auth.api.AuthController; import com.fluffy.exam.application.ExamQueryService; import com.fluffy.exam.application.ExamService; -import com.fluffy.exam.ui.ExamController; +import com.fluffy.exam.api.ExamController; import com.fluffy.global.web.cookie.CookieManager; import com.fluffy.oauth2.application.OAuth2Service; -import com.fluffy.oauth2.ui.OAuth2Controller; +import com.fluffy.oauth2.api.OAuth2Controller; import com.fluffy.submission.application.SubmissionQueryService; import com.fluffy.submission.application.SubmissionService; -import com.fluffy.submission.ui.SubmissionController; +import com.fluffy.submission.api.SubmissionController; import io.restassured.mapper.ObjectMapper; import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; import org.springframework.boot.test.mock.mockito.MockBean; diff --git a/server/src/test/resources/application-test.yml b/server/src/test/resources/application-test.yml index aae20ab..a5962ec 100644 --- a/server/src/test/resources/application-test.yml +++ b/server/src/test/resources/application-test.yml @@ -6,6 +6,8 @@ spring: hibernate: format_sql: true highlight_sql: true + flyway: + enabled: false data: redis: host: localhost