feat: 변경 요구사항 반영

woowacourse-teams · Jan 6, 2024 · fe568b5 · fe568b5
1 parent 5c7550d
commit fe568b5
Show file tree

Hide file tree

Showing 20 changed files with 21 additions and 22 deletions.
diff --git a/backend/kirikiri/src/main/java/co/kirikiri/auth/controller/AuthController.java b/backend/kirikiri/src/main/java/co/kirikiri/auth/controller/AuthController.java
@@ -2,7 +2,7 @@
 
 import co.kirikiri.auth.service.AuthService;
 import co.kirikiri.auth.service.NaverOauthService;
-import co.kirikiri.auth.service.dto.OauthRedirectResponse;
+import co.kirikiri.auth.service.dto.response.OauthRedirectResponse;
 import co.kirikiri.auth.service.dto.request.LoginRequest;
 import co.kirikiri.auth.service.dto.request.ReissueTokenRequest;
 import co.kirikiri.auth.service.dto.response.AuthenticationResponse;

diff --git a/backend/kirikiri/src/main/java/co/kirikiri/auth/service/NaverOauthService.java b/backend/kirikiri/src/main/java/co/kirikiri/auth/service/NaverOauthService.java
@@ -3,7 +3,7 @@
 import co.kirikiri.auth.service.dto.NaverMemberProfileDto;
 import co.kirikiri.auth.service.dto.NaverMemberProfileResponseDto;
 import co.kirikiri.auth.service.dto.NaverOauthTokenDto;
-import co.kirikiri.auth.service.dto.OauthRedirectResponse;
+import co.kirikiri.auth.service.dto.response.OauthRedirectResponse;
 import co.kirikiri.auth.service.dto.response.AuthenticationResponse;
 import co.kirikiri.auth.service.mapper.OauthMapper;
 import co.kirikiri.member.domain.Member;

diff --git a/...th/service/dto/OauthRedirectResponse.java → ...e/dto/response/OauthRedirectResponse.java b/...th/service/dto/OauthRedirectResponse.java → ...e/dto/response/OauthRedirectResponse.java
@@ -1,4 +1,4 @@
-package co.kirikiri.auth.service.dto;
+package co.kirikiri.auth.service.dto.response;
 
 public record OauthRedirectResponse(
         String url,

diff --git a/backend/kirikiri/src/main/java/co/kirikiri/auth/service/mapper/OauthMapper.java b/backend/kirikiri/src/main/java/co/kirikiri/auth/service/mapper/OauthMapper.java
@@ -1,6 +1,6 @@
 package co.kirikiri.auth.service.mapper;
 
-import co.kirikiri.auth.service.dto.OauthRedirectResponse;
+import co.kirikiri.auth.service.dto.response.OauthRedirectResponse;
 
 public class OauthMapper {
 

diff --git a/backend/kirikiri/src/main/java/co/kirikiri/common/aop/ExceptionConvertAop.java b/backend/kirikiri/src/main/java/co/kirikiri/common/aop/ExceptionConvertAop.java
@@ -1,9 +1,9 @@
 package co.kirikiri.common.aop;
 
 import co.kirikiri.common.exception.BadRequestException;
-import co.kirikiri.common.exception.DomainException;
+import co.kirikiri.common.exception.domain.DomainException;
 import co.kirikiri.common.exception.ServerException;
-import co.kirikiri.common.exception.UnexpectedDomainException;
+import co.kirikiri.common.exception.domain.UnexpectedDomainException;
 import org.aspectj.lang.annotation.AfterThrowing;
 import org.aspectj.lang.annotation.Aspect;
 import org.springframework.stereotype.Component;

diff --git a/...iri/common/exception/DomainException.java → ...mon/exception/domain/DomainException.java b/...iri/common/exception/DomainException.java → ...mon/exception/domain/DomainException.java
@@ -1,4 +1,4 @@
-package co.kirikiri.common.exception;
+package co.kirikiri.common.exception.domain;
 
 public class DomainException extends RuntimeException {
 

diff --git a/...on/exception/ImageExtensionException.java → ...ption/domain/ImageExtensionException.java b/...on/exception/ImageExtensionException.java → ...ption/domain/ImageExtensionException.java
@@ -1,4 +1,4 @@
-package co.kirikiri.common.exception;
+package co.kirikiri.common.exception.domain;
 
 public class ImageExtensionException extends DomainException {
 

diff --git a/.../exception/UnexpectedDomainException.java → ...ion/domain/UnexpectedDomainException.java b/.../exception/UnexpectedDomainException.java → ...ion/domain/UnexpectedDomainException.java
@@ -1,4 +1,4 @@
-package co.kirikiri.common.exception;
+package co.kirikiri.common.exception.domain;
 
 public class UnexpectedDomainException extends DomainException {
 

diff --git a/backend/kirikiri/src/main/java/co/kirikiri/common/type/ImageContentType.java b/backend/kirikiri/src/main/java/co/kirikiri/common/type/ImageContentType.java
@@ -1,6 +1,6 @@
 package co.kirikiri.common.type;
 
-import co.kirikiri.common.exception.ImageExtensionException;
+import co.kirikiri.common.exception.domain.ImageExtensionException;
 import java.util.Arrays;
 
 public enum ImageContentType {

diff --git a/backend/kirikiri/src/main/java/co/kirikiri/domain/goalroom/GoalRoomMembers.java b/backend/kirikiri/src/main/java/co/kirikiri/domain/goalroom/GoalRoomMembers.java
@@ -1,6 +1,6 @@
 package co.kirikiri.domain.goalroom;
 
-import co.kirikiri.common.exception.UnexpectedDomainException;
+import co.kirikiri.common.exception.domain.UnexpectedDomainException;
 import co.kirikiri.member.domain.Member;
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Embeddable;

diff --git a/backend/kirikiri/src/main/java/co/kirikiri/domain/goalroom/GoalRoomPendingMembers.java b/backend/kirikiri/src/main/java/co/kirikiri/domain/goalroom/GoalRoomPendingMembers.java
@@ -1,6 +1,6 @@
 package co.kirikiri.domain.goalroom;
 
-import co.kirikiri.common.exception.UnexpectedDomainException;
+import co.kirikiri.common.exception.domain.UnexpectedDomainException;
 import co.kirikiri.member.domain.Member;
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Embeddable;

diff --git a/backend/kirikiri/src/main/java/co/kirikiri/domain/goalroom/exception/GoalRoomException.java b/backend/kirikiri/src/main/java/co/kirikiri/domain/goalroom/exception/GoalRoomException.java
@@ -1,6 +1,6 @@
 package co.kirikiri.domain.goalroom.exception;
 
-import co.kirikiri.common.exception.DomainException;
+import co.kirikiri.common.exception.domain.DomainException;
 
 public class GoalRoomException extends DomainException {
 

diff --git a/backend/kirikiri/src/main/java/co/kirikiri/domain/roadmap/exception/RoadmapException.java b/backend/kirikiri/src/main/java/co/kirikiri/domain/roadmap/exception/RoadmapException.java
@@ -1,6 +1,6 @@
 package co.kirikiri.domain.roadmap.exception;
 
-import co.kirikiri.common.exception.DomainException;
+import co.kirikiri.common.exception.domain.DomainException;
 
 public class RoadmapException extends DomainException {
 

diff --git a/backend/kirikiri/src/main/java/co/kirikiri/member/domain/EncryptedPassword.java b/backend/kirikiri/src/main/java/co/kirikiri/member/domain/EncryptedPassword.java
@@ -1,6 +1,6 @@
 package co.kirikiri.member.domain;
 
-import co.kirikiri.common.exception.UnexpectedDomainException;
+import co.kirikiri.common.exception.domain.UnexpectedDomainException;
 import co.kirikiri.member.domain.vo.Password;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;

diff --git a/backend/kirikiri/src/main/java/co/kirikiri/member/domain/exception/MemberException.java b/backend/kirikiri/src/main/java/co/kirikiri/member/domain/exception/MemberException.java
@@ -1,6 +1,6 @@
 package co.kirikiri.member.domain.exception;
 
-import co.kirikiri.common.exception.DomainException;
+import co.kirikiri.common.exception.domain.DomainException;
 
 public class MemberException extends DomainException {
 

diff --git a/backend/kirikiri/src/test/java/co/kirikiri/auth/controller/AuthCreateApiTest.java b/backend/kirikiri/src/test/java/co/kirikiri/auth/controller/AuthCreateApiTest.java
@@ -14,7 +14,7 @@
 
 import co.kirikiri.auth.service.AuthService;
 import co.kirikiri.auth.service.NaverOauthService;
-import co.kirikiri.auth.service.dto.OauthRedirectResponse;
+import co.kirikiri.auth.service.dto.response.OauthRedirectResponse;
 import co.kirikiri.auth.service.dto.request.LoginRequest;
 import co.kirikiri.auth.service.dto.request.ReissueTokenRequest;
 import co.kirikiri.auth.service.dto.response.AuthenticationResponse;

diff --git a/backend/kirikiri/src/test/java/co/kirikiri/auth/service/NaverOauthServiceTest.java b/backend/kirikiri/src/test/java/co/kirikiri/auth/service/NaverOauthServiceTest.java
@@ -8,7 +8,7 @@
 import co.kirikiri.auth.service.dto.NaverMemberProfileDto;
 import co.kirikiri.auth.service.dto.NaverMemberProfileResponseDto;
 import co.kirikiri.auth.service.dto.NaverOauthTokenDto;
-import co.kirikiri.auth.service.dto.OauthRedirectResponse;
+import co.kirikiri.auth.service.dto.response.OauthRedirectResponse;
 import co.kirikiri.auth.service.dto.response.AuthenticationResponse;
 import co.kirikiri.member.domain.Gender;
 import co.kirikiri.member.domain.Member;

diff --git a/backend/kirikiri/src/test/java/co/kirikiri/domain/goalroom/GoalRoomPendingMembersTest.java b/backend/kirikiri/src/test/java/co/kirikiri/domain/goalroom/GoalRoomPendingMembersTest.java
@@ -3,7 +3,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import co.kirikiri.common.exception.UnexpectedDomainException;
+import co.kirikiri.common.exception.domain.UnexpectedDomainException;
 import co.kirikiri.domain.goalroom.vo.GoalRoomName;
 import co.kirikiri.domain.goalroom.vo.LimitedMemberCount;
 import co.kirikiri.member.domain.EncryptedPassword;

diff --git a/backend/kirikiri/src/test/java/co/kirikiri/integration/fixture/GoalRoomAPIFixture.java b/backend/kirikiri/src/test/java/co/kirikiri/integration/fixture/GoalRoomAPIFixture.java
@@ -160,15 +160,14 @@ public class GoalRoomAPIFixture {
     }
 
     public static ExtractableResponse<Response> 골룸을_시작한다(final String 로그인_토큰, final Long 골룸_아이디) {
-        final ExtractableResponse<Response> 골룸_시작_요청_응답 = given().log().all()
+        return given().log().all()
                 .contentType(MediaType.APPLICATION_JSON_VALUE)
                 .when()
                 .header(new Header(HttpHeaders.AUTHORIZATION, 로그인_토큰))
                 .post(API_PREFIX + "/goal-rooms/{goalRoomId}/start", 골룸_아이디)
                 .then()
                 .log().all()
                 .extract();
-        return 골룸_시작_요청_응답;
     }
 
     public static ExtractableResponse<Response> 골룸의_사용자_정보를_정렬_기준없이_조회(final Long 골룸_아이디, final String 로그인_토큰) {

diff --git a/backend/kirikiri/src/test/java/co/kirikiri/service/GoalRoomCreateServiceTest.java b/backend/kirikiri/src/test/java/co/kirikiri/service/GoalRoomCreateServiceTest.java
@@ -14,7 +14,7 @@
 import static org.mockito.Mockito.when;
 
 import co.kirikiri.common.exception.BadRequestException;
-import co.kirikiri.common.exception.ImageExtensionException;
+import co.kirikiri.common.exception.domain.ImageExtensionException;
 import co.kirikiri.common.exception.NotFoundException;
 import co.kirikiri.common.service.FilePathGenerator;
 import co.kirikiri.common.service.FileService;