some corrections; more remain

ncats · Nov 8, 2024 · ff96939 · ff96939
1 parent ea62d5e
commit ff96939
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 23 deletions.
diff --git a/gsrs-module-substance-example/src/main/resources/fda-extension.conf b/gsrs-module-substance-example/src/main/resources/fda-extension.conf
@@ -24,10 +24,11 @@ gsrs.microservice.clinicaltrialseurope.api.headers= {
                         "auth-key"="myKey"
 }
 
-gsrs.entityProcessors.UniqueCodeGenerator ={
-    "order":123,
-               "entityClassName": "ix.ginas.models.v1.Substance",
+gsrs.entityProcessors.list.UniqueCodeGenerator =
+       {
+               "entityClassName" = "ix.ginas.models.v1.Substance",
                "processor" = "gsrs.module.substance.processors.UniqueCodeGenerator",
+               "order" = 8010,
                "with"=  {
                         "useLegacy"=true,
                         "codesystem"="BDNUM",
@@ -40,16 +41,25 @@ gsrs.entityProcessors.UniqueCodeGenerator ={
                }
         }
 
-gsrs.entityProcessors.ApprovalIdProcessor=
-        {
-        "order":124,
-        "entityClassName": "ix.ginas.models.v1.Substance",
-        "processor" = "gsrs.module.substance.processors.ApprovalIdProcessor",
-        "parameters" = {
-            "codeSystem" = "FDA UNII"
-        }
+gsrs.entityProcessors.list.ApprovalIdProcessor =
+       {
+	       "entityClassName" = "ix.ginas.models.v1.Substance",
+	       "processor" = "gsrs.module.substance.processors.ApprovalIdProcessor",
+         "order" = 6010
         }
 
+
+
+#gsrs.entityProcessors.ApprovalIdProcessor=
+#        {
+#        "order":124,
+#        "entityClassName": "ix.ginas.models.v1.Substance",
+#        "processor" = "gsrs.module.substance.processors.ApprovalIdProcessor",
+#        "parameters" = {
+#            "codeSystem" = "FDA UNII"
+#        }
+#        }
+
 #removed ${ix.ginas.export.factories.substances}
 ix.ginas.export.factories.substances =[
     #"gsrs.module.substance.ExtraColumnsSpreadsheetExporterFactory",

diff --git a/gsrs-module-substance-example/src/test/resources/application-test.conf b/gsrs-module-substance-example/src/test/resources/application-test.conf
@@ -61,11 +61,10 @@ gsrs.standardizers.substances = {
     }
 }
 
-gsrs.importAdapterFactories.substances =
-	[
+gsrs.importAdapterFactories.substances.SDFImportAdapterFactory =
 		{
-
 			"adapterName": "SDF Adapter",
+			"order" : 10,
 			"importAdapterFactoryClass": "gsrs.module.substance.importers.SDFImportAdapterFactory",
 			"stagingAreaServiceClass": "gsrs.stagingarea.service.DefaultStagingAreaService",
 			"entityServiceClass" :"gsrs.dataexchange.SubstanceStagingAreaEntityService",
@@ -303,9 +302,11 @@ gsrs.importAdapterFactories.substances =
 					}
 				]
 			}
-		},
-		{
+		}
+
+gsrs.importAdapterFactories.substances.DelimTextImportAdapterFactory ={
 			"adapterName": "Delimited Text Adapter",
+			"order" : 40,
 			"importAdapterFactoryClass": "gsrs.module.substance.importers.DelimTextImportAdapterFactory",
 			"stagingAreaServiceClass": "gsrs.stagingarea.service.DefaultStagingAreaService",
 			"entityServiceClass" :"gsrs.dataexchange.SubstanceStagingAreaEntityService",
@@ -436,9 +437,11 @@ gsrs.importAdapterFactories.substances =
 				],
 				"lineValueDelimiter": ","
 			}
-		},
-		{
+		}
+
+gsrs.importAdapterFactories.substances.ExcelFileImportAdapterFactory ={
 			"adapterName": "Excel File Adapter",
+			"order" : 41,
 			"importAdapterFactoryClass": "gsrs.module.substance.importers.ExcelFileImportAdapterFactory",
 			"stagingAreaServiceClass": "gsrs.stagingarea.service.DefaultStagingAreaService",
 			"entityServiceClass" :"gsrs.dataexchange.SubstanceStagingAreaEntityService",
@@ -567,10 +570,12 @@ gsrs.importAdapterFactories.substances =
 				],
 				"lineValueDelimiter": ","
 			}
-		},
-		{
+	}
+
+gsrs.importAdapterFactories.substances.GSRSJSONImportAdapterFactory={
 			"adapterName": "GSRS JSON Adapter",
-			"importAdapterFactoryClass": "gsrs.module.substance.importers.GSRSJSONImportAdapterFactory",
+			"order" : 11,
+			"importAdapterFactoryClass"= "gsrs.module.substance.importers.GSRSJSONImportAdapterFactory",
 			"stagingAreaServiceClass": "gsrs.stagingarea.service.DefaultStagingAreaService",
 			"entityServiceClass" :"gsrs.dataexchange.SubstanceStagingAreaEntityService",
 			"description" : "GSRS legacy JSON file importer",
@@ -583,7 +588,6 @@ gsrs.importAdapterFactories.substances =
 			#the things used to instantiate the adapter
 
 			}
-		}
-	]
+	}
 
 gsrs.substance.structures.saltFilePath=salt_data_public.tsv