Skip to content
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

User/refactor grpc passport #172

Merged
merged 1 commit into from
Feb 1, 2024
+37 −64
Merged

User/refactor grpc passport #172

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
5 changes: 5 additions & 0 deletions src/common-module/src/main/java/org/palette/passport/component/UserInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,9 @@ public record UserInfo(
String createdAt,
String deletedAt
) {
@Override
public String deletedAt() {
if (deletedAt == null) return "";
return deletedAt;
}
}
2 changes: 1 addition & 1 deletion src/user-service/src/main/java/org/palette/easeluserservice/external/GrpcServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public void loadUserInfoFromId(
.setIsActivated(user.getIsActivated())
.setAccessedAt(user.getAccessedAt().toString())
.setCreatedAt(user.getCreatedAt().toString())
.setDeletedAt(user.getDeletedAt().toString())
.setDeletedAt(user.getStringDeletedAt().toString())
.build()
);
responseObserver.onCompleted();
Expand Down
89 changes: 26 additions & 63 deletions src/user-service/src/main/java/org/palette/easeluserservice/external/GrpcSocialClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,41 +46,22 @@ private GLoadUserFollowInformationResponse retrieveFollowShipMe(
final String integrityKey
) {
try {
if (userInfo.deletedAt() == null) {
return gSocialServiceBlockingStub.loadUserFollowInformation(
GLoadUserFollowInformationRequest.newBuilder()
.setPassport(GPassport.newBuilder()
.setId(userInfo.id())
.setEmail(userInfo.email())
.setUsername(userInfo.username())
.setNickname(userInfo.nickname())
.setRole(userInfo.role())
.setAccessedAt(userInfo.isActivated().toString())
.setCreatedAt(userInfo.createdAt())
.setDeletedAt("")
.setIntegrityKey(integrityKey)
.build()
)
.build()
);
}
return gSocialServiceBlockingStub.loadUserFollowInformation(
GLoadUserFollowInformationRequest.newBuilder()
.setPassport(GPassport.newBuilder()
.setId(userInfo.id())
.setEmail(userInfo.email())
.setUsername(userInfo.username())
.setNickname(userInfo.nickname())
.setRole(userInfo.role())
.setAccessedAt(userInfo.isActivated().toString())
.setCreatedAt(userInfo.createdAt())
.setDeletedAt(userInfo.deletedAt())
.setIntegrityKey(integrityKey)
.build()
)
.build()
.setPassport(
GPassport.newBuilder()
.setId(userInfo.id())
.setEmail(userInfo.email())
.setUsername(userInfo.username())
.setNickname(userInfo.nickname())
.setRole(userInfo.role())
.setAccessedAt(userInfo.isActivated().toString())
.setCreatedAt(userInfo.createdAt())
.setDeletedAt(userInfo.deletedAt())
.setIntegrityKey(integrityKey)
.build()
).build()
);

} catch (final StatusRuntimeException e) {
throw new BaseException(ExceptionType.USER_500_000001);
}
Expand All @@ -91,39 +72,21 @@ private GLoadUserFollowInformationResponse retrieveFollowShipOther(
final String integrityKey
) {
try {
if (user.getDeletedAt() == null) {
return gSocialServiceBlockingStub.loadUserFollowInformation(
GLoadUserFollowInformationRequest.newBuilder()
.setPassport(GPassport.newBuilder()
.setId(user.getId())
.setEmail(user.getEmail())
.setUsername(user.getUsername())
.setNickname(user.getProfile().nickname())
.setRole(user.getRole().toString())
.setAccessedAt(user.getAccessedAt().toString())
.setCreatedAt(user.getCreatedAt().toString())
.setDeletedAt(user.getDeletedAt().toString())
.setIntegrityKey(integrityKey)
.build()
)
.build()
);
}
return gSocialServiceBlockingStub.loadUserFollowInformation(
GLoadUserFollowInformationRequest.newBuilder()
.setPassport(GPassport.newBuilder()
.setId(user.getId())
.setEmail(user.getEmail())
.setUsername(user.getUsername())
.setNickname(user.getProfile().nickname())
.setRole(user.getRole().toString())
.setAccessedAt(user.getAccessedAt().toString())
.setCreatedAt(user.getCreatedAt().toString())
.setDeletedAt(user.getDeletedAt().toString())
.setIntegrityKey(integrityKey)
.build()
)
.build()
.setPassport(
GPassport.newBuilder()
.setId(user.getId())
.setEmail(user.getEmail())
.setUsername(user.getUsername())
.setNickname(user.getProfile().nickname())
.setRole(user.getRole().toString())
.setAccessedAt(user.getAccessedAt().toString())
.setCreatedAt(user.getCreatedAt().toString())
.setDeletedAt(user.getStringDeletedAt())
.setIntegrityKey(integrityKey)
.build()
).build()
);

} catch (final StatusRuntimeException e) {
Expand Down
5 changes: 5 additions & 0 deletions src/user-service/src/main/java/org/palette/easeluserservice/persistence/User.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,11 @@ public void stampAccessedAt() {
this.accessedAt = LocalDateTime.now();
}

public String getStringDeletedAt() {
if (deletedAt == null) return "";
return deletedAt.toString();
}

public static User preJoin(
String email,
String nickname,
Expand Down