Merge pull request #7 from ncats/arch-starter

export and facet
ncats · Nov 7, 2022 · 1b85282 · 1b85282
2 parents 8f30886 + ec3b372
commit 1b85282
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 1 deletion.
diff --git a/...src/main/java/gov/hhs/gsrs/application/application/controllers/ApplicationController.java b/...src/main/java/gov/hhs/gsrs/application/application/controllers/ApplicationController.java
@@ -12,15 +12,19 @@
 
 import gov.nih.ncats.common.util.Unchecked;
 import gsrs.DefaultDataSourceConfig;
+import gsrs.GsrsFactoryConfiguration;
 import gsrs.autoconfigure.GsrsExportConfiguration;
 import gsrs.controller.*;
 import gsrs.controller.hateoas.HttpRequestHolder;
 import gsrs.legacy.LegacyGsrsSearchService;
+import gsrs.module.substance.SubstanceEntityServiceImpl;
 import gsrs.repository.ETagRepository;
 import gsrs.service.EtagExportGenerator;
 import gsrs.service.ExportService;
 import gsrs.service.GsrsEntityService;
 import ix.core.models.ETag;
+import ix.core.search.SearchOptions;
+import ix.core.search.text.TextIndexer;
 import ix.ginas.exporters.ExportMetaData;
 import ix.ginas.exporters.ExportProcess;
 import ix.ginas.exporters.Exporter;
@@ -84,6 +88,9 @@ public class ApplicationController extends EtagLegacySearchEntityController<Appl
     @Autowired
     private ObjectMapper objectMapper;
 
+    @Autowired
+    private GsrsFactoryConfiguration gsrsFactoryConfiguration;
+
 
     @Override
     public GsrsEntityService<Application, Long> getEntityService() {
@@ -234,6 +241,15 @@ public ResponseEntity<String> findCenterBySubstanceKey(@PathVariable("substanceK
     }
     */
 
+    @Override
+    public SearchOptions instrumentSearchOptions(SearchOptions so) {
+
+        so= super.instrumentSearchOptions(so);
+        so.addDateRangeFacet("root_submitDate");
+
+        return so;
+    }
+
     public JsonNode injectSubstanceBySubstanceKey(String substanceKey) {
 
         JsonNode actualObj = null;

diff --git a/...a/gov/hhs/gsrs/application/application/indexers/ApplicationIngredientIndexValueMaker.java b/...a/gov/hhs/gsrs/application/application/indexers/ApplicationIngredientIndexValueMaker.java
@@ -75,9 +75,15 @@ public void createIndexableValues(Application application, Consumer<IndexableVal
     }
 
     public String leftPadding(String value) {
+        /*
         if (value != null) {
             return String.format("%06d", Integer.parseInt(value));
         }
-        return value;
+        */
+        String paddedAppNumber = value;
+        if (value != null) {
+            paddedAppNumber =  ("000000" + value).substring(("000000" + value).length() - 6);
+        }
+        return paddedAppNumber;
     }
 }
diff --git a/...-autoconfigure/src/main/java/gov/hhs/gsrs/application/application/models/Application.java b/...-autoconfigure/src/main/java/gov/hhs/gsrs/application/application/models/Application.java
@@ -245,6 +245,7 @@ public String getStatusDateByYear(){
         return result;
     }
 
+    /*
     @JsonIgnore
     @Indexable(facet=true, name="Submit Date")
     public String getSubmitDateRange(){
@@ -283,6 +284,7 @@ public String getSubmitDateRange(){
         }
         return result;
     }
+     */
 
     /*
     @JsonIgnore

diff --git a/gsrs-module-applications-spring-boot-autoconfigure/src/main/resources/applications-core.conf b/gsrs-module-applications-spring-boot-autoconfigure/src/main/resources/applications-core.conf
@@ -549,4 +549,20 @@ gsrs.substances.molwitch.enabled=false
 #Allows deep analysis of fields to do suggestions
 ix.index.deepfieldsraw = "gov.hhs.gsrs.application.application.models.Application"
 
+# Export CONFIG
+ix.ginas.export.settingsPresets.applications= {
+  "ALL_DATA": {
+    "owner":"admin",
+   	"scrubberSettings":null
+   }
+}
+
+# Export CONFIG
+ix.ginas.export.settingsPresets.applicationsall= {
+  "ALL_DATA": {
+    "owner":"admin",
+   	"scrubberSettings":null
+   }
+}
+
 ##******* APPLICATION CONFIG END ***************