Skip to content

refactor : domain 구조로 코드 변경 #32

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

Open
YoonBoorue wants to merge 2 commits into
base: main
Choose a base branch
from
Open

refactor : domain 구조로 코드 변경 #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8cd1b32
refactor : domain 구조로 코드 변경
YoonBoorue May 31, 2026
1a464ab
Delete docs/refactoring-proposal.md
YoonBoorue May 31, 2026
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
128 changes: 128 additions & 0 deletions docs/refactoring-migration-map.csv
View file
Open in desktop

Large diffs are not rendered by default.

Binary file added docs/refactoring-migration-map.xlsx
View file
Open in desktop
Binary file not shown.
6 changes: 3 additions & 3 deletions src/main/java/RIKU/server/Config/SecurityConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package RIKU.server.Config;
package RIKU.server.config;

import RIKU.server.Security.JwtAuthenticationFilter;
import RIKU.server.Security.JwtTokenProvider;
import RIKU.server.security.JwtAuthenticationFilter;
import RIKU.server.security.JwtTokenProvider;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.Environment;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/RIKU/server/Config/SwaggerConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package RIKU.server.Config;
package RIKU.server.config;

import io.swagger.v3.oas.annotations.OpenAPIDefinition;
import io.swagger.v3.oas.annotations.servers.Server;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/RIKU/server/Security/AuthMember.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package RIKU.server.Security;
package RIKU.server.security;

import RIKU.server.Entity.Base.BaseStatus;
import RIKU.server.Entity.User.UserRole;
import RIKU.server.global.entity.BaseStatus;
import RIKU.server.domains.user.entity.UserRole;
import lombok.Builder;
import lombok.Getter;
import org.springframework.security.core.GrantedAuthority;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/RIKU/server/Security/AuthenticationProviderImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package RIKU.server.Security;
package RIKU.server.security;

import RIKU.server.Util.BaseResponseStatus;
import RIKU.server.Util.Exception.Domain.UserException;
import RIKU.server.global.response.BaseResponseStatus;
import RIKU.server.domains.user.exception.UserException;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.authentication.AuthenticationProvider;
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/RIKU/server/Security/JwtAuthenticationFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package RIKU.server.Security;
package RIKU.server.security;

import RIKU.server.Util.BaseResponse;
import RIKU.server.Util.Exception.CustomJwtException;
import RIKU.server.Util.Exception.Domain.UserException;
import RIKU.server.global.response.BaseResponse;
import RIKU.server.global.exception.CustomJwtException;
import RIKU.server.domains.user.exception.UserException;
import jakarta.servlet.FilterChain;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServletRequest;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/RIKU/server/Security/JwtInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package RIKU.server.Security;
package RIKU.server.security;

import lombok.AllArgsConstructor;
import lombok.Builder;
Expand Down
16 changes: 8 additions & 8 deletions src/main/java/RIKU/server/Security/JwtTokenProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package RIKU.server.Security;

import RIKU.server.Entity.Base.BaseStatus;
import RIKU.server.Entity.User.User;
import RIKU.server.Repository.UserRepository;
import RIKU.server.Util.BaseResponseStatus;
import RIKU.server.Util.Exception.CustomJwtException;
import RIKU.server.Util.Exception.Domain.UserException;
package RIKU.server.security;

import RIKU.server.global.entity.BaseStatus;
import RIKU.server.domains.user.entity.User;
import RIKU.server.domains.user.repository.UserRepository;
import RIKU.server.global.response.BaseResponseStatus;
import RIKU.server.global.exception.CustomJwtException;
import RIKU.server.domains.user.exception.UserException;
import io.jsonwebtoken.*;
import io.jsonwebtoken.io.Decoders;
import io.jsonwebtoken.security.Keys;
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/RIKU/server/Security/UserDetailsServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package RIKU.server.Security;
package RIKU.server.security;

import RIKU.server.Entity.User.User;
import RIKU.server.Repository.UserRepository;
import RIKU.server.Util.BaseResponseStatus;
import RIKU.server.Util.Exception.Domain.UserException;
import RIKU.server.domains.user.entity.User;
import RIKU.server.domains.user.repository.UserRepository;
import RIKU.server.global.response.BaseResponseStatus;
import RIKU.server.domains.user.exception.UserException;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.core.GrantedAuthority;
Expand Down
22 changes: 11 additions & 11 deletions ...KU/server/Controller/AdminController.java → ...ins/admin/controller/AdminController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package RIKU.server.Controller;

import RIKU.server.Dto.User.Request.AuthorizePacerRequest;
import RIKU.server.Dto.User.Request.UpdateUsersRequest;
import RIKU.server.Dto.User.Response.ReadPacersResponse;
import RIKU.server.Dto.User.Response.ReadUsersResponse;
import RIKU.server.Dto.User.Response.SearchAdminUsersResponse;
import RIKU.server.Security.AuthMember;
import RIKU.server.Service.AdminService;
import RIKU.server.Util.BaseResponse;
import RIKU.server.Util.Exception.Validation.FieldValidationException;
package RIKU.server.domains.admin.controller;

import RIKU.server.domains.admin.dto.request.AuthorizePacerRequest;
import RIKU.server.domains.admin.dto.request.UpdateUsersRequest;
import RIKU.server.domains.admin.dto.response.ReadPacersResponse;
import RIKU.server.domains.admin.dto.response.ReadUsersResponse;
import RIKU.server.domains.admin.dto.response.SearchAdminUsersResponse;
import RIKU.server.security.AuthMember;
import RIKU.server.domains.admin.service.AdminService;
import RIKU.server.global.response.BaseResponse;
import RIKU.server.global.validation.FieldValidationException;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
Expand Down
2 changes: 1 addition & 1 deletion ...o/User/Request/AuthorizePacerRequest.java → ...in/dto/request/AuthorizePacerRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package RIKU.server.Dto.User.Request;
package RIKU.server.domains.admin.dto.request;

import lombok.Getter;
import lombok.NoArgsConstructor;
Expand Down
4 changes: 2 additions & 2 deletions .../Dto/User/Request/UpdateUsersRequest.java → ...admin/dto/request/UpdateUsersRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package RIKU.server.Dto.User.Request;
package RIKU.server.domains.admin.dto.request;

import RIKU.server.Entity.User.UserRole;
import RIKU.server.domains.user.entity.UserRole;
import jakarta.annotation.Nullable;
import jakarta.validation.constraints.NotBlank;
import lombok.Getter;
Expand Down
4 changes: 2 additions & 2 deletions ...Dto/User/Response/ReadPacersResponse.java → ...dmin/dto/response/ReadPacersResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package RIKU.server.Dto.User.Response;
package RIKU.server.domains.admin.dto.response;

import RIKU.server.Entity.User.User;
import RIKU.server.domains.user.entity.User;
import lombok.Getter;

@Getter
Expand Down
8 changes: 4 additions & 4 deletions .../Dto/User/Response/ReadUsersResponse.java → ...admin/dto/response/ReadUsersResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package RIKU.server.Dto.User.Response;
package RIKU.server.domains.admin.dto.response;

import RIKU.server.Entity.Base.BaseStatus;
import RIKU.server.Entity.User.User;
import RIKU.server.Entity.User.UserRole;
import RIKU.server.global.entity.BaseStatus;
import RIKU.server.domains.user.entity.User;
import RIKU.server.domains.user.entity.UserRole;
import lombok.Builder;
import lombok.Getter;

Expand Down
6 changes: 3 additions & 3 deletions ...er/Response/SearchAdminUsersResponse.java → ...to/response/SearchAdminUsersResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package RIKU.server.Dto.User.Response;
package RIKU.server.domains.admin.dto.response;

import RIKU.server.Entity.Base.BaseStatus;
import RIKU.server.Entity.User.User;
import RIKU.server.global.entity.BaseStatus;
import RIKU.server.domains.user.entity.User;
import lombok.Builder;
import lombok.Getter;

Expand Down
36 changes: 18 additions & 18 deletions ...ava/RIKU/server/Service/AdminService.java → ...r/domains/admin/service/AdminService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
package RIKU.server.Service;

import RIKU.server.Config.SeasonProvider;
import RIKU.server.Dto.User.Request.AuthorizePacerRequest;
import RIKU.server.Dto.User.Response.ReadPacersResponse;
import RIKU.server.Dto.User.Response.ReadUsersResponse;
import RIKU.server.Dto.User.Response.SearchAdminUsersResponse;
import RIKU.server.Dto.User.Request.UpdateUsersRequest;
import RIKU.server.Entity.Base.BaseStatus;
import RIKU.server.Entity.Participant.ParticipantStatus;
import RIKU.server.Entity.User.User;
import RIKU.server.Entity.User.UserRole;
import RIKU.server.Repository.ParticipantRepository;
import RIKU.server.Repository.UserPointRepository;
import RIKU.server.Repository.UserRepository;
import RIKU.server.Security.AuthMember;
import RIKU.server.Util.BaseResponseStatus;
import RIKU.server.Util.Exception.Domain.UserException;
package RIKU.server.domains.admin.service;

import RIKU.server.domains.season.SeasonProvider;
import RIKU.server.domains.admin.dto.request.AuthorizePacerRequest;
import RIKU.server.domains.admin.dto.response.ReadPacersResponse;
import RIKU.server.domains.admin.dto.response.ReadUsersResponse;
import RIKU.server.domains.admin.dto.response.SearchAdminUsersResponse;
import RIKU.server.domains.admin.dto.request.UpdateUsersRequest;
import RIKU.server.global.entity.BaseStatus;
import RIKU.server.domains.run.participant.entity.ParticipantStatus;
import RIKU.server.domains.user.entity.User;
import RIKU.server.domains.user.entity.UserRole;
import RIKU.server.domains.run.participant.repository.ParticipantRepository;
import RIKU.server.domains.point.repository.UserPointRepository;
import RIKU.server.domains.user.repository.UserRepository;
import RIKU.server.security.AuthMember;
import RIKU.server.global.response.BaseResponseStatus;
import RIKU.server.domains.user.exception.UserException;
import lombok.RequiredArgsConstructor;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Service;
Expand Down
20 changes: 10 additions & 10 deletions ...IKU/server/Controller/AuthController.java → ...mains/auth/controller/AuthController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package RIKU.server.Controller;
package RIKU.server.domains.auth.controller;

import RIKU.server.Dto.User.Request.LoginUserRequest;
import RIKU.server.Dto.User.Response.LoginUserResponse;
import RIKU.server.Dto.User.Response.UpdateUserRoleResponse;
import RIKU.server.Entity.User.UserRole;
import RIKU.server.Service.AuthService;
import RIKU.server.Util.BaseResponse;
import RIKU.server.Util.BaseResponseStatus;
import RIKU.server.Util.Exception.Domain.UserException;
import RIKU.server.Util.Exception.Validation.FieldValidationException;
import RIKU.server.domains.auth.dto.request.LoginUserRequest;
import RIKU.server.domains.auth.dto.response.LoginUserResponse;
import RIKU.server.domains.auth.dto.response.UpdateUserRoleResponse;
import RIKU.server.domains.user.entity.UserRole;
import RIKU.server.domains.auth.service.AuthService;
import RIKU.server.global.response.BaseResponse;
import RIKU.server.global.response.BaseResponseStatus;
import RIKU.server.domains.user.exception.UserException;
import RIKU.server.global.validation.FieldValidationException;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
Expand Down
2 changes: 1 addition & 1 deletion ...er/Dto/User/Request/LoginUserRequest.java → ...ns/auth/dto/request/LoginUserRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package RIKU.server.Dto.User.Request;
package RIKU.server.domains.auth.dto.request;

import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Pattern;
Expand Down
4 changes: 2 additions & 2 deletions .../Dto/User/Response/LoginUserResponse.java → .../auth/dto/response/LoginUserResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package RIKU.server.Dto.User.Response;
package RIKU.server.domains.auth.dto.response;

import RIKU.server.Security.JwtInfo;
import RIKU.server.security.JwtInfo;
import lombok.Getter;

@Getter
Expand Down
6 changes: 3 additions & 3 deletions ...User/Response/UpdateUserRoleResponse.java → .../dto/response/UpdateUserRoleResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package RIKU.server.Dto.User.Response;
package RIKU.server.domains.auth.dto.response;

import RIKU.server.Entity.User.UserRole;
import RIKU.server.Security.JwtInfo;
import RIKU.server.domains.user.entity.UserRole;
import RIKU.server.security.JwtInfo;
import lombok.Getter;
import lombok.NoArgsConstructor;

Expand Down
24 changes: 12 additions & 12 deletions ...java/RIKU/server/Service/AuthService.java → ...ver/domains/auth/service/AuthService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
package RIKU.server.Service;
package RIKU.server.domains.auth.service;

import RIKU.server.Dto.User.Request.LoginUserRequest;
import RIKU.server.Dto.User.Response.LoginUserResponse;
import RIKU.server.Dto.User.Response.UpdateUserRoleResponse;
import RIKU.server.Entity.User.User;
import RIKU.server.Entity.User.UserRole;
import RIKU.server.Repository.UserRepository;
import RIKU.server.Security.AuthMember;
import RIKU.server.Security.JwtInfo;
import RIKU.server.Security.JwtTokenProvider;
import RIKU.server.Util.BaseResponseStatus;
import RIKU.server.Util.Exception.Domain.UserException;
import RIKU.server.domains.auth.dto.request.LoginUserRequest;
import RIKU.server.domains.auth.dto.response.LoginUserResponse;
import RIKU.server.domains.auth.dto.response.UpdateUserRoleResponse;
import RIKU.server.domains.user.entity.User;
import RIKU.server.domains.user.entity.UserRole;
import RIKU.server.domains.user.repository.UserRepository;
import RIKU.server.security.AuthMember;
import RIKU.server.security.JwtInfo;
import RIKU.server.security.JwtTokenProvider;
import RIKU.server.global.response.BaseResponseStatus;
import RIKU.server.domains.user.exception.UserException;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
Expand Down
14 changes: 7 additions & 7 deletions ...server/Controller/CalendarController.java → ...lendar/controller/CalendarController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package RIKU.server.Controller;
package RIKU.server.domains.calendar.controller;

import RIKU.server.Dto.Calendar.Response.ListMonthlyScheduleResponse;
import RIKU.server.Dto.Calendar.Response.ReadDailyScheduleResponse;
import RIKU.server.Dto.Calendar.Response.ReadMonthlyScheduleResponse;
import RIKU.server.Security.AuthMember;
import RIKU.server.Service.CalendarService;
import RIKU.server.Util.BaseResponse;
import RIKU.server.domains.calendar.dto.response.ListMonthlyScheduleResponse;
import RIKU.server.domains.calendar.dto.response.ReadDailyScheduleResponse;
import RIKU.server.domains.calendar.dto.response.ReadMonthlyScheduleResponse;
import RIKU.server.security.AuthMember;
import RIKU.server.domains.calendar.service.CalendarService;
import RIKU.server.global.response.BaseResponse;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
Expand Down
8 changes: 4 additions & 4 deletions ...Response/ListMonthlyScheduleResponse.java → ...response/ListMonthlyScheduleResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package RIKU.server.Dto.Calendar.Response;
package RIKU.server.domains.calendar.dto.response;

import RIKU.server.Entity.Base.BaseStatus;
import RIKU.server.Entity.User.User;
import RIKU.server.Entity.User.UserRole;
import RIKU.server.global.entity.BaseStatus;
import RIKU.server.domains.user.entity.User;
import RIKU.server.domains.user.entity.UserRole;
import lombok.Getter;

import java.util.List;
Expand Down
4 changes: 2 additions & 2 deletions ...r/Response/ReadDailyScheduleResponse.java → ...o/response/ReadDailyScheduleResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package RIKU.server.Dto.Calendar.Response;
package RIKU.server.domains.calendar.dto.response;

import RIKU.server.Entity.Board.Post.Post;
import RIKU.server.domains.run.post.entity.Post;
import lombok.Getter;

import java.time.LocalDateTime;
Expand Down
2 changes: 1 addition & 1 deletion ...Response/ReadMonthlyScheduleResponse.java → ...response/ReadMonthlyScheduleResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package RIKU.server.Dto.Calendar.Response;
package RIKU.server.domains.calendar.dto.response;

import lombok.Getter;

Expand Down
28 changes: 14 additions & 14 deletions .../RIKU/server/Service/CalendarService.java → ...ins/calendar/service/CalendarService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
package RIKU.server.Service;

import RIKU.server.Dto.Calendar.Response.ListMonthlyScheduleResponse;
import RIKU.server.Dto.Calendar.Response.ReadDailyScheduleResponse;
import RIKU.server.Dto.Calendar.Response.ReadMonthlyScheduleResponse;
import RIKU.server.Entity.Base.BaseStatus;
import RIKU.server.Entity.Board.Post.Post;
import RIKU.server.Entity.User.User;
import RIKU.server.Repository.PostRepository;
import RIKU.server.Repository.UserRepository;
import RIKU.server.Security.AuthMember;
import RIKU.server.Util.BaseResponseStatus;
import RIKU.server.Util.Exception.Domain.UserException;
package RIKU.server.domains.calendar.service;

import RIKU.server.domains.calendar.dto.response.ListMonthlyScheduleResponse;
import RIKU.server.domains.calendar.dto.response.ReadDailyScheduleResponse;
import RIKU.server.domains.calendar.dto.response.ReadMonthlyScheduleResponse;
import RIKU.server.global.entity.BaseStatus;
import RIKU.server.domains.run.post.entity.Post;
import RIKU.server.domains.user.entity.User;
import RIKU.server.domains.run.post.repository.PostRepository;
import RIKU.server.domains.user.repository.UserRepository;
import RIKU.server.security.AuthMember;
import RIKU.server.global.response.BaseResponseStatus;
import RIKU.server.domains.user.exception.UserException;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
Expand All @@ -25,7 +25,7 @@
import java.util.Map;
import java.util.stream.Collectors;

import static RIKU.server.Util.DateTimeUtils.*;
import static RIKU.server.global.util.DateTimeUtils.*;


@Service
Expand Down
16 changes: 8 additions & 8 deletions ...erver/Controller/UserPointController.java → ...point/controller/UserPointController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package RIKU.server.Controller;
package RIKU.server.domains.point.controller;

import RIKU.server.Dto.User.Request.ReadUserEventRankingRequest;
import RIKU.server.Dto.User.Response.ReadUserParticipationsResponse;
import RIKU.server.Dto.User.Response.ReadUserRankingResponse;
import RIKU.server.Security.AuthMember;
import RIKU.server.Service.UserPointService;
import RIKU.server.Util.BaseResponse;
import RIKU.server.Util.Exception.Validation.FieldValidationException;
import RIKU.server.domains.point.dto.request.ReadUserEventRankingRequest;
import RIKU.server.domains.point.dto.response.ReadUserParticipationsResponse;
import RIKU.server.domains.point.dto.response.ReadUserRankingResponse;
import RIKU.server.security.AuthMember;
import RIKU.server.domains.point.service.UserPointService;
import RIKU.server.global.response.BaseResponse;
import RIKU.server.global.validation.FieldValidationException;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
Expand Down
Loading