CargoHub

.github/workflows/dotnet.yml

@@ -40,12 +40,14 @@ jobs:
       run: | 
         dotnet build --no-restore
         echo "time=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT
+
   test:
     needs: build
     runs-on: self-hosted
     outputs:
       TEST_TIME: ${{ steps.test-time.outputs.time }}
       COVERAGE: ${{ steps.coverage.outputs.percentage }}
+      UNIT_TEST_COVERAGE: ${{ steps.unit-test-coverage.outputs.percentage }}
     steps:
     - uses: actions/checkout@v4
     - name: Setup .NET Core
@@ -61,6 +63,8 @@ jobs:
           ${{ runner.os }}-dotnet-
     - name: Build the application
       run: dotnet build --configuration Release
+    - name: Run unit tests with coverage
+      run: dotnet test --no-build --configuration Release --collect:"XPlat Code Coverage" --results-directory ./coverage --verbosity normal
     - name: Run application
       run: dotnet run --no-build --configuration Release --urls=${{ secrets.LOCALHOST }} & sleep 5
     - name: Setup Python
@@ -78,8 +82,10 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         python -m pip install httpx pytest coverage
-    - name: Run integration tests
-      run: coverage run -m pytest
+    - name: Run integration tests V1
+      run: pytest "C#apiV1/Tests"
+    - name: Run integration tests V2
+      run: coverage run -m pytest "C#api/Tests"
     - name: Generate code coverage report
       id: coverage
       run: |
@@ -132,11 +138,18 @@ jobs:
           coverage-summary.txt
           parsed-coverage-summary.txt
           coverage.xml
+          coveragereport/**
         retention-days: 1
+    - name: Cache Coverage Reports
+      uses: actions/cache@v3
+      with:
+        path: coverage/
+        key: ${{ runner.os }}-coverage-${{ github.run_id }}
     - name: Set test Completion time
       id: test-time
       run: |
         echo "time=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT
+
   release:
     runs-on: self-hosted
     if: github.event_name == 'pull_request' && github.event.pull_request.base.ref == 'main'
@@ -155,19 +168,19 @@ jobs:
     - name: Generate release notes
       run: |
         git fetch --all --tags
-        # Get the date 4 weeks ago in ISO 8601 format
-        FOUR_WEEKS_AGO=$(date -d '4 weeks ago' '+%Y-%m-%d' || date -v '-4w' '+%Y-%m-%d')
-        echo "Debug: Date 4 weeks ago is $FOUR_WEEKS_AGO"
+        # Get the date 2 weeks ago in ISO 8601 format
+        TWO_WEEKS_AGO=$(date -d '2 weeks ago' '+%Y-%m-%d' || date -v '-2w' '+%Y-%m-%d')
+        echo "Debug: Date 2 weeks ago is $TWO_WEEKS_AGO"
         echo "# Release Notes" > release_notes.md
-        echo "## Branches merged into Development in the last 4 weeks:" >> release_notes.md
-        # Get merged branches in the last 4 weeks
-        MERGED_BRANCHES=$(git log --since="$FOUR_WEEKS_AGO" --merges --pretty=format:"%s%n%b" origin/Development |
+        echo "## Branches merged into Development in the last 2 weeks:" >> release_notes.md
+        # Get merged branches in the last 2 weeks
+        MERGED_BRANCHES=$(git log --since="$TWO_WEEKS_AGO" --merges --pretty=format:"%s%n%b" origin/Development |
           grep -E "Merge (branch|pull request)|into 'Development'" |
           sed -E "s/Merge (branch|pull request) //g; s/ into Development//g; s/from //g; s/'//g; s/\"//g" |
           sort -u)
         echo "Merged branches: $MERGED_BRANCHES"
         if [ -z "$MERGED_BRANCHES" ]; then
-          echo "No branches merged in the last 4 weeks." >> release_notes.md
+          echo "No branches merged in the last 2 weeks." >> release_notes.md
         else
           echo "$MERGED_BRANCHES" | sed 's/^/- /' >> release_notes.md
         fi
@@ -258,6 +271,7 @@ jobs:
 
           Branch: ${{ github.ref_name }}
           Event: ${{ github.event_name }}
+
   close_pr_on_failure:
     needs: [build, test]
     runs-on: ubuntu-latest

.gitignore

@@ -56,7 +56,6 @@ cover/
 *.pot
 
 # Django stuff:
-*.log
 local_settings.py
 db.sqlite3
 db.sqlite3-journal
@@ -184,8 +183,6 @@ obj/
 packages/
 *.snupkg
 
-# Logs
-*.log
 
 # IDE specific files
 .idea/

C#api/Attributes/LogRequestAttribute.cs

@@ -0,0 +1,5 @@
+namespace AttributesV2;
+[AttributeUsage(AttributeTargets.Method)]
+public class LogRequestAttribute : Attribute
+{
+}

C#api/Controllers/BaseApiController.cs

@@ -1,8 +1,9 @@
 using Microsoft.AspNetCore.Mvc;
-using Providers;
+using ProvidersV2;
+using ProcessorsV2;
 
 [ApiController]
-[Route("api/v1/[controller]")]
+[Route("api/v2/[controller]")]
 public abstract class BaseApiController : ControllerBase
 {
     protected readonly NotificationSystem _notificationSystem;

C#api/Controllers/ClientsController.cs

@@ -1,12 +1,14 @@
 using Microsoft.AspNetCore.Mvc;
-using Models;
+using ModelsV2;
 using Microsoft.AspNetCore.JsonPatch;
-
-using Providers;
+using HelpersV2;
+using ProcessorsV2;
+using ProvidersV2;
 using System.Text.Json;
+using System.Xml.XPath;
 
 [ApiController]
-[Route("api/v1/[controller]")]
+[Route("api/v2/[controller]")]
 public class ClientsController : BaseApiController
 {
     public ClientsController(
@@ -16,46 +18,53 @@
     }
 
     [HttpGet]
-    public IActionResult GetClients()
+    public IActionResult GetClients(
+        [FromQuery] int page = 1,
+        [FromQuery] int pageSize = 10,
+        [FromQuery] string sortOrder = "asc"
+    )
     {
         var auth = CheckAuthorization(Request.Headers["API_KEY"], "clients", "get");
         if (auth != null) return auth;
-
         var clients = DataProvider.fetch_client_pool().GetClients();
-        return Ok(clients);
+        clients = sortOrder.ToLower() == "desc"
+            ? clients.OrderByDescending(c => c.Id).ToList()
+            : clients.OrderBy(c => c.Id).ToList();
+        var response = PaginationHelper.Paginate(clients, page, pageSize);
+        return Ok(response);
     }
 
     [HttpGet("search")]
     public IActionResult SearchClients(
-        [FromQuery] int? id = null,
         [FromQuery] string name = null,
         [FromQuery] string address = null, 
-        [FromQuery] string city = null,
-        [FromQuery] string zipCode = null,
-        [FromQuery] string province = null,
         [FromQuery] string country = null,
         [FromQuery] string contactName = null,
-        [FromQuery] string contactPhone = null,
-        [FromQuery] string contactEmail = null)
+        [FromQuery] int page = 1,
+        [FromQuery] int pageSize = 10
+
+    )
     {
         var auth = CheckAuthorization(Request.Headers["API_KEY"], "clients", "get");
         if (auth != null) return auth;
 
         try
         {
-            var clients = DataProvider.fetch_client_pool().SearchClients(id,name, address, city, zipCode, province, country, contactName, contactPhone, contactEmail);
-
-            if (clients == null || !clients.Any())
+                var clients = DataProvider.fetch_client_pool().SearchClients(name, address, country, contactName);
+
+
+                if (clients == null || !clients.Any())
+                {
+                    return BadRequest("Error, er is geen Client(s) gevonden met deze gegevens.");
+                }
+                var response = PaginationHelper.Paginate(clients, page, pageSize);
+                return Ok(response);
+            }
+            catch (ArgumentException ex)
             {
-                return BadRequest("Error, er is geen Client(s) gevonden met deze gegevens.");
+                return BadRequest(ex.Message);
             }
-            return Ok(clients);
-        }
-        catch (ArgumentException ex)
-        {
-            return BadRequest(ex.Message);
         }
-    }
 
     [HttpGet("{id}")]
     public IActionResult GetClient(int id)
@@ -202,4 +211,3 @@
         return Ok();
     }
 }
-

C#api/Controllers/InventoriesController.cs

@@ -1,11 +1,13 @@
 using Microsoft.AspNetCore.Mvc;
-using Models;
-using Providers;
+using ModelsV2;
+using ProvidersV2;
 using System.Text.Json;
+using HelpersV2;
+using ProcessorsV2;
 
 
 [ApiController]
-[Route("api/v1/[controller]")]
+[Route("api/v2/[controller]")]
 public class InventoriesController : BaseApiController
 {
     public InventoriesController(
@@ -15,22 +17,30 @@ public InventoriesController(
     }
 
     [HttpGet]
-    public IActionResult GetInventories()
+    public IActionResult GetInventories(
+        [FromQuery] int page = 1,
+        [FromQuery] int pageSize = 10,
+        [FromQuery] string sortOrder = "asc"
+        )
     {
         var auth = CheckAuthorization(Request.Headers["API_KEY"], "inventories", "get");
         if (auth is UnauthorizedResult) return auth;
 
         var inventories = DataProvider.fetch_inventory_pool().GetInventories();
-
-        if (auth is OkResult)
+            inventories = sortOrder.ToLower() == "desc"
+                        ? inventories.OrderByDescending(i => i.Id).ToList()
+                        : inventories.OrderBy(i => i.Id).ToList();
+    if (auth is OkResult)
         {
             var user = AuthProvider.GetUser(Request.Headers["API_KEY"]);
             var locations = DataProvider.fetch_location_pool().GetLocations();
             var locationids = locations.Where(x => user.OwnWarehouses.Contains(x.Warehouse_Id)).Select(x => x.Id).ToList();
             inventories = inventories.Where(x => x.Locations.Any(y => locationids.Contains(y))).ToList();
         }
 
-        return Ok(inventories);
+        var response = PaginationHelper.Paginate(inventories, page, pageSize);
+
+        return Ok(response);
     }
 
     [HttpGet("{id}")]
@@ -52,7 +62,7 @@ public IActionResult CreateInventory([FromBody] Inventory inventory)
         if (auth != null) return auth;
         if (inventory.Id != null) return BadRequest("Inventory: Id should not be given a value in the body; Id will be assigned automatically.");
         var success = DataProvider.fetch_inventory_pool().AddInventory(inventory);
-        if (!success) return BadRequest("Inventory: Id already exists");
+        if (!success) return BadRequest("Item ID and Reference do not refer to the same Item entity");
 
         DataProvider.fetch_inventory_pool().Save();
         return CreatedAtAction(nameof(GetInventory), new { id = inventory.Id }, inventory);
@@ -65,9 +75,9 @@ public IActionResult UpdateInventory(int id, [FromBody] Inventory inventory)
         if (auth != null) return auth;
 
         if (inventory.Id != null) return BadRequest("Inventory: Id should not be given a value in the body; Id will be assigned automatically.");
-
+        if (DataProvider.fetch_inventory_pool().GetInventory(id) == null) return NoContent();
         var success = DataProvider.fetch_inventory_pool().UpdateInventory(id, inventory);
-        if (!success) return NoContent();
+        if (!success) return BadRequest("Item ID and Reference do not refer to the same Item entity");
 
         DataProvider.fetch_inventory_pool().Save();
         return Ok();
@@ -145,7 +155,7 @@ public IActionResult PartiallyUpdateInventory(int id, [FromBody] JsonElement par
 
         var success = InventoryPool.ReplaceInventory(id, existingInventory);
         if (!success)
-            return StatusCode(500, "Failed to update inventory");
+            return BadRequest("Item ID and Reference do not refer to the same Item entity");
 
         DataProvider.fetch_inventory_pool().Save();
         return Ok(existingInventory);

C#api/Controllers/Item_GroupsController.cs

@@ -1,10 +1,12 @@
 using Microsoft.AspNetCore.Mvc;
-using Models;
+using ModelsV2;
 using System.Text.Json;
-using Providers;
+using ProvidersV2;
+using HelpersV2;
+using ProcessorsV2;
 
 [ApiController]
-[Route("api/v1/[controller]")]
+[Route("api/v2/[controller]")]
 public class Item_GroupsController : BaseApiController
 {
     public Item_GroupsController(
@@ -14,13 +16,18 @@ public Item_GroupsController(
     }
 
     [HttpGet]
-    public IActionResult GetItemGroups()
+    public IActionResult GetItemGroups(
+        [FromQuery] int page = 1,
+        [FromQuery] int pageSize = 10)
     {
         var auth = CheckAuthorization(Request.Headers["API_KEY"], "item_groups", "get");
         if (auth != null) return auth;
 
         var itemGroups = DataProvider.fetch_itemgroup_pool().GetItemGroups();
-        return Ok(itemGroups);
+
+        var response = PaginationHelper.Paginate(itemGroups, page, pageSize);
+
+        return Ok(response);
     }
 
     [HttpGet("{id}")]

C#api/Controllers/Item_LinesController.cs

@@ -1,10 +1,12 @@
 using System.Text.Json;
 using Microsoft.AspNetCore.Mvc;
-using Models;
-using Providers;
+using ModelsV2;
+using ProvidersV2;
+using HelpersV2;
+using ProcessorsV2;
 
 [ApiController]
-[Route("api/v1/[controller]")]
+[Route("api/v2/[controller]")]
 public class Item_LinesController : BaseApiController
 {
     public Item_LinesController(
@@ -14,13 +16,18 @@ public Item_LinesController(
     }
 
     [HttpGet]
-    public IActionResult GetItemLines()
+    public IActionResult GetItemLines(
+        [FromQuery] int page = 1,
+        [FromQuery] int pageSize = 10)
     {
         var auth = CheckAuthorization(Request.Headers["API_KEY"], "item_lines", "get");
         if (auth != null) return auth;
 
         var itemLines = DataProvider.fetch_itemline_pool().GetItemLines();
-        return Ok(itemLines);
+
+        var response = PaginationHelper.Paginate(itemLines, page, pageSize);
+
+        return Ok(response);
     }
 
     [HttpGet("{id}")]