Fixes syntax for ConditonalOnProperty (#262)

* Fixes syntax for ConditonalOnProperty * update postman --------- Co-authored-by: Michael Peels <[email protected]>
CDCgov · Dec 20, 2024 · d8c8e7f · d8c8e7f
1 parent 02f877c
commit d8c8e7f
Show file tree

Hide file tree

Showing 2 changed files with 89 additions and 4 deletions.
diff --git a/...va/gov/cdc/dataprocessing/service/implementation/person/matching/DeduplicationClient.java b/...va/gov/cdc/dataprocessing/service/implementation/person/matching/DeduplicationClient.java
@@ -7,7 +7,7 @@
 import org.springframework.web.client.RestClient;
 
 @Configuration
-@ConditionalOnProperty(name = "${features.modernizedMatching.enabled}", havingValue = "true")
+@ConditionalOnProperty(name = "features.modernizedMatching.enabled", havingValue = "true")
 public class DeduplicationClient {
 
   @Bean

diff --git a/docs/DataIngestion.postman_collection.json b/docs/DataIngestion.postman_collection.json
@@ -63,7 +63,7 @@
 			"response": []
 		},
 		{
-			"name": "Submit",
+			"name": "Melissa Foster - Prelim",
 			"event": [
 				{
 					"listen": "test",
@@ -144,7 +144,7 @@
 			"response": []
 		},
 		{
-			"name": "Submit2",
+			"name": "Melis Foste - Final",
 			"event": [
 				{
 					"listen": "test",
@@ -206,7 +206,88 @@
 				],
 				"body": {
 					"mode": "raw",
-					"raw": "MSH|^~\\&|HL7 Generator^^|LAKELAND FAMILY PRATICE^25D2552222^CLIA|ALDOH^OID^ISO|AL^OID^ISO|202411271010||ORU^R01^ORU_R01|20241127101053|P|2.5.1\nPID|1|244240270^^^CVS Health GA7783POCT RICHMOND HILL&55D1111111&CLIA|244240270^^^Social Security Administration&SSA&CLIA^SS||Foster^Melissa^Alexandra^IV^Dr^CPA|Morris|192812110000|U|kavita|2028-9^Asian^CDCREC|82917 Gonzalez Underpass^unit 1213^Erikafort^GA^30342^USA||^^^[email protected]^^732^5447266^6212|^^^[email protected]^^732^6573042^6212|ENG|T^^^^^|||889-18-5322|||2135-2^Hispanic or Latino^CDCREC|Alyssaside|Y|3|||USA|202411061010|Y\nPV1||N\nORC|RE||68396754924^Simpson, Richardson and Becker^55D1555155^CLIA||N||||||||||||||||Tran, Hobbs and Porter|541 Robert Burgs Apt. 745^unit 6026^Jacksonchester^WV^75676^USA|^^^^^^979^6491628^1467|3833 Joshua Parkway^unit 6548^South Terrenceport^CA^54258^USA\nOBR|1|53^Enquizit^eq^|083991250O^LAKELAND FAMILY PRATICE^25D2552222^CLIA|77190-7^Hepatitis B virus core and surface Ab and surface Ag panel - Serum^LN^53^TestData^L|S||202411271010|202412021010||||BLD|Score along nice forward.|202411271010||2959104^Garcia^Alejandro^III^Dr^DO|2369054894^^^[email protected]|||||202412021010|||F|||1103478^Lozano^James^Sr^Mrs^DD|||89832^ACUTE ATOPIC CONJUNCTIVIT^10497|85824&Smith&Emily&&Sr&Dr&MD^202411271010^202412021010\nOBX|1|NM|77190-7^Hepatitis B virus core and surface Ab and surface Ag panel - Serum^LN|1|100^1^:^1|mL|10-100|H|||C||||||||202411271010\nSPM|1|4541277&Enquizit&eq&^1379139&LAKELAND FAMILY PRATICE&25D2552222&CLIA||PLR^Pleural fluid (thoracentesis fld)^HL70487^ISLT^Isolate^SCT^2.5.1^Pleural fluid (thoracentesis fld)|||ISLT^ISLT^TG|871698510^research^SNM||||53^ML||Rock walk reality.|||202411271010^202412021010|202411271010|||\n"
+					"raw": "MSH|^~\\&|HL7 Generator^^|LAKELAND FAMILY PRATICE^25D2552222^CLIA|ALDOH^OID^ISO|AL^OID^ISO|202411271010||ORU^R01^ORU_R01|20241127101053|P|2.5.1\nPID|1|244240270^^^CVS Health GA7783POCT RICHMOND HILL&55D1111111&CLIA|244240270^^^Social Security Administration&SSA&CLIA^SS||Foste^Melis^Alexandra^IV^Dr^CPA|Morris|192812110000|U|kavita|2028-9^Asian^CDCREC|82917 Gonzalez Underpass^unit 1213^Erikafort^GA^30342^USA||^^^[email protected]^^732^5447266^6212|^^^[email protected]^^732^6573042^6212|ENG|T^^^^^|||889-18-5322|||2135-2^Hispanic or Latino^CDCREC|Alyssaside|Y|3|||USA|202411061010|Y\nPV1||N\nORC|RE||68396754924^Simpson, Richardson and Becker^55D1555155^CLIA||N||||||||||||||||Tran, Hobbs and Porter|541 Robert Burgs Apt. 745^unit 6026^Jacksonchester^WV^75676^USA|^^^^^^979^6491628^1467|3833 Joshua Parkway^unit 6548^South Terrenceport^CA^54258^USA\nOBR|1|53^Enquizit^eq^|083991250O^LAKELAND FAMILY PRATICE^25D2552222^CLIA|77190-7^Hepatitis B virus core and surface Ab and surface Ag panel - Serum^LN^53^TestData^L|S||202411271010|202412021010||||BLD|Score along nice forward.|202411271010||2959104^Garcia^Alejandro^III^Dr^DO|2369054894^^^[email protected]|||||202412021010|||F|||1103478^Lozano^James^Sr^Mrs^DD|||89832^ACUTE ATOPIC CONJUNCTIVIT^10497|85824&Smith&Emily&&Sr&Dr&MD^202411271010^202412021010\nOBX|1|NM|77190-7^Hepatitis B virus core and surface Ab and surface Ag panel - Serum^LN|1|100^1^:^1|mL|10-100|H|||C||||||||202411271010\nSPM|1|4541277&Enquizit&eq&^1379139&LAKELAND FAMILY PRATICE&25D2552222&CLIA||PLR^Pleural fluid (thoracentesis fld)^HL70487^ISLT^Isolate^SCT^2.5.1^Pleural fluid (thoracentesis fld)|||ISLT^ISLT^TG|871698510^research^SNM||||53^ML||Rock walk reality.|||202411271010^202412021010|202411271010|||\n"
+				},
+				"url": {
+					"raw": "http://localhost:8081/ingestion/api/elrs",
+					"protocol": "http",
+					"host": [
+						"localhost"
+					],
+					"port": "8081",
+					"path": [
+						"ingestion",
+						"api",
+						"elrs"
+					]
+				}
+			},
+			"response": []
+		},
+		{
+			"name": "Ashley Berry",
+			"event": [
+				{
+					"listen": "test",
+					"script": {
+						"exec": [
+							"const messageUuid = pm.response.text();",
+							"pm.collectionVariables.set(\"messageUuid\", messageUuid);"
+						],
+						"type": "text/javascript",
+						"packages": {}
+					}
+				}
+			],
+			"request": {
+				"auth": {
+					"type": "bearer",
+					"bearer": [
+						{
+							"key": "token",
+							"value": "{{token}}",
+							"type": "string"
+						}
+					]
+				},
+				"method": "POST",
+				"header": [
+					{
+						"key": "msgType",
+						"value": "HL7"
+					},
+					{
+						"key": "validationActive",
+						"value": "true"
+					},
+					{
+						"key": "Content-Type",
+						"value": "text/plain"
+					},
+					{
+						"key": "Authorization",
+						"value": "Basic ZGl0ZWFtYWRtaW46dGVtcDEyMw==",
+						"disabled": true
+					},
+					{
+						"key": "clientid",
+						"value": "di-keycloak-client",
+						"type": "text"
+					},
+					{
+						"key": "clientsecret",
+						"value": "OhBq1ar96aep8cnirHwkCNfgsO9yybZI",
+						"type": "text"
+					},
+					{
+						"key": "version",
+						"value": "2",
+						"type": "text"
+					}
+				],
+				"body": {
+					"mode": "raw",
+					"raw": "MSH|^~\\&|HL7 Generator^^|GACARROLLTONMANORINC^22D2332322^CLIA|ALDOH^OID^ISO|AL^OID^ISO|202411271010||ORU^R01^ORU_R01|20241127101053|P|2.5.1\nPID|1|283561008^^^GACARROLLTONMANORINC&22D2332322&CLIA|283561008^^^Social Security Administration&SSA&CLIA^SS||Berry^Ashley^Crystal^Jr^Dr^DD|Hill|201803160000|M|kavita|2028-9^Asian^CDCREC|103 Gabriel Shoal Suite 804^unit 4508^Benjaminmouth^TN^30342^USA||^^^[email protected]^^732^9755350^5809|^^^[email protected]^^732^0942769^5809|ENG|T^^^^^|||063-23-5252|||2135-2^Hispanic or Latino^CDCREC|South Rachel|Y|3|||USA|202411061010|Y\nPV1||C\nORC|RE||18052360608^Taylor Group^11D1113111^CLIA||N||||||||||||||||Rodriguez, Freeman and Reynolds|986 Johnny Run Suite 269^unit 7489^Johnnyfort^MD^69885^USA|^^^^^^979^6098821^9015|0967 Elizabeth Neck^unit 952^Mccormickside^IN^79845^USA\nOBR|1|53^Hospital^110^|028268228a^GACARROLLTONMANORINC^22D2332322^CLIA|77190-7^Hepatitis B virus core and surface Ab and surface Ag panel - Serum^LN^53^TestData^L|S||202411271010|202412021010||||BLD|Answer itself bag recent everybody that.|202411271010||1988699^Meyer^Kim^ESQ^Ms^DDS|0143738122^^^[email protected]|||||202412021010|||P|||1993558^Young^Nathan^Sr^Dr^MD|||26382^Adult hypertrophic pyloric stenosis^70945|34465&Moreno&Austin&&Jr&Mr&DRN^202411271010^202412021010\nOBX|1|NM|77190-7^Hepatitis B virus core and surface Ab and surface Ag panel - Serum^LN|1|100^1^:^1|mL|10-100|H|||C||||||||202411271010\nSPM|1|5749215&Hospital&110&^3642773&GACARROLLTONMANORINC&22D2332322&CLIA||STON^Stone (use CALC)^HL70487^ENDM^Endometrium^SCT^2.5.1^Stone (use CALC)|||ENDM^ENDM^TG|793717233^whose^SNM||||53^ML||Ok Republican available its move.|||202411271010^202412021010|202411271010|||"
 				},
 				"url": {
 					"raw": "http://localhost:8081/ingestion/api/elrs",
@@ -321,6 +402,10 @@
 		{
 			"key": "messageUuid",
 			"value": ""
+		},
+		{
+			"key": "cacheToken",
+			"value": ""
 		}
 	]
 }