Merge pull request #54 from Adel-Atzouza/Adel

fix models

Author: Adel-Atzouza

CargoHub/Models/Supplier.cs

@@ -6,34 +6,35 @@ public class Supplier : BaseModel, IContainsClassification
     {
         [JsonPropertyName("code")]
 
-        public string? Code { get; set; }
+        public required string? Code { get; set; }
         [JsonPropertyName("name")]
 
-        public string? Name { get; set; }
+        public required string? Name { get; set; }
         [JsonPropertyName("address")]
 
-        public string? Address { get; set; }
+        public required string? Address { get; set; }
         [JsonPropertyName("address_extra")]
-        public string? AddressExtra { get; set; }
+        public required string? AddressExtra { get; set; }
         [JsonPropertyName("city")]
-        public string? City { get; set; }
+        public required string? City { get; set; }
         [JsonPropertyName("zip_code")]
-        public string? ZipCode { get; set; }
+        public required string? ZipCode { get; set; }
         [JsonPropertyName("province")]
 
-        public string? Province { get; set; }
+        public required string? Province { get; set; }
         [JsonPropertyName("country")]
 
-        public string? Country { get; set; }
+        public required string? Country { get; set; }
 
         [JsonPropertyName("contact_name")]
-        public string? ContactName { get; set; }
+        public required string? ContactName { get; set; }
         [JsonPropertyName("phonenumber")]
 
-        public string? Phonenumber { get; set; }
+        public required string? Phonenumber { get; set; }
         [JsonPropertyName("reference")]
 
-        public string? Reference { get; set; }
+        public required string? Reference { get; set; }
         [JsonIgnore]
         public List<Classification> Classifications { get; set; } = [];
-    }
+    }
+}

CargoHub/Models/Warehouse.cs

@@ -5,35 +5,21 @@ namespace CargoHub.Models
 {
     public class Warehouse : BaseModel, IContainsClassification
     {
-        [JsonPropertyName("code")]
-
-        public string? Code { get; set; }
-        [JsonPropertyName("name")]
-
-        public string? Name { get; set; }
-        [JsonPropertyName("address")]
-
-        public string? Address { get; set; }
-        [JsonPropertyName("zip")]
-
-        public string? Zip { get; set; }
-        [JsonPropertyName("city")]
-
-        public string? City { get; set; }
-        [JsonPropertyName("province")]
-
-        public string? Province { get; set; }
-        [JsonPropertyName("country")]
-
-        public string? Country { get; set; }
+        public required string Code { get; set; }
+        public required string Name { get; set; }
+        public required string Address { get; set; }
+        public required string Zip { get; set; }
+        public required string City { get; set; }
+        public required string Province { get; set; }
+        public required string Country { get; set; }
         [JsonIgnore]
-        public string? ContactName { get; set; }
+        public string ContactName { get; set; } = string.Empty;
 
         [JsonIgnore]
-        public string? ContactPhone { get; set; }
+        public string ContactPhone { get; set; } = string.Empty;
 
         [JsonIgnore]
-        public string? ContactEmail { get; set; }
+        public string ContactEmail { get; set; } = string.Empty;
 
         [NotMapped]
         // Contact dictionary for JSON serialization/deserialization
@@ -58,14 +44,9 @@ public class Warehouse : BaseModel, IContainsClassification
             }
         }
 
-
+        [JsonIgnore]
+        public ICollection<Location> Locations { get; } = []; 
         [JsonIgnore]
         public List<Classification> Classifications { get; set; } = [];
-        // Metadata
-        [JsonPropertyName("created_at")]
-        public DateTime CreatedAt { get; set; }
-
-        // [JsonPropertyName("updated_at")]
-        // public DateTime UpdatedAt { get; set; }
     }
 }