Skip to content

Commit c2d80e0

Browse files
junggyo1020junggyo1020
authored
Merge pull request #241 from teamterning/develop
[🔀 merge] [4차] 코드 리펙토링 사항 스테이징 서버에 적용 (6)
2 parents 8cc1310 + 5c927be commit c2d80e0

177 files changed

Lines changed: 761 additions & 681 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/main/java/org/terning/terningserver/auth/api/AuthController.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,20 @@
66
import org.springframework.security.core.annotation.AuthenticationPrincipal;
77
import org.springframework.web.bind.annotation.*;
88
import org.terning.terningserver.auth.application.AuthService;
9-
import org.terning.terningserver.controller.swagger.AuthSwagger;
109
import org.terning.terningserver.auth.dto.request.SignInRequest;
1110
import org.terning.terningserver.auth.dto.request.SignUpFilterRequestDto;
1211
import org.terning.terningserver.auth.dto.request.SignUpRequestDto;
1312
import org.terning.terningserver.auth.dto.response.AccessTokenGetResponseDto;
1413
import org.terning.terningserver.auth.dto.response.SignInResponse;
1514
import org.terning.terningserver.auth.dto.response.SignUpResponseDto;
16-
import org.terning.terningserver.exception.dto.SuccessResponse;
15+
import org.terning.terningserver.common.exception.dto.SuccessResponse;
1716

1817
import static org.terning.terningserver.auth.common.success.AuthSuccessCode.SUCCESS_SIGN_IN;
19-
import static org.terning.terningserver.exception.enums.SuccessMessage.*;
18+
import static org.terning.terningserver.common.exception.enums.SuccessMessage.SUCCESS_REISSUE_TOKEN;
19+
import static org.terning.terningserver.common.exception.enums.SuccessMessage.SUCCESS_SIGN_OUT;
20+
import static org.terning.terningserver.common.exception.enums.SuccessMessage.SUCCESS_SIGN_UP;
21+
import static org.terning.terningserver.common.exception.enums.SuccessMessage.SUCCESS_SIGN_UP_FILTER;
22+
import static org.terning.terningserver.common.exception.enums.SuccessMessage.SUCCESS_WITHDRAW;
2023

2124

2225
@RestController

src/main/java/org/terning/terningserver/controller/swagger/AuthSwagger.java renamed to src/main/java/org/terning/terningserver/auth/api/AuthSwagger.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.terning.terningserver.controller.swagger;
1+
package org.terning.terningserver.auth.api;
22

33
import io.swagger.v3.oas.annotations.Operation;
44
import io.swagger.v3.oas.annotations.Parameter;
@@ -13,7 +13,7 @@
1313
import org.terning.terningserver.auth.dto.response.AccessTokenGetResponseDto;
1414
import org.terning.terningserver.auth.dto.response.SignInResponse;
1515
import org.terning.terningserver.auth.dto.response.SignUpResponseDto;
16-
import org.terning.terningserver.exception.dto.SuccessResponse;
16+
import org.terning.terningserver.common.exception.dto.SuccessResponse;
1717

1818
@Tag(name = "Auth", description = "소셜 로그인 및 회원가입 API")
1919
public interface AuthSwagger {

‎src/main/java/org/terning/terningserver/auth/application/reissue/AuthReissueServiceImpl.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
import lombok.RequiredArgsConstructor;
44
import org.springframework.stereotype.Service;
55
import org.springframework.transaction.annotation.Transactional;
6-
import org.terning.terningserver.jwt.application.JwtTokenManager;
7-
import org.terning.terningserver.domain.Token;
8-
import org.terning.terningserver.domain.User;
6+
import org.terning.terningserver.common.security.jwt.application.JwtTokenManager;
7+
import org.terning.terningserver.user.domain.Token;
8+
import org.terning.terningserver.user.domain.User;
99
import org.terning.terningserver.auth.dto.response.AccessTokenGetResponseDto;
10-
import org.terning.terningserver.exception.CustomException;
11-
import org.terning.terningserver.jwt.auth.TokenExtractor;
12-
import org.terning.terningserver.repository.user.UserRepository;
10+
import org.terning.terningserver.common.exception.CustomException;
11+
import org.terning.terningserver.common.security.jwt.auth.TokenExtractor;
12+
import org.terning.terningserver.user.repository.UserRepository;
1313

14-
import static org.terning.terningserver.exception.enums.ErrorMessage.FAILED_TOKEN_REISSUE;
14+
import static org.terning.terningserver.common.exception.enums.ErrorMessage.FAILED_TOKEN_REISSUE;
1515

1616
@Service
1717
@RequiredArgsConstructor

‎src/main/java/org/terning/terningserver/auth/application/signin/AuthSignInServiceImpl.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
import org.springframework.transaction.annotation.Transactional;
66
import org.terning.terningserver.auth.application.social.SocialAuthProvider;
77
import org.terning.terningserver.auth.application.social.SocialAuthServiceManager;
8-
import org.terning.terningserver.external.notification.NotificationUserClient;
9-
import org.terning.terningserver.jwt.application.JwtTokenManager;
10-
import org.terning.terningserver.domain.Token;
11-
import org.terning.terningserver.domain.User;
12-
import org.terning.terningserver.domain.enums.AuthType;
8+
import org.terning.terningserver.external.pushNotification.notification.NotificationUserClient;
9+
import org.terning.terningserver.common.security.jwt.application.JwtTokenManager;
10+
import org.terning.terningserver.user.domain.Token;
11+
import org.terning.terningserver.user.domain.User;
12+
import org.terning.terningserver.user.domain.AuthType;
1313
import org.terning.terningserver.auth.dto.request.SignInRequest;
1414
import org.terning.terningserver.auth.dto.response.SignInResponse;
15-
import org.terning.terningserver.repository.user.UserRepository;
15+
import org.terning.terningserver.user.repository.UserRepository;
1616

1717
@Service
1818
@RequiredArgsConstructor
@@ -41,7 +41,7 @@ public SignInResponse signIn(String authAccessToken, SignInRequest request) {
4141
// boolean fcmReissueRequired = fcmTokenValidationClient.requestFcmTokenValidation(user.getId());
4242

4343
if (request.fcmToken() != null && !request.fcmToken().trim().isEmpty()) {
44-
notificationUserClient.updateFcmToken(user.getId(), request.fcmToken());
44+
notificationUserClient.createOrUpdateUser(user, request.fcmToken());
4545
}
4646

4747
// return SignInResponse.of(token, authId, request.authType(), user.getId(), fcmReissueRequired);

‎src/main/java/org/terning/terningserver/auth/application/signout/AuthSignOutServiceImpl.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
import lombok.val;
55
import org.springframework.stereotype.Service;
66
import org.springframework.transaction.annotation.Transactional;
7-
import org.terning.terningserver.domain.User;
8-
import org.terning.terningserver.exception.CustomException;
9-
import org.terning.terningserver.repository.user.UserRepository;
7+
import org.terning.terningserver.user.domain.User;
8+
import org.terning.terningserver.common.exception.CustomException;
9+
import org.terning.terningserver.user.repository.UserRepository;
1010

11-
import static org.terning.terningserver.exception.enums.ErrorMessage.INVALID_USER;
11+
import static org.terning.terningserver.common.exception.enums.ErrorMessage.INVALID_USER;
1212

1313
@Service
1414
@RequiredArgsConstructor

‎src/main/java/org/terning/terningserver/auth/application/signup/AuthSignUpServiceImpl.java‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
package org.terning.terningserver.auth.application.signup;
22

3+
import static org.terning.terningserver.common.exception.enums.ErrorMessage.FAILED_SIGN_UP_USER_FILTER_CREATION;
4+
35
import lombok.RequiredArgsConstructor;
46
import lombok.val;
57
import org.springframework.context.ApplicationEventPublisher;
68
import org.springframework.stereotype.Service;
79
import org.springframework.transaction.annotation.Transactional;
8-
import org.terning.terningserver.domain.enums.Grade;
9-
import org.terning.terningserver.domain.enums.JobType;
10-
import org.terning.terningserver.domain.enums.ProfileImage;
11-
import org.terning.terningserver.domain.enums.PushNotificationStatus;
12-
import org.terning.terningserver.domain.enums.WorkingPeriod;
13-
import org.terning.terningserver.external.notification.NotificationUserClient;
14-
import org.terning.terningserver.jwt.application.JwtTokenManager;
15-
import org.terning.terningserver.domain.Filter;
16-
import org.terning.terningserver.domain.Token;
17-
import org.terning.terningserver.domain.User;
10+
import org.terning.terningserver.filter.domain.Grade;
11+
import org.terning.terningserver.filter.domain.JobType;
12+
import org.terning.terningserver.user.domain.ProfileImage;
13+
import org.terning.terningserver.user.domain.PushNotificationStatus;
14+
import org.terning.terningserver.filter.domain.WorkingPeriod;
15+
import org.terning.terningserver.external.pushNotification.notification.NotificationUserClient;
16+
import org.terning.terningserver.common.security.jwt.application.JwtTokenManager;
17+
import org.terning.terningserver.filter.domain.Filter;
18+
import org.terning.terningserver.user.domain.Token;
19+
import org.terning.terningserver.user.domain.User;
1820
import org.terning.terningserver.auth.dto.request.SignUpFilterRequestDto;
1921
import org.terning.terningserver.auth.dto.request.SignUpRequestDto;
2022
import org.terning.terningserver.auth.dto.request.SignUpWithAuthIdRequestDto;
2123
import org.terning.terningserver.auth.dto.response.SignUpResponseDto;
22-
import org.terning.terningserver.event.UserSignedUpEvent;
23-
import org.terning.terningserver.exception.CustomException;
24-
import org.terning.terningserver.repository.filter.FilterRepository;
25-
import org.terning.terningserver.repository.user.UserRepository;
26-
27-
import static org.terning.terningserver.exception.enums.ErrorMessage.*;
24+
import org.terning.terningserver.user.event.UserSignedUpEvent;
25+
import org.terning.terningserver.common.exception.CustomException;
26+
import org.terning.terningserver.filter.repository.FilterRepository;
27+
import org.terning.terningserver.user.repository.UserRepository;
2828

2929
@Service
3030
@RequiredArgsConstructor

‎src/main/java/org/terning/terningserver/auth/application/social/SocialAuthProvider.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.terning.terningserver.auth.application.social;
22

3-
import org.terning.terningserver.domain.enums.AuthType;
3+
import org.terning.terningserver.user.domain.AuthType;
44

55
public interface SocialAuthProvider {
66
String getAuthId(String authAccessToken);

‎src/main/java/org/terning/terningserver/auth/application/social/SocialAuthServiceManager.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.terning.terningserver.auth.application.social;
22

3-
import org.terning.terningserver.domain.enums.AuthType;
3+
import org.terning.terningserver.user.domain.AuthType;
44

55
import java.util.List;
66
import java.util.Map;

‎src/main/java/org/terning/terningserver/auth/application/social/apple/AppleAuthProvider.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import lombok.RequiredArgsConstructor;
44
import org.springframework.stereotype.Service;
55
import org.terning.terningserver.auth.application.social.SocialAuthProvider;
6-
import org.terning.terningserver.domain.enums.AuthType;
6+
import org.terning.terningserver.user.domain.AuthType;
77

88
@Service
99
@RequiredArgsConstructor

‎src/main/java/org/terning/terningserver/auth/application/social/apple/AppleAuthTokenValidator.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import lombok.RequiredArgsConstructor;
77
import org.springframework.http.HttpMethod;
88
import org.springframework.stereotype.Component;
9-
import org.terning.terningserver.config.ValueConfig;
10-
import org.terning.terningserver.exception.CustomException;
9+
import org.terning.terningserver.common.config.ValueConfig;
10+
import org.terning.terningserver.common.exception.CustomException;
1111

1212
import java.io.BufferedReader;
1313
import java.io.IOException;
@@ -23,7 +23,7 @@
2323
import java.util.Base64;
2424
import java.util.Objects;
2525

26-
import static org.terning.terningserver.exception.enums.ErrorMessage.INVALID_KEY;
26+
import static org.terning.terningserver.common.exception.enums.ErrorMessage.INVALID_KEY;
2727

2828
@Component
2929
@RequiredArgsConstructor

0 commit comments

Comments
 (0)