Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into
Browse files Browse the repository at this point in the history
EA-3957-insert-multiple-items
  • Loading branch information
gsergiu committed Nov 6, 2024
2 parents eace0cc + 766ea97 commit d43cc6d
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@
<!-- To enable logging of Mongo queries, set log level to debug -->
<logger name="org.mongodb.morphia" level="DEBUG"/>

<!-- To enable logging of Mongo queries, set log level to debug -->
<logger name="dev.morphia" level="WARN"/>
<!-- Supress Mapper logs (e.g. entity caching disabled) -->
<logger name="dev.morphia.Mapper" level="WARN"/>

<!-- To enable logging of test contaners, set log level to debug -->
<logger name="org.testcontainers" level="DEBUG"/>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ public static void initTokens() {

@DynamicPropertySource
static void setProperties(DynamicPropertyRegistry registry) {
// registry.add("mongodb.set.connectionUrl", MONGO_CONTAINER::getConnectionUrl);
registry.add("mongodb.set.connectionUrl", () -> "mongodb://127.0.0.1:27017/set_test");
//registry.add("mongodb.set.connectionUrl", () -> "");
//registry.add("mongodb.set.truststore", () -> "");
//registry.add("mongodb.set.truststorepass", () -> "");
}
Expand All @@ -69,30 +69,53 @@ public void generateGalleriesWithDepiction() throws Exception {
Authentication adminAuth = UserSetAuthorizationUtils.createAuthentication(adminUserToken);

final int pageSize = 200;
int page = Integer.valueOf(UserSetUtils.DEFAULT_PAGE);
//int page = Integer.valueOf(UserSetUtils.DEFAULT_PAGE);
String sort = WebUserSetModelFields.CREATED + " asc";
UserSetQuery searchQuery =
queryBuilder.buildUserSetQuery("type:Collection", null, sort, page, pageSize, getConfiguration());
queryBuilder.buildUserSetQuery("type:Collection", null, sort, 0, pageSize, getConfiguration());
final ArrayList<LdProfiles> profiles = new ArrayList<LdProfiles>();
profiles.add(LdProfiles.STANDARD);
DepictionGenerationReport report = new DepictionGenerationReport();

ResultSet<? extends UserSet> results = null;
//page index startw with 1, but that is set at the beginning of the
int page= 0;
do {
//move to first/next page
page++;
searchQuery.setPageNr(page);
results =
getUserSetService().search(searchQuery, null, profiles, adminAuth);
final int found = results.getResults() == null? 0 : results.getResults().size();
System.out.println(found + " Items found on page: " + page);

if(hasNoItems(results)) {
break; // stop if no results found anymore
}
generateDepictions(results.getResults(), report);

//move to next page
page++;
searchQuery.setPageNr(page);

//brake
results = null;
} while (results != null && hasNext(pageSize, results));
//results = null;
} while (hasItems(results));

System.out.println("Completed Depiction Generation for result pages: " + page);

System.out.println("Generated depictions: " + report.getGenerated());
System.out.println("Skipped sets: " + report.getSkipped());
System.out.println("Not generated: " + report.getNotGenerated());

}

private boolean hasItems(ResultSet<? extends UserSet> results) {
return !hasNoItems(results);
}

private boolean hasNoItems(ResultSet<? extends UserSet> results) {
return results == null || results.getResults() == null || results.getResults().isEmpty();
}

private void generateDepictions(List<? extends UserSet> results, DepictionGenerationReport report) {

for (UserSet userSet : results) {
Expand Down Expand Up @@ -134,11 +157,4 @@ private WebResource generateGalleryDepiction(UserSet userSet){
return null;
}
}



private boolean hasNext(final int pageSize, ResultSet<? extends UserSet> results) {
return results.getResultSize() < pageSize;
}

}
5 changes: 4 additions & 1 deletion set-web/src/main/resources/log4j2-spring.xml.template
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,10 @@
<logger name="org.mongodb.driver.connection" level="WARN"/>

<!-- To enable logging of Mongo queries, set log level to debug -->
<logger name="org.mongodb.morphia" level="WARN"/>
<logger name="dev.morphia" level="WARN"/>
<!-- Supress Mapper logs (e.g. entity caching disabled) -->
<logger name="dev.morphia.Mapper" level="WARN"/>

</Loggers>
</Configuration>

0 comments on commit d43cc6d

Please sign in to comment.