Skip to content

Commit 7d37898

Browse files
authored
[FIX] auth생성시 fcm 누락
[FIX] auth생성시 fcm 누락
2 parents 46e2413 + 0f0a6cf commit 7d37898

File tree

4 files changed

+13
-10
lines changed

4 files changed

+13
-10
lines changed

src/main/java/com/official/memento/auth/domain/Auth.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,12 @@ public class Auth {
1414
private String refreshToken;
1515
private String fcmToken;
1616

17-
private Auth(long memberId, AuthProvider provider, String platformId, String refreshToken) {
17+
private Auth(final long memberId,final AuthProvider provider,final String platformId,final String refreshToken,final String fcmToken) {
1818
this.memberId = memberId;
1919
this.provider = provider;
2020
this.platformId = platformId;
2121
this.refreshToken = refreshToken;
22+
this.fcmToken = fcmToken;
2223
}
2324

2425
public static Auth withId(
@@ -32,8 +33,8 @@ public static Auth withId(
3233
return new Auth(id, memberId, provider, platformId, refreshToken,fcmToken);
3334
}
3435

35-
public static Auth of(long memberId, AuthProvider provider, String platformId, String refreshToken) {
36-
return new Auth(memberId, provider, platformId, refreshToken);
36+
public static Auth of(final long memberId,final AuthProvider provider,final String platformId,final String refreshToken,final String fcmToken) {
37+
return new Auth(memberId, provider, platformId, refreshToken, fcmToken);
3738
}
3839

3940
public void withUpdatedToken(final String newRefreshToken) {

src/main/java/com/official/memento/auth/service/AuthService.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,16 @@ public Auth create(
7474
final long memberId,
7575
final AuthProvider provider,
7676
final String platformId,
77-
final String refreshToken
77+
final String refreshToken,
78+
final String fcmToken
7879
) {
7980
return authRepository.save(
8081
Auth.of(
8182
memberId,
8283
provider,
8384
platformId,
84-
refreshToken
85+
refreshToken,
86+
fcmToken
8587
)
8688
);
8789
}

src/main/java/com/official/memento/auth/service/usecase/AuthCreateUseCase.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ Auth create(
88
final long memberId,
99
final AuthProvider provider,
1010
final String platformId,
11-
final String refreshToken
11+
final String refreshToken,
12+
final String fcmToken
1213
);
1314
}

src/main/java/com/official/memento/member/service/MemberService.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public NewAuthResult authenticate(final AuthCommand command) {
6868
final String email = (String) tokenInfo.get("email");
6969

7070
Auth auth = authGetUseCase.findByPlatformIdAndProvider(platformId, provider)
71-
.orElseGet(() -> createNewMember(platformId, provider, command.timeZoneOffset()));
71+
.orElseGet(() -> createNewMember(platformId, provider, command.timeZoneOffset(), command.fcmToken()));
7272

7373
Optional<MemberPersonalInfo> personalInfo = memberPersonalInfoGetUseCase.findByMemberIdOrNull(auth.getMemberId());
7474
updateTimeZone(personalInfo, command.timeZoneOffset());
@@ -102,14 +102,13 @@ private Map<String, Object> verifyIdToken(final AuthProvider provider, final Str
102102
return clientAdapter.verifyIdToken(idToken);
103103
}
104104

105-
private Auth createNewMember(final String platformId, final AuthProvider provider, final String timeZoneOffset) {
105+
private Auth createNewMember(final String platformId, final AuthProvider provider, final String timeZoneOffset,final String fcmToken) {
106106
Member newMember = memberRepository.save(Member.createNew());
107107
Long memberId = newMember.getId();
108108
memberPersonalInfoCreateUseCase.create(MemberPersonalInfoCreateCommand.from(memberId, timeZoneOffset));
109109
memberSyncInfoCreateUseCase.create(MemberSyncInfoCreateCommand.from(memberId));
110110
createOwnTags(memberId);
111-
Auth newAuth = Auth.of(memberId, provider, platformId, "");
112-
return authCreateUseCase.create(memberId,provider,platformId,"");
111+
return authCreateUseCase.create(memberId, provider, platformId, "",fcmToken);
113112
}
114113

115114
private void createOwnTags(Long memberId) {

0 commit comments

Comments
 (0)