Skip to content

#923: Add title, description, category to the application list endpoint #1381

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 3 commits into from
Dec 16, 2024
Merged

#923: Add title, description, category to the application list endpoint #1381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f51381
#923: Add title, description, category to the application list endpoint
dragonpoo Dec 5, 2024
c00d60c
Add icon, published, publishedVersion, lastPublishedTime field to the…
dragonpoo Dec 16, 2024
a97deef
null error on map
dragonpoo Dec 16, 2024
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
66 changes: 56 additions & 10 deletions ...vice/lowcoder-domain/src/main/java/org/lowcoder/domain/application/model/Application.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,16 +164,62 @@ public Map<String, Object> getEditingApplicationDSL() {
return dsl;
}

public String getCategory() {
if(editingApplicationDSL == null || editingApplicationDSL.get("settings") == null) return "";
Object settingsObject = editingApplicationDSL.get("settings");
if (settingsObject instanceof Map) {
@SuppressWarnings("unchecked")
Map<String, Object> settings = (Map<String, Object>) editingApplicationDSL.get("settings");
return (String) settings.get("category");
} else {
return "";
}
public Mono<String> getCategory(ApplicationRecordService applicationRecordService) {
return getLiveApplicationDsl(applicationRecordService).map(liveDSL -> {
if (liveDSL == null || liveDSL.get("settings") == null) return "";
Object settingsObject = liveDSL.get("settings");
if (settingsObject instanceof Map) {
@SuppressWarnings("unchecked")
Map<String, Object> settings = (Map<String, Object>) liveDSL.get("settings");
return (String) settings.get("category");
} else {
return "";
}
});
}

public Mono<String> getTitle(ApplicationRecordService applicationRecordService) {
return getLiveApplicationDsl(applicationRecordService).map(liveDSL -> {
if (liveDSL == null || liveDSL.get("settings") == null) return "";
Object settingsObject = liveDSL.get("settings");
if (settingsObject instanceof Map) {
@SuppressWarnings("unchecked")
Map<String, Object> settings = (Map<String, Object>) liveDSL.get("settings");
return (String) settings.get("title");
} else {
return "";
}
});
}

public Mono<String> getDescription(ApplicationRecordService applicationRecordService) {
return getLiveApplicationDsl(applicationRecordService).map(liveDSL -> {
if (liveDSL == null || liveDSL.get("settings") == null) return "";
Object settingsObject = liveDSL.get("settings");
if (settingsObject instanceof Map) {
@SuppressWarnings("unchecked")
Map<String, Object> settings = (Map<String, Object>) liveDSL.get("settings");
return (String) settings.get("description");
} else {
return "";
}
}
);
}

public Mono<String> getIcon(ApplicationRecordService applicationRecordService) {
return getLiveApplicationDsl(applicationRecordService).map(liveDSL -> {
if (liveDSL == null || liveDSL.get("settings") == null) return "";
Object settingsObject = liveDSL.get("settings");
if (settingsObject instanceof Map) {
@SuppressWarnings("unchecked")
Map<String, Object> settings = (Map<String, Object>) liveDSL.get("settings");
return (String) settings.get("icon");
} else {
return "";
}
}
).onErrorReturn("");
}

public Map<String, Object> getEditingApplicationDSLOrNull() {return editingApplicationDSL; }
Expand Down
6 changes: 3 additions & 3 deletions ...omain/src/main/java/org/lowcoder/domain/application/repository/ApplicationRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@
public interface ApplicationRepository extends ReactiveMongoRepository<Application, String>, CustomApplicationRepository {

// publishedApplicationDSL : 0 -> excludes publishedApplicationDSL from the return
@Aggregation(pipeline = {"{ $match: { organizationId: ?0 } }", "{ $project: { 'editingApplicationDSL.settings.category': 1, _id: 1, gid: 1, organizationId: 1, name: 1, applicationType: 1, applicationStatus: 1, publicToAll: 1, publicToMarketplace: 1, agencyProfile: 1, editingUserId: 1, lastEditedAt: 1, createdAt: 1, updatedAt: 1, createdBy: 1, modifiedBy: 1, _class: 1}}"})
@Aggregation(pipeline = {"{ $match: { organizationId: ?0 } }", "{ $project: { 'editingApplicationDSL.settings': 1, _id: 1, gid: 1, organizationId: 1, name: 1, applicationType: 1, applicationStatus: 1, publicToAll: 1, publicToMarketplace: 1, agencyProfile: 1, editingUserId: 1, lastEditedAt: 1, createdAt: 1, updatedAt: 1, createdBy: 1, modifiedBy: 1, _class: 1}}"})
Flux<Application> findByOrganizationId(String organizationId);


@Override
@Nonnull
@Aggregation(pipeline = {"{ $match: { _id: ?0 } }", "{ $project: { 'editingApplicationDSL.settings.category': 1, _id: 1, gid: 1, organizationId: 1, name: 1, applicationType: 1, applicationStatus: 1, publicToAll: 1, publicToMarketplace: 1, agencyProfile: 1, editingUserId: 1, lastEditedAt: 1, createdAt: 1, updatedAt: 1, createdBy: 1, modifiedBy: 1, _class: 1}}"})
@Aggregation(pipeline = {"{ $match: { _id: ?0 } }", "{ $project: { 'editingApplicationDSL.settings': 1, _id: 1, gid: 1, organizationId: 1, name: 1, applicationType: 1, applicationStatus: 1, publicToAll: 1, publicToMarketplace: 1, agencyProfile: 1, editingUserId: 1, lastEditedAt: 1, createdAt: 1, updatedAt: 1, createdBy: 1, modifiedBy: 1, _class: 1}}"})
Mono<Application> findById(@Nonnull String id);

@Aggregation(pipeline = {"{ $match: { gid: ?0 } }", "{ $project: { 'editingApplicationDSL.settings.category': 1, _id: 1, gid: 1, organizationId: 1, name: 1, applicationType: 1, applicationStatus: 1, publicToAll: 1, publicToMarketplace: 1, agencyProfile: 1, editingUserId: 1, lastEditedAt: 1, createdAt: 1, updatedAt: 1, createdBy: 1, modifiedBy: 1, _class: 1}}"})
@Aggregation(pipeline = {"{ $match: { gid: ?0 } }", "{ $project: { 'editingApplicationDSL.settings': 1, _id: 1, gid: 1, organizationId: 1, name: 1, applicationType: 1, applicationStatus: 1, publicToAll: 1, publicToMarketplace: 1, agencyProfile: 1, editingUserId: 1, lastEditedAt: 1, createdAt: 1, updatedAt: 1, createdBy: 1, modifiedBy: 1, _class: 1}}"})
Flux<Application> findByGid(@Nonnull String gid);

Mono<Long> countByOrganizationIdAndApplicationStatus(String organizationId, ApplicationStatus applicationStatus);
Expand Down
14 changes: 14 additions & 0 deletions .../lowcoder-server/src/main/java/org/lowcoder/api/application/view/ApplicationInfoView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,20 @@ public class ApplicationInfoView {

private final String editingUserId;

@JsonInclude(Include.NON_NULL)
private final String title;
@JsonInclude(Include.NON_NULL)
private final String description;
@JsonInclude(Include.NON_NULL)
private final String category;
@JsonInclude(Include.NON_NULL)
private final String icon;
private final boolean published;
@JsonInclude(Include.NON_NULL)
private final String publishedVersion;
@JsonInclude(Include.NON_NULL)
private final Instant lastPublishedTime;

public long getLastViewTime() {
return lastViewTime == null ? 0 : lastViewTime.toEpochMilli();
}
Expand Down
84 changes: 52 additions & 32 deletions ...i-service/lowcoder-server/src/main/java/org/lowcoder/api/home/UserHomeApiServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import org.lowcoder.api.usermanagement.view.OrgAndVisitorRoleView;
import org.lowcoder.api.usermanagement.view.UserProfileView;
import org.lowcoder.domain.application.model.Application;
import org.lowcoder.domain.application.model.ApplicationRecord;
import org.lowcoder.domain.application.model.ApplicationStatus;
import org.lowcoder.domain.application.model.ApplicationType;
import org.lowcoder.domain.application.service.ApplicationRecordService;
Expand All @@ -35,7 +36,9 @@
import org.lowcoder.domain.user.service.UserService;
import org.lowcoder.domain.user.service.UserStatusService;
import org.lowcoder.infra.util.NetworkUtils;
import org.lowcoder.infra.util.TupleUtils;
import org.lowcoder.sdk.config.CommonConfig;
import org.lowcoder.sdk.models.VersionedModel;
import org.springframework.stereotype.Component;
import org.springframework.web.server.ServerWebExchange;
import reactor.core.publisher.Flux;
Expand Down Expand Up @@ -203,11 +206,13 @@ public Flux<ApplicationInfoView> getAllAuthorisedApplications4CurrentOrgMember(@
return applicationService.findByOrganizationIdWithDsl(currentOrgId);
}
return applicationService.findByOrganizationIdWithoutDsl(currentOrgId);
})
.filter(application -> (isNull(applicationType) || applicationType == ApplicationType.ALL || application.getApplicationType() == applicationType.getValue())
&& (isNull(applicationStatus) || application.getApplicationStatus() == applicationStatus)
&& (isNull(name) || StringUtils.containsIgnoreCase(application.getName(), name))
&& (isNull(category) || StringUtils.containsIgnoreCase(application.getCategory(), category)))
}).flatMap(application -> application.getCategory(applicationRecordService)
.map(categoryValue -> Map.entry(application, categoryValue)))
.filter(entry -> (isNull(applicationType) || applicationType == ApplicationType.ALL || entry.getKey().getApplicationType() == applicationType.getValue())
&& (isNull(applicationStatus) || entry.getKey().getApplicationStatus() == applicationStatus)
&& (isNull(name) || StringUtils.containsIgnoreCase(entry.getKey().getName(), name))
&& (isNull(category) || StringUtils.containsIgnoreCase(entry.getValue(), category)))
.map(Map.Entry::getKey)
.cache()
.collectList()
.flatMapIterable(Function.identity());
Expand Down Expand Up @@ -563,33 +568,48 @@ public Flux<MarketplaceBundleInfoView> getAllAgencyProfileBundles() {

private Mono<ApplicationInfoView> buildView(Application application, ResourceRole maxRole, Map<String, User> userMap, @Nullable Instant lastViewTime,
Long bundlePosition, boolean withContainerSize) {
ApplicationInfoViewBuilder applicationInfoViewBuilder = ApplicationInfoView.builder()
.applicationId(application.getId())
.applicationGid(application.getGid())
.orgId(application.getOrganizationId())
.name(application.getName())
.createBy(Optional.ofNullable(userMap.get(application.getCreatedBy()))
.map(User::getName)
.orElse(""))
.createAt(application.getCreatedAt().toEpochMilli())
.role(maxRole.getValue())
.applicationType(application.getApplicationType())
.applicationStatus(application.getApplicationStatus())
.lastModifyTime(application.getUpdatedAt())
.lastViewTime(lastViewTime)
.lastEditedAt(application.getLastEditedAt())
.publicToAll(application.isPublicToAll())
.publicToMarketplace(application.isPublicToMarketplace())
.agencyProfile(application.agencyProfile());
if (withContainerSize) {
return application.getLiveContainerSize(applicationRecordService).map(size -> applicationInfoViewBuilder
.containerSize(size)
.build())
.switchIfEmpty(Mono.just(applicationInfoViewBuilder
.containerSize(null)
.build()));
}
return Mono.just(applicationInfoViewBuilder.build());
return application.getTitle(applicationRecordService)
.zipWith(application.getDescription(applicationRecordService))
.zipWith(application.getCategory(applicationRecordService), TupleUtils::merge)
.zipWith(application.getIcon(applicationRecordService), TupleUtils::merge)
.zipWith(applicationRecordService.getLatestRecordByApplicationId(application.getId()).map(Optional::of).switchIfEmpty(Mono.just(Optional.empty())), TupleUtils::merge)
.flatMap(tuple -> {
Optional<ApplicationRecord> lastAppRecord = tuple.getT5();
ApplicationInfoView.ApplicationInfoViewBuilder applicationInfoViewBuilder = ApplicationInfoView.builder()
.applicationId(application.getId())
.applicationGid(application.getGid())
.orgId(application.getOrganizationId())
.name(application.getName())
.title(tuple.getT1())
.description(tuple.getT2())
.category(tuple.getT3())
.icon(tuple.getT4())
.published(lastAppRecord.isPresent())
.publishedVersion(lastAppRecord.map(ApplicationRecord::version).orElse(null))
.lastPublishedTime(lastAppRecord.map(ApplicationRecord::getCreatedAt).orElse(null))
.createBy(Optional.ofNullable(userMap.get(application.getCreatedBy()))
.map(User::getName)
.orElse(""))
.createAt(application.getCreatedAt().toEpochMilli())
.role(maxRole.getValue())
.applicationType(application.getApplicationType())
.applicationStatus(application.getApplicationStatus())
.lastModifyTime(application.getUpdatedAt())
.lastViewTime(lastViewTime)
.lastEditedAt(application.getLastEditedAt())
.publicToAll(application.isPublicToAll())
.publicToMarketplace(application.isPublicToMarketplace())
.agencyProfile(application.agencyProfile());
if (withContainerSize) {
return application.getLiveContainerSize(applicationRecordService).map(size -> applicationInfoViewBuilder
.containerSize(size)
.build())
.switchIfEmpty(Mono.just(applicationInfoViewBuilder
.containerSize(null)
.build()));
}
return Mono.just(applicationInfoViewBuilder.build());
});
}

}
Loading