Fix the report versioning of the template (#236)

bcgov · Sep 17, 2024 · dffdc79 · dffdc79
1 parent f76f2d6
commit dffdc79
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/OFM.Infrastructure.WebAPI/Services/Processes/FundingReports/P610CreateQuestionProvider.cs b/OFM.Infrastructure.WebAPI/Services/Processes/FundingReports/P610CreateQuestionProvider.cs
@@ -236,6 +236,9 @@ public string ReportTemplateVersionRequestUri
                         <attribute name="statuscode" />
                         <attribute name="statecode" />
                         <order attribute="ofm_version" descending="true" />
+                         <filter>
+                      <condition attribute="statecode" operator="eq" value="0" />
+                    </filter>
                       </entity>
                     </fetch>
                     """;
@@ -807,10 +810,10 @@ public async Task<bool> CreateBusinessRule(Guid? _sectionId, ID365AppUserService
 
             deserializedDataBR?.ForEach(br =>
             {
-                var parentQuestionId = deserializedQuestiondata.FirstOrDefault(q => q.ofm_source_question_id == br.brSourceQuestion && q.surveyStatecode == (int)ofm_survey_statecode.Active)?.ofm_questionid;
-                var trueQuestionId = deserializedQuestiondata.FirstOrDefault(q => q.ofm_source_question_id == br.TrueSourcequestionIdentifier && q.surveyStatecode == (int)ofm_survey_statecode.Active)?.ofm_questionid;
-                var falseQuestionId = deserializedQuestiondata.FirstOrDefault(q => q.ofm_source_question_id == br.FalseSourcequestionIdentifier && q.surveyStatecode == (int)ofm_survey_statecode.Active)?.ofm_questionid;
-                var hasResponseQuestionId = deserializedQuestiondata.FirstOrDefault(q => q.ofm_source_question_id == br.childSourcequestionIdentifier && q.surveyStatecode == (int)ofm_survey_statecode.Active)?.ofm_questionid;
+                var parentQuestionId = deserializedQuestiondata.FirstOrDefault(q => q.ofm_source_question_id == br.brSourceQuestion && q.surveyStatecode == (int)ofm_survey_statecode.Active && q.surveyVersion == latestVersion.ToString())?.ofm_questionid;
+                var trueQuestionId = deserializedQuestiondata.FirstOrDefault(q => q.ofm_source_question_id == br.TrueSourcequestionIdentifier && q.surveyStatecode == (int)ofm_survey_statecode.Active && q.surveyVersion == latestVersion.ToString())?.ofm_questionid;
+                var falseQuestionId = deserializedQuestiondata.FirstOrDefault(q => q.ofm_source_question_id == br.FalseSourcequestionIdentifier && q.surveyStatecode == (int)ofm_survey_statecode.Active && q.surveyVersion == latestVersion.ToString())?.ofm_questionid;
+                var hasResponseQuestionId = deserializedQuestiondata.FirstOrDefault(q => q.ofm_source_question_id == br.childSourcequestionIdentifier && q.surveyStatecode == (int)ofm_survey_statecode.Active && q.surveyVersion == latestVersion.ToString())?.ofm_questionid;
                 requestsQuestionBRCreation.Add(new CreateRequest($"{entitySetNameQuestionBR}",
       new JsonObject()
       {