Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Fixed app publish version.#1879

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.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Open
thomas37-star wants to merge1 commit intodev
base:dev
Choose a base branch
Loading
fromfix/app_publish_version
Open
Changes fromall commits
Commits
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -92,7 +92,7 @@ public class ApplicationApiServiceImpl implements ApplicationApiService {
private final OrgDevChecker orgDevChecker;
private final TemplateSolutionService templateSolutionService;
private final SuggestAppAdminSolutionService suggestAppAdminSolutionService;

private final FolderApiService folderApiService;
private final UserHomeApiService userHomeApiService;
private final UserApplicationInteractionService userApplicationInteractionService;
Expand DownExpand Up@@ -240,8 +240,8 @@ private Mono<Void> checkApplicationViewRequest(Application application, Applicat
if (expected == ApplicationRequestType.PUBLIC_TO_MARKETPLACE && application.isPublicToMarketplace() && application.isPublicToAll()) {
return Mono.empty();
}
//

//
// Falk: application.agencyProfile() & isPublicToAll must be both true
if (expected == ApplicationRequestType.AGENCY_PROFILE && application.agencyProfile() && application.isPublicToAll()) {
return Mono.empty();
Expand DownExpand Up@@ -560,9 +560,9 @@ public Mono<ResourcePermission> checkApplicationPermissionWithReadableErrorMsg(S
return Mono.just(permissionStatus.getPermission());
});
}



private Mono<ApplicationInfoView> buildView(Application application, String role) {
return buildView(application, role, null).delayUntil(applicationInfoView -> {
String applicationId = applicationInfoView.getApplicationId();
Expand All@@ -574,32 +574,47 @@ private Mono<ApplicationInfoView> buildView(Application application, String role
}

private Mono<ApplicationInfoView> buildView(Application application, String role, @Nullable String folderId) {
return application.getCategory(applicationRecordService)
.zipWith(application.getDescription(applicationRecordService))
.zipWith(application.getTitle(applicationRecordService), TupleUtils::merge)
.map(tuple ->
ApplicationInfoView.builder()
.applicationId(application.getId())
.applicationGid(application.getGid())
.orgId(application.getOrganizationId())
.name(application.getName())
.createBy(application.getCreatedBy())
.createAt(application.getCreatedAt().toEpochMilli())
.role(role)
.applicationType(application.getApplicationType())
.applicationStatus(application.getApplicationStatus())
.folderId(folderId)
.publicToAll(application.isPublicToAll())
.publicToMarketplace(application.isPublicToMarketplace())
.agencyProfile(application.agencyProfile())
.editingUserId(application.getEditingUserId())
.lastModifyTime(application.getUpdatedAt())
.lastEditedAt(application.getLastEditedAt())
.category(tuple.getT1())
.description(tuple.getT2())
.title(tuple.getT3())
.build()
);
Mono<String> categoryMono = application.getCategory(applicationRecordService);
Mono<String> descriptionMono = application.getDescription(applicationRecordService);
Mono<ApplicationVersion> latestRecordMono = applicationRecordService
.getLatestRecordByApplicationId(application.getId())
.defaultIfEmpty(new ApplicationVersion() );
Mono<String> titleMono = application.getTitle(applicationRecordService);

return Mono.zip(categoryMono, descriptionMono, latestRecordMono, titleMono)
.map(tuple -> {
String category = tuple.getT1();
String description = tuple.getT2();
ApplicationVersion latestRecord = tuple.getT3();
String title = tuple.getT4();
boolean hasPublished = latestRecord.getTag() != null && !latestRecord.getTag().isEmpty();
return ApplicationInfoView.builder()
.category(category)
.description(description)
.published(hasPublished)
.publishedVersion(hasPublished ? latestRecord.getTag() : null)
.lastPublishedTime(hasPublished && latestRecord.getCreateTime() != 0
? Instant.ofEpochMilli(latestRecord.getCreateTime())
: null)
.title(title)
.applicationId(application.getId())
.applicationGid(application.getGid())
.orgId(application.getOrganizationId())
.name(application.getName())
.createBy(application.getCreatedBy())
.createAt(application.getCreatedAt().toEpochMilli())
.role(role)
.applicationType(application.getApplicationType())
.applicationStatus(application.getApplicationStatus())
.folderId(folderId)
.publicToAll(application.isPublicToAll())
.publicToMarketplace(application.isPublicToMarketplace())
.agencyProfile(application.agencyProfile())
.editingUserId(application.getEditingUserId())
.lastModifyTime(application.getUpdatedAt())
.lastEditedAt(application.getLastEditedAt())
.build();
});
}

private Mono<ApplicationInfoView> buildView(Application application) {
Expand Down
Loading

[8]ページ先頭

©2009-2025 Movatter.jp