Skip to content

[♻️ refactor/#237] 도메인 기반 폴더링 구조로 변경 #240

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

Merged
junggyo1020 merged 4 commits into from
May 11, 2025
Merged

[♻️ refactor/#237] 도메인 기반 폴더링 구조로 변경 #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e70d7be
[refactor] 도메인 기반 폴더링 구조로 수정 - common
junggyo1020 May 10, 2025
1b51795
[refactor] 도메인 기반 폴더링 구조로 수정 - common
junggyo1020 May 10, 2025
34ea30b
[refactor] 도메인 기반 폴더링 구조로 수정
junggyo1020 May 10, 2025
9ea6df6
[refactor] 도메인 기반 폴더링 구조로 수정
junggyo1020 May 10, 2025
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
9 changes: 6 additions & 3 deletions src/main/java/org/terning/terningserver/auth/api/AuthController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,20 @@
import org.springframework.security.core.annotation.AuthenticationPrincipal;
import org.springframework.web.bind.annotation.*;
import org.terning.terningserver.auth.application.AuthService;
import org.terning.terningserver.controller.swagger.AuthSwagger;
import org.terning.terningserver.auth.dto.request.SignInRequest;
import org.terning.terningserver.auth.dto.request.SignUpFilterRequestDto;
import org.terning.terningserver.auth.dto.request.SignUpRequestDto;
import org.terning.terningserver.auth.dto.response.AccessTokenGetResponseDto;
import org.terning.terningserver.auth.dto.response.SignInResponse;
import org.terning.terningserver.auth.dto.response.SignUpResponseDto;
import org.terning.terningserver.exception.dto.SuccessResponse;
import org.terning.terningserver.common.exception.dto.SuccessResponse;

import static org.terning.terningserver.auth.common.success.AuthSuccessCode.SUCCESS_SIGN_IN;
import static org.terning.terningserver.exception.enums.SuccessMessage.*;
import static org.terning.terningserver.common.exception.enums.SuccessMessage.SUCCESS_REISSUE_TOKEN;
import static org.terning.terningserver.common.exception.enums.SuccessMessage.SUCCESS_SIGN_OUT;
import static org.terning.terningserver.common.exception.enums.SuccessMessage.SUCCESS_SIGN_UP;
import static org.terning.terningserver.common.exception.enums.SuccessMessage.SUCCESS_SIGN_UP_FILTER;
import static org.terning.terningserver.common.exception.enums.SuccessMessage.SUCCESS_WITHDRAW;


@RestController
Expand Down
4 changes: 2 additions & 2 deletions ...erver/controller/swagger/AuthSwagger.java → ...g/terningserver/auth/api/AuthSwagger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.terning.terningserver.controller.swagger;
package org.terning.terningserver.auth.api;

import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
Expand All @@ -13,7 +13,7 @@
import org.terning.terningserver.auth.dto.response.AccessTokenGetResponseDto;
import org.terning.terningserver.auth.dto.response.SignInResponse;
import org.terning.terningserver.auth.dto.response.SignUpResponseDto;
import org.terning.terningserver.exception.dto.SuccessResponse;
import org.terning.terningserver.common.exception.dto.SuccessResponse;

@Tag(name = "Auth", description = "소셜 로그인 및 회원가입 API")
public interface AuthSwagger {
Expand Down
14 changes: 7 additions & 7 deletions src/main/java/org/terning/terningserver/auth/application/reissue/AuthReissueServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.terning.terningserver.jwt.application.JwtTokenManager;
import org.terning.terningserver.domain.Token;
import org.terning.terningserver.domain.User;
import org.terning.terningserver.common.security.jwt.application.JwtTokenManager;
import org.terning.terningserver.user.domain.Token;
import org.terning.terningserver.user.domain.User;
import org.terning.terningserver.auth.dto.response.AccessTokenGetResponseDto;
import org.terning.terningserver.exception.CustomException;
import org.terning.terningserver.jwt.auth.TokenExtractor;
import org.terning.terningserver.repository.user.UserRepository;
import org.terning.terningserver.common.exception.CustomException;
import org.terning.terningserver.common.security.jwt.auth.TokenExtractor;
import org.terning.terningserver.user.repository.UserRepository;

import static org.terning.terningserver.exception.enums.ErrorMessage.FAILED_TOKEN_REISSUE;
import static org.terning.terningserver.common.exception.enums.ErrorMessage.FAILED_TOKEN_REISSUE;

@Service
@RequiredArgsConstructor
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/org/terning/terningserver/auth/application/signin/AuthSignInServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
import org.springframework.transaction.annotation.Transactional;
import org.terning.terningserver.auth.application.social.SocialAuthProvider;
import org.terning.terningserver.auth.application.social.SocialAuthServiceManager;
import org.terning.terningserver.external.notification.NotificationUserClient;
import org.terning.terningserver.jwt.application.JwtTokenManager;
import org.terning.terningserver.domain.Token;
import org.terning.terningserver.domain.User;
import org.terning.terningserver.domain.enums.AuthType;
import org.terning.terningserver.external.pushNotification.notification.NotificationUserClient;
import org.terning.terningserver.common.security.jwt.application.JwtTokenManager;
import org.terning.terningserver.user.domain.Token;
import org.terning.terningserver.user.domain.User;
import org.terning.terningserver.user.domain.AuthType;
import org.terning.terningserver.auth.dto.request.SignInRequest;
import org.terning.terningserver.auth.dto.response.SignInResponse;
import org.terning.terningserver.repository.user.UserRepository;
import org.terning.terningserver.user.repository.UserRepository;

@Service
@RequiredArgsConstructor
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/org/terning/terningserver/auth/application/signout/AuthSignOutServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
import lombok.val;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.terning.terningserver.domain.User;
import org.terning.terningserver.exception.CustomException;
import org.terning.terningserver.repository.user.UserRepository;
import org.terning.terningserver.user.domain.User;
import org.terning.terningserver.common.exception.CustomException;
import org.terning.terningserver.user.repository.UserRepository;

import static org.terning.terningserver.exception.enums.ErrorMessage.INVALID_USER;
import static org.terning.terningserver.common.exception.enums.ErrorMessage.INVALID_USER;

@Service
@RequiredArgsConstructor
Expand Down
32 changes: 16 additions & 16 deletions src/main/java/org/terning/terningserver/auth/application/signup/AuthSignUpServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
package org.terning.terningserver.auth.application.signup;

import static org.terning.terningserver.common.exception.enums.ErrorMessage.FAILED_SIGN_UP_USER_FILTER_CREATION;

import lombok.RequiredArgsConstructor;
import lombok.val;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.terning.terningserver.domain.enums.Grade;
import org.terning.terningserver.domain.enums.JobType;
import org.terning.terningserver.domain.enums.ProfileImage;
import org.terning.terningserver.domain.enums.PushNotificationStatus;
import org.terning.terningserver.domain.enums.WorkingPeriod;
import org.terning.terningserver.external.notification.NotificationUserClient;
import org.terning.terningserver.jwt.application.JwtTokenManager;
import org.terning.terningserver.domain.Filter;
import org.terning.terningserver.domain.Token;
import org.terning.terningserver.domain.User;
import org.terning.terningserver.filter.domain.Grade;
import org.terning.terningserver.filter.domain.JobType;
import org.terning.terningserver.user.domain.ProfileImage;
import org.terning.terningserver.user.domain.PushNotificationStatus;
import org.terning.terningserver.filter.domain.WorkingPeriod;
import org.terning.terningserver.external.pushNotification.notification.NotificationUserClient;
import org.terning.terningserver.common.security.jwt.application.JwtTokenManager;
import org.terning.terningserver.filter.domain.Filter;
import org.terning.terningserver.user.domain.Token;
import org.terning.terningserver.user.domain.User;
import org.terning.terningserver.auth.dto.request.SignUpFilterRequestDto;
import org.terning.terningserver.auth.dto.request.SignUpRequestDto;
import org.terning.terningserver.auth.dto.request.SignUpWithAuthIdRequestDto;
import org.terning.terningserver.auth.dto.response.SignUpResponseDto;
import org.terning.terningserver.event.UserSignedUpEvent;
import org.terning.terningserver.exception.CustomException;
import org.terning.terningserver.repository.filter.FilterRepository;
import org.terning.terningserver.repository.user.UserRepository;

import static org.terning.terningserver.exception.enums.ErrorMessage.*;
import org.terning.terningserver.user.event.UserSignedUpEvent;
import org.terning.terningserver.common.exception.CustomException;
import org.terning.terningserver.filter.repository.FilterRepository;
import org.terning.terningserver.user.repository.UserRepository;

@Service
@RequiredArgsConstructor
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/terning/terningserver/auth/application/social/SocialAuthProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.terning.terningserver.auth.application.social;

import org.terning.terningserver.domain.enums.AuthType;
import org.terning.terningserver.user.domain.AuthType;

public interface SocialAuthProvider {
String getAuthId(String authAccessToken);
Expand Down
2 changes: 1 addition & 1 deletion ...main/java/org/terning/terningserver/auth/application/social/SocialAuthServiceManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.terning.terningserver.auth.application.social;

import org.terning.terningserver.domain.enums.AuthType;
import org.terning.terningserver.user.domain.AuthType;

import java.util.List;
import java.util.Map;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/terning/terningserver/auth/application/social/apple/AppleAuthProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.terning.terningserver.auth.application.social.SocialAuthProvider;
import org.terning.terningserver.domain.enums.AuthType;
import org.terning.terningserver.user.domain.AuthType;

@Service
@RequiredArgsConstructor
Expand Down
6 changes: 3 additions & 3 deletions ...java/org/terning/terningserver/auth/application/social/apple/AppleAuthTokenValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpMethod;
import org.springframework.stereotype.Component;
import org.terning.terningserver.config.ValueConfig;
import org.terning.terningserver.exception.CustomException;
import org.terning.terningserver.common.config.ValueConfig;
import org.terning.terningserver.common.exception.CustomException;

import java.io.BufferedReader;
import java.io.IOException;
Expand All @@ -23,7 +23,7 @@
import java.util.Base64;
import java.util.Objects;

import static org.terning.terningserver.exception.enums.ErrorMessage.INVALID_KEY;
import static org.terning.terningserver.common.exception.enums.ErrorMessage.INVALID_KEY;

@Component
@RequiredArgsConstructor
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/terning/terningserver/auth/application/social/kakao/KakaoAuthProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.terning.terningserver.auth.application.social.SocialAuthProvider;
import org.terning.terningserver.domain.enums.AuthType;
import org.terning.terningserver.user.domain.AuthType;

@Service
@RequiredArgsConstructor
Expand Down
6 changes: 3 additions & 3 deletions ...java/org/terning/terningserver/auth/application/social/kakao/KakaoAuthTokenValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.client.RestTemplate;
import org.terning.terningserver.config.ValueConfig;
import org.terning.terningserver.exception.CustomException;
import org.terning.terningserver.common.config.ValueConfig;
import org.terning.terningserver.common.exception.CustomException;

import java.util.Map;

import static org.terning.terningserver.exception.enums.ErrorMessage.FAILED_SOCIAL_LOGIN;
import static org.terning.terningserver.common.exception.enums.ErrorMessage.FAILED_SOCIAL_LOGIN;

@Component
@RequiredArgsConstructor
Expand Down
10 changes: 5 additions & 5 deletions ...ain/java/org/terning/terningserver/auth/application/withdraw/AuthWithdrawServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
import lombok.val;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.terning.terningserver.domain.User;
import org.terning.terningserver.exception.CustomException;
import org.terning.terningserver.repository.user.UserRepository;
import org.terning.terningserver.service.UserService;
import org.terning.terningserver.user.domain.User;
import org.terning.terningserver.common.exception.CustomException;
import org.terning.terningserver.user.repository.UserRepository;
import org.terning.terningserver.user.application.UserService;

import static org.terning.terningserver.exception.enums.ErrorMessage.INVALID_USER;
import static org.terning.terningserver.common.exception.enums.ErrorMessage.INVALID_USER;

@Service
@RequiredArgsConstructor
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/terning/terningserver/auth/common/success/AuthSuccessCode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import lombok.AllArgsConstructor;
import lombok.Getter;
import org.springframework.http.HttpStatus;
import org.terning.terningserver.exception.SuccessCode;
import org.terning.terningserver.common.exception.SuccessCode;

@Getter
@AllArgsConstructor
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/terning/terningserver/auth/dto/request/SignInRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.terning.terningserver.auth.dto.request;

import lombok.NonNull;
import org.terning.terningserver.domain.enums.AuthType;
import org.terning.terningserver.user.domain.AuthType;

public record SignInRequest(@NonNull AuthType authType, String fcmToken) {
public static SignInRequest of(AuthType authType, String fcmToken){
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/terning/terningserver/auth/dto/request/SignUpRequestDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import lombok.Builder;
import lombok.NonNull;
import org.terning.terningserver.domain.enums.AuthType;
import org.terning.terningserver.user.domain.AuthType;

import static lombok.AccessLevel.PRIVATE;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/terning/terningserver/auth/dto/request/SignUpWithAuthIdRequestDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import lombok.Builder;
import lombok.NonNull;
import org.terning.terningserver.domain.enums.AuthType;
import org.terning.terningserver.user.domain.AuthType;

import static lombok.AccessLevel.*;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/terning/terningserver/auth/dto/response/AccessTokenGetResponseDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import lombok.Builder;
import lombok.NonNull;
import org.terning.terningserver.domain.Token;
import org.terning.terningserver.user.domain.Token;

import static lombok.AccessLevel.*;

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/terning/terningserver/auth/dto/response/SignInResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.terning.terningserver.auth.dto.response;

import org.terning.terningserver.domain.Token;
import org.terning.terningserver.domain.enums.AuthType;
import org.terning.terningserver.user.domain.Token;
import org.terning.terningserver.user.domain.AuthType;

import java.util.Optional;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/terning/terningserver/auth/dto/response/SignUpResponseDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.terning.terningserver.auth.dto.response;

import org.terning.terningserver.domain.enums.AuthType;
import org.terning.terningserver.user.domain.AuthType;

public record SignUpResponseDto(
String accessToken,
Expand Down
11 changes: 5 additions & 6 deletions ...ngserver/controller/BannerController.java → ...ngserver/banner/api/BannerController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.terning.terningserver.controller;
package org.terning.terningserver.banner.api;


import lombok.RequiredArgsConstructor;
Expand All @@ -8,11 +8,10 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import org.terning.terningserver.controller.swagger.BannerSwagger;
import org.terning.terningserver.dto.Banner.BannerListResponseDto;
import org.terning.terningserver.exception.dto.SuccessResponse;
import org.terning.terningserver.exception.enums.SuccessMessage;
import org.terning.terningserver.service.BannerService;
import org.terning.terningserver.banner.dto.response.BannerListResponseDto;
import org.terning.terningserver.common.exception.dto.SuccessResponse;
import org.terning.terningserver.common.exception.enums.SuccessMessage;
import org.terning.terningserver.banner.application.BannerService;

@RestController
@RequiredArgsConstructor
Expand Down
6 changes: 3 additions & 3 deletions ...ver/controller/swagger/BannerSwagger.java → ...rningserver/banner/api/BannerSwagger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package org.terning.terningserver.controller.swagger;
package org.terning.terningserver.banner.api;


import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;

import org.springframework.http.ResponseEntity;

import org.terning.terningserver.dto.Banner.BannerListResponseDto;
import org.terning.terningserver.exception.dto.SuccessResponse;
import org.terning.terningserver.banner.dto.response.BannerListResponseDto;
import org.terning.terningserver.common.exception.dto.SuccessResponse;

@Tag(name= "Banner", description = "탐색 > 배너 조회 관련 API")
public interface BannerSwagger {
Expand Down
8 changes: 8 additions & 0 deletions src/main/java/org/terning/terningserver/banner/application/BannerService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package org.terning.terningserver.banner.application;

import org.terning.terningserver.banner.dto.response.BannerListResponseDto;

public interface BannerService {

public BannerListResponseDto getBanners();
}
8 changes: 4 additions & 4 deletions ...ningserver/service/BannerServiceImpl.java → ...banner/application/BannerServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package org.terning.terningserver.service;
package org.terning.terningserver.banner.application;

import org.springframework.stereotype.Service;
import org.terning.terningserver.domain.Banner;
import org.terning.terningserver.dto.Banner.BannerListResponseDto;
import org.terning.terningserver.repository.Banner.BannerRepository;
import org.terning.terningserver.banner.domain.Banner;
import org.terning.terningserver.banner.dto.response.BannerListResponseDto;
import org.terning.terningserver.banner.repository.BannerRepository;

import lombok.RequiredArgsConstructor;

Expand Down
2 changes: 1 addition & 1 deletion .../terning/terningserver/domain/Banner.java → ...g/terningserver/banner/domain/Banner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.terning.terningserver.domain;
package org.terning.terningserver.banner.domain;

import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
Expand Down
4 changes: 2 additions & 2 deletions ...ver/dto/Banner/BannerListResponseDto.java → ...r/dto/response/BannerListResponseDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.terning.terningserver.dto.Banner;
package org.terning.terningserver.banner.dto.response;

import org.terning.terningserver.domain.Banner;
import org.terning.terningserver.banner.domain.Banner;

import java.util.List;

Expand Down
4 changes: 2 additions & 2 deletions ...r/repository/Banner/BannerRepository.java → ...r/banner/repository/BannerRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.terning.terningserver.repository.Banner;
package org.terning.terningserver.banner.repository;

import org.springframework.data.repository.Repository;
import org.terning.terningserver.domain.Banner;
import org.terning.terningserver.banner.domain.Banner;

import java.util.List;

Expand Down
Loading
Loading