From 423c463f77f5a62e1a96e8aced8cd21f4fcf981b Mon Sep 17 00:00:00 2001 From: MacAdam Date: Tue, 12 Nov 2024 09:35:50 -0500 Subject: [PATCH] update tests to use bfdr in url param --- .../Integration/BundlesControllerTests.cs | 12 ++++++------ messaging/Controllers/BundlesController.cs | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/messaging.tests/Integration/BundlesControllerTests.cs b/messaging.tests/Integration/BundlesControllerTests.cs index 0010c27..8c44e89 100644 --- a/messaging.tests/Integration/BundlesControllerTests.cs +++ b/messaging.tests/Integration/BundlesControllerTests.cs @@ -114,7 +114,7 @@ public async System.Threading.Tasks.Task NewBirthSubmissionMessagePostCreatesNew recordSubmission.CertNo = 1; // Submit that Death Record - HttpResponseMessage createSubmissionMessage = await JsonResponseHelpers.PostJsonAsync(_client, "/UT/Bundle", recordSubmission.ToJson()); + HttpResponseMessage createSubmissionMessage = await JsonResponseHelpers.PostJsonAsync(_client, "/UT/Bundle/BFDR/v2.0", recordSubmission.ToJson()); Assert.Equal(HttpStatusCode.NoContent, createSubmissionMessage.StatusCode); Hl7.Fhir.Model.Bundle updatedBundle = null; @@ -330,7 +330,7 @@ public async System.Threading.Tasks.Task QueryByBusinessIdsDeathYear() // Submit that Death Record HttpResponseMessage createSubmissionMessage = await JsonResponseHelpers.PostJsonAsync(_client, "/" + recordSubmission.JurisdictionId + "/Bundle", recordSubmission.ToJson()); Assert.Equal(HttpStatusCode.NoContent, createSubmissionMessage.StatusCode); - await System.Threading.Tasks.Task.Delay(1000); + await System.Threading.Tasks.Task.Delay(2000); HttpResponseMessage getBundle = await _client.GetAsync("/" + recordSubmission.JurisdictionId + "/Bundle?deathYear=" + recordSubmission.DeathYear); Bundle updatedBundle = await JsonResponseHelpers.ParseBundleAsync(getBundle); @@ -456,7 +456,7 @@ public async System.Threading.Tasks.Task UpdateBirthMessagesAreSuccessfullyAckno recordSubmission.CertNo = 1; // Submit that Death Record - HttpResponseMessage submissionMessage = await JsonResponseHelpers.PostJsonAsync(_client, "/UT/Bundle", recordSubmission.ToJson()); + HttpResponseMessage submissionMessage = await JsonResponseHelpers.PostJsonAsync(_client, "/UT/Bundle/BFDR/v2.0", recordSubmission.ToJson()); Assert.Equal(HttpStatusCode.NoContent, submissionMessage.StatusCode); BirthRecordUpdateMessage recordUpdate = new BirthRecordUpdateMessage(recordSubmission.BirthRecord); @@ -466,7 +466,7 @@ public async System.Threading.Tasks.Task UpdateBirthMessagesAreSuccessfullyAckno recordUpdate.CertNo = 1; // Submit update message - HttpResponseMessage updateMessage = await JsonResponseHelpers.PostJsonAsync(_client, "/UT/Bundle", recordUpdate.ToJson()); + HttpResponseMessage updateMessage = await JsonResponseHelpers.PostJsonAsync(_client, "/UT/Bundle/BFDR/v2.0", recordUpdate.ToJson()); Assert.Equal(HttpStatusCode.NoContent, updateMessage.StatusCode); // Make sure the ACKs made it into the queue before querying the endpoint @@ -957,7 +957,7 @@ public async void PostNCHSIsInDestinationEndpointList() recordSubmission2.CertNo = 1; recordSubmission2.MessageDestination = "http://notnchs.cdc.gov/bfdr_submission,http://nchs.cdc.gov/bfdr_submission"; // Submit that Death Record - HttpResponseMessage createSubmissionMessage2 = await JsonResponseHelpers.PostJsonAsync(_client, $"/UT/Bundle", recordSubmission2.ToJson()); + HttpResponseMessage createSubmissionMessage2 = await JsonResponseHelpers.PostJsonAsync(_client, $"/UT/Bundle/BFDR/v2.0", recordSubmission2.ToJson()); Assert.Equal(HttpStatusCode.NoContent, createSubmissionMessage2.StatusCode); } @@ -986,7 +986,7 @@ public async void PostNCHSIsInDestinationEndpointListUppercase() recordSubmission.DeathYear = 2024; recordSubmission2.MessageDestination = "temp,http://nchs.CDC.gov/BFDR_Submission,temp"; // Submit that Death Record - HttpResponseMessage createSubmissionMessage2 = await JsonResponseHelpers.PostJsonAsync(_client, $"/MA/Bundle", recordSubmission2.ToJson()); + HttpResponseMessage createSubmissionMessage2 = await JsonResponseHelpers.PostJsonAsync(_client, $"/MA/Bundle/BFDR/v2.0", recordSubmission2.ToJson()); Assert.Equal(HttpStatusCode.NoContent, createSubmissionMessage2.StatusCode); } diff --git a/messaging/Controllers/BundlesController.cs b/messaging/Controllers/BundlesController.cs index adaa65c..c9bd322 100644 --- a/messaging/Controllers/BundlesController.cs +++ b/messaging/Controllers/BundlesController.cs @@ -506,7 +506,7 @@ protected virtual string GetNextUri() protected IncomingMessageItem ParseIncomingMessageItem(string jurisdictionId, string vitalType, Bundle bundle) { // the vital type must be specified as BFDR to post BFDR records - if (_settings.BFDREnabled && vitalType.Equals("BFDR")) + if (_settings.BFDREnabled && !String.IsNullOrEmpty(vitalType) && vitalType.Equals("BFDR")) { try {