Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor: 회원 도메인의 dto 패키징 방식을 변경한다. #39

Merged
merged 4 commits into from
Aug 14, 2024
Merged

Refactor: 회원 도메인의 dto 패키징 방식을 변경한다. #39

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
af03df6
refactor: 회원 도메인 요청 dto 패키지 이동
hseong3243 Aug 14, 2024
fd9d0c8
refactor: 회원 도메인 응답 dto 패키지 이동
hseong3243 Aug 14, 2024
1ea85a6
refactor: 코드 포맷 정렬
hseong3243 Aug 14, 2024
46b2131
chore: resolve conflict
mirageoasis Aug 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/com/thirdparty/ticketing/domain/member/controller/AuthController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import com.thirdparty.ticketing.domain.member.controller.request.LoginRequest;
import com.thirdparty.ticketing.domain.member.dto.request.LoginRequest;
import com.thirdparty.ticketing.domain.member.dto.response.LoginResponse;
import com.thirdparty.ticketing.domain.member.service.AuthService;
import com.thirdparty.ticketing.domain.member.service.response.LoginResponse;

import lombok.RequiredArgsConstructor;

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/thirdparty/ticketing/domain/member/controller/MemberController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import com.thirdparty.ticketing.domain.member.controller.request.MemberCreationRequest;
import com.thirdparty.ticketing.domain.member.dto.request.MemberCreationRequest;
import com.thirdparty.ticketing.domain.member.dto.response.CreateMemberResponse;
import com.thirdparty.ticketing.domain.member.service.MemberService;
import com.thirdparty.ticketing.domain.member.service.response.CreateMemberResponse;

import lombok.RequiredArgsConstructor;

Expand Down
2 changes: 1 addition & 1 deletion ...mber/controller/request/LoginRequest.java → ...main/member/dto/request/LoginRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.thirdparty.ticketing.domain.member.controller.request;
package com.thirdparty.ticketing.domain.member.dto.request;

import jakarta.validation.constraints.Email;
import jakarta.validation.constraints.NotBlank;
Expand Down
2 changes: 1 addition & 1 deletion ...roller/request/MemberCreationRequest.java → ...er/dto/request/MemberCreationRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.thirdparty.ticketing.domain.member.controller.request;
package com.thirdparty.ticketing.domain.member.dto.request;

import jakarta.validation.constraints.Email;
import jakarta.validation.constraints.NotBlank;
Expand Down
2 changes: 1 addition & 1 deletion ...ervice/response/CreateMemberResponse.java → ...er/dto/response/CreateMemberResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.thirdparty.ticketing.domain.member.service.response;
package com.thirdparty.ticketing.domain.member.dto.response;

import com.thirdparty.ticketing.domain.member.Member;

Expand Down
2 changes: 1 addition & 1 deletion ...member/service/response/CustomClaims.java → ...ain/member/dto/response/CustomClaims.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.thirdparty.ticketing.domain.member.service.response;
package com.thirdparty.ticketing.domain.member.dto.response;

import com.thirdparty.ticketing.domain.member.MemberRole;

Expand Down
2 changes: 1 addition & 1 deletion ...ember/service/response/LoginResponse.java → ...in/member/dto/response/LoginResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.thirdparty.ticketing.domain.member.service.response;
package com.thirdparty.ticketing.domain.member.dto.response;

import com.thirdparty.ticketing.domain.member.Member;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/thirdparty/ticketing/domain/member/service/AuthService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
import org.springframework.stereotype.Service;

import com.thirdparty.ticketing.domain.member.Member;
import com.thirdparty.ticketing.domain.member.dto.response.LoginResponse;
import com.thirdparty.ticketing.domain.member.repository.MemberRepository;
import com.thirdparty.ticketing.domain.member.service.response.LoginResponse;

import lombok.RequiredArgsConstructor;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/thirdparty/ticketing/domain/member/service/JwtProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.thirdparty.ticketing.domain.member.service;

import com.thirdparty.ticketing.domain.member.Member;
import com.thirdparty.ticketing.domain.member.service.response.CustomClaims;
import com.thirdparty.ticketing.domain.member.dto.response.CustomClaims;

public interface JwtProvider {
CustomClaims parseAccessToken(String accessToken);
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/thirdparty/ticketing/domain/member/service/MemberService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@

import com.thirdparty.ticketing.domain.member.Member;
import com.thirdparty.ticketing.domain.member.MemberRole;
import com.thirdparty.ticketing.domain.member.controller.request.MemberCreationRequest;
import com.thirdparty.ticketing.domain.member.dto.request.MemberCreationRequest;
import com.thirdparty.ticketing.domain.member.dto.response.CreateMemberResponse;
import com.thirdparty.ticketing.domain.member.repository.MemberRepository;
import com.thirdparty.ticketing.domain.member.service.response.CreateMemberResponse;

import lombok.RequiredArgsConstructor;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/thirdparty/ticketing/global/security/AuthenticationFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.web.filter.OncePerRequestFilter;

import com.thirdparty.ticketing.domain.member.dto.response.CustomClaims;
import com.thirdparty.ticketing.domain.member.service.JwtProvider;
import com.thirdparty.ticketing.domain.member.service.response.CustomClaims;

import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/thirdparty/ticketing/global/security/JJwtProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@

import com.thirdparty.ticketing.domain.member.Member;
import com.thirdparty.ticketing.domain.member.MemberRole;
import com.thirdparty.ticketing.domain.member.dto.response.CustomClaims;
import com.thirdparty.ticketing.domain.member.service.ExpiredTokenException;
import com.thirdparty.ticketing.domain.member.service.InvalidTokenException;
import com.thirdparty.ticketing.domain.member.service.JwtProvider;
import com.thirdparty.ticketing.domain.member.service.response.CustomClaims;

import io.jsonwebtoken.Claims;
import io.jsonwebtoken.ExpiredJwtException;
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/com/thirdparty/ticketing/domain/member/controller/MemberControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
import org.springframework.test.web.servlet.ResultActions;

import com.fasterxml.jackson.databind.ObjectMapper;
import com.thirdparty.ticketing.domain.member.controller.request.MemberCreationRequest;
import com.thirdparty.ticketing.domain.member.dto.request.MemberCreationRequest;
import com.thirdparty.ticketing.domain.member.dto.response.CreateMemberResponse;
import com.thirdparty.ticketing.domain.member.service.MemberService;
import com.thirdparty.ticketing.domain.member.service.response.CreateMemberResponse;
import com.thirdparty.ticketing.support.BaseControllerTest;

@WebMvcTest(controllers = MemberController.class)
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/thirdparty/ticketing/domain/member/service/AuthServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@

import com.thirdparty.ticketing.domain.member.Member;
import com.thirdparty.ticketing.domain.member.MemberRole;
import com.thirdparty.ticketing.domain.member.dto.response.LoginResponse;
import com.thirdparty.ticketing.domain.member.repository.MemberRepository;
import com.thirdparty.ticketing.domain.member.service.response.LoginResponse;
import com.thirdparty.ticketing.global.security.JJwtProvider;

@DataJpaTest
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/com/thirdparty/ticketing/domain/member/service/MemberServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@

import com.thirdparty.ticketing.domain.member.Member;
import com.thirdparty.ticketing.domain.member.MemberRole;
import com.thirdparty.ticketing.domain.member.controller.request.MemberCreationRequest;
import com.thirdparty.ticketing.domain.member.dto.request.MemberCreationRequest;
import com.thirdparty.ticketing.domain.member.dto.response.CreateMemberResponse;
import com.thirdparty.ticketing.domain.member.repository.MemberRepository;
import com.thirdparty.ticketing.domain.member.service.response.CreateMemberResponse;

@DataJpaTest
class MemberServiceTest {
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/thirdparty/ticketing/global/security/AuthenticationFilterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@

import com.thirdparty.ticketing.domain.member.Member;
import com.thirdparty.ticketing.domain.member.MemberRole;
import com.thirdparty.ticketing.domain.member.dto.response.CustomClaims;
import com.thirdparty.ticketing.domain.member.service.JwtProvider;
import com.thirdparty.ticketing.domain.member.service.response.CustomClaims;

class AuthenticationFilterTest {

Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/thirdparty/ticketing/global/security/JJwtProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@

import com.thirdparty.ticketing.domain.member.Member;
import com.thirdparty.ticketing.domain.member.MemberRole;
import com.thirdparty.ticketing.domain.member.dto.response.CustomClaims;
import com.thirdparty.ticketing.domain.member.repository.MemberRepository;
import com.thirdparty.ticketing.domain.member.service.ExpiredTokenException;
import com.thirdparty.ticketing.domain.member.service.InvalidTokenException;
import com.thirdparty.ticketing.domain.member.service.JwtProvider;
import com.thirdparty.ticketing.domain.member.service.response.CustomClaims;

@DataJpaTest
class JJwtProviderTest {
Expand Down
Loading