Skip to content

Commit

Permalink
refactor : Add Custom Getter For Column (DeletedAt) (#172)
Browse files Browse the repository at this point in the history
  • Loading branch information
@K-Diger
K-Diger authored Feb 1, 2024
1 parent 89a055c commit b2de978
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 64 deletions.
5 changes: 5 additions & 0 deletions src/common-module/src/main/java/org/palette/passport/component/UserInfo.java
View file
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
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
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
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

0 comments on commit b2de978

Please sign in to comment.