Skip to content

[FIX] auth생성시 fcm 누락 #94

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
chaaehyun merged 1 commit into from
Jun 6, 2025
Merged

[FIX] auth생성시 fcm 누락 #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions src/main/java/com/official/memento/auth/domain/Auth.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,12 @@ public class Auth {
private String refreshToken;
private String fcmToken;

private Auth(long memberId, AuthProvider provider, String platformId, String refreshToken) {
private Auth(final long memberId,final AuthProvider provider,final String platformId,final String refreshToken,final String fcmToken) {
this.memberId = memberId;
this.provider = provider;
this.platformId = platformId;
this.refreshToken = refreshToken;
this.fcmToken = fcmToken;
}

public static Auth withId(
Expand All @@ -32,8 +33,8 @@ public static Auth withId(
return new Auth(id, memberId, provider, platformId, refreshToken,fcmToken);
}

public static Auth of(long memberId, AuthProvider provider, String platformId, String refreshToken) {
return new Auth(memberId, provider, platformId, refreshToken);
public static Auth of(final long memberId,final AuthProvider provider,final String platformId,final String refreshToken,final String fcmToken) {
return new Auth(memberId, provider, platformId, refreshToken, fcmToken);
}

public void withUpdatedToken(final String newRefreshToken) {
Expand Down
6 changes: 4 additions & 2 deletions src/main/java/com/official/memento/auth/service/AuthService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,16 @@ public Auth create(
final long memberId,
final AuthProvider provider,
final String platformId,
final String refreshToken
final String refreshToken,
final String fcmToken
) {
return authRepository.save(
Auth.of(
memberId,
provider,
platformId,
refreshToken
refreshToken,
fcmToken
)
);
}
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/com/official/memento/auth/service/usecase/AuthCreateUseCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ Auth create(
final long memberId,
final AuthProvider provider,
final String platformId,
final String refreshToken
final String refreshToken,
final String fcmToken
);
}
7 changes: 3 additions & 4 deletions src/main/java/com/official/memento/member/service/MemberService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public NewAuthResult authenticate(final AuthCommand command) {
final String email = (String) tokenInfo.get("email");

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

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

private Auth createNewMember(final String platformId, final AuthProvider provider, final String timeZoneOffset) {
private Auth createNewMember(final String platformId, final AuthProvider provider, final String timeZoneOffset,final String fcmToken) {
Member newMember = memberRepository.save(Member.createNew());
Long memberId = newMember.getId();
memberPersonalInfoCreateUseCase.create(MemberPersonalInfoCreateCommand.from(memberId, timeZoneOffset));
memberSyncInfoCreateUseCase.create(MemberSyncInfoCreateCommand.from(memberId));
createOwnTags(memberId);
Auth newAuth = Auth.of(memberId, provider, platformId, "");
return authCreateUseCase.create(memberId,provider,platformId,"");
return authCreateUseCase.create(memberId, provider, platformId, "",fcmToken);
}

private void createOwnTags(Long memberId) {
Expand Down