Merge pull request #352 from bcgov/applicationscore-poc

Multiple Calculator check ignore more than 1 calculator logic

Author: Anjana1010

OFM.Infrastructure.WebAPI/Models/ApplicationScore/AppicationScore.cs

@@ -292,6 +292,9 @@ public static class DataverseQueries
         public static string AllScoreCategoryQuery = "ofm_application_score_categories?$filter=_ofm_application_score_calculator_value eq '{0}'&$select=ofm_name,ofm_maximum_score,ofm_description,ofm_category_display_name,ofm_application_score_group";
         public static string AllACCBDataQuery = @$"ofm_accbs?$select=ofm_accbid,ofm_postal_code,ofm_income_indicator,ofm_name&$filter=(_ofm_application_score_calculator_value eq {{0}}  and statecode eq 0)";
         public static string AllPopulationCentreQuery = $@"ofm_population_centres?$select=ofm_population_centreid,ofm_city,ofm_projected_population,ofm_name,ofm_projected_population&$filter=(_ofm_application_score_calculator_value eq {{0}} and statecode eq 0)";
+
+        public const string ApplicationScoresQuery = "ofm_application_scores?$filter=_ofm_application_value eq {0}&$select=ofm_application_scoreid,_ofm_application_score_calculator_value,_ofm_application_value";
+
     }
     /// <summary>
     /// Represents a OFM Application entity.
@@ -627,4 +630,17 @@ public JsonObject Clone(Guid calculatorId)
         //region.ccof_region_period_start
         public string? ProgramYear => _data.ContainsKey("region.ccof_region_period_start") ? _data.GetFormattedValue("region.ccof_region_period_start") : null;
     }
+
+    //application score
+    public class ApplicationScoreValue
+    {
+        protected readonly JsonObject _data;
+        public ApplicationScoreValue(JsonObject data)
+        {
+            _data = data ?? throw new ArgumentNullException(nameof(data));
+        }
+        public Guid? ApplicationScoreId => _data.GetPropertyValue<Guid>("ofm_application_scoreid");
+        public Guid? ApplicationScoreCalculatorId => _data.GetPropertyValue<Guid>("_ofm_application_score_calculator_value");
+
+    }
 }

OFM.Infrastructure.WebAPI/Services/Processes/ApplicationScore/DataverseRepository.cs

@@ -56,6 +56,10 @@ public interface IDataverseRepository
     /// <param name="calculatorId">GUID of the application score calculator</param>
     /// <returns></returns>
     Task<ACCBIncomeIndicator> GetIncomeDataAsync(string postalCode, Guid calculatorId);
+
+
+    Task<IEnumerable<ApplicationScoreValue>> GetApplicationScores(Guid ApplicationId);
+
     /// <summary>
     /// Get Approved Parent Fees of the facility
     /// </summary>
@@ -138,7 +142,19 @@ public async Task<OFMApplication> GetFundingApplicationAsync(Guid applicationId)
         var json = await response.Content.ReadFromJsonAsync<JsonObject>();
         return new OFMApplication(json);
     }
-
+    public async Task<IEnumerable<ApplicationScoreValue>> GetApplicationScores(Guid applicationId)
+    {
+        
+        var response = await d365WebApiService.SendRetrieveRequestAsync(appUserService.AZSystemAppUser, $"{string.Format(DataverseQueries.ApplicationScoresQuery, applicationId)}", formatted: true, pageSize: 5000);
+        if (!response.IsSuccessStatusCode)
+        {
+            var responseBody = await response.Content.ReadAsStringAsync();
+            throw new Exception($"GetApplicationScores({applicationId}): HTTP Failure: {responseBody}");
+        }
+        var json = await response.Content.ReadFromJsonAsync<JsonObject>();
+        var values = json["value"]?.AsArray() ?? new JsonArray();
+        return values.Select(v => new ApplicationScoreValue(v.AsObject()));
+    }
     public async Task<IEnumerable<OFMApplication>> GetUnprocessedApplicationsAsync(DateTime lastTime)
     {
         var formattedTime = lastTime.ToString("yyyy-MM-ddTHH:mm:ssZ");

OFM.Infrastructure.WebAPI/Services/Processes/ApplicationScore/P800ScoreCalculatorProvider.cs

@@ -36,7 +36,10 @@ private string RetrieveApplicationCalculator
                                     </filter>
                                     <link-entity name=""ofm_intake"" from=""ofm_application_score_calculator"" to=""ofm_application_score_calculatorid"" link-type=""inner"" alias=""intake"">
                                     <attribute name=""ofm_start_date"" />
-                                    <attribute name=""ofm_end_date"" />                                      
+                                    <attribute name=""ofm_end_date"" />  
+<filter>
+                                    <condition attribute=""statecode"" operator=""eq"" value=""0"" />
+                                    </filter>
                                     </link-entity>
                                   </entity>
                                 </fetch>";
@@ -177,17 +180,24 @@ private IComparisonHandler comparisonChain
                     {
                         scores.Add(scoreData);
                     }
-                }               
-               
-                //Upsert Scores
-                foreach (var score in scores)
+                }
+
+
+
+                var existingScores = await dataverseRepository.GetApplicationScores(applicationId);
+
+
+                if ((existingScores == null || !existingScores.Any()) || (existingScores != null && existingScores.Any() && existingScores.Where(x => x.ApplicationScoreCalculatorId.Equals(calculatorId)).Any()))
                 {
-                    _logger.LogInformation(CustomLogEvent.Process, "Upsert Batch started for calculated scores for application {applicationId}", applicationId);
-                    await dataverseRepository.UpsertApplicationScoreAsync($"_ofm_application_value={applicationId},_ofm_application_score_category_value={score["ofm_application_score_category@odata.bind"]?.ToString().Replace("ofm_application_score_categories", "").Replace("(", "").Replace(")", "")}", score);
-                    _logger.LogInformation(CustomLogEvent.Process, "Upsert Batch completed for calculated scores for application {applicationId}", applicationId);
+                    //Upsert Scores
+                    foreach (var score in scores)
+                    {
+                        _logger.LogInformation(CustomLogEvent.Process, "Upsert Batch started for calculated scores for application {applicationId}", applicationId);
+                        await dataverseRepository.UpsertApplicationScoreAsync($"_ofm_application_value={applicationId},_ofm_application_score_category_value={score["ofm_application_score_category@odata.bind"]?.ToString().Replace("ofm_application_score_categories", "").Replace("(", "").Replace(")", "")}", score);
+                        _logger.LogInformation(CustomLogEvent.Process, "Upsert Batch completed for calculated scores for application {applicationId}", applicationId);
 
+                    }
                 }
-                 
 
 
                 //commented due to timeout while processing batch