Merge branch '311-remove-taxid-field-From-DB-and-Project' into Dev

gaepdit · Feb 9, 2024 · 85289bb · 85289bb
2 parents 7fd8cad + 9946342
commit 85289bb
Show file tree

Hide file tree

Showing 17 changed files with 1,763 additions and 94 deletions.
diff --git a/FMS.Domain/Dto/Facility/FacilityCreateDto.cs b/FMS.Domain/Dto/Facility/FacilityCreateDto.cs
@@ -107,9 +107,6 @@ public class FacilityCreateDto
         [Display(Name = "Historical C.O.")]
         public string HistoricalComplianceOfficer { get; set; }
 
-        [Display(Name = "Tax ID")]
-        public string TaxId { get; set; }
-
         [Display(Name = "Has Electronic Records")]
         public bool HasERecord { get; set; }
 
@@ -124,7 +121,6 @@ public void TrimAll()
             PostalCode = PostalCode?.Trim();
             HSInumber = HSInumber?.Trim();
             HistoricalUnit = HistoricalUnit?.Trim();
-            TaxId = TaxId?.Trim();
         }
     }
 }
diff --git a/FMS.Domain/Dto/Facility/FacilityDetailDto.cs b/FMS.Domain/Dto/Facility/FacilityDetailDto.cs
@@ -43,9 +43,7 @@ public FacilityDetailDto(Facility facility)
             VRPReferral = facility.VRPReferral;
             RNDateReceived = facility.RNDateReceived;
             HistoricalUnit = facility.HistoricalUnit;
-            HistoricalComplianceOfficer = facility.HistoricalComplianceOfficer;
-            TaxId = facility.TaxId;
-            // *** End release Notification Only Properties
+            HistoricalComplianceOfficer = facility.HistoricalComplianceOfficer;
             IsRetained = facility.IsRetained;
             Cabinets = new List<string>();
             RetentionRecords = facility.RetentionRecords?
@@ -144,11 +142,6 @@ public FacilityDetailDto(Facility facility)
         [Display(Name = "Historical C.O.")]
         public string HistoricalComplianceOfficer { get; set; }
 
-        [Display(Name = "Tax ID")]
-        public string TaxId { get; set; }
-
-        // End release notification Only Properties
-
         [Display(Name = "Has Electronic Records")]
         public bool HasERecord { get; set; }
 

diff --git a/FMS.Domain/Dto/Facility/FacilityEditDto.cs b/FMS.Domain/Dto/Facility/FacilityEditDto.cs
@@ -38,7 +38,6 @@ public FacilityEditDto(FacilityDetailDto facility)
             RNDateReceived = facility.RNDateReceived;
             HistoricalUnit = facility.HistoricalUnit;
             HistoricalComplianceOfficer = facility.HistoricalComplianceOfficer;
-            TaxId = facility.TaxId;
             HasERecord = facility.HasERecord;
             IsRetained = facility.IsRetained;
         }
@@ -151,9 +150,6 @@ public FacilityEditDto(FacilityDetailDto facility)
         [Display(Name = "Historical Compliance Officer")]
         public string HistoricalComplianceOfficer { get; set; }
 
-        [Display(Name = "Tax ID")]
-        public string TaxId { get; set; }
-
         [Display(Name = "Has Electronic Records")]
         public bool HasERecord { get; set; }
 
@@ -168,7 +164,6 @@ public void TrimAll()
             PostalCode = PostalCode?.Trim();
             HSInumber = HSInumber?.Trim();
             HistoricalUnit = HistoricalUnit?.Trim();
-            TaxId = TaxId?.Trim();
         }
     }
 }
diff --git a/FMS.Domain/Dto/Facility/FacilitySpec.cs b/FMS.Domain/Dto/Facility/FacilitySpec.cs
@@ -92,9 +92,6 @@ public class FacilitySpec
         [Display(Name = "Historical C.O.")]
         public string HistoricalComplianceOfficer { get; set; }
 
-        [Display(Name = "Tax ID")]
-        public string TaxId { get; set; }
-
         [Display(Name = "Has Electronic Records")]
         public bool HasERecord { get; set; }
 

diff --git a/FMS.Domain/Entities/Facility.cs b/FMS.Domain/Entities/Facility.cs
@@ -42,7 +42,6 @@ public Facility(FacilityCreateDto newFacility)
             RNDateReceived = newFacility.RNDateReceived;
             HistoricalUnit = newFacility.HistoricalUnit;
             HistoricalComplianceOfficer = newFacility.HistoricalComplianceOfficer;
-            TaxId = newFacility.TaxId;
         }
 
         // Existing ID for Facility May be used by Programs - System Generated, but not a Guid
@@ -130,8 +129,6 @@ public Facility(FacilityCreateDto newFacility)
 
         public string HistoricalComplianceOfficer { get; set; }
 
-        public string TaxId { get; set; }
-
         // List of retention records for this Facility
         public ICollection<RetentionRecord> RetentionRecords { get; set; }
     }