Merge pull request #448 from Breeding-Insight/feature/BI-2579

[BI-2579] Refresh cache after import completes

Author: nickpalladino

src/main/java/org/breedinginsight/brapi/v2/dao/BrAPIGermplasmDAO.java

@@ -162,6 +162,10 @@ private Map<String, BrAPIGermplasm> fetchProgramGermplasm(UUID programId) throws
         }
     }
 
+    public void repopulateGermplasmCacheForProgram(UUID programId) {
+        programGermplasmCache.populate(programId);
+    }
+
     /**
      * Process germplasm into a format for display
      * @param programGermplasm
@@ -310,11 +314,8 @@ public List<BrAPIGermplasm> createBrAPIGermplasm(List<BrAPIGermplasm> postBrAPIG
         var program = programDAO.fetchOneById(programId);
         try {
             if (!postBrAPIGermplasmList.isEmpty()) {
-                Callable<Map<String, BrAPIGermplasm>> postFunction = () -> {
                     List<BrAPIGermplasm> postResponse = brAPIDAOUtil.post(postBrAPIGermplasmList, upload, api::germplasmPost, importDAO::update);
-                    return processGermplasmForDisplay(postResponse, program.getKey());
-                };
-                return programGermplasmCache.post(programId, postFunction);
+                    return new ArrayList<>(processGermplasmForDisplay(postResponse, program.getKey()).values());
             }
             return new ArrayList<>();
         } catch (Exception e) {

src/main/java/org/breedinginsight/brapps/importer/services/processors/germplasm/GermplasmProcessor.java

@@ -635,6 +635,8 @@ public void postBrapiData(Map<Integer, PendingImport> mappedBrAPIImport, Program
             try {
                 // Create germplasm list
                 brAPIListDAO.createBrAPILists(List.of(importList), program.getId(), upload);
+                // Now that we have finished uploading, fetch all the data posted to BrAPI to the cache so it is up-to-date.
+                brAPIGermplasmDAO.repopulateGermplasmCacheForProgram(program.getId());
             } catch (ApiException e) {
                 throw new InternalServerException(e.toString(), e);
             }

src/main/resources/brapi/properties/application.properties

@@ -25,13 +25,25 @@ spring.datasource.password=${BRAPI_DB_PASSWORD}
 
 spring.datasource.driver-class-name=org.postgresql.Driver
 
+# This property when set to true makes it so that a DB transaction is open through the body of a request, nullifying the use of @Transactional.
+# It is generally recommended that this be set to false, and methods are properly annotated and release the transactions when complete.
+# However, many of the endpoints already rely on this kind of connection infrastructure and changing is more trouble than it's worth.
+spring.jpa.open-in-view=true
+
+spring.jpa.properties.hibernate.jdbc.batch_size=50
+spring.jpa.properties.hibernate.order_inserts=true
+spring.jpa.properties.hibernate.order_updates=true
+spring.jpa.hibernate.ddl-auto=validate
+
+# Use these to help debug queries.
+# The stats will tell you how long hibernate transactions are taking, how many queries occur, how many entities are being flushed/accessed, etc.
+spring.jpa.show-sql=false
+spring.jpa.properties.hibernate.generate_statistics=false
+
 spring.flyway.locations=classpath:db/migration,classpath:db/sql,classpath:org/brapi/test/BrAPITestServer/db/migration
 spring.flyway.schemas=public
 spring.flyway.baselineOnMigrate=true
 
-spring.jpa.hibernate.ddl-auto=validate
-spring.jpa.show-sql=false
-
 spring.mvc.dispatch-options-request=true
 
 security.oidc_discovery_url=https://example.com/auth/.well-known/openid-configuration