Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

f #72

Merged
merged 2 commits into from
Jan 21, 2025
Merged

f #72

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 17 additions & 6 deletions CargoHub/Models/Client.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,24 @@ namespace CargoHub.Models
{
public class Client : BaseModel
{
public required string Name { get; set; }
public required string Address { get; set; }
public required string City { get; set; }

[JsonPropertyName("name")]
public required string? Name { get; set; }
[JsonPropertyName("address")]

public required string? Address { get; set; }
[JsonPropertyName("city")]

public required string? City { get; set; }
[JsonPropertyName("zip_code")]
public required string ZipCode { get; set; }
public required string Province { get; set; }
public required string Country { get; set; }
public required string? ZipCode { get; set; }
[JsonPropertyName("province")]

public required string? Province { get; set; }
[JsonPropertyName("country")]

public required string? Country { get; set; }

[JsonPropertyName("contact_name")]
public required string ContactName { get; set; }
[JsonPropertyName("contact_phone")]
Expand Down
8 changes: 5 additions & 3 deletions CargoHub/Models/Inventory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,11 @@ public class Inventory : BaseModel
{

[JsonPropertyName("item_id")]
public required string ItemId { get; set; }

public required string Description { get; set; }
public required string? ItemId { get; set; }
[JsonPropertyName("description")]

public required string? Description { get; set; }


[JsonPropertyName("item_reference")]
public required string ItemReference { get; set; }
Expand Down
19 changes: 11 additions & 8 deletions CargoHub/Models/Item.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@ public class Item : BaseModel, IContainsClassification
[Key]
[JsonPropertyName("uid")]

public string Uid { get; set; } = string.Empty;

public string? Uid { get; set; } = string.Empty;


[JsonPropertyName("code")]

public required string Code { get; set; }
Expand All @@ -34,25 +37,25 @@ public class Item : BaseModel, IContainsClassification
public required string CommodityCode { get; set; }

[JsonPropertyName("item_line")]
public required int ItemLine { get; set; }
public required int? ItemLine { get; set; }

[JsonPropertyName("item_group")]
public required int ItemGroup { get; set; }
public required int? ItemGroup { get; set; }

[JsonPropertyName("item_type")]
public required int ItemType { get; set; }
public required int? ItemType { get; set; }

[JsonPropertyName("unit_purchase_quantity")]
public required int UnitPurchaseQuantity { get; set; }
public required int? UnitPurchaseQuantity { get; set; }

[JsonPropertyName("unit_order_quantity")]
public required int UnitOrderQuantity { get; set; }
public required int? UnitOrderQuantity { get; set; }

[JsonPropertyName("pack_order_quantity")]
public required int PackOrderQuantity { get; set; }
public required int? PackOrderQuantity { get; set; }

[JsonPropertyName("supplier_id")]
public required int SupplierId { get; set; }
public required int? SupplierId { get; set; }

[JsonPropertyName("supplier_code")]
public required string SupplierCode { get; set; }
Expand Down
9 changes: 7 additions & 2 deletions CargoHub/Models/ItemGroup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,12 @@ namespace CargoHub.Models
{
public class ItemGroup : BaseModel
{
public required string Name {get;set;}
public required string Description {get;set;}

[JsonPropertyName("name")]
public required string? Name {get;set;}
[JsonPropertyName("description")]

public required string? Description {get;set;}

}
}
10 changes: 8 additions & 2 deletions CargoHub/Models/ItemLine.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,13 @@ namespace CargoHub.Models
{
public class ItemLine : BaseModel
{
public required string Name {get;set;}
public required string Description {get;set;}

[JsonPropertyName("name")]

public required string? Name {get;set;}
[JsonPropertyName("description")]

public required string? Description {get;set;}

}
}
11 changes: 9 additions & 2 deletions CargoHub/Models/ItemType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,15 @@ namespace CargoHub.Models

public class ItemType : BaseModel
{
public required string Name {get;set;}
public required string Description {get;set;}

[JsonPropertyName("name")]

public required string? Name {get;set;}
[JsonPropertyName("description")]

public required string? Description {get;set;}


}
}

6 changes: 5 additions & 1 deletion CargoHub/Models/Location.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,11 @@ public class Location : BaseModel, IContainsClassification
public string? Code { get; set; } // Nullable based on provided JSON
[JsonIgnore]
public ICollection<Inventory> Inventories { get; } = [];
public required string Name { get; set; }

[JsonPropertyName("name")]


public required string? Name { get; set; }
[JsonIgnore]
public List<Classification> Classifications { get; set; } = [];
}
Expand Down
3 changes: 2 additions & 1 deletion CargoHub/Rest/Migrate.rest
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@baseUrl = http://localhost:3000/api/v2/Migrations
@baseUrl = http://localhost:3000/api/v2/DataTransfer

POST {{baseUrl}}?FolderName=data
apikey: 4125a7b2-7ef8-4c4f-9ff9-3386c0dbcb5c

Loading