Development to Main

.gitignore

@@ -0,0 +1,2 @@
+.vs
+.idea

api/.env.development

@@ -1 +1,2 @@
-DB_CONNECTION_STRING="Host=localhost;Port=5432;Database=cargohub;Username=postgres;Password=password"
+DB_CONNECTION_STRING="Host=localhost;Port=5432;Database=cargohub;Username=postgres;Password=password"
+SECURITY_KEY=SuperSecretKeyThatIs32BytesLongX

api/Controllers/AddressesController.cs

@@ -0,0 +1,66 @@
+using Microsoft.AspNetCore.Mvc;
+using DTO.Address;
+
+
+
+[Route("api/[controller]")]
+[ApiController]
+public class AddressesController : ControllerBase
+{
+    private readonly AddressProvider _addressProvider;
+
+    public AddressesController(AddressProvider addressProvider)
+    {
+        _addressProvider = addressProvider;
+    }
+
+    [HttpPost]
+    public IActionResult Create([FromBody] AddressRequest req)
+    {
+        Address? newAddress = _addressProvider.Create(req);
+
+        if (newAddress == null) throw new ApiFlowException("Saving new Address failed.");
+
+        return Ok(new 
+        {
+            message = "Address created",
+            new_address = new AddressResponse
+            {
+                Id = newAddress.Id,
+                Street = newAddress.Street,
+                HouseNumber = newAddress.HouseNumber,
+                HouseNumberExtension = newAddress.HouseNumberExtension,
+                HouseNumberExtensionExtra = newAddress.HouseNumberExtensionExtra,
+                ZipCode = newAddress.ZipCode,
+                City = newAddress.City,
+                Province = newAddress.Province,
+                CountryCode = newAddress.CountryCode
+            }
+        });
+    }
+
+    [HttpPut("{id}")]
+    public IActionResult Update(Guid id, [FromBody] AddressRequest req)
+    {
+        Address? updateAddress = _addressProvider.Update(id,req);
+
+        if (updateAddress == null) throw new ApiFlowException($"Address not found for id '{id}'");
+
+        return Ok(new 
+        {
+            message = "Address updated",
+            new_address = new AddressResponse
+            {
+                Id = updateAddress.Id,
+                Street = updateAddress.Street,
+                HouseNumber = updateAddress.HouseNumber,
+                HouseNumberExtension = updateAddress.HouseNumberExtension,
+                HouseNumberExtensionExtra = updateAddress.HouseNumberExtensionExtra,
+                ZipCode = updateAddress.ZipCode,
+                City = updateAddress.City,
+                Province = updateAddress.Province,
+                CountryCode = updateAddress.CountryCode
+            }
+        });
+    }
+}

api/Controllers/AuthController.cs

@@ -6,37 +6,36 @@
 public class AuthController : ControllerBase
 {
     private readonly TokenService _tokenService;
+    private readonly string? _securityKey;
 
-    public AuthController(TokenService tokenService)
+    public AuthController(TokenService tokenService, string? securityKey)
     {
         _tokenService = tokenService;
+        _securityKey = securityKey;
     }
 
-    [HttpGet("generate-admin-token")]
-    public async Task<IActionResult> GenerateAdminToken()
+    [HttpGet("generate-token")]
+    public async Task<IActionResult> GenerateToken([FromQuery] string role)
     {
-        var token = await _tokenService.GenerateAdminToken();
-        return Ok(new { Token = token });
-    }
+        if (string.IsNullOrWhiteSpace(role))
+        {
+            return BadRequest(new { Error = "Role must be specified." });
+        }
 
-    [HttpGet("generate-reader-token")]
-    public async Task<IActionResult> GenerateReaderToken()
-    {
-        var token = await _tokenService.GenerateReaderToken();
+        var validRoles = new[] { "admin", "warehousemanager", "inventorymanager", "floormanager", "operative", "supervisor", "analyst", "logistics", "sales" };
+        if (!validRoles.Contains(role.ToLower()))
+        {
+            return BadRequest(new { Error = $"Role '{role}' is not recognized." });
+        }
+
+        var token = await _tokenService.GenerateToken(role.ToLower());
         return Ok(new { Token = token });
     }
-
+    
     [HttpGet("admin-only")]
-    [Authorize(Roles = "admin")]
+    [Authorize(Roles = "admin,operative")]
     public IActionResult AdminOnly()
     {
         return Ok(new{message = "Admin Only Authorized."});
     }
-
-    [HttpGet("reader")]
-    [Authorize]
-    public IActionResult Reader()
-    {
-        return Ok(new{message = "Reader / Admin Authorized."});
-    }
 }

api/Controllers/ClientsController.cs

@@ -10,13 +10,10 @@
 public class ClientsController : ControllerBase
 {
     private readonly ClientsProvider _clientProvider;
-    private readonly ContactProvider _contactProvider;
-    private readonly AddressProvider _addressProvider;
+
     public ClientsController(ClientsProvider clientProvider, ContactProvider contactProvider, AddressProvider addressProvider)
     {
         _clientProvider = clientProvider;
-        _contactProvider = contactProvider;
-        _addressProvider = addressProvider;
     }
 
     [HttpPost()]
@@ -31,7 +28,7 @@
             message = "Client created!",
             new_client = new ClientResponse
             {
                 Id = newClient.Id,
                 Name = newClient.Name,
                 Contact = new ContactResponse
                 {
@@ -46,6 +43,7 @@
                     Street = newClient.Address?.Street,
                     HouseNumber = newClient.Address?.HouseNumber,
                     HouseNumberExtension = newClient.Address?.HouseNumberExtension,
+                    HouseNumberExtensionExtra = newClient.Address?.HouseNumberExtensionExtra,
                     ZipCode = newClient.Address?.ZipCode,
                     City = newClient.Address?.City,
                     Province = newClient.Address?.Province,
@@ -57,6 +55,44 @@
         });
     }
 
+    [HttpPut("{id}")]
+    public IActionResult Update(Guid id, [FromBody] ClientRequest req)
+    {
+        Client? updatedClient = _clientProvider.Update(id, req);
+
+        if (updatedClient == null) BadRequest(new { message = "Client update failed." });
+
+        Client? foundClient = _clientProvider.GetById(updatedClient.Id);
+        return Ok(new ClientResponse
+        {
+            Id = foundClient.Id,
+            Name = foundClient.Name,
+            Contact = new ContactResponse
+            {
+                Id = foundClient.ContactId,
+                Name = foundClient.Contact?.Name,
+                Phone = foundClient.Contact?.Phone,
+                Email = foundClient.Contact?.Email
+            },
+            Address = new AddressResponse
+            {
+                Id = foundClient.AddressId,
+                Street = foundClient.Address?.Street,
+                HouseNumber = foundClient.Address?.HouseNumber,
+                HouseNumberExtension = foundClient.Address?.HouseNumberExtension,
+                HouseNumberExtensionExtra = foundClient.Address?.HouseNumberExtensionExtra,
+                ZipCode = foundClient.Address?.ZipCode,
+                City = foundClient.Address?.City,
+                Province = foundClient.Address?.Province,
+                CountryCode = foundClient.Address?.CountryCode
+            },
+            CreatedAt = foundClient.CreatedAt,
+            UpdatedAt = foundClient.UpdatedAt
+        });
+
+    }
+
+
     [HttpGet("{id}")]
     public IActionResult ShowSingle(Guid id)
     {
@@ -70,17 +106,18 @@
             Name = createdClient.Name,
             Contact = new ContactResponse
             {
-                Id = createdClient.AddressId,
+                Id = createdClient.ContactId,
                 Name = createdClient.Contact?.Name,
                 Phone = createdClient.Contact?.Phone,
                 Email = createdClient.Contact?.Email
             },
             Address = new AddressResponse
             {
-                Id = createdClient.ContactId,
+                Id = createdClient.AddressId,
                 Street = createdClient.Address?.Street,
                 HouseNumber = createdClient.Address?.HouseNumber,
                 HouseNumberExtension = createdClient.Address?.HouseNumberExtension,
+                HouseNumberExtensionExtra = createdClient.Address?.HouseNumberExtensionExtra,
                 ZipCode = createdClient.Address?.ZipCode,
                 City = createdClient.Address?.City,
                 Province = createdClient.Address?.Province,
@@ -103,17 +140,18 @@
             Name = c.Name,
             Contact = new ContactResponse
             {
-                Id = c.AddressId,
+                Id = c.ContactId,
                 Name = c.Contact?.Name,
                 Phone = c.Contact?.Phone,
                 Email = c.Contact?.Email
             },
             Address = new AddressResponse
             {
-                Id = c.ContactId,
+                Id = c.AddressId,
                 Street = c.Address?.Street,
                 HouseNumber = c.Address?.HouseNumber,
                 HouseNumberExtension = c.Address?.HouseNumberExtension,
+                HouseNumberExtensionExtra = c.Address?.HouseNumberExtensionExtra,
                 ZipCode = c.Address?.ZipCode,
                 City = c.Address?.City,
                 Province = c.Address?.Province,

api/Controllers/ContactsController.cs

@@ -31,4 +31,56 @@ public IActionResult Create([FromBody] ContactRequest req)
             }
         });
     }
+
+    [HttpPut("{id}")]
+    public IActionResult Update(Guid id, [FromBody] ContactRequest req)
+    {
+        Contact? updateContact = _contactProvider.Update(id, req);
+
+        if (updateContact == null)
+            return NotFound(new { message = $"Contact not found for id {id}" });
+
+        return Ok(new
+        {
+            message = "Contact updated!",
+            Contact = new ContactResponse
+            {
+                Id = updateContact.Id,
+                Name = updateContact.Name,
+                Phone = updateContact.Phone,
+                Email = updateContact.Email
+            }
+        });
+    }
+
+    [HttpGet("{id}")]
+    public IActionResult ShowSingle(Guid id)
+    {
+        Contact? foundContact = _contactProvider.GetById(id);
+
+        if (foundContact == null)
+            return NotFound(new { message = $"Contact not found for id {id}" });
+
+        return Ok(new
+        {
+            message = "Contact found!",
+            Contact = new ContactResponse
+            {
+                Id = foundContact.Id,
+                Name = foundContact.Name,
+                Phone = foundContact.Phone,
+                Email = foundContact.Email
+            }
+        });
+    }
+
+    [HttpGet()]
+    public IActionResult ShowAll() => Ok(_contactProvider.GetAll()?.Select(c => new ContactResponse
+        {
+            Id = c.Id,
+            Name = c.Name,
+            Phone = c.Phone,
+            Email = c.Email
+        }).ToList());
+
 }

api/Controllers/InventoriesController.cs

@@ -52,6 +52,40 @@ public IActionResult Create([FromBody] InventoryRequest req)
         });
     }
 
+    [HttpPut("{id}")]
+    public IActionResult Update(Guid id, [FromBody] InventoryRequest req)
+    {   
+        Inventory? updatedInventory = _inventoriesProvider.Update(id, req);
+        if(updatedInventory == null) return NotFound(new {message = $"Inventory not found for id '{id}'"});
+
+        List<Location> locations = _locationsProvider.GetLocationsByInventoryId(updatedInventory.Id);
+        Dictionary<string, int> calculatedValues = _inventoriesProvider.GetCalculatedValues(updatedInventory.Id);
+
+        return Ok(new
+        {
+            message = "Inventory updated!",
+            updated_inventory = new InventoryResponse
+            {
+                Id = updatedInventory.Id,
+                Description = updatedInventory.Description,
+                ItemReference = updatedInventory.ItemReference,
+                ItemId = updatedInventory.ItemId,
+                Locations = locations.Select(l => new InventoryLocation()
+                {
+                    LocationId = l.Id,
+                    OnHand = l.OnHand
+                }).ToList(),
+                TotalOnHand = calculatedValues["TotalOnHand"],
+                TotalExpected = calculatedValues["TotalExpected"],
+                TotalOrdered = calculatedValues["TotalOrdered"],
+                TotalAllocated = calculatedValues["TotalAllocated"],
+                TotalAvailable = calculatedValues["TotalAvailable"],
+                CreatedAt = updatedInventory.CreatedAt,
+                UpdatedAt = updatedInventory.UpdatedAt,
+            }
+        });
+    }
+
     [HttpDelete("{id}")]
     public IActionResult Delete(Guid id)
     {

api/Program.cs

@@ -10,7 +10,11 @@
 // Load Env vars
 DotNetEnv.Env.Load();
 string? connectionString = Environment.GetEnvironmentVariable("DB_CONNECTION_STRING");
+string? securityKey = Environment.GetEnvironmentVariable("SECURITY_KEY");
 if(connectionString == null) throw new InvalidOperationException("The required environment variable 'DB_CONNECTION_STRING' is not set.");
+if(securityKey == null) throw new InvalidOperationException("The required environment variable 'SECURITY_KEY' is not set.");
+
+builder.Services.AddSingleton(securityKey);
 
 // Add services to the container.
 builder.Services.AddControllers();
@@ -32,7 +36,8 @@
         ValidateIssuerSigningKey = true,
         IssuerSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes("SuperSecretKeyThatIs32BytesLongX")),
         ValidateIssuer = false,
-        ValidateAudience = false
+        ValidateAudience = false,
+        ValidateLifetime = false
     };
 
     options.Events = new JwtBearerEvents

api/REST/Clients/Addresses.rest

@@ -0,0 +1,29 @@
+POST http://localhost:5000/api/addresses
+Content-Type: application/json
+
+{
+  "street": "Main Street",
+  "house_number": "123",
+  "house_number_extension": "A",
+  "house_number_extension_extra": "Extra",
+  "zipcode": "12345",
+  "city": "Example City",
+  "province": "Example Province",
+  "country_code": "NL"
+}
+###
+### Update Address
+PUT http://localhost:5000/api/addresses/94509304-04ff-44f6-ba10-d77524c71a2f
+Content-Type: application/json
+
+{
+  "street": "Street",
+  "house_number": "1",
+  "house_number_extension": "b",
+  "house_number_extension_extra": "Extra",
+  "zipcode": "12345",
+  "city": "Example City",
+  "province": "Example Province",
+  "country_code": "NL"
+}
+###