Skip to content

Commit d57585a

Browse files
author
Thomas
committed
Refactor code
1 parent cde6f53 commit d57585a

File tree

2 files changed

+7
-31
lines changed

2 files changed

+7
-31
lines changed

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/service/ApplicationServiceImpl.java

Lines changed: 6 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public Mono<Application> findByIdWithoutDsl(String id) {
6161
return Mono.error(new BizException(BizError.INVALID_PARAMETER, "INVALID_PARAMETER", FieldName.ID));
6262
}
6363

64-
if(FieldName.guessFieldNameFromId(id).equals(FieldName.GID))
64+
if(FieldName.isGID(id))
6565
return Mono.from(repository.findByGid(id)).switchIfEmpty(Mono.error(new BizException(BizError.NO_RESOURCE_FOUND, "CANT_FIND_APPLICATION", id)));
6666
return repository.findById(id)
6767
.switchIfEmpty(Mono.error(new BizException(BizError.NO_RESOURCE_FOUND, "CANT_FIND_APPLICATION", id)));
@@ -129,8 +129,7 @@ public Mono<Long> countByOrganizationId(String orgId, ApplicationStatus applicat
129129

130130
@Override
131131
public Flux<Application> findByIdIn(List<String> applicationIds) {
132-
if(applicationIds.isEmpty()) return Flux.empty();
133-
if(FieldName.guessFieldNameFromId(applicationIds.get(0)).equals(FieldName.GID))
132+
if(!applicationIds.isEmpty() && FieldName.isGID(applicationIds.get(0)))
134133
return repository.findByGidIn(applicationIds);
135134
return repository.findByIdIn(applicationIds);
136135
}
@@ -261,13 +260,7 @@ public Mono<Set<String>> getFilteredPublicApplicationIds(ApplicationRequestType
261260
@NonEmptyMono
262261
@SuppressWarnings("ReactiveStreamsNullableInLambdaInTransform")
263262
public Mono<Set<String>> getPublicApplicationIds(Collection<String> applicationIds) {
264-
265-
if(applicationIds.isEmpty())
266-
return repository.findByPublicToAllIsTrueAndIdIn(applicationIds)
267-
.map(HasIdAndAuditing::getId)
268-
.collect(Collectors.toSet());
269-
270-
if(FieldName.guessFieldNameFromId(applicationIds.stream().findFirst().get()).equals(FieldName.GID))
263+
if(!applicationIds.isEmpty() && FieldName.isGID(applicationIds.stream().findFirst().get()))
271264
return repository.findByPublicToAllIsTrueAndGidIn(applicationIds)
272265
.map(Application::getGid)
273266
.collect(Collectors.toSet());
@@ -287,12 +280,7 @@ public Mono<Set<String>> getPublicApplicationIds(Collection<String> applicationI
287280
public Mono<Set<String>> getPrivateApplicationIds(Collection<String> applicationIds, String userId) {
288281

289282
// TODO: in 2.4.0 we need to check whether the app was published or not
290-
if(applicationIds.isEmpty())
291-
return repository.findByCreatedByAndIdIn(userId, applicationIds)
292-
.map(HasIdAndAuditing::getId)
293-
.collect(Collectors.toSet());
294-
295-
if(FieldName.guessFieldNameFromId(applicationIds.stream().findFirst().get()).equals(FieldName.GID))
283+
if(!applicationIds.isEmpty() && FieldName.isGID(applicationIds.stream().findFirst().get()))
296284
return repository.findByCreatedByAndGidIn(userId, applicationIds)
297285
.map(Application::getGid)
298286
.collect(Collectors.toSet());
@@ -313,12 +301,7 @@ public Mono<Set<String>> getPublicMarketplaceApplicationIds(Collection<String> a
313301

314302
if ((isAnonymous && !isPrivateMarketplace) || !isAnonymous)
315303
{
316-
if(applicationIds.isEmpty())
317-
return repository.findByPublicToAllIsTrueAndPublicToMarketplaceIsTrueAndIdIn(applicationIds)
318-
.map(HasIdAndAuditing::getId)
319-
.collect(Collectors.toSet());
320-
321-
if(FieldName.guessFieldNameFromId(applicationIds.stream().findFirst().get()).equals(FieldName.GID))
304+
if(!applicationIds.isEmpty() && FieldName.isGID(applicationIds.stream().findFirst().get()))
322305
return repository.findByPublicToAllIsTrueAndPublicToMarketplaceIsTrueAndGidIn(applicationIds)
323306
.map(Application::getGid)
324307
.collect(Collectors.toSet());
@@ -338,12 +321,7 @@ public Mono<Set<String>> getPublicMarketplaceApplicationIds(Collection<String> a
338321
@SuppressWarnings("ReactiveStreamsNullableInLambdaInTransform")
339322
public Mono<Set<String>> getPublicAgencyApplicationIds(Collection<String> applicationIds) {
340323

341-
if(applicationIds.isEmpty())
342-
return repository.findByPublicToAllIsTrueAndAgencyProfileIsTrueAndIdIn(applicationIds)
343-
.map(HasIdAndAuditing::getId)
344-
.collect(Collectors.toSet());
345-
346-
if(FieldName.guessFieldNameFromId(applicationIds.stream().findFirst().get()).equals(FieldName.GID))
324+
if(!applicationIds.isEmpty() && FieldName.isGID(applicationIds.stream().findFirst().get()))
347325
return repository.findByPublicToAllIsTrueAndAgencyProfileIsTrueAndGidIn(applicationIds)
348326
.map(Application::getGid)
349327
.collect(Collectors.toSet());

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/bundle/service/BundleServiceImpl.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,7 @@ public Flux<Bundle> findByUserId(String userId) {
6868

6969
@Override
7070
public Mono<Void> deleteAllById(Collection<String> ids) {
71-
if(ids.isEmpty())
72-
return repository.deleteAllById(ids);
73-
if(FieldName.isGID(ids.stream().findFirst().get()))
71+
if(!ids.isEmpty() && FieldName.isGID(ids.stream().findFirst().get()))
7472
return repository.deleteAllByGid(ids);
7573
return repository.deleteAllById(ids);
7674
}

0 commit comments

Comments
 (0)