Alihan Items/ItemTypes tests, Validate Items.

CargoHub.sln

@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31903.59
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CargoHub", "CargoHub\CargoHub.csproj", "{DF5C2A7E-1DF9-42A8-B3B9-D6552BDB3BE3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CargoHub", "CargoHub\CargoHub.csproj", "{D287ADFD-E9BA-4787-9B63-F0EAACE63FE9}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CargoHub.Test", "UnitTest\CargoHub.Test.csproj", "{2565E8A5-EBB2-4773-AE8C-C14387ACB2A0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CargoHub.Test", "UnitTest\CargoHub.Test.csproj", "{537592E6-925A-45C2-AF47-B1F001267F77}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -16,17 +16,13 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{DF5C2A7E-1DF9-42A8-B3B9-D6552BDB3BE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DF5C2A7E-1DF9-42A8-B3B9-D6552BDB3BE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DF5C2A7E-1DF9-42A8-B3B9-D6552BDB3BE3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DF5C2A7E-1DF9-42A8-B3B9-D6552BDB3BE3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{08CCD5C8-5AE7-4908-843D-884E2BAC774D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{08CCD5C8-5AE7-4908-843D-884E2BAC774D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{08CCD5C8-5AE7-4908-843D-884E2BAC774D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{08CCD5C8-5AE7-4908-843D-884E2BAC774D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2565E8A5-EBB2-4773-AE8C-C14387ACB2A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2565E8A5-EBB2-4773-AE8C-C14387ACB2A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2565E8A5-EBB2-4773-AE8C-C14387ACB2A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2565E8A5-EBB2-4773-AE8C-C14387ACB2A0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D287ADFD-E9BA-4787-9B63-F0EAACE63FE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D287ADFD-E9BA-4787-9B63-F0EAACE63FE9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D287ADFD-E9BA-4787-9B63-F0EAACE63FE9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D287ADFD-E9BA-4787-9B63-F0EAACE63FE9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{537592E6-925A-45C2-AF47-B1F001267F77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{537592E6-925A-45C2-AF47-B1F001267F77}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{537592E6-925A-45C2-AF47-B1F001267F77}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{537592E6-925A-45C2-AF47-B1F001267F77}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal

CargoHub/Controllers/ItemGroupsController.cs

@@ -14,5 +14,16 @@ public async Task<IActionResult> GetItemsForSupplier(int itemGroupId)
             var items = await itemStorageService.GetItemsforSupplier(itemGroupId);
             return Ok(items);
         }
+
+        [HttpGet("itemgroup/{itemGroupId}")]
+        public async Task<IActionResult> GetItemsforItemGroup(int itemGroupId)
+        {
+            var items = await itemStorageService.GetItemsforItemGroup(itemGroupId);
+            if (items == null || items.Count == 0)
+            {
+                return NotFound($"No items found for this ItemGroup ID {itemGroupId}");
+            }
+            return Ok(items);
+        }
     }
 }

CargoHub/Controllers/ItemLinesController.cs

@@ -15,6 +15,16 @@ public async Task<IActionResult> GetItemsForSupplier(int itemLineId)
             var items = await itemStorageService.GetItemsforSupplier(itemLineId);
             return Ok(items);
         }
-    }
 
+        [HttpGet("itemline/{itemLineId}")]
+        public async Task<IActionResult> GetItemsForItemLine(int itemLineId)
+        {
+            var items = await itemStorageService.GetItemsforItemLine(itemLineId);
+            if (items == null || items.Count == 0)
+            {
+                return NotFound($"No items found for this ItemLine ID {itemLineId}");
+            }
+            return Ok(items);
+        }
+    }
 }

CargoHub/Controllers/ItemTypesController.cs

@@ -14,5 +14,16 @@ public async Task<IActionResult> GetItemsForSupplier(int itemTypeId)
             var items = await itemStorageService.GetItemsforSupplier(itemTypeId);
             return Ok(items);
         }
+
+        [HttpGet("itemtype/{itemTypeId}")]
+        public async Task<IActionResult> GetItemsforItemType(int itemTypeId)
+        {
+            var items = await itemStorageService.GetItemsforItemType(itemTypeId);
+            if (items == null || items.Count == 0)
+            {
+                return NotFound($"No items found for this ItemLine ID {itemTypeId}");
+            }
+            return Ok(items);
+        }
     }
 }

CargoHub/Controllers/ItemsController.cs

@@ -5,7 +5,7 @@
 
 namespace CargoHub.Controllers
 {
-    [Route("api/v2/[Controller]")]    
+    [Route("api/v2/[Controller]")]
     public class ItemsController(ItemStorageService storage, InventoryStorageService inventoryStorageService, ErrorHandler error) : BaseController<Item>(storage, error)
     {
         public override async Task<IActionResult> PostRow([FromBody] Item row)
@@ -18,11 +18,11 @@ public override async Task<IActionResult> PostRow([FromBody] Item row)
                 var rowId = await storage.AddRowUid(row);
                 return CreatedAtAction(nameof(GetRow), new { id = rowId }, rowId);
             }
-            
+
             return error.ModelInvalid(base.Name, ModelState);
         }
 
-        
+
         [HttpGet("{itemId}/inventory")]
         public async Task<IActionResult> GetInventoriesForItem(string itemId)
         {

CargoHub/Services/ItemStorageService.cs

@@ -20,12 +20,18 @@ private static string IdToUid(int id)
 
         public async Task<string?> AddRowUid<T>(T row) where T : Item
         {
+            var isValid = await ValidateItems(row.ItemType, row.ItemGroup, row.ItemLine);
+            if (!isValid)
+            {
+                return null;
+            }
+
             row.Id = appDbContext.Set<T>().Any() ? appDbContext.Set<T>().Max(_ => _.Id) + 1 : 1;
             row.Uid = IdToUid(row.Id);
 
             if (await base.AddRow(row) is null)
                 return null;
-            
+
             return row.Uid;
         }
 
@@ -65,5 +71,14 @@ public async Task<List<Item>> GetItemsforSupplier(int supplierId)
 
             return items;
         }
+
+        public async Task<bool> ValidateItems(int itemTypeId, int itemGroupId, int itemLineId)
+        {
+            bool isItemTypeValid = await appDbContext.ItemTypes.AnyAsync(it => it.Id == itemTypeId);
+            bool isItemGroupValid = await appDbContext.ItemGroups.AnyAsync(ig => ig.Id == itemGroupId);
+            bool isItemLineValid = await appDbContext.ItemLines.AnyAsync(il => il.Id == itemLineId);
+
+            return isItemTypeValid && isItemGroupValid && isItemLineValid;
+        }
     }
 }

Tests/test_helper.py

@@ -45,7 +45,6 @@ def get_integer_from_json_string(json_string):
 }
 
 template_item = {
-    "uid": "",
     "code": "",
     "description": "",
     "short_description": "",
@@ -64,16 +63,15 @@ def get_integer_from_json_string(json_string):
 }
 
 item_1 = {
-    "uid": "P000001",
     "code": "sjQ23408K",
     "description": "Face-to-face clear-thinking complexity",
     "short_description": "must",
     "upc_code": "6523540947122",
     "model_number": "63-OFFTq0T",
     "commodity_code": "oTo304",
-    "item_line": 11,
-    "item_group": 73,
-    "item_type": 14,
+    "item_line": 1,
+    "item_group": 1,
+    "item_type": 1,
     "unit_purchase_quantity": 47,
     "unit_order_quantity": 13,
     "pack_order_quantity": 11,
@@ -83,16 +81,15 @@ def get_integer_from_json_string(json_string):
 }
 
 item_1_updated = {
-    "uid": "P000001",
     "code": "sjQ23408K",
     "description": "Changed",
     "short_description": "must",
     "upc_code": "6523540947122",
     "model_number": "63-OFFTq0T",
     "commodity_code": "oTo304",
-    "item_line": 11,
-    "item_group": 73,
-    "item_type": 14,
+    "item_line": 1,
+    "item_group": 1,
+    "item_type": 1,
     "unit_purchase_quantity": 47,
     "unit_order_quantity": 13,
     "pack_order_quantity": 11,

Tests/test_item_types.py

@@ -0,0 +1,89 @@
+import requests
+import test_helper
+
+
+BASE_URL = "http://localhost:3000/api/v2/ItemTypes"
+
+VALID_ITEM_TYPE = {
+    "Name": "Test Name",
+    "Description": "Test Description"
+}
+
+INVALID_ITEM_TYPE_1 = {}
+HEADERS = {"Content-Type": "application/json"}
+
+UPDATED_ITEM_TYPE = {
+    "id": 1,
+    "Name": "Updated test name",
+    "Description": "Updated test description"
+}
+
+
+def test_Post():
+    # post the test body
+    post_response = requests.post(
+        BASE_URL, headers=HEADERS, json=VALID_ITEM_TYPE)
+    # convert the json response to a string and look for the id of the created Entity
+    json = str(post_response.json())
+    # look here for an integer (digit)
+
+    generated_id = test_helper.get_integer_from_json_string(json)
+    assert generated_id != 0
+
+    # get the same entity that has been posted
+    get_response = requests.get(BASE_URL + f"/{generated_id}")
+    json = get_response.json()
+    assert get_response.status_code == 200
+    assert json["name"] == VALID_ITEM_TYPE["Name"]
+    assert json["description"] == VALID_ITEM_TYPE["Description"]
+    assert "created_at" in json, "created_at key was not created"
+    assert "updated_at" in json, "updated_at key was not created"
+
+    delete_response = requests.delete(
+        BASE_URL+f"/{generated_id}")
+
+    assert delete_response.status_code == 200
+
+
+def test_invalid_post():
+    # post an item TYPE with an empty body
+    post_response = requests.post(
+        BASE_URL, headers=HEADERS, json=INVALID_ITEM_TYPE_1)
+    # the response should return a bad request
+    assert post_response.status_code == 400
+
+
+# def test_put():
+#     # post an item TYPE
+#     post_response = requests.post(
+#         BASE_URL, headers=HEADERS, json=VALID_ITEM_TYPE)
+#     # convert the json response to a string and look for the id of the created Entity
+#     json = str(post_response.json())
+#     # look here for an integer (digit)
+#     generated_id = test_helper.get_integer_from_json_string(json)
+#     assert generated_id != 0
+#     # modify the added item TYPE
+#     put_response = requests.put(
+#         BASE_URL + f"/{generated_id}", headers=HEADERS, json=UPDATED_ITEM_TYPE)
+#     assert put_response.status_code == 200
+
+
+def test_put_Item_type_that_does_not_exist():
+    put_response = requests.put(
+        BASE_URL + "999999999999", json=VALID_ITEM_TYPE)
+    assert put_response.status_code == 404
+
+
+def test_delete():
+    post_response = requests.post(BASE_URL, json=VALID_ITEM_TYPE)
+    json = str(post_response.json())
+    generated_id = test_helper.get_integer_from_json_string(json)
+    assert generated_id != 0
+
+    delete_response = requests.delete(
+        BASE_URL+f"/{generated_id}")
+
+    assert delete_response.status_code == 200
+
+    get_response = requests.get(BASE_URL + str(generated_id))
+    assert get_response.status_code == 404

Tests/test_items.py

@@ -0,0 +1,45 @@
+import requests
+import test_helper
+
+
+BASE_URL = "http://localhost:3000/api/v2/items"
+
+VALID_ITEM = {
+    "Name": "Test Name",
+    "Description": "Test Description"
+}
+
+INVALID_ITEM_1 = {}
+HEADERS = {"Content-Type": "application/json"}
+
+UPDATED_ITEM = {
+    "code": "XLE77785i",
+    "description": "Focused human-resource implementation",
+    "short_description": "offer",
+    "upc_code": "7946503676171",
+    "model_number": "fM-605648-lbu",
+    "commodity_code": "qB-2533",
+    "item_line": 1,
+    "item_group": 1,
+    "item_type": 1,
+    "unit_purchase_quantity": 27,
+    "unit_order_quantity": 20,
+    "pack_order_quantity": 16,
+    "supplier_id": 45,
+    "supplier_code": "SUP127",
+    "supplier_part_number": "Ay-062669-VVl"
+}
+
+
+def test_invalid_post():
+    # post an item TYPE with an empty body
+    post_response = requests.post(
+        BASE_URL, headers=HEADERS, json=INVALID_ITEM_1)
+    # the response should return a bad request
+    assert post_response.status_code == 400
+
+
+def test_put_Item_that_does_not_exist():
+    put_response = requests.put(
+        BASE_URL + "999999999999", json=VALID_ITEM)
+    assert put_response.status_code == 404