Skip to content

Commit 17c9bd4

Browse files
sss4920sss4920
authored
Merge pull request #251 from Link-MIND/refactor/#250
[Refactor/#250] 패키지 구조 변경
2 parents 95cf8e9 + 1cb6af6 commit 17c9bd4

File tree

94 files changed

+225
-490
lines changed

Some content is hidden

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

94 files changed

+225
-490
lines changed

‎.DS_Store

-6 KB
Binary file not shown.

‎linkmind/src/main/java/com/app/toaster/controller/AuthController.java renamed to ‎linkmind/src/main/java/com/app/toaster/auth/controller/AuthController.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.app.toaster.controller;
1+
package com.app.toaster.auth.controller;
22

33
import java.io.IOException;
44

@@ -13,13 +13,13 @@
1313

1414
import com.app.toaster.common.dto.ApiResponse;
1515
// import com.app.toaster.config.UserId;
16-
import com.app.toaster.config.UserId;
17-
import com.app.toaster.controller.request.auth.SignInRequestDto;
18-
import com.app.toaster.controller.response.auth.SignInResponseDto;
19-
import com.app.toaster.controller.response.auth.TokenHealthDto;
20-
import com.app.toaster.controller.response.auth.TokenResponseDto;
16+
import com.app.toaster.common.config.UserId;
17+
import com.app.toaster.auth.controller.request.SignInRequestDto;
18+
import com.app.toaster.auth.controller.response.SignInResponseDto;
19+
import com.app.toaster.auth.controller.response.TokenHealthDto;
20+
import com.app.toaster.auth.controller.response.TokenResponseDto;
2121
import com.app.toaster.exception.Success;
22-
import com.app.toaster.service.auth.AuthService;
22+
import com.app.toaster.auth.service.AuthService;
2323

2424
import lombok.RequiredArgsConstructor;
2525

‎linkmind/src/main/java/com/app/toaster/controller/request/auth/SignInRequestDto.java renamed to ‎linkmind/src/main/java/com/app/toaster/auth/controller/request/SignInRequestDto.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.app.toaster.controller.request.auth;
1+
package com.app.toaster.auth.controller.request;
22

33
public record SignInRequestDto(String socialType, String fcmToken) {
44
}

‎linkmind/src/main/java/com/app/toaster/controller/response/auth/SignInResponseDto.java renamed to ‎linkmind/src/main/java/com/app/toaster/auth/controller/response/SignInResponseDto.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.app.toaster.controller.response.auth;
1+
package com.app.toaster.auth.controller.response;
22

33
public record SignInResponseDto(Long userId, String accessToken, String refreshToken, String fcmToken, Boolean isRegistered,Boolean fcmIsAllowed, String profile) {
44
public static SignInResponseDto of(Long userId, String accessToken, String refreshToken, String fcmToken,

‎linkmind/src/main/java/com/app/toaster/controller/response/auth/TokenHealthDto.java renamed to ‎linkmind/src/main/java/com/app/toaster/auth/controller/response/TokenHealthDto.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.app.toaster.controller.response.auth;
1+
package com.app.toaster.auth.controller.response;
22

33
public record TokenHealthDto(boolean tokenHealth) {
44
public static TokenHealthDto of(boolean tokenHealth){return new TokenHealthDto(tokenHealth);}

‎linkmind/src/main/java/com/app/toaster/controller/response/auth/TokenResponseDto.java renamed to ‎linkmind/src/main/java/com/app/toaster/auth/controller/response/TokenResponseDto.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.app.toaster.controller.response.auth;
1+
package com.app.toaster.auth.controller.response;
22

33
public record TokenResponseDto(String accessToken, String refreshToken) {
44
public static TokenResponseDto of(String accessToken, String refreshToken){

‎linkmind/src/main/java/com/app/toaster/service/auth/AuthService.java renamed to ‎linkmind/src/main/java/com/app/toaster/auth/service/AuthService.java

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,35 @@
1-
package com.app.toaster.service.auth;
1+
package com.app.toaster.auth.service;
22

33
import java.io.IOException;
4-
import java.time.LocalDateTime;
54

65
import org.springframework.beans.factory.annotation.Value;
76
import org.springframework.stereotype.Service;
87
import org.springframework.transaction.annotation.Transactional;
9-
import org.springframework.web.client.RestTemplate;
10-
import org.springframework.web.context.request.WebRequest;
118

129

13-
import com.app.toaster.config.jwt.JwtService;
14-
import com.app.toaster.controller.request.auth.SignInRequestDto;
15-
import com.app.toaster.controller.response.auth.SignInResponseDto;
16-
import com.app.toaster.controller.response.auth.TokenHealthDto;
17-
import com.app.toaster.controller.response.auth.TokenResponseDto;
18-
import com.app.toaster.domain.SocialType;
19-
import com.app.toaster.domain.User;
10+
import com.app.toaster.common.config.jwt.JwtService;
11+
import com.app.toaster.auth.controller.request.SignInRequestDto;
12+
import com.app.toaster.auth.controller.response.SignInResponseDto;
13+
import com.app.toaster.auth.controller.response.TokenHealthDto;
14+
import com.app.toaster.auth.controller.response.TokenResponseDto;
15+
import com.app.toaster.user.domain.SocialType;
16+
import com.app.toaster.user.domain.User;
2017
import com.app.toaster.exception.Error;
21-
import com.app.toaster.exception.Success;
2218
import com.app.toaster.exception.model.CustomException;
2319
import com.app.toaster.exception.model.NotFoundException;
2420
import com.app.toaster.exception.model.UnprocessableEntityException;
25-
import com.app.toaster.external.client.discord.DiscordMessage;
2621
import com.app.toaster.external.client.discord.DiscordMessageProvider;
2722
import com.app.toaster.external.client.discord.NotificationDto;
2823
import com.app.toaster.external.client.discord.NotificationType;
2924
import com.app.toaster.external.client.slack.SlackApi;
30-
import com.app.toaster.infrastructure.CategoryRepository;
31-
import com.app.toaster.infrastructure.TimerRepository;
25+
import com.app.toaster.category.infrastructure.CategoryRepository;
26+
import com.app.toaster.timer.infrastructure.TimerRepository;
3227
import com.app.toaster.toast.infrastructure.ToastRepository;
33-
import com.app.toaster.infrastructure.UserRepository;
28+
import com.app.toaster.user.infrastructure.UserRepository;
3429
import com.app.toaster.popup.infrastructure.PopupManagerRepository;
35-
import com.app.toaster.service.auth.apple.AppleSignInService;
36-
import com.app.toaster.service.auth.kakao.KakaoSignInService;
37-
import com.app.toaster.service.auth.kakao.LoginResult;
30+
import com.app.toaster.auth.service.apple.AppleSignInService;
31+
import com.app.toaster.auth.service.kakao.KakaoSignInService;
32+
import com.app.toaster.auth.service.kakao.LoginResult;
3833
import com.app.toaster.toast.service.ToastService;
3934

4035
import lombok.RequiredArgsConstructor;

‎linkmind/src/main/java/com/app/toaster/service/auth/apple/AppleSignInService.java renamed to ‎linkmind/src/main/java/com/app/toaster/auth/service/apple/AppleSignInService.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.app.toaster.service.auth.apple;
1+
package com.app.toaster.auth.service.apple;
22

33
import java.security.PublicKey;
44
import java.util.Map;
@@ -7,11 +7,10 @@
77
import org.springframework.stereotype.Service;
88
import org.springframework.web.client.RestClient;
99

10-
import com.app.toaster.service.auth.apple.response.ApplePublicKeys;
11-
import com.app.toaster.service.auth.apple.verify.AppleJwtParser;
12-
import com.app.toaster.service.auth.apple.verify.PublicKeyGenerator;
13-
import com.app.toaster.service.auth.kakao.LoginResult;
14-
import com.mysql.cj.log.Log;
10+
import com.app.toaster.auth.service.apple.response.ApplePublicKeys;
11+
import com.app.toaster.auth.service.apple.verify.AppleJwtParser;
12+
import com.app.toaster.auth.service.apple.verify.PublicKeyGenerator;
13+
import com.app.toaster.auth.service.kakao.LoginResult;
1514

1615
import io.jsonwebtoken.Claims;
1716
import lombok.RequiredArgsConstructor;

‎linkmind/src/main/java/com/app/toaster/service/auth/apple/response/ApplePublicKey.java renamed to ‎linkmind/src/main/java/com/app/toaster/auth/service/apple/response/ApplePublicKey.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.app.toaster.service.auth.apple.response;
1+
package com.app.toaster.auth.service.apple.response;
22

33
public record ApplePublicKey(
44
String kty,

‎linkmind/src/main/java/com/app/toaster/service/auth/apple/response/ApplePublicKeys.java renamed to ‎linkmind/src/main/java/com/app/toaster/auth/service/apple/response/ApplePublicKeys.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
package com.app.toaster.service.auth.apple.response;
1+
package com.app.toaster.auth.service.apple.response;
22

33
import java.util.List;
44

55
import com.app.toaster.exception.Error;
66
import com.app.toaster.exception.model.CustomException;
77

8-
import lombok.extern.slf4j.Slf4j;
9-
108
public record ApplePublicKeys(List<ApplePublicKey> keys) {
119

1210
public ApplePublicKey getMatchesKey(String alg, String kid) {

0 commit comments

Comments
 (0)