Merge remote-tracking branch 'origin/dev' into agent/dex/CUB-33-moonraker-usage-polling

# Conflicts:
#	backend/Domain/Interfaces/IMoonrakerClient.cs
#	backend/Infrastructure/Services/MoonrakerClient.cs

backend/API/Controllers/FilamentsController.cs

@@ -40,15 +40,18 @@ public class FilamentsController : ControllerBase
     /// <response code="200">Returns the paginated list of filament spools.</response>
     [HttpGet]
     [ProducesResponseType(typeof(PagedResponse<FilamentResponse>), StatusCodes.Status200OK)]
+    [ProducesResponseType(StatusCodes.Status400BadRequest)]
     public async Task<ActionResult<PagedResponse<FilamentResponse>>> GetFilaments(
         [FromQuery] FilamentQueryParameters query)
     {
         _logger.LogDebug(
             "Getting filaments: pageNumber={PageNumber}, pageSize={PageSize}, " +
             "materialBaseId={MaterialBaseId}, materialFinishId={MaterialFinishId}, " +
-            "materialModifierId={MaterialModifierId}, brand={Brand}, isActive={IsActive}",
+            "materialModifierId={MaterialModifierId}, brand={Brand}, isActive={IsActive}, " +
+            "includeArchived={IncludeArchived}, storageLocation={StorageLocation}",
             query.PageNumber, query.PageSize, query.MaterialBaseId,
-            query.MaterialFinishId, query.MaterialModifierId, query.Brand, query.IsActive);
+            query.MaterialFinishId, query.MaterialModifierId, query.Brand, query.IsActive,
+            query.IncludeArchived, query.StorageLocation);
 
         // Clamp pagination values
         var pageNumber = Math.Max(1, query.PageNumber);
@@ -77,6 +80,15 @@ public class FilamentsController : ControllerBase
         if (query.IsActive.HasValue)
             spoolQuery = spoolQuery.Where(s => s.IsActive == query.IsActive.Value);
 
+        // Exclude archived spools by default; include when explicitly requested
+        if (query.IncludeArchived != true)
+            spoolQuery = spoolQuery.Where(s => !s.IsArchived);
+
+        if (!string.IsNullOrWhiteSpace(query.StorageLocation))
+            spoolQuery = spoolQuery.Where(s =>
+                s.StorageLocation != null &&
+                s.StorageLocation.ToLower().Contains(query.StorageLocation.ToLower()));
+
         var totalCount = await spoolQuery.CountAsync();
 
         var items = await spoolQuery
@@ -185,7 +197,9 @@ public class FilamentsController : ControllerBase
             SpoolSerial = request.SpoolSerial,
             PurchasePrice = request.PurchasePrice,
             PurchaseDate = request.PurchaseDate,
-            IsActive = request.IsActive
+            IsActive = request.IsActive,
+            IsArchived = request.IsArchived,
+            StorageLocation = request.StorageLocation
         };
 
         _dbContext.Spools.Add(entity);
@@ -267,6 +281,8 @@ public class FilamentsController : ControllerBase
         entity.PurchasePrice = request.PurchasePrice;
         entity.PurchaseDate = request.PurchaseDate;
         entity.IsActive = request.IsActive;
+        entity.IsArchived = request.IsArchived;
+        entity.StorageLocation = request.StorageLocation;
 
         await _dbContext.SaveChangesAsync();
 
@@ -307,6 +323,8 @@ public class FilamentsController : ControllerBase
         PurchasePrice = s.PurchasePrice,
         PurchaseDate = s.PurchaseDate,
         IsActive = s.IsActive,
+        IsArchived = s.IsArchived,
+        StorageLocation = s.StorageLocation,
         CreatedAt = s.CreatedAt,
         UpdatedAt = s.UpdatedAt,
         QrCodeUrl = $"/api/qr/spool/{s.Id}"