Fix Null File Label exception

gaepdit · May 13, 2024 · 7fda357 · 7fda357
1 parent 3fd7be8
commit 7fda357
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/FMS.Domain/Dto/Cabinet/CabinetExtensions.cs b/FMS.Domain/Dto/Cabinet/CabinetExtensions.cs
@@ -8,15 +8,12 @@ namespace FMS.Domain.Dto
 {
     public static class CabinetExtensions
     {
-        public static List<string> GetCabinetsForFile(this IEnumerable<CabinetSummaryDto> cabinets, string fileLabel, bool testValidity = true)
-        {
-            if (testValidity) 
+        public static List<string> GetCabinetsForFile(this IEnumerable<CabinetSummaryDto> cabinets, string fileLabel)
+        {
+            Prevent.NullOrEmpty(fileLabel, nameof(fileLabel));
+            if (!File.IsValidFileLabelFormat(fileLabel))
             {
-                Prevent.NullOrEmpty(fileLabel, nameof(fileLabel));
-                if (!File.IsValidFileLabelFormat(fileLabel))
-                {
-                    throw new ArgumentException($"File label '{fileLabel}' is invalid.", nameof(fileLabel));
-                }
+                throw new ArgumentException($"File label '{fileLabel}' is invalid.", nameof(fileLabel));
             }
 
             return cabinets.Where(e =>

diff --git a/FMS.Infrastructure/Repositories/FacilityRepository.cs b/FMS.Infrastructure/Repositories/FacilityRepository.cs
@@ -133,9 +133,10 @@ public async Task<PaginatedList<FacilitySummaryDto>> GetFacilityPaginatedListAsy
             var cabinets = await _context.GetCabinetListAsync(false);
             foreach (var item in items)
             {
-                bool test = item.FacilityType.Name != "RN" || !item.FileLabel.IsNullOrEmpty();
-
-                item.Cabinets = cabinets.GetCabinetsForFile(item.FileLabel, test);
+                if (!item.FileLabel.IsNullOrEmpty())
+                {
+                    item.Cabinets = cabinets.GetCabinetsForFile(item.FileLabel);
+                }
             }
 
             var totalCount = await queried.CountAsync();