Updates for merge (#248)

Fixed issues with merge issues
CDCgov · Sep 12, 2024 · 107b1b6 · 107b1b6
1 parent 2b1ad11
commit 107b1b6
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/source/CDC.DEX.FHIR.Function/CDC.DEX.FHIR.Function.DataExport/FhirEventProcessor.cs b/source/CDC.DEX.FHIR.Function/CDC.DEX.FHIR.Function.DataExport/FhirEventProcessor.cs
@@ -16,6 +16,11 @@ namespace CDC.DEX.FHIR.Function.DataExport
     public class FhirEventProcessor
     {
 
+        private string TruncateStrForLog(string jsonString, int maxLen)
+        {
+            return jsonString.Length > maxLen ? jsonString.Substring(0, maxLen) + "..." : jsonString;
+        } // .TruncateStrForLog
+
         /// <summary>
         /// Read resource created event message and retrieve the created fhir resource
         /// </summary>
@@ -36,7 +41,7 @@ public async Task<JObject>  ProcessFhirEvent(FhirResourceCreated resourceCreated
             using (HttpClient client = httpClientFactory.CreateClient())
             {
 
-                string token = await FhirServiceUtils.GetFhirServerToken(config, client);
+                string token = await FhirServiceUtils.GetFhirServerToken(config, client,log);
                 int maxLengthForLog = 500;
 
                 client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));//ACCEPT header
@@ -45,9 +50,7 @@ public async Task<JObject>  ProcessFhirEvent(FhirResourceCreated resourceCreated
                 using (var request = new HttpRequestMessage(HttpMethod.Get, requestUrl))
                 {
                     // get auth token
-                    log.LogInformation(DataExport.LogPrefix() + "GetFhirServerToken Start");
-                   string token = await FhirServiceUtils.GetFhirServerToken(config, client,log);
-                    log.LogInformation(DataExport.LogPrefix() + "GetFhirServerToken End");
+
 
                     request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", token);
                     //  request.Headers.Add("Ocp-Apim-Subscription-Key", config["OcpApimSubscriptionKey"]);
@@ -58,7 +61,7 @@ public async Task<JObject>  ProcessFhirEvent(FhirResourceCreated resourceCreated
 
                     response.EnsureSuccessStatusCode();
                     string jsonString = await response.Content.ReadAsStringAsync();
-                    log.LogInformation(DataExport.LogPrefix() + $"FHIR Record details returned from FHIR service: " + TruncateStrForLog(validateReportingBundleResult.JsonString, maxLengthForLog));
+                    log.LogInformation(DataExport.LogPrefix() + $"FHIR Record details returned from FHIR service: " + TruncateStrForLog(jsonString, maxLengthForLog));
                     fhirResourceToProcessJObject = JObject.Parse(jsonString);
                     return fhirResourceToProcessJObject;
                 }