Skip to content

Fix/anon usage log #1733

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
merged 5 commits into from
Jun 2, 2025
Merged

Fix/anon usage log #1733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
158a3a6
When an anonymous user visits a published app, a log entry is added t…
dragonpoo Jun 2, 2025
e843aab
When an anonymous user visits a published app, a log entry is added t…
dragonpoo Jun 2, 2025
61726d2
Add applicationAuthor field to application event.
dragonpoo Jun 2, 2025
03ec0e9
Add applicationAuthorOrgId field to application event.
dragonpoo Jun 2, 2025
dd6f42f
Merge branch 'dev' into fix/anon_usage_log
ludomikula Jun 2, 2025
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
2 changes: 2 additions & 0 deletions ...service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/ApplicationCommonEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ public class ApplicationCommonEvent extends AbstractEvent {
private final String oldApplicationCategory;
private final String oldApplicationDescription;
private final String oldApplicationTitle;
private final String applicationAuthor;
private final String applicationAuthorOrgId;
private final EventType type;
@Nullable
@JsonInclude(JsonInclude.Include.NON_NULL)
Expand Down
151 changes: 76 additions & 75 deletions ...i-service/lowcoder-server/src/main/java/org/lowcoder/api/util/BusinessEventPublisher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,81 +125,82 @@ public Mono<Void> publishApplicationCommonEvent(ApplicationView originalApplicat

public Mono<Void> publishApplicationCommonEvent(ApplicationView originalApplicationView, ApplicationView applicationView, EventType eventType) {
return sessionUserService.isAnonymousUser()
.flatMap(anonymous -> {
return sessionUserService.getVisitorOrgMemberCache()
.zipWith(Mono.defer(() -> {
String folderId = applicationView.getApplicationInfoView().getFolderId();
if (StringUtils.isBlank(folderId)) {
return Mono.just(Optional.<Folder>empty());
}
return folderService.findById(folderId)
.map(Optional::of)
.onErrorReturn(Optional.empty());
}))
.zipWith(Mono.defer(() -> {
String folderId = applicationView.getApplicationInfoView().getFolderIdFrom();
if (StringUtils.isBlank(folderId)) {
return Mono.just(Optional.<Folder>empty());
}
return folderService.findById(folderId)
.map(Optional::of)
.onErrorReturn(Optional.empty());
}), TupleUtils::merge)
.zipWith(sessionUserService.getVisitorToken())
.zipWith(Mono.defer(() -> {
String appId = applicationView.getApplicationInfoView().getApplicationId();
return applicationService.findById(appId)
.zipWhen(application -> application.getCategory(applicationRecordServiceImpl))
.zipWhen(application -> application.getT1().getDescription(applicationRecordServiceImpl))
.zipWhen(application -> application.getT1().getT1().getTitle(applicationRecordServiceImpl))
.map(tuple -> {
String category = tuple.getT1().getT1().getT2();
String description = tuple.getT1().getT2();
String title = tuple.getT2();
return new String[]{category, description, title};
});
}), TupleUtils::merge)
.flatMap(tuple -> Mono.deferContextual(contextView -> {
OrgMember orgMember = tuple.getT1().getT1();
Optional<Folder> optional = tuple.getT1().getT2();
Optional<Folder> optionalFrom = tuple.getT1().getT3();
String token = tuple.getT2();
String category = tuple.getT3()[0];
String description = tuple.getT3()[1];
String title = tuple.getT3()[2];
ApplicationInfoView applicationInfoView = applicationView.getApplicationInfoView();

ApplicationCommonEvent event = ApplicationCommonEvent.builder()
.orgId(orgMember.getOrgId())
.userId(orgMember.getUserId())
.applicationId(applicationInfoView.getApplicationId())
.applicationGid(applicationInfoView.getApplicationGid())
.applicationName(applicationInfoView.getName())
.applicationCategory(category)
.applicationDescription(description)
.applicationTitle(title)
.oldApplicationName(originalApplicationView!=null ? originalApplicationView.getApplicationInfoView().getName() : null)
.oldApplicationCategory(originalApplicationView!=null ?originalApplicationView.getApplicationInfoView().getCategory() : null)
.oldApplicationDescription(originalApplicationView!=null ?originalApplicationView.getApplicationInfoView().getDescription() : null)
.oldApplicationTitle(originalApplicationView!=null ?originalApplicationView.getApplicationInfoView().getTitle() : null)
.type(eventType)
.folderId(optional.map(Folder::getId).orElse(null))
.folderName(optional.map(Folder::getName).orElse(null))
.oldFolderId(optionalFrom.map(Folder::getId).orElse(null))
.oldFolderName(optionalFrom.map(Folder::getName).orElse(null))
.isAnonymous(anonymous)
.sessionHash(Hashing.sha512().hashString(token, StandardCharsets.UTF_8).toString())
.build();

event.populateDetails(contextView);
applicationEventPublisher.publishEvent(event);
return Mono.empty();
})).then() // **Ensures Mono<Void> return type**
.onErrorResume(throwable -> {
log.error("publishApplicationCommonEvent error. {}, {}", applicationView, eventType, throwable);
return Mono.empty();
});
});
.flatMap(anonymous -> sessionUserService.getVisitorOrgMemberCache()
.onErrorReturn(new OrgMember(null, null, null, null, 0))
.zipWith(Mono.defer(() -> {
String folderId = applicationView.getApplicationInfoView().getFolderId();
if (StringUtils.isBlank(folderId)) {
return Mono.just(Optional.<Folder>empty());
}
return folderService.findById(folderId)
.map(Optional::of)
.onErrorReturn(Optional.empty());
}))
.zipWith(Mono.defer(() -> {
String folderId = applicationView.getApplicationInfoView().getFolderIdFrom();
if (StringUtils.isBlank(folderId)) {
return Mono.just(Optional.<Folder>empty());
}
return folderService.findById(folderId)
.map(Optional::of)
.onErrorReturn(Optional.empty());
}), TupleUtils::merge)
.zipWith(sessionUserService.getVisitorToken())
.zipWith(Mono.defer(() -> {
String appId = applicationView.getApplicationInfoView().getApplicationId();
return applicationService.findById(appId)
.zipWhen(application -> application.getCategory(applicationRecordServiceImpl))
.zipWhen(application -> application.getT1().getDescription(applicationRecordServiceImpl))
.zipWhen(application -> application.getT1().getT1().getTitle(applicationRecordServiceImpl))
.map(tuple -> {
String category = tuple.getT1().getT1().getT2();
String description = tuple.getT1().getT2();
String title = tuple.getT2();
return new String[]{category, description, title};
});
}), TupleUtils::merge)
.flatMap(tuple -> Mono.deferContextual(contextView -> {
OrgMember orgMember = tuple.getT1().getT1();
Optional<Folder> optional = tuple.getT1().getT2();
Optional<Folder> optionalFrom = tuple.getT1().getT3();
String token = tuple.getT2();
String category = tuple.getT3()[0];
String description = tuple.getT3()[1];
String title = tuple.getT3()[2];
ApplicationInfoView applicationInfoView = applicationView.getApplicationInfoView();

ApplicationCommonEvent event = ApplicationCommonEvent.builder()
.orgId(orgMember.getOrgId())
.userId(orgMember.getUserId())
.applicationId(applicationInfoView.getApplicationId())
.applicationGid(applicationInfoView.getApplicationGid())
.applicationName(applicationInfoView.getName())
.applicationAuthor(applicationInfoView.getCreateBy())
.applicationAuthorOrgId(applicationInfoView.getOrgId())
.applicationCategory(category)
.applicationDescription(description)
.applicationTitle(title)
.oldApplicationName(originalApplicationView!=null ? originalApplicationView.getApplicationInfoView().getName() : null)
.oldApplicationCategory(originalApplicationView!=null ?originalApplicationView.getApplicationInfoView().getCategory() : null)
.oldApplicationDescription(originalApplicationView!=null ?originalApplicationView.getApplicationInfoView().getDescription() : null)
.oldApplicationTitle(originalApplicationView!=null ?originalApplicationView.getApplicationInfoView().getTitle() : null)
.type(eventType)
.folderId(optional.map(Folder::getId).orElse(null))
.folderName(optional.map(Folder::getName).orElse(null))
.oldFolderId(optionalFrom.map(Folder::getId).orElse(null))
.oldFolderName(optionalFrom.map(Folder::getName).orElse(null))
.isAnonymous(anonymous)
.sessionHash(Hashing.sha512().hashString(token, StandardCharsets.UTF_8).toString())
.build();

event.populateDetails(contextView);
applicationEventPublisher.publishEvent(event);
return Mono.empty();
})).then() // **Ensures Mono<Void> return type**
.onErrorResume(throwable -> {
log.error("publishApplicationCommonEvent error. {}, {}", applicationView, eventType, throwable);
return Mono.empty();
}));
}


Expand Down
Loading