TH-112626: recalculate seniority list order when archived company was…

… brought back
bcgov · Mar 5, 2024 · 775c038 · 775c038
1 parent 56c4aea
commit 775c038
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/Server/HetsApi/Controllers/RentalRequestController.cs b/Server/HetsApi/Controllers/RentalRequestController.cs
@@ -1197,7 +1197,10 @@ public virtual IActionResult GetSeniorityList(int id, bool counterCopy = false)
             {
                 listRecord.SeniorityList.Add(SeniorityListHelper.ToSeniorityViewModel(equipment, numberOfBlocks));
             }
-
+            // TH-112626
+            listRecord.SeniorityList = listRecord.SeniorityList
+                .OrderByDescending(x => Convert.ToDecimal(x.Seniority))
+                .ToList();
             string documentName = $"SeniorityList-{DateTime.Now:yyyy-MM-dd}{(counterCopy ? "-(CounterCopy)" : "")}.docx";
             byte[] document = SeniorityList.GetSeniorityList(seniorityList, documentName, counterCopy, (errMessage, ex) => {
                 _logger.LogError(errMessage);

diff --git a/Server/HetsData/Repositories/RentalRequestRepository.cs b/Server/HetsData/Repositories/RentalRequestRepository.cs
@@ -196,7 +196,17 @@ public RentalRequestDto GetRecordWithRotationList(int id, SeniorityScoringRules
                     }
                 }
             }
-
+            // TH-112626
+            // Sorting the RentalRequestRotationList based on Equipment.Seniority
+            var sortedList = request.HetRentalRequestRotationLists
+                .OrderByDescending(x => x.Equipment.Seniority)
+                .ToList();
+            // Updating RotationListSortOrder based on the sorted list
+            for (int i = 0; i < sortedList.Count; i++)
+            {
+                sortedList[i].RotationListSortOrder = i + 1;
+            }
+            request.HetRentalRequestRotationLists = sortedList;
             return _mapper.Map<RentalRequestDto>(request);
         }