Compare commits

..

28 Commits

Author SHA1 Message Date
a90627de28 CUB-6: fix MoonrakerClient namespace to match directory structure
Some checks failed
Dev Build / build-test (pull_request) Failing after 1m0s
Dev Build / deploy-dev (pull_request) Has been skipped
Dev Build / notify-success (pull_request) Has been skipped
Dev Build / notify-failure (pull_request) Successful in 4s
2026-04-27 20:29:25 -04:00
e9e856a012 Merge pull request 'CUB-5: Implement GET /filaments and GET /filaments/{id}' (#27) from agent/dex/CUB-5-get-filaments-endpoints into dev
Some checks failed
Dev Build / deploy-dev (push) Has been skipped
Dev Build / notify-failure (push) Successful in 3s
Dev Build / build-test (push) Failing after 59s
Dev Build / notify-success (push) Has been skipped
2026-04-27 20:21:53 -04:00
46d28676f0 CUB-5: Add 400 BadRequest ProducesResponseType to GET /filaments endpoint
Some checks failed
Dev Build / build-test (pull_request) Failing after 54s
Dev Build / deploy-dev (pull_request) Has been skipped
Dev Build / notify-success (pull_request) Has been skipped
Dev Build / notify-failure (pull_request) Successful in 4s
2026-04-27 20:20:04 -04:00
ed0efd598b Merge pull request 'CUB-7: Implement POST /filaments with validation' (#26) from agent/dex/CUB-7-post-filaments-validation into dev
Some checks failed
Dev Build / build-test (push) Failing after 1m0s
Dev Build / deploy-dev (push) Has been skipped
Dev Build / notify-success (push) Has been skipped
Dev Build / notify-failure (push) Successful in 6s
2026-04-27 19:06:12 -04:00
19415003a2 feat(CUB-7): Add XML doc comments to FilamentValidators constructors
Some checks failed
Dev Build / build-test (pull_request) Failing after 56s
Dev Build / deploy-dev (pull_request) Has been skipped
Dev Build / notify-success (pull_request) Has been skipped
Dev Build / notify-failure (pull_request) Successful in 3s
2026-04-27 19:01:19 -04:00
7904fcda02 Merge pull request 'CUB-10: Create IMoonrakerClient interface and DTOs' (#25) from agent/dex/CUB-10-imoonrakerclient-interface-dtos into dev
Some checks failed
Dev Build / build-test (push) Failing after 1m3s
Dev Build / deploy-dev (push) Has been skipped
Dev Build / notify-success (push) Has been skipped
Dev Build / notify-failure (push) Successful in 3s
2026-04-27 18:50:47 -04:00
3d3b7059cf Merge branch 'dev' into agent/dex/CUB-10-imoonrakerclient-interface-dtos
Some checks failed
Dev Build / build-test (pull_request) Failing after 57s
Dev Build / deploy-dev (pull_request) Has been skipped
Dev Build / notify-success (pull_request) Has been skipped
Dev Build / notify-failure (pull_request) Successful in 3s
2026-04-27 18:50:41 -04:00
fc6134b162 docs: add comprehensive README
Some checks failed
Dev Build / deploy-dev (push) Has been cancelled
Dev Build / notify-success (push) Has been cancelled
Dev Build / notify-failure (push) Has been cancelled
Dev Build / build-test (push) Has been cancelled
2026-04-27 18:49:26 -04:00
51bfb6d115 CUB-10: Create IMoonrakerClient interface and DTOs
Some checks failed
Dev Build / build-test (pull_request) Failing after 58s
Dev Build / deploy-dev (pull_request) Has been skipped
Dev Build / notify-success (pull_request) Has been skipped
Dev Build / notify-failure (pull_request) Successful in 6s
- Expanded IMoonrakerClient interface with 6 strongly-typed methods:
  - GetServerInfoAsync (Moonraker /server/info)
  - IsReachableAsync (connectivity check)
  - GetPrinterInfoAsync (Moonraker /printer/info)
  - GetPrintHistoryAsync (Moonraker /server/history/items)
  - GetPrintStatsAsync (Moonraker /printer/objects/query?print_stats)
  - GetDisplayStatusAsync (Moonraker /printer/objects/query?display_status)
  - GetFilamentUsageAsync (retained for backward compatibility)

- Created Domain/DTOs/Moonraker/ with 7 DTOs:
  - MoonrakerServerInfo, MoonrakerPrinterInfo, MoonrakerPrintJob
  - MoonrakerHistoryResponse, MoonrakerPrintStats
  - MoonrakerDisplayStatus, MoonrakerRequest

- Updated MoonrakerClient implementation to support all new methods
  with proper JSON parsing and mapping helpers

- Full XML doc comments on all public members
2026-04-27 18:42:47 -04:00
aa182af979 Merge pull request 'feat(CUB-28): [Extrudex] Define filament inventory database entities' (#24) from agent/hex/CUB-28-filament-inventory-entities into dev
Some checks failed
Dev Build / build-test (push) Failing after 54s
Dev Build / deploy-dev (push) Has been skipped
Dev Build / notify-success (push) Has been skipped
Dev Build / notify-failure (push) Successful in 3s
2026-04-27 18:28:26 -04:00
ac033859a8 feat(CUB-28): [Extrudex] Define filament inventory database entities
Some checks failed
Dev Build / build-test (pull_request) Failing after 1m3s
Dev Build / deploy-dev (pull_request) Has been skipped
Dev Build / notify-success (pull_request) Has been skipped
Dev Build / notify-failure (pull_request) Successful in 3s
Add storage_location and is_archived fields to Spool entity to complete
the filament inventory entity definition per CUB-28 requirements.

Changes:
- Spool entity: add IsArchived (bool, default false) and StorageLocation
  (nullable string, max 200) for physical inventory tracking
- SpoolConfiguration: add snake_case column mappings, defaults, and indexes
  (ix_spools_is_archived, ix_spools_active_archived composite)
- FilamentDtos: add IsArchived + StorageLocation to Response, Create, Update
- FilamentQueryDtos: add IncludeArchived and StorageLocation query filters
- FilamentsController: wire new fields into query, create, update, mapping
- FilamentValidators: add StorageLocation max-length validation

Build: PASS (0 errors)
2026-04-27 18:24:52 -04:00
c3a0f210a1 Merge pull request 'CUB-64: Docker Runtime Setup for Development & Deployment' (#14) from agent/dex/CUB-64-docker-runtime-setup into dev
Some checks failed
Dev Build / build-test (push) Failing after 59s
Dev Build / deploy-dev (push) Has been skipped
Dev Build / notify-success (push) Has been skipped
Dev Build / notify-failure (push) Successful in 3s
Reviewed-on: #14
2026-04-27 17:34:40 -04:00
2017843dc1 Merge branch 'dev' into agent/dex/CUB-64-docker-runtime-setup
Some checks failed
Dev Build / build-test (pull_request) Failing after 58s
Dev Build / deploy-dev (pull_request) Has been skipped
Dev Build / notify-success (pull_request) Has been skipped
Dev Build / notify-failure (pull_request) Successful in 3s
2026-04-27 17:34:26 -04:00
c150f54c64 Merge pull request 'feat(CUB-39): Create background job for filament usage sync' (#16) from agent/dex/CUB-39-filament-usage-sync into dev
Some checks failed
Dev Build / deploy-dev (push) Has been cancelled
Dev Build / notify-success (push) Has been cancelled
Dev Build / notify-failure (push) Has been cancelled
Dev Build / build-test (push) Has been cancelled
Reviewed-on: #16
2026-04-27 17:33:59 -04:00
73363206ec Merge branch 'dev' into agent/dex/CUB-39-filament-usage-sync
Some checks failed
Dev Build / build-test (pull_request) Failing after 1m3s
Dev Build / deploy-dev (pull_request) Has been skipped
Dev Build / notify-success (pull_request) Has been skipped
Dev Build / notify-failure (pull_request) Successful in 4s
2026-04-27 17:25:58 -04:00
174dd294e9 Merge pull request 'CUB-37: Implement cost-per-print calculation service' (#18) from agent/dex/CUB-37-cost-per-print into dev
Some checks failed
Dev Build / deploy-dev (push) Has been skipped
Dev Build / notify-success (push) Has been skipped
Dev Build / build-test (push) Failing after 1m3s
Dev Build / notify-failure (push) Successful in 3s
Reviewed-on: #18
2026-04-27 17:25:37 -04:00
0378aee43e Merge branch 'dev' into agent/dex/CUB-37-cost-per-print
Some checks failed
Dev Build / build-test (pull_request) Failing after 1m0s
Dev Build / deploy-dev (pull_request) Has been skipped
Dev Build / notify-success (pull_request) Has been skipped
Dev Build / notify-failure (pull_request) Successful in 5s
2026-04-27 17:25:22 -04:00
72a39ec766 Merge pull request 'CUB-34: Add filament filter bar with material type, color, and low stock filters' (#21) from agent/rex/CUB-34-filament-list-ui into dev
Some checks failed
Dev Build / build-test (push) Failing after 51s
Dev Build / deploy-dev (push) Has been skipped
Dev Build / notify-success (push) Has been skipped
Dev Build / notify-failure (push) Successful in 3s
Reviewed-on: #21
Reviewed-by: Joshua <joshua@cnjmail.com>
2026-04-27 17:14:55 -04:00
c05b9dd87d merge(dev): Re-apply CUB-34 changes after merge conflict resolution
Some checks failed
Dev Build / build-test (pull_request) Failing after 54s
Dev Build / deploy-dev (pull_request) Has been skipped
Dev Build / notify-success (pull_request) Has been skipped
Dev Build / notify-failure (pull_request) Successful in 3s
2026-04-27 17:02:25 -04:00
5a577e1871 Merge remote-tracking branch 'origin/dev' into fix-pr-21
# Conflicts:
#	frontend/src/app/components/filament-table/filament-table.component.html
#	frontend/src/app/components/filament-table/filament-table.component.ts
2026-04-27 17:02:25 -04:00
2e8227c3f9 Merge pull request 'CUB-36: Add delete confirmation dialog for filament spool removal' (#19) from agent/rex/CUB-36-delete-confirmation into dev
Some checks failed
Dev Build / build-test (push) Failing after 55s
Dev Build / deploy-dev (push) Has been skipped
Dev Build / notify-success (push) Has been skipped
Dev Build / notify-failure (push) Successful in 4s
Reviewed-on: #19
2026-04-27 15:24:55 -04:00
d207c49ffd CUB-34: add filament filter bar with material type, color, and low stock filters
Some checks failed
Dev Build / deploy-dev (pull_request) Has been skipped
Dev Build / notify-success (pull_request) Has been skipped
Dev Build / build-test (pull_request) Failing after 54s
Dev Build / notify-failure (pull_request) Successful in 6s
2026-04-27 15:08:31 -04:00
5b9dde13fe Merge remote-tracking branch 'origin/dev' into fix-pr-18
Some checks failed
Dev Build / build-test (pull_request) Failing after 54s
Dev Build / deploy-dev (pull_request) Has been skipped
Dev Build / notify-success (pull_request) Has been skipped
Dev Build / notify-failure (pull_request) Successful in 4s
# Conflicts:
#	backend/API/Controllers/PrintJobsController.cs
2026-04-27 14:30:05 -04:00
fd9fcd47ab Merge remote-tracking branch 'origin/dev' into fix-pr-14
Some checks failed
Dev Build / build-test (pull_request) Failing after 58s
Dev Build / deploy-dev (pull_request) Has been skipped
Dev Build / notify-success (pull_request) Has been skipped
Dev Build / notify-failure (pull_request) Successful in 3s
# Conflicts:
#	frontend/.dockerignore
#	frontend/Dockerfile
#	frontend/nginx.conf
2026-04-27 14:30:03 -04:00
d43985cad9 Merge branch 'dev' into agent/dex/CUB-39-filament-usage-sync
Some checks failed
Dev Build / build-test (pull_request) Failing after 52s
Dev Build / deploy-dev (pull_request) Has been skipped
Dev Build / notify-success (pull_request) Has been skipped
Dev Build / notify-failure (pull_request) Successful in 3s
2026-04-27 14:15:16 -04:00
6aa31f4be3 CUB-37: implement cost-per-print calculation service
Some checks failed
Dev Build / build-test (pull_request) Failing after 48s
Dev Build / deploy-dev (pull_request) Has been skipped
Dev Build / notify-success (pull_request) Has been skipped
Dev Build / notify-failure (pull_request) Successful in 3s
2026-04-27 17:57:57 +00:00
4ba98966eb feat(CUB-39): create background job for filament usage sync
Some checks failed
Dev Build / build-test (pull_request) Failing after 48s
Dev Build / deploy-dev (pull_request) Has been skipped
Dev Build / notify-success (pull_request) Has been skipped
Dev Build / notify-failure (pull_request) Successful in 3s
2026-04-27 17:23:24 +00:00
61178ebb7b feat(CUB-64): Docker runtime setup for development & deployment
Some checks failed
Dev Build / build-test (pull_request) Failing after 47s
Dev Build / deploy-dev (pull_request) Has been skipped
Dev Build / notify-success (pull_request) Has been skipped
Dev Build / notify-failure (pull_request) Successful in 3s
- Backend Dockerfile: added curl install for health check (not in aspnet base image)
- Frontend Dockerfile: multi-stage Angular build with nginx serving
- Frontend nginx.conf: SPA routing, API proxy, SignalR WebSocket support, health endpoint
- Frontend .dockerignore: excludes node_modules, dist, .angular, etc.
- docker-compose.dev.yml: added PostgreSQL service, fixed frontend context path,
  renamed web service from control-center-web to extrudex-web, added DB env vars,
  proper service dependencies with health checks
- deploy.sh: updated service list to include PostgreSQL port
2026-04-27 08:33:18 +00:00
43 changed files with 2344 additions and 470 deletions

220
README.md
View File

@@ -0,0 +1,220 @@
# Extrudex
> Filament inventory and print tracking system for CubeCraft Creations.
Extrudex replaces Spoolman with a fully custom solution built for Joshua's 7-printer fleet. It tracks spool stock, per-print material consumption, and cost-of-goods — with a touch-optimized kiosk interface on a Raspberry Pi 5.
---
## Tech Stack
| Layer | Technology |
|---|---|
| Backend | ASP.NET Core Web API (.NET 8) |
| Database | PostgreSQL (snake_case via EF Core) |
| ORM | Entity Framework Core |
| Real-time | SignalR (`PrinterHub`) |
| Printer integration | Moonraker REST/WebSocket (Elegoo) · MQTTnet + TLS (Bambu Lab) |
| Frontend | Angular 17+, Angular Material |
| Deployment | Docker · Docker Compose |
---
## Project Structure
```
Extrudex/
├── backend/
│ ├── Domain/
│ │ ├── Base/ # BaseEntity, AuditableEntity
│ │ ├── Entities/ # Spool, Printer, PrintJob, FilamentUsage,
│ │ │ # AmsUnit, AmsSlot, MaterialBase,
│ │ │ # MaterialFinish, MaterialModifier
│ │ ├── Enums/ # ConnectionType, DataSource, JobStatus,
│ │ │ # PrinterStatus, PrinterType, QrResourceType
│ │ └── Interfaces/ # ICostPerPrintService, IFilamentUsageSyncService,
│ │ # IMoonrakerClient, IQrCodeService
│ ├── Infrastructure/
│ │ ├── Configuration/ # FilamentUsageSyncOptions
│ │ ├── Data/
│ │ │ ├── Configurations/ # EF Core fluent configs (snake_case)
│ │ │ ├── Migrations/ # EF migrations
│ │ │ ├── Seed/ # SeedData.cs
│ │ │ └── ExtrudexDbContext.cs
│ │ └── Services/ # CostPerPrintService, FilamentUsageSyncService,
│ │ # MoonrakerClient, QrCodeService
│ └── API/
│ ├── Controllers/ # Filaments, Spools, Printers, PrintJobs,
│ │ # MaterialBases, MaterialFinishes,
│ │ # MaterialModifiers, MaterialLookups,
│ │ # CostAnalysis, QR
│ ├── DTOs/ # Request/response shapes per domain
│ ├── Filters/ # FluentValidationFilter
│ ├── Hubs/ # PrinterHub, IPrinterClient
│ ├── Jobs/ # FilamentUsageSyncJob (background)
│ ├── Validators/ # FluentValidation validators
│ ├── Program.cs
│ └── appsettings.json
├── frontend/
│ └── src/app/
│ ├── components/ # DashboardSummary, FilamentFilter, FilamentTable
│ ├── models/ # Filament, Agent model types
│ └── app.routes.ts
├── design/ # UX specs and mockups (kiosk + mobile)
├── docker-compose.dev.yml
├── deploy.sh
└── README.md
```
---
## Domain Model
### Materials (normalized taxonomy)
| Entity | Description |
|---|---|
| `MaterialBase` | The base material type — PLA, PETG, ABS, ASA, TPU, etc. |
| `MaterialFinish` | Required. Surface finish — Basic (default), Matte, Silk, Sparkle, etc. |
| `MaterialModifier` | Optional. Composite fill — Carbon Fiber, Glass Fiber, Wood, etc. |
**Rules:**
- `MaterialFinish` is required — every spool must have one. Default is `"Basic"`.
- `MaterialModifier` is optional — plain PLA has no modifier.
### Consumption calculation
```
grams_used = mm_extruded × filament_cross_section_area × material_density
```
Grams are always derived, never assumed from printer telemetry directly.
### Printers
| Type | Integration |
|---|---|
| Bambu Lab (×5) | MQTTnet with TLS |
| Elegoo Centauri Carbon | Moonraker REST + WebSocket |
| Elegoo Saturn (resin ×2) | Manual / future |
AMS units and slots are modelled as `AmsUnit``AmsSlot[]``Spool`.
---
## Key Design Decisions
1. **Spoolman rejected** — Full custom system for data model control and workflow flexibility.
2. **`"Basic"` not `"Standard"`** — Default `MaterialFinish` value is `Basic`.
3. **`MaterialFinish` is required** — No null/optional finish state allowed.
4. **`MaterialModifier` is optional** — Not every spool has a modifier.
5. **Derived consumption** — Grams calculated from mm × density, never assumed.
6. **Push over poll** — SignalR and MQTT preferred over periodic polling.
7. **Snake_case PostgreSQL** — All database identifiers follow this convention via EF Core.
---
## Getting Started
### Prerequisites
- .NET 8 SDK
- Node.js 20+
- Docker + Docker Compose
- PostgreSQL (or use the dev compose stack)
### Backend
```bash
cd backend
# Restore and build
dotnet restore
dotnet build
# Apply migrations
dotnet ef database update
# Run API (dev)
dotnet run --project API
```
API runs at `http://localhost:5000` · Swagger at `http://localhost:5000/swagger`
### Frontend
```bash
cd frontend
npm install
ng serve
```
Frontend runs at `http://localhost:4200`
### Docker (dev stack)
```bash
docker-compose -f docker-compose.dev.yml up
```
---
## Configuration
`backend/appsettings.json` — override in `appsettings.Development.json` or environment variables:
| Key | Default | Description |
|---|---|---|
| `ConnectionStrings:ExtrudexDb` | `Host=localhost;...` | PostgreSQL connection string |
| `FilamentUsageSync:PollingInterval` | `00:05:00` | Sync job interval |
| `FilamentUsageSync:RequestTimeout` | `00:00:30` | Moonraker request timeout |
| `FilamentUsageSync:Enabled` | `true` | Enable/disable background sync |
---
## Real-Time Events
SignalR hub endpoint: `/hubs/printer`
Clients receive `PrinterHub` events for live printer status, job progress, and spool consumption updates.
---
## API Overview
| Route prefix | Resource |
|---|---|
| `/api/filaments` | Filament catalog |
| `/api/spools` | Spool inventory |
| `/api/printers` | Printer registry |
| `/api/print-jobs` | Print job tracking |
| `/api/material-bases` | Material base types |
| `/api/material-finishes` | Material finishes |
| `/api/material-modifiers` | Material modifiers |
| `/api/material-lookups` | Combined material lookup |
| `/api/cost-analysis` | Cost-per-print and COGS |
| `/api/qr` | QR code generation |
Full schema available at `/swagger` when running in dev.
---
## CI
Gitea Actions pipeline (`.gitea/workflows/dev.yml`) runs on every push to `dev`:
- `dotnet build`
- Frontend `ng build`
---
## Branch & PR Rules
- All feature branches target `dev`**never `main`**
- Branch naming: `agent/<agent>/CUB-N-short-description`
- PR titles: `CUB-N: short description`
- PRs require Otto review before Joshua merges
---
*Built by CubeCraft Creations · Orchestrated by Otto*

View File

@@ -0,0 +1,108 @@
using Extrudex.API.DTOs.PrintJobs;
using Extrudex.Domain.Interfaces;
using Microsoft.AspNetCore.Mvc;
namespace Extrudex.API.Controllers;
/// <summary>
/// Controller for cost analysis endpoints. Provides spool-level
/// cost breakdowns and aggregated COGS reporting.
/// </summary>
[ApiController]
[Route("api/cost-analysis")]
public class CostAnalysisController : ControllerBase
{
private readonly ICostPerPrintService _costService;
private readonly ILogger<CostAnalysisController> _logger;
/// <summary>
/// Initializes a new instance of the <see cref="CostAnalysisController"/> class.
/// </summary>
/// <param name="costService">The cost-per-print calculation service.</param>
/// <param name="logger">The logger for diagnostic output.</param>
public CostAnalysisController(
ICostPerPrintService costService,
ILogger<CostAnalysisController> logger)
{
_costService = costService;
_logger = logger;
}
// ── POST /api/cost-analysis/spool ────────────────────────────
/// <summary>
/// Calculates cost breakdowns for all print jobs associated with a specific spool.
/// Returns per-job costs plus an aggregated total. Jobs with missing cost data
/// include warnings and null cost fields — the endpoint never throws for missing data.
/// </summary>
/// <param name="request">The request containing the spool identifier.</param>
/// <returns>A spool-level cost summary with per-job breakdowns.</returns>
/// <response code="200">Returns the spool cost breakdown with per-job details.</response>
/// <response code="404">If the spool has no print jobs.</response>
[HttpPost("spool")]
[ProducesResponseType(typeof(SpoolCostResponse), StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status404NotFound)]
public async Task<ActionResult<SpoolCostResponse>> CalculateSpoolCost([FromBody] SpoolCostRequest request)
{
_logger.LogDebug("Calculating cost breakdown for spool {SpoolId}", request.SpoolId);
var results = await _costService.CalculateBySpoolAsync(request.SpoolId);
if (results.Count == 0)
{
return NotFound(new { error = $"No print jobs found for spool with ID '{request.SpoolId}'." });
}
// Build the spool-level summary
var firstResult = results[0];
var jobResponses = results.Select(MapCostToResponse).ToList();
// Aggregate total cost and grams — only include jobs that have a valid cost
var calculableJobs = results.Where(r => r.CostPerPrint.HasValue).ToList();
var totalCost = calculableJobs.Count == results.Count
? Math.Round(calculableJobs.Sum(r => r.CostPerPrint!.Value), 4)
: (decimal?)null;
var aggregateWarnings = new List<string>();
if (calculableJobs.Count < results.Count)
{
aggregateWarnings.Add(
$"{results.Count - calculableJobs.Count} of {results.Count} print jobs have missing cost data. " +
"Total cost reflects only jobs with complete data.");
}
var response = new SpoolCostResponse
{
SpoolId = request.SpoolId,
SpoolSerial = firstResult.SpoolSerial,
PurchasePrice = firstResult.PurchasePrice,
WeightTotalGrams = firstResult.WeightTotalGrams,
CostPerGram = firstResult.CostPerGram,
TotalGramsConsumed = results.Sum(r => r.GramsDerived),
TotalCost = totalCost,
JobCount = results.Count,
Jobs = jobResponses,
Warnings = aggregateWarnings
};
return Ok(response);
}
/// <summary>
/// Maps a domain CostPerPrintResult to an API CostPerPrintResponse DTO.
/// </summary>
private static CostPerPrintResponse MapCostToResponse(CostPerPrintResult r) => new()
{
PrintJobId = r.PrintJobId,
PrintName = r.PrintName,
SpoolId = r.SpoolId,
SpoolSerial = r.SpoolSerial,
MmExtruded = r.MmExtruded,
GramsDerived = r.GramsDerived,
PurchasePrice = r.PurchasePrice,
WeightTotalGrams = r.WeightTotalGrams,
CostPerGram = r.CostPerGram,
CostPerPrint = r.CostPerPrint,
Warnings = r.Warnings
};
}

View File

@@ -40,15 +40,18 @@ public class FilamentsController : ControllerBase
/// <response code="200">Returns the paginated list of filament spools.</response> /// <response code="200">Returns the paginated list of filament spools.</response>
[HttpGet] [HttpGet]
[ProducesResponseType(typeof(PagedResponse<FilamentResponse>), StatusCodes.Status200OK)] [ProducesResponseType(typeof(PagedResponse<FilamentResponse>), StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status400BadRequest)]
public async Task<ActionResult<PagedResponse<FilamentResponse>>> GetFilaments( public async Task<ActionResult<PagedResponse<FilamentResponse>>> GetFilaments(
[FromQuery] FilamentQueryParameters query) [FromQuery] FilamentQueryParameters query)
{ {
_logger.LogDebug( _logger.LogDebug(
"Getting filaments: pageNumber={PageNumber}, pageSize={PageSize}, " + "Getting filaments: pageNumber={PageNumber}, pageSize={PageSize}, " +
"materialBaseId={MaterialBaseId}, materialFinishId={MaterialFinishId}, " + "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.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 // Clamp pagination values
var pageNumber = Math.Max(1, query.PageNumber); var pageNumber = Math.Max(1, query.PageNumber);
@@ -77,6 +80,15 @@ public class FilamentsController : ControllerBase
if (query.IsActive.HasValue) if (query.IsActive.HasValue)
spoolQuery = spoolQuery.Where(s => s.IsActive == query.IsActive.Value); 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 totalCount = await spoolQuery.CountAsync();
var items = await spoolQuery var items = await spoolQuery
@@ -185,7 +197,9 @@ public class FilamentsController : ControllerBase
SpoolSerial = request.SpoolSerial, SpoolSerial = request.SpoolSerial,
PurchasePrice = request.PurchasePrice, PurchasePrice = request.PurchasePrice,
PurchaseDate = request.PurchaseDate, PurchaseDate = request.PurchaseDate,
IsActive = request.IsActive IsActive = request.IsActive,
IsArchived = request.IsArchived,
StorageLocation = request.StorageLocation
}; };
_dbContext.Spools.Add(entity); _dbContext.Spools.Add(entity);
@@ -267,6 +281,8 @@ public class FilamentsController : ControllerBase
entity.PurchasePrice = request.PurchasePrice; entity.PurchasePrice = request.PurchasePrice;
entity.PurchaseDate = request.PurchaseDate; entity.PurchaseDate = request.PurchaseDate;
entity.IsActive = request.IsActive; entity.IsActive = request.IsActive;
entity.IsArchived = request.IsArchived;
entity.StorageLocation = request.StorageLocation;
await _dbContext.SaveChangesAsync(); await _dbContext.SaveChangesAsync();
@@ -307,6 +323,8 @@ public class FilamentsController : ControllerBase
PurchasePrice = s.PurchasePrice, PurchasePrice = s.PurchasePrice,
PurchaseDate = s.PurchaseDate, PurchaseDate = s.PurchaseDate,
IsActive = s.IsActive, IsActive = s.IsActive,
IsArchived = s.IsArchived,
StorageLocation = s.StorageLocation,
CreatedAt = s.CreatedAt, CreatedAt = s.CreatedAt,
UpdatedAt = s.UpdatedAt, UpdatedAt = s.UpdatedAt,
QrCodeUrl = $"/api/qr/spool/{s.Id}" QrCodeUrl = $"/api/qr/spool/{s.Id}"

View File

@@ -59,6 +59,12 @@ public class FilamentResponse
/// <summary>Whether the spool is currently active and available.</summary> /// <summary>Whether the spool is currently active and available.</summary>
public bool IsActive { get; set; } public bool IsActive { get; set; }
/// <summary>Whether the spool has been archived (removed from active inventory).</summary>
public bool IsArchived { get; set; }
/// <summary>Physical storage location (e.g., "Shelf A", "Drawer 3"). Null if unset.</summary>
public string? StorageLocation { get; set; }
/// <summary>Timestamp when this record was created (UTC).</summary> /// <summary>Timestamp when this record was created (UTC).</summary>
public DateTime CreatedAt { get; set; } public DateTime CreatedAt { get; set; }
@@ -133,6 +139,15 @@ public class CreateFilamentRequest
/// <summary>Whether the spool is active. Defaults to true.</summary> /// <summary>Whether the spool is active. Defaults to true.</summary>
public bool IsActive { get; set; } = true; public bool IsActive { get; set; } = true;
/// <summary>Whether the spool is archived. Defaults to false.
/// </summary>
public bool IsArchived { get; set; } = false;
/// <summary>Physical storage location (e.g., "Shelf A", "Drawer 3"). Optional.
/// </summary>
[StringLength(200, ErrorMessage = "StorageLocation must not exceed 200 characters.")]
public string? StorageLocation { get; set; }
} }
/// <summary> /// <summary>
@@ -196,4 +211,11 @@ public class UpdateFilamentRequest
/// <summary>Whether the spool is active.</summary> /// <summary>Whether the spool is active.</summary>
public bool IsActive { get; set; } = true; public bool IsActive { get; set; } = true;
/// <summary>Whether the spool is archived. Defaults to false.</summary>
public bool IsArchived { get; set; } = false;
/// <summary>Physical storage location (e.g., "Shelf A", "Drawer 3"). Optional.</summary>
[StringLength(200, ErrorMessage = "StorageLocation must not exceed 200 characters.")]
public string? StorageLocation { get; set; }
} }

View File

@@ -30,4 +30,11 @@ public class FilamentQueryParameters
/// <summary>Optional filter by active status. True = active only, False = inactive only.</summary> /// <summary>Optional filter by active status. True = active only, False = inactive only.</summary>
public bool? IsActive { get; set; } public bool? IsActive { get; set; }
/// <summary>Whether to include archived spools in results. Defaults to false (excludes archived).
/// </summary>
public bool? IncludeArchived { get; set; }
/// <summary>Optional filter by storage location (case-insensitive partial match).</summary>
public string? StorageLocation { get; set; }
} }

View File

@@ -0,0 +1,99 @@
using System.ComponentModel.DataAnnotations;
namespace Extrudex.API.DTOs.PrintJobs;
/// <summary>
/// Response DTO for cost-per-print calculation. Contains the full cost
/// breakdown and any warnings about missing or incomplete data.
/// </summary>
public class CostPerPrintResponse
{
/// <summary>The print job identifier this result belongs to.</summary>
public Guid PrintJobId { get; set; }
/// <summary>Human-readable name of the print job.</summary>
public string PrintName { get; set; } = string.Empty;
/// <summary>The spool identifier that provided filament.</summary>
public Guid SpoolId { get; set; }
/// <summary>Serial number of the spool.</summary>
public string SpoolSerial { get; set; } = string.Empty;
/// <summary>Total millimeters of filament extruded.</summary>
public decimal MmExtruded { get; set; }
/// <summary>Derived grams consumed for this print.</summary>
public decimal GramsDerived { get; set; }
/// <summary>The spool's purchase price. Null if not recorded.</summary>
public decimal? PurchasePrice { get; set; }
/// <summary>The spool's total weight in grams when full.</summary>
public decimal? WeightTotalGrams { get; set; }
/// <summary>Cost per gram of filament. Null if purchase price or total weight is missing.</summary>
public decimal? CostPerGram { get; set; }
/// <summary>Calculated cost of this print job. Null if cost data is incomplete.</summary>
public decimal? CostPerPrint { get; set; }
/// <summary>
/// Warnings about missing or incomplete data. Empty when all data is available
/// and the calculation succeeded.
/// </summary>
public List<string> Warnings { get; set; } = new();
}
/// <summary>
/// Request DTO for batch cost calculation by spool. Returns cost breakdowns
/// for all print jobs associated with the specified spool.
/// </summary>
public class SpoolCostRequest
{
/// <summary>The unique identifier of the spool to calculate costs for.</summary>
[Required(ErrorMessage = "SpoolId is required.")]
public Guid SpoolId { get; set; }
}
/// <summary>
/// Response DTO for spool-level cost calculation. Contains cost breakdowns
/// for all print jobs on the spool, plus a total cost summary.
/// </summary>
public class SpoolCostResponse
{
/// <summary>The spool identifier.</summary>
public Guid SpoolId { get; set; }
/// <summary>Serial number of the spool.</summary>
public string SpoolSerial { get; set; } = string.Empty;
/// <summary>The spool's purchase price. Null if not recorded.</summary>
public decimal? PurchasePrice { get; set; }
/// <summary>The spool's total weight in grams when full.</summary>
public decimal? WeightTotalGrams { get; set; }
/// <summary>Cost per gram of filament. Null if cost data is incomplete.</summary>
public decimal? CostPerGram { get; set; }
/// <summary>Total grams consumed across all print jobs on this spool.</summary>
public decimal TotalGramsConsumed { get; set; }
/// <summary>Total calculated cost across all print jobs. Null if any job has missing data.</summary>
public decimal? TotalCost { get; set; }
/// <summary>Number of print jobs included in this calculation.</summary>
public int JobCount { get; set; }
/// <summary>
/// Individual cost breakdowns per print job. Jobs with missing data
/// will have null cost fields and populated warnings.
/// </summary>
public List<CostPerPrintResponse> Jobs { get; set; } = new();
/// <summary>
/// Aggregate warnings about missing data across all jobs.
/// </summary>
public List<string> Warnings { get; set; } = new();
}

View File

@@ -0,0 +1,79 @@
using Extrudex.Domain.Interfaces;
using Extrudex.Infrastructure.Configuration;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
namespace Extrudex.API.Jobs;
/// <summary>
/// Background job that periodically syncs filament usage data from
/// Moonraker printers. Runs as a hosted service and polls all active
/// Moonraker printers on a configurable interval to persist usage
/// data to the Extrudex database.
///
/// Configuration is bound from the "FilamentUsageSync" section in
/// appsettings.json. Set Enabled=false to disable without removing
/// the service registration.
/// </summary>
public class FilamentUsageSyncJob : BackgroundService
{
private readonly IFilamentUsageSyncService _syncService;
private readonly FilamentUsageSyncOptions _options;
private readonly ILogger<FilamentUsageSyncJob> _logger;
/// <summary>
/// Creates a new FilamentUsageSyncJob.
/// </summary>
/// <param name="syncService">The service that performs the actual sync logic.</param>
/// <param name="options">Configuration options for polling interval and timeouts.</param>
/// <param name="logger">Logger for diagnostic output.</param>
public FilamentUsageSyncJob(
IFilamentUsageSyncService syncService,
IOptions<FilamentUsageSyncOptions> options,
ILogger<FilamentUsageSyncJob> logger)
{
_syncService = syncService;
_options = options.Value;
_logger = logger;
}
/// <inheritdoc />
protected override async Task ExecuteAsync(CancellationToken stoppingToken)
{
if (!_options.Enabled)
{
_logger.LogInformation("Filament usage sync job is disabled via configuration — exiting");
return;
}
_logger.LogInformation(
"Filament usage sync job starting — polling every {Interval}",
_options.PollingInterval);
// Delay briefly on startup to allow the web host to fully initialize
await Task.Delay(TimeSpan.FromSeconds(10), stoppingToken);
while (!stoppingToken.IsCancellationRequested)
{
try
{
var syncedCount = await _syncService.SyncAllAsync(stoppingToken);
_logger.LogInformation(
"Filament usage sync completed — {SyncedCount} printer(s) synced. Next sync in {Interval}",
syncedCount, _options.PollingInterval);
}
catch (Exception ex) when (ex is not OperationCanceledException)
{
_logger.LogError(ex,
"Error during filament usage sync cycle — will retry in {Interval}",
_options.PollingInterval);
}
await Task.Delay(_options.PollingInterval, stoppingToken);
}
_logger.LogInformation("Filament usage sync job shutting down");
}
}

View File

@@ -10,6 +10,9 @@ namespace Extrudex.API.Validators;
/// </summary> /// </summary>
public class CreateFilamentRequestValidator : AbstractValidator<CreateFilamentRequest> public class CreateFilamentRequestValidator : AbstractValidator<CreateFilamentRequest>
{ {
/// <summary>
/// Initializes validation rules for <see cref="CreateFilamentRequest"/>.
/// </summary>
public CreateFilamentRequestValidator() public CreateFilamentRequestValidator()
{ {
RuleFor(x => x.MaterialBaseId) RuleFor(x => x.MaterialBaseId)
@@ -52,6 +55,12 @@ public class CreateFilamentRequestValidator : AbstractValidator<CreateFilamentRe
RuleFor(x => x.PurchasePrice!.Value) RuleFor(x => x.PurchasePrice!.Value)
.GreaterThanOrEqualTo(0).WithMessage("Purchase price must be non-negative."); .GreaterThanOrEqualTo(0).WithMessage("Purchase price must be non-negative.");
}); });
When(x => x.StorageLocation != null, () =>
{
RuleFor(x => x.StorageLocation!)
.MaximumLength(200).WithMessage("StorageLocation must not exceed 200 characters.");
});
} }
} }
@@ -62,6 +71,9 @@ public class CreateFilamentRequestValidator : AbstractValidator<CreateFilamentRe
/// </summary> /// </summary>
public class UpdateFilamentRequestValidator : AbstractValidator<UpdateFilamentRequest> public class UpdateFilamentRequestValidator : AbstractValidator<UpdateFilamentRequest>
{ {
/// <summary>
/// Initializes validation rules for <see cref="UpdateFilamentRequest"/>.
/// </summary>
public UpdateFilamentRequestValidator() public UpdateFilamentRequestValidator()
{ {
RuleFor(x => x.MaterialBaseId) RuleFor(x => x.MaterialBaseId)
@@ -104,5 +116,11 @@ public class UpdateFilamentRequestValidator : AbstractValidator<UpdateFilamentRe
RuleFor(x => x.PurchasePrice!.Value) RuleFor(x => x.PurchasePrice!.Value)
.GreaterThanOrEqualTo(0).WithMessage("Purchase price must be non-negative."); .GreaterThanOrEqualTo(0).WithMessage("Purchase price must be non-negative.");
}); });
When(x => x.StorageLocation != null, () =>
{
RuleFor(x => x.StorageLocation!)
.MaximumLength(200).WithMessage("StorageLocation must not exceed 200 characters.");
});
} }
} }

View File

@@ -17,6 +17,9 @@ RUN dotnet publish Extrudex.csproj \
FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS runtime FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS runtime
WORKDIR /app WORKDIR /app
# Install curl for health check (not included in aspnet base image)
RUN apt-get update && apt-get install -y --no-install-recommends curl && rm -rf /var/lib/apt/lists/*
# Non-root user for security # Non-root user for security
RUN adduser --disabled-password --gecos "" appuser RUN adduser --disabled-password --gecos "" appuser
USER appuser USER appuser

View File

@@ -0,0 +1,19 @@
namespace Extrudex.Domain.DTOs.Moonraker;
/// <summary>
/// Response DTO for Moonraker /printer/objects/query?display_status endpoint.
/// Contains progress percentage and message for the current print job.
/// Used by the SignalR hub to push real-time progress to connected clients.
/// </summary>
public class MoonrakerDisplayStatus
{
/// <summary>
/// Print progress as a decimal between 0 and 1 (0% to 100%).
/// </summary>
public decimal Progress { get; set; }
/// <summary>
/// Status message displayed on the printer LCD (e.g., "Printing...", "Heating...").
/// </summary>
public string Message { get; set; } = string.Empty;
}

View File

@@ -0,0 +1,20 @@
namespace Extrudex.Domain.DTOs.Moonraker;
/// <summary>
/// Response DTO for the Moonraker /server/history/items endpoint.
/// Wraps the paginated list of print job history items.
/// </summary>
public class MoonrakerHistoryResponse
{
/// <summary>
/// The list of print job history items returned by Moonraker.
/// Most recent jobs appear first (descending by start time).
/// </summary>
public List<MoonrakerPrintJob> Items { get; set; } = [];
/// <summary>
/// Total number of print jobs available on the server
/// (for pagination; the Items list may be a subset).
/// </summary>
public int TotalCount { get; set; }
}

View File

@@ -0,0 +1,56 @@
namespace Extrudex.Domain.DTOs.Moonraker;
/// <summary>
/// Response DTO for a single Moonraker print job history item.
/// Maps to the objects returned by /server/history/items.
/// Contains filament usage, duration, and status for a completed or active print.
/// </summary>
public class MoonrakerPrintJob
{
/// <summary>
/// Unique Moonraker job identifier (e.g., "000001").
/// </summary>
public string JobId { get; set; } = string.Empty;
/// <summary>
/// Filename of the G-code file that was printed.
/// </summary>
public string Filename { get; set; } = string.Empty;
/// <summary>
/// Current status of this print job: "completed", "cancelled", "error", "in_progress".
/// </summary>
public string Status { get; set; } = string.Empty;
/// <summary>
/// Total filament used in millimeters for this print job.
/// This is the primary measurement; grams are derived from this value.
/// </summary>
public decimal FilamentUsedMm { get; set; }
/// <summary>
/// Total print duration in seconds.
/// </summary>
public decimal PrintDurationSeconds { get; set; }
/// <summary>
/// Total print duration including setup and warmup, in seconds.
/// </summary>
public decimal TotalDurationSeconds { get; set; }
/// <summary>
/// Timestamp when the print job started (UTC).
/// </summary>
public DateTime? StartTime { get; set; }
/// <summary>
/// Timestamp when the print job ended (UTC). Null if still in progress.
/// </summary>
public DateTime? EndTime { get; set; }
/// <summary>
/// Metadata dictionary from Moonraker. May contain filament_type,
/// filament_name, nozzle_diameter, and other slicer-provided fields.
/// </summary>
public Dictionary<string, object> Metadata { get; set; } = new();
}

View File

@@ -0,0 +1,36 @@
namespace Extrudex.Domain.DTOs.Moonraker;
/// <summary>
/// Response DTO for Moonraker /printer/objects/query?print_stats endpoint.
/// Contains real-time print statistics including current job state,
/// filament consumed, and file being printed.
/// </summary>
public class MoonrakerPrintStats
{
/// <summary>
/// Current print state: "standby", "printing", "paused", "complete", "error", "cancelled".
/// </summary>
public string State { get; set; } = string.Empty;
/// <summary>
/// Total filament used in millimeters for the current print session.
/// </summary>
public decimal FilamentUsedMm { get; set; }
/// <summary>
/// Total print duration in seconds for the current print session.
/// </summary>
public decimal PrintDurationSeconds { get; set; }
/// <summary>
/// Filename of the G-code file currently being printed.
/// Null if no print is active.
/// </summary>
public string? Filename { get; set; }
/// <summary>
/// Detailed message from Klipper about the current print state.
/// May contain error details when state is "error".
/// </summary>
public string? Message { get; set; }
}

View File

@@ -0,0 +1,26 @@
namespace Extrudex.Domain.DTOs.Moonraker;
/// <summary>
/// Response DTO for the Moonraker /printer/info endpoint.
/// Contains the current operational state of the Klipper printer.
/// Used to determine whether the printer is idle, printing, paused, or in error.
/// </summary>
public class MoonrakerPrinterInfo
{
/// <summary>
/// Current Klipper state: "ready", "startup", "shutdown", "error", "cancelled".
/// A "ready" state means the printer is connected and idle.
/// </summary>
public string State { get; set; } = string.Empty;
/// <summary>
/// Detailed state message from Klipper. May contain error details
/// when the state is "error" or "shutdown".
/// </summary>
public string StateMessage { get; set; } = string.Empty;
/// <summary>
/// Whether the Klipper firmware is currently connected and responsive.
/// </summary>
public bool KlippyReady { get; set; }
}

View File

@@ -0,0 +1,25 @@
namespace Extrudex.Domain.DTOs.Moonraker;
/// <summary>
/// Request DTO for querying the Moonraker API.
/// Encapsulates the connection parameters needed to reach a specific
/// Moonraker instance on a Klipper-based printer.
/// </summary>
public class MoonrakerRequest
{
/// <summary>
/// Hostname or IP address of the Moonraker printer.
/// </summary>
public string HostnameOrIp { get; set; } = string.Empty;
/// <summary>
/// Port number for the Moonraker API. Default: 7125.
/// </summary>
public int Port { get; set; } = 7125;
/// <summary>
/// Optional API key for authenticating with Moonraker.
/// Required when the server has API key authentication enabled.
/// </summary>
public string? ApiKey { get; set; }
}

View File

@@ -0,0 +1,44 @@
namespace Extrudex.Domain.DTOs.Moonraker;
/// <summary>
/// Response DTO for the Moonraker /server/info endpoint.
/// Contains server identification and operational state.
/// Used to verify connectivity and determine Moonraker version.
/// </summary>
public class MoonrakerServerInfo
{
/// <summary>
/// The hostname of the Moonraker server (e.g., "mainsail").
/// </summary>
public string Hostname { get; set; } = string.Empty;
/// <summary>
/// Moonraker software version string (e.g., "0.8.0-89ee464").
/// </summary>
public string SoftwareVersion { get; set; } = string.Empty;
/// <summary>
/// CPU model string reported by the host system.
/// </summary>
public string CpuInfo { get; set; } = string.Empty;
/// <summary>
/// Whether Klipper is currently connected to the MCU.
/// </summary>
public bool KlippyConnected { get; set; }
/// <summary>
/// The current Klipper state (e.g., "ready", "startup", "error").
/// </summary>
public string KlippyState { get; set; } = string.Empty;
/// <summary>
/// Whether the Moonraker API requires an authentication token.
/// </summary>
public bool ApiKeyRequired { get; set; }
/// <summary>
/// List of registered Moonraker plugin names.
/// </summary>
public List<string> Plugins { get; set; } = [];
}

View File

@@ -93,6 +93,20 @@ public class Spool : AuditableEntity
/// </summary> /// </summary>
public bool IsActive { get; set; } = true; public bool IsActive { get; set; } = true;
/// <summary>
/// Whether the spool has been archived (removed from active inventory).
/// Archived spools are retained for historical records but hidden from
/// default inventory views. Distinguishes long-term archival from
/// temporary inactivity (e.g., spool swapped out of AMS).
/// </summary>
public bool IsArchived { get; set; } = false;
/// <summary>
/// Physical storage location of the spool (e.g., "Shelf A", "Drawer 3", "AMS Tray 2").
/// Optional — not every spool has a designated storage location.
/// </summary>
public string? StorageLocation { get; set; }
/// <summary> /// <summary>
/// Navigation collection of AMS slots where this spool is loaded. /// Navigation collection of AMS slots where this spool is loaded.
/// </summary> /// </summary>

View File

@@ -0,0 +1,76 @@
namespace Extrudex.Domain.Interfaces;
/// <summary>
/// Service interface for calculating the cost of goods sold (COGS) per print job.
/// Uses the spool's purchase price and the print job's derived grams consumed
/// to produce a cost breakdown. Handles missing cost data gracefully by returning
/// warnings rather than throwing exceptions.
/// </summary>
public interface ICostPerPrintService
{
/// <summary>
/// Calculates the cost per print for a specific print job.
/// </summary>
/// <param name="printJobId">The unique identifier of the print job.</param>
/// <param name="cancellationToken">Optional cancellation token.</param>
/// <returns>
/// A <see cref="CostPerPrintResult"/> containing the cost breakdown,
/// or warnings if cost data is missing or incomplete.
/// </returns>
Task<CostPerPrintResult> CalculateAsync(Guid printJobId, CancellationToken cancellationToken = default);
/// <summary>
/// Calculates cost breakdowns for all print jobs associated with a specific spool.
/// Useful for spool-level COGS reporting.
/// </summary>
/// <param name="spoolId">The unique identifier of the spool.</param>
/// <param name="cancellationToken">Optional cancellation token.</param>
/// <returns>
/// A list of <see cref="CostPerPrintResult"/> for each print job on the spool.
/// Jobs with missing cost data will include warnings.
/// </returns>
Task<IReadOnlyList<CostPerPrintResult>> CalculateBySpoolAsync(Guid spoolId, CancellationToken cancellationToken = default);
}
/// <summary>
/// Result of a cost-per-print calculation. Contains the cost breakdown
/// and any warnings about missing or incomplete cost data.
/// </summary>
public class CostPerPrintResult
{
/// <summary>The print job identifier this result belongs to.</summary>
public Guid PrintJobId { get; set; }
/// <summary>Human-readable name of the print job.</summary>
public string PrintName { get; set; } = string.Empty;
/// <summary>The spool identifier that provided filament.</summary>
public Guid SpoolId { get; set; }
/// <summary>Serial number of the spool.</summary>
public string SpoolSerial { get; set; } = string.Empty;
/// <summary>Total millimeters of filament extruded.</summary>
public decimal MmExtruded { get; set; }
/// <summary>Derived grams consumed for this print.</summary>
public decimal GramsDerived { get; set; }
/// <summary>The spool's purchase price. Null if not recorded.</summary>
public decimal? PurchasePrice { get; set; }
/// <summary>The spool's total weight in grams when full.</summary>
public decimal? WeightTotalGrams { get; set; }
/// <summary>Cost per gram of filament. Null if purchase price or total weight is missing.</summary>
public decimal? CostPerGram { get; set; }
/// <summary>Calculated cost of this print job. Null if cost data is incomplete.</summary>
public decimal? CostPerPrint { get; set; }
/// <summary>
/// Warnings about missing or incomplete data that prevented a full calculation.
/// Empty when all data is available and the calculation succeeded.
/// </summary>
public List<string> Warnings { get; set; } = new();
}

View File

@@ -0,0 +1,19 @@
namespace Extrudex.Domain.Interfaces;
/// <summary>
/// Service interface for syncing filament usage data from printers
/// into the Extrudex database. Handles querying Moonraker printers,
/// computing derived usage metrics, and persisting updates to spools
/// and print job records.
/// </summary>
public interface IFilamentUsageSyncService
{
/// <summary>
/// Performs a single sync cycle: queries all active Moonraker printers,
/// fetches their current filament usage data, and persists updates to
/// the database.
/// </summary>
/// <param name="cancellationToken">Cancellation token for graceful shutdown.</param>
/// <returns>The number of printers successfully synced.</returns>
Task<int> SyncAllAsync(CancellationToken cancellationToken = default);
}

View File

@@ -0,0 +1,131 @@
using Extrudex.Domain.DTOs.Moonraker;
namespace Extrudex.Domain.Interfaces;
/// <summary>
/// Client interface for communicating with Moonraker REST API endpoints
/// on Klipper-based printers (e.g., Elegoo Centauri Carbon).
/// Provides strongly-typed methods for server discovery, printer status,
/// print job history, and real-time telemetry.
/// </summary>
public interface IMoonrakerClient
{
/// <summary>
/// Checks whether the Moonraker server is reachable and responding.
/// Calls the /server/info endpoint and returns the server information
/// if successful, or null if the server is unreachable.
/// </summary>
/// <param name="hostnameOrIp">The printer's hostname or IP address.</param>
/// <param name="port">The Moonraker API port (default: 7125).</param>
/// <param name="apiKey">Optional API key for authentication.</param>
/// <param name="cancellationToken">Cancellation token for the HTTP request.</param>
/// <returns>Server info if reachable; <c>null</c> if unreachable.</returns>
Task<MoonrakerServerInfo?> GetServerInfoAsync(
string hostnameOrIp,
int port,
string? apiKey,
CancellationToken cancellationToken = default);
/// <summary>
/// Checks whether the Moonraker server is reachable and responding.
/// This is a convenience method equivalent to calling GetServerInfoAsync
/// and checking for a non-null result.
/// </summary>
/// <param name="hostnameOrIp">The printer's hostname or IP address.</param>
/// <param name="port">The Moonraker API port (default: 7125).</param>
/// <param name="apiKey">Optional API key for authentication.</param>
/// <param name="cancellationToken">Cancellation token for the HTTP request.</param>
/// <returns><c>true</c> if the server responded successfully; otherwise <c>false</c>.</returns>
Task<bool> IsReachableAsync(
string hostnameOrIp,
int port,
string? apiKey,
CancellationToken cancellationToken = default);
/// <summary>
/// Fetches the current printer info from the /printer/info endpoint.
/// Returns the Klipper state and readiness status.
/// </summary>
/// <param name="hostnameOrIp">The printer's hostname or IP address.</param>
/// <param name="port">The Moonraker API port (default: 7125).</param>
/// <param name="apiKey">Optional API key for authentication.</param>
/// <param name="cancellationToken">Cancellation token for the HTTP request.</param>
/// <returns>Printer info if successful; <c>null</c> if the request failed.</returns>
Task<MoonrakerPrinterInfo?> GetPrinterInfoAsync(
string hostnameOrIp,
int port,
string? apiKey,
CancellationToken cancellationToken = default);
/// <summary>
/// Fetches print job history from the /server/history/items endpoint.
/// Returns the most recent print jobs with filament usage data,
/// print duration, and completion status.
/// </summary>
/// <param name="hostnameOrIp">The printer's hostname or IP address.</param>
/// <param name="port">The Moonraker API port (default: 7125).</param>
/// <param name="apiKey">Optional API key for authentication.</param>
/// <param name="limit">Maximum number of history items to return. Default: 50.</param>
/// <param name="cancellationToken">Cancellation token for the HTTP request.</param>
/// <returns>History response with print jobs; empty list if request failed.</returns>
Task<MoonrakerHistoryResponse> GetPrintHistoryAsync(
string hostnameOrIp,
int port,
string? apiKey,
int limit = 50,
CancellationToken cancellationToken = default);
/// <summary>
/// Fetches the current print statistics from the /printer/objects/query endpoint.
/// Returns real-time data including filament used, print duration,
/// and current print state for the active or most recent print.
/// </summary>
/// <param name="hostnameOrIp">The printer's hostname or IP address.</param>
/// <param name="port">The Moonraker API port (default: 7125).</param>
/// <param name="apiKey">Optional API key for authentication.</param>
/// <param name="cancellationToken">Cancellation token for the HTTP request.</param>
/// <returns>Print stats if successful; <c>null</c> if the request failed.</returns>
Task<MoonrakerPrintStats?> GetPrintStatsAsync(
string hostnameOrIp,
int port,
string? apiKey,
CancellationToken cancellationToken = default);
/// <summary>
/// Fetches the current display status from the /printer/objects/query endpoint.
/// Returns progress percentage and status message for the active print.
/// Used by SignalR to push real-time progress updates to connected clients.
/// </summary>
/// <param name="hostnameOrIp">The printer's hostname or IP address.</param>
/// <param name="port">The Moonraker API port (default: 7125).</param>
/// <param name="apiKey">Optional API key for authentication.</param>
/// <param name="cancellationToken">Cancellation token for the HTTP request.</param>
/// <returns>Display status if successful; <c>null</c> if the request failed.</returns>
Task<MoonrakerDisplayStatus?> GetDisplayStatusAsync(
string hostnameOrIp,
int port,
string? apiKey,
CancellationToken cancellationToken = default);
/// <summary>
/// Fetches the current filament usage data from the Moonraker server.
/// Returns a dictionary of usage metrics reported by the printer.
///
/// <para>
/// <b>Prefer GetPrintHistoryAsync or GetPrintStatsAsync for new code.</b>
/// This method is retained for backward compatibility with the
/// FilamentUsageSyncService and returns a dictionary of metric names
/// to their decimal values for callers that don't need typed DTOs.
/// </para>
/// </summary>
/// <param name="hostnameOrIp">The printer's hostname or IP address.</param>
/// <param name="port">The Moonraker API port (default: 7125).</param>
/// <param name="apiKey">Optional API key for authentication.</param>
/// <param name="cancellationToken">Cancellation token for the HTTP request.</param>
/// <returns>A dictionary of usage metric names to their decimal values.</returns>
Task<Dictionary<string, decimal>> GetFilamentUsageAsync(
string hostnameOrIp,
int port,
string? apiKey,
CancellationToken cancellationToken = default);
}

View File

@@ -0,0 +1,33 @@
namespace Extrudex.Infrastructure.Configuration;
/// <summary>
/// Configuration options for the FilamentUsageSync background job.
/// Bound from appsettings.json under the "FilamentUsageSync" section.
/// Controls polling interval and per-printer timeout settings.
/// </summary>
public class FilamentUsageSyncOptions
{
/// <summary>
/// The section name in appsettings.json where these options are bound.
/// </summary>
public const string SectionName = "FilamentUsageSync";
/// <summary>
/// How often the background job polls printers for usage data.
/// Default: 5 minutes. Minimum recommended: 1 minute.
/// </summary>
public TimeSpan PollingInterval { get; set; } = TimeSpan.FromMinutes(5);
/// <summary>
/// Timeout for individual HTTP requests to a Moonraker printer.
/// Default: 30 seconds.
/// </summary>
public TimeSpan RequestTimeout { get; set; } = TimeSpan.FromSeconds(30);
/// <summary>
/// Whether the sync job is enabled. Set to false to disable
/// the background job without removing its registration.
/// Default: true.
/// </summary>
public bool Enabled { get; set; } = true;
}

View File

@@ -68,6 +68,15 @@ public class SpoolConfiguration : BaseEntityConfiguration<Spool>
.HasDefaultValue(true) .HasDefaultValue(true)
.IsRequired(); .IsRequired();
builder.Property(e => e.IsArchived)
.HasColumnName("is_archived")
.HasDefaultValue(false)
.IsRequired();
builder.Property(e => e.StorageLocation)
.HasColumnName("storage_location")
.HasMaxLength(200);
// Unique index on spool_serial — critical for barcode/QR scanning // Unique index on spool_serial — critical for barcode/QR scanning
builder.HasIndex(e => e.SpoolSerial) builder.HasIndex(e => e.SpoolSerial)
.IsUnique() .IsUnique()
@@ -89,6 +98,14 @@ public class SpoolConfiguration : BaseEntityConfiguration<Spool>
builder.HasIndex(e => e.IsActive) builder.HasIndex(e => e.IsActive)
.HasDatabaseName("ix_spools_is_active"); .HasDatabaseName("ix_spools_is_active");
// Index on is_archived for inventory filtering (exclude archived from default views)
builder.HasIndex(e => e.IsArchived)
.HasDatabaseName("ix_spools_is_archived");
// Composite index on is_active + is_archived for common inventory queries
builder.HasIndex(e => new { e.IsActive, e.IsArchived })
.HasDatabaseName("ix_spools_active_archived");
// Relationships // Relationships
builder.HasOne(e => e.MaterialBase) builder.HasOne(e => e.MaterialBase)
.WithMany(e => e.Spools) .WithMany(e => e.Spools)

View File

@@ -0,0 +1,158 @@
using Extrudex.Domain.Interfaces;
using Extrudex.Infrastructure.Data;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
namespace Extrudex.Infrastructure.Services;
/// <summary>
/// Calculates the cost of goods sold (COGS) per print job using the spool's
/// purchase price and the print job's derived grams consumed.
///
/// Formula:
/// cost_per_gram = purchase_price / weight_total_grams
/// cost_per_print = grams_derived × cost_per_gram
///
/// Handles missing data gracefully — if the spool has no purchase price or
/// weight recorded, the result includes warnings and null cost fields
/// instead of throwing exceptions.
/// </summary>
public class CostPerPrintService : ICostPerPrintService
{
private readonly ExtrudexDbContext _dbContext;
private readonly ILogger<CostPerPrintService> _logger;
/// <summary>
/// Initializes a new instance of the <see cref="CostPerPrintService"/> class.
/// </summary>
/// <param name="dbContext">The database context for data access.</param>
/// <param name="logger">The logger for diagnostic output.</param>
public CostPerPrintService(ExtrudexDbContext dbContext, ILogger<CostPerPrintService> logger)
{
_dbContext = dbContext;
_logger = logger;
}
/// <inheritdoc />
public async Task<CostPerPrintResult> CalculateAsync(Guid printJobId, CancellationToken cancellationToken = default)
{
_logger.LogDebug("Calculating cost per print for job {PrintJobId}", printJobId);
var job = await _dbContext.PrintJobs
.Include(j => j.Spool)
.ThenInclude(s => s!.MaterialBase)
.FirstOrDefaultAsync(j => j.Id == printJobId, cancellationToken);
if (job is null)
{
_logger.LogWarning("Print job {PrintJobId} not found for cost calculation", printJobId);
return new CostPerPrintResult
{
PrintJobId = printJobId,
Warnings = new List<string> { $"Print job with ID '{printJobId}' not found." }
};
}
return BuildResult(job);
}
/// <inheritdoc />
public async Task<IReadOnlyList<CostPerPrintResult>> CalculateBySpoolAsync(
Guid spoolId, CancellationToken cancellationToken = default)
{
_logger.LogDebug("Calculating cost per print for all jobs on spool {SpoolId}", spoolId);
var jobs = await _dbContext.PrintJobs
.Include(j => j.Spool)
.ThenInclude(s => s!.MaterialBase)
.Where(j => j.SpoolId == spoolId)
.OrderByDescending(j => j.CreatedAt)
.ToListAsync(cancellationToken);
if (jobs.Count == 0)
{
_logger.LogDebug("No print jobs found for spool {SpoolId}", spoolId);
return Array.Empty<CostPerPrintResult>();
}
return jobs.Select(BuildResult).ToList();
}
/// <summary>
/// Builds a <see cref="CostPerPrintResult"/> from a print job entity.
/// Computes cost_per_gram and cost_per_print when all required data is available.
/// Populates warnings when data is missing or incomplete.
/// </summary>
/// <param name="job">The print job entity with Spool navigation loaded.</param>
/// <returns>A cost calculation result with breakdown and any warnings.</returns>
private CostPerPrintResult BuildResult(Domain.Entities.PrintJob job)
{
var warnings = new List<string>();
var spool = job.Spool;
// Map what we always have
var result = new CostPerPrintResult
{
PrintJobId = job.Id,
PrintName = job.PrintName,
SpoolId = job.SpoolId,
SpoolSerial = spool?.SpoolSerial ?? string.Empty,
MmExtruded = job.MmExtruded,
GramsDerived = job.GramsDerived,
};
// Guard: spool must be loaded
if (spool is null)
{
warnings.Add("Spool data is not available for this print job.");
result.Warnings = warnings;
return result;
}
// Capture purchase price
result.PurchasePrice = spool.PurchasePrice;
result.WeightTotalGrams = spool.WeightTotalGrams;
// Check for missing purchase price
if (!spool.PurchasePrice.HasValue)
{
warnings.Add(
"Spool purchase price is not recorded. Cost calculation requires a purchase price on the spool.");
}
// Check for zero or negative weight — prevents division by zero
if (spool.WeightTotalGrams <= 0)
{
warnings.Add(
"Spool total weight is zero or not recorded. Cost calculation requires a positive weight_total_grams on the spool.");
}
// Check for zero grams derived
if (job.GramsDerived <= 0)
{
warnings.Add(
"Derived grams consumed is zero. Ensure mm_extruded, filament diameter, and material density are recorded for this print job.");
}
// If all data is present and valid, compute the cost
if (spool.PurchasePrice.HasValue && spool.WeightTotalGrams > 0 && job.GramsDerived > 0)
{
var costPerGram = spool.PurchasePrice.Value / spool.WeightTotalGrams;
result.CostPerGram = Math.Round(costPerGram, 6);
result.CostPerPrint = Math.Round(job.GramsDerived * costPerGram, 4);
_logger.LogDebug(
"Cost calculated for job {PrintJobId}: {GramsDerived}g × {CostPerGram:C}/g = {CostPerPrint:C}",
job.Id, job.GramsDerived, result.CostPerGram, result.CostPerPrint);
}
else
{
_logger.LogDebug(
"Cost calculation incomplete for job {PrintJobId}: missing data (warnings: {WarningCount})",
job.Id, warnings.Count);
}
result.Warnings = warnings;
return result;
}
}

View File

@@ -0,0 +1,139 @@
using Extrudex.Domain.Enums;
using Extrudex.Domain.Interfaces;
using Extrudex.Infrastructure.Data;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
namespace Extrudex.Infrastructure.Configuration;
/// <summary>
/// Service that syncs filament usage data from Moonraker printers into the
/// Extrudex database. Queries all active Moonraker printers, fetches their
/// current filament usage metrics, and updates spool remaining weights and
/// print job records.
/// </summary>
public class FilamentUsageSyncService : IFilamentUsageSyncService
{
private readonly ExtrudexDbContext _dbContext;
private readonly IMoonrakerClient _moonrakerClient;
private readonly ILogger<FilamentUsageSyncService> _logger;
/// <summary>
/// Creates a new FilamentUsageSyncService.
/// </summary>
/// <param name="dbContext">The EF Core database context for persisting updates.</param>
/// <param name="moonrakerClient">The Moonraker HTTP client for fetching printer data.</param>
/// <param name="logger">Logger for diagnostic output.</param>
public FilamentUsageSyncService(
ExtrudexDbContext dbContext,
IMoonrakerClient moonrakerClient,
ILogger<FilamentUsageSyncService> logger)
{
_dbContext = dbContext;
_moonrakerClient = moonrakerClient;
_logger = logger;
}
/// <inheritdoc />
public async Task<int> SyncAllAsync(CancellationToken cancellationToken = default)
{
_logger.LogInformation("Starting filament usage sync cycle");
var printers = await _dbContext.Printers
.Where(p => p.IsActive && p.ConnectionType == ConnectionType.Moonraker)
.Include(p => p.AmsUnits)
.ThenInclude(u => u.Slots)
.ThenInclude(s => s.Spool)
.ToListAsync(cancellationToken);
if (printers.Count == 0)
{
_logger.LogInformation("No active Moonraker printers found — skipping sync");
return 0;
}
_logger.LogInformation("Found {PrinterCount} active Moonraker printer(s) to sync", printers.Count);
var syncedCount = 0;
foreach (var printer in printers)
{
try
{
var usageData = await _moonrakerClient.GetFilamentUsageAsync(
printer.HostnameOrIp,
printer.Port,
printer.ApiKey,
cancellationToken);
if (usageData.Count == 0)
{
_logger.LogWarning(
"No usage data returned from printer {PrinterName} ({Host}:{Port})",
printer.Name, printer.HostnameOrIp, printer.Port);
continue;
}
// Update spool remaining weights from AMS data
UpdateSpoolWeights(printer, usageData);
// Mark printer as seen and idle (reachable = idle, not printing)
printer.LastSeenAt = DateTime.UtcNow;
printer.Status = PrinterStatus.Idle;
syncedCount++;
_logger.LogInformation(
"Successfully synced filament usage from printer {PrinterName}",
printer.Name);
}
catch (Exception ex)
{
_logger.LogError(ex,
"Error syncing filament usage from printer {PrinterName} ({Host}:{Port})",
printer.Name, printer.HostnameOrIp, printer.Port);
}
}
await _dbContext.SaveChangesAsync(cancellationToken);
_logger.LogInformation(
"Filament usage sync cycle complete — {SyncedCount}/{TotalCount} printers synced",
syncedCount, printers.Count);
return syncedCount;
}
/// <summary>
/// Updates spool remaining weights based on usage data received from Moonraker.
/// For printers with AMS units, updates the remaining weight on each slot's spool.
/// </summary>
private void UpdateSpoolWeights(
Domain.Entities.Printer printer,
Dictionary<string, decimal> usageData)
{
// Update AMS slot remaining weights if available
foreach (var amsUnit in printer.AmsUnits)
{
foreach (var slot in amsUnit.Slots)
{
if (slot.Spool != null && slot.RemainingWeightG.HasValue)
{
// Sync the AMS-reported remaining weight to the spool
slot.Spool.WeightRemainingGrams = slot.RemainingWeightG.Value;
_logger.LogDebug(
"Updated spool {SpoolSerial} remaining weight to {Weight}g",
slot.Spool.SpoolSerial, slot.RemainingWeightG.Value);
}
}
}
// If usage data contains extruded mm, log it for observability
if (usageData.TryGetValue("mm_extruded", out var mmExtruded) && mmExtruded > 0)
{
_logger.LogInformation(
"Printer {PrinterName} reports {MmExtruded}mm filament extruded in latest job",
printer.Name, mmExtruded);
}
}
}

View File

@@ -0,0 +1,447 @@
using System.Net.Http.Json;
using System.Text.Json;
using Extrudex.Domain.DTOs.Moonraker;
using Extrudex.Domain.Interfaces;
using Microsoft.Extensions.Logging;
namespace Extrudex.Infrastructure.Services;
/// <summary>
/// HTTP client for communicating with Moonraker REST API endpoints
/// on Klipper-based printers (e.g., Elegoo Centauri Carbon).
/// Provides strongly-typed methods for server discovery, printer status,
/// print job history, and real-time telemetry.
/// </summary>
public class MoonrakerClient : IMoonrakerClient
{
private readonly HttpClient _httpClient;
private readonly ILogger<MoonrakerClient> _logger;
/// <summary>
/// Creates a new MoonrakerClient with the configured HTTP client and logger.
/// </summary>
/// <param name="httpClient">The HTTP client for making requests to Moonraker endpoints.</param>
/// <param name="logger">Logger for diagnostic output.</param>
public MoonrakerClient(HttpClient httpClient, ILogger<MoonrakerClient> logger)
{
_httpClient = httpClient;
_logger = logger;
}
/// <inheritdoc />
public async Task<MoonrakerServerInfo?> GetServerInfoAsync(
string hostnameOrIp,
int port,
string? apiKey,
CancellationToken cancellationToken = default)
{
var baseUrl = BuildBaseUrl(hostnameOrIp, port);
try
{
using var request = CreateRequest(HttpMethod.Get, $"{baseUrl}/server/info", apiKey);
using var response = await _httpClient.SendAsync(request, cancellationToken);
response.EnsureSuccessStatusCode();
var json = await response.Content.ReadFromJsonAsync<JsonElement>(cancellationToken: cancellationToken);
var serverInfo = new MoonrakerServerInfo();
if (json.TryGetProperty("result", out var result))
{
if (result.TryGetProperty("hostname", out var hostname))
serverInfo.Hostname = hostname.GetString() ?? string.Empty;
if (result.TryGetProperty("software_version", out var version))
serverInfo.SoftwareVersion = version.GetString() ?? string.Empty;
if (result.TryGetProperty("cpu_info", out var cpuInfo))
serverInfo.CpuInfo = cpuInfo.GetString() ?? string.Empty;
if (result.TryGetProperty("klippy_connected", out var klippyConnected))
serverInfo.KlippyConnected = klippyConnected.GetBoolean();
if (result.TryGetProperty("klippy_state", out var klippyState))
serverInfo.KlippyState = klippyState.GetString() ?? string.Empty;
if (result.TryGetProperty("api_key_required", out var apiKeyRequired))
serverInfo.ApiKeyRequired = apiKeyRequired.GetBoolean();
if (result.TryGetProperty("plugins", out var plugins))
serverInfo.Plugins = plugins.EnumerateArray()
.Select(p => p.GetString() ?? string.Empty)
.Where(s => !string.IsNullOrEmpty(s))
.ToList();
}
_logger.LogDebug(
"Retrieved server info from Moonraker at {Host}:{Port} — version {Version}, klippy {State}",
hostnameOrIp, port, serverInfo.SoftwareVersion, serverInfo.KlippyState);
return serverInfo;
}
catch (HttpRequestException ex)
{
_logger.LogWarning(ex,
"Failed to retrieve server info from Moonraker at {Host}:{Port}",
hostnameOrIp, port);
return null;
}
catch (JsonException ex)
{
_logger.LogWarning(ex,
"Failed to parse Moonraker server info response from {Host}:{Port}",
hostnameOrIp, port);
return null;
}
}
/// <inheritdoc />
public async Task<bool> IsReachableAsync(
string hostnameOrIp,
int port,
string? apiKey,
CancellationToken cancellationToken = default)
{
var serverInfo = await GetServerInfoAsync(hostnameOrIp, port, apiKey, cancellationToken);
return serverInfo is not null;
}
/// <inheritdoc />
public async Task<MoonrakerPrinterInfo?> GetPrinterInfoAsync(
string hostnameOrIp,
int port,
string? apiKey,
CancellationToken cancellationToken = default)
{
var baseUrl = BuildBaseUrl(hostnameOrIp, port);
try
{
using var request = CreateRequest(HttpMethod.Get, $"{baseUrl}/printer/info", apiKey);
using var response = await _httpClient.SendAsync(request, cancellationToken);
response.EnsureSuccessStatusCode();
var json = await response.Content.ReadFromJsonAsync<JsonElement>(cancellationToken: cancellationToken);
var printerInfo = new MoonrakerPrinterInfo();
if (json.TryGetProperty("result", out var result))
{
if (result.TryGetProperty("state", out var state))
printerInfo.State = state.GetString() ?? string.Empty;
if (result.TryGetProperty("state_message", out var stateMessage))
printerInfo.StateMessage = stateMessage.GetString() ?? string.Empty;
if (result.TryGetProperty("klippy_ready", out var klippyReady))
printerInfo.KlippyReady = klippyReady.GetBoolean();
}
_logger.LogDebug(
"Retrieved printer info from Moonraker at {Host}:{Port} — state: {State}",
hostnameOrIp, port, printerInfo.State);
return printerInfo;
}
catch (HttpRequestException ex)
{
_logger.LogWarning(ex,
"Failed to retrieve printer info from Moonraker at {Host}:{Port}",
hostnameOrIp, port);
return null;
}
catch (JsonException ex)
{
_logger.LogWarning(ex,
"Failed to parse Moonraker printer info response from {Host}:{Port}",
hostnameOrIp, port);
return null;
}
}
/// <inheritdoc />
public async Task<MoonrakerHistoryResponse> GetPrintHistoryAsync(
string hostnameOrIp,
int port,
string? apiKey,
int limit = 50,
CancellationToken cancellationToken = default)
{
var baseUrl = BuildBaseUrl(hostnameOrIp, port);
var historyResponse = new MoonrakerHistoryResponse();
try
{
using var request = CreateRequest(
HttpMethod.Get,
$"{baseUrl}/server/history/items?limit={limit}",
apiKey);
using var response = await _httpClient.SendAsync(request, cancellationToken);
response.EnsureSuccessStatusCode();
var json = await response.Content.ReadFromJsonAsync<JsonElement>(cancellationToken: cancellationToken);
if (json.TryGetProperty("result", out var result))
{
if (result.TryGetProperty("count", out var count))
historyResponse.TotalCount = count.GetInt32();
if (result.TryGetProperty("items", out var items))
{
foreach (var item in items.EnumerateArray())
{
var job = MapPrintJob(item);
historyResponse.Items.Add(job);
}
}
}
_logger.LogDebug(
"Retrieved {JobCount} print history items from Moonraker at {Host}:{Port}",
historyResponse.Items.Count, hostnameOrIp, port);
}
catch (HttpRequestException ex)
{
_logger.LogWarning(ex,
"Failed to retrieve print history from Moonraker at {Host}:{Port}",
hostnameOrIp, port);
}
catch (JsonException ex)
{
_logger.LogWarning(ex,
"Failed to parse Moonraker history response from {Host}:{Port}",
hostnameOrIp, port);
}
return historyResponse;
}
/// <inheritdoc />
public async Task<MoonrakerPrintStats?> GetPrintStatsAsync(
string hostnameOrIp,
int port,
string? apiKey,
CancellationToken cancellationToken = default)
{
var baseUrl = BuildBaseUrl(hostnameOrIp, port);
try
{
using var request = CreateRequest(
HttpMethod.Get,
$"{baseUrl}/printer/objects/query?print_stats",
apiKey);
using var response = await _httpClient.SendAsync(request, cancellationToken);
response.EnsureSuccessStatusCode();
var json = await response.Content.ReadFromJsonAsync<JsonElement>(cancellationToken: cancellationToken);
if (json.TryGetProperty("result", out var result)
&& result.TryGetProperty("status", out var status)
&& status.TryGetProperty("print_stats", out var printStats))
{
var stats = MapPrintStats(printStats);
_logger.LogDebug(
"Retrieved print stats from Moonraker at {Host}:{Port} — state: {State}, filament: {FilamentMm}mm",
hostnameOrIp, port, stats.State, stats.FilamentUsedMm);
return stats;
}
_logger.LogWarning(
"Moonraker print_stats not found in response from {Host}:{Port}",
hostnameOrIp, port);
return null;
}
catch (HttpRequestException ex)
{
_logger.LogWarning(ex,
"Failed to retrieve print stats from Moonraker at {Host}:{Port}",
hostnameOrIp, port);
return null;
}
catch (JsonException ex)
{
_logger.LogWarning(ex,
"Failed to parse Moonraker print stats response from {Host}:{Port}",
hostnameOrIp, port);
return null;
}
}
/// <inheritdoc />
public async Task<MoonrakerDisplayStatus?> GetDisplayStatusAsync(
string hostnameOrIp,
int port,
string? apiKey,
CancellationToken cancellationToken = default)
{
var baseUrl = BuildBaseUrl(hostnameOrIp, port);
try
{
using var request = CreateRequest(
HttpMethod.Get,
$"{baseUrl}/printer/objects/query?display_status",
apiKey);
using var response = await _httpClient.SendAsync(request, cancellationToken);
response.EnsureSuccessStatusCode();
var json = await response.Content.ReadFromJsonAsync<JsonElement>(cancellationToken: cancellationToken);
if (json.TryGetProperty("result", out var result)
&& result.TryGetProperty("status", out var status)
&& status.TryGetProperty("display_status", out var displayStatus))
{
var ds = new MoonrakerDisplayStatus();
if (displayStatus.TryGetProperty("progress", out var progress))
ds.Progress = progress.GetDecimal();
if (displayStatus.TryGetProperty("message", out var message))
ds.Message = message.GetString() ?? string.Empty;
_logger.LogDebug(
"Retrieved display status from Moonraker at {Host}:{Port} — progress: {Progress:P0}",
hostnameOrIp, port, ds.Progress);
return ds;
}
_logger.LogWarning(
"Moonraker display_status not found in response from {Host}:{Port}",
hostnameOrIp, port);
return null;
}
catch (HttpRequestException ex)
{
_logger.LogWarning(ex,
"Failed to retrieve display status from Moonraker at {Host}:{Port}",
hostnameOrIp, port);
return null;
}
catch (JsonException ex)
{
_logger.LogWarning(ex,
"Failed to parse Moonraker display status response from {Host}:{Port}",
hostnameOrIp, port);
return null;
}
}
/// <inheritdoc />
public async Task<Dictionary<string, decimal>> GetFilamentUsageAsync(
string hostnameOrIp,
int port,
string? apiKey,
CancellationToken cancellationToken = default)
{
// Delegate to the typed GetPrintHistoryAsync and extract metrics
var history = await GetPrintHistoryAsync(hostnameOrIp, port, apiKey, limit: 1, cancellationToken);
var result = new Dictionary<string, decimal>();
if (history.Items.Count > 0)
{
var latestJob = history.Items[0];
result["mm_extruded"] = latestJob.FilamentUsedMm;
result["print_duration_seconds"] = latestJob.PrintDurationSeconds;
}
_logger.LogDebug(
"Retrieved filament usage from Moonraker at {Host}:{Port}: {MetricCount} metrics",
hostnameOrIp, port, result.Count);
return result;
}
/// <summary>
/// Builds the base URL for Moonraker API calls from hostname and port.
/// </summary>
private static string BuildBaseUrl(string hostnameOrIp, int port)
{
return $"http://{hostnameOrIp}:{port}";
}
/// <summary>
/// Creates an HttpRequestMessage with the optional API key header.
/// </summary>
private static HttpRequestMessage CreateRequest(HttpMethod method, string url, string? apiKey)
{
var request = new HttpRequestMessage(method, url);
if (!string.IsNullOrEmpty(apiKey))
{
request.Headers.Add("X-Api-Key", apiKey);
}
return request;
}
/// <summary>
/// Maps a JSON element representing a Moonraker print job history item
/// to a <see cref="MoonrakerPrintJob"/> DTO.
/// </summary>
private static MoonrakerPrintJob MapPrintJob(JsonElement item)
{
var job = new MoonrakerPrintJob();
if (item.TryGetProperty("job_id", out var jobId))
job.JobId = jobId.GetString() ?? string.Empty;
if (item.TryGetProperty("filename", out var filename))
job.Filename = filename.GetString() ?? string.Empty;
if (item.TryGetProperty("status", out var status))
job.Status = status.GetString() ?? string.Empty;
if (item.TryGetProperty("filament_used", out var filamentUsed))
job.FilamentUsedMm = filamentUsed.GetDecimal();
if (item.TryGetProperty("print_duration", out var printDuration))
job.PrintDurationSeconds = printDuration.GetDecimal();
if (item.TryGetProperty("total_duration", out var totalDuration))
job.TotalDurationSeconds = totalDuration.GetDecimal();
if (item.TryGetProperty("start_time", out var startTime) && startTime.ValueKind != JsonValueKind.Null)
{
if (startTime.TryGetInt64(out var startTimeSeconds))
job.StartTime = DateTimeOffset.FromUnixTimeSeconds(startTimeSeconds).UtcDateTime;
}
if (item.TryGetProperty("end_time", out var endTime) && endTime.ValueKind != JsonValueKind.Null)
{
if (endTime.TryGetInt64(out var endTimeSeconds))
job.EndTime = DateTimeOffset.FromUnixTimeSeconds(endTimeSeconds).UtcDateTime;
}
if (item.TryGetProperty("metadata", out var metadata) && metadata.ValueKind == JsonValueKind.Object)
{
foreach (var prop in metadata.EnumerateObject())
{
object value = prop.Value.ValueKind switch
{
JsonValueKind.String => prop.Value.GetString() ?? string.Empty,
JsonValueKind.Number => prop.Value.GetDecimal(),
JsonValueKind.True => true,
JsonValueKind.False => false,
_ => prop.Value.ToString() ?? string.Empty
};
job.Metadata[prop.Name] = value;
}
}
return job;
}
/// <summary>
/// Maps a JSON element representing Moonraker print_stats
/// to a <see cref="MoonrakerPrintStats"/> DTO.
/// </summary>
private static MoonrakerPrintStats MapPrintStats(JsonElement printStats)
{
var stats = new MoonrakerPrintStats();
if (printStats.TryGetProperty("state", out var state))
stats.State = state.GetString() ?? string.Empty;
if (printStats.TryGetProperty("filament_used", out var filamentUsed))
stats.FilamentUsedMm = filamentUsed.GetDecimal();
if (printStats.TryGetProperty("print_duration", out var printDuration))
stats.PrintDurationSeconds = printDuration.GetDecimal();
if (printStats.TryGetProperty("filename", out var filename) && filename.ValueKind != JsonValueKind.Null)
stats.Filename = filename.GetString();
if (printStats.TryGetProperty("message", out var message) && message.ValueKind != JsonValueKind.Null)
stats.Message = message.GetString();
return stats;
}
}

View File

@@ -1,7 +1,9 @@
using System.Reflection; using System.Reflection;
using Extrudex.API.Filters; using Extrudex.API.Filters;
using Extrudex.API.Hubs; using Extrudex.API.Hubs;
using Extrudex.API.Jobs;
using Extrudex.Domain.Interfaces; using Extrudex.Domain.Interfaces;
using Extrudex.Infrastructure.Configuration;
using Extrudex.Infrastructure.Data; using Extrudex.Infrastructure.Data;
using Extrudex.Infrastructure.Services; using Extrudex.Infrastructure.Services;
using FluentValidation; using FluentValidation;
@@ -50,6 +52,9 @@ builder.Services.AddSwaggerGen(c =>
// ── QR Code Generation ────────────────────────────────────── // ── QR Code Generation ──────────────────────────────────────
builder.Services.AddSingleton<IQrCodeService, QrCodeService>(); builder.Services.AddSingleton<IQrCodeService, QrCodeService>();
// ── Cost Per Print Calculation ─────────────────────────────
builder.Services.AddScoped<ICostPerPrintService, CostPerPrintService>();
// ── FluentValidation ────────────────────────────────────── // ── FluentValidation ──────────────────────────────────────
// Registers all validators from the API assembly into DI. // Registers all validators from the API assembly into DI.
builder.Services.AddValidatorsFromAssembly(Assembly.GetExecutingAssembly()); builder.Services.AddValidatorsFromAssembly(Assembly.GetExecutingAssembly());
@@ -77,6 +82,16 @@ builder.Services.AddCors(options =>
// ── SignalR (real-time printer updates) ──────────────────── // ── SignalR (real-time printer updates) ────────────────────
builder.Services.AddSignalR(); builder.Services.AddSignalR();
// ── Filament Usage Sync (Background Job) ──────────────────
builder.Services.Configure<FilamentUsageSyncOptions>(
builder.Configuration.GetSection(FilamentUsageSyncOptions.SectionName));
builder.Services.AddHttpClient<IMoonrakerClient, MoonrakerClient>(client =>
{
client.DefaultRequestHeaders.Add("User-Agent", "Extrudex/1.0");
});
builder.Services.AddScoped<IFilamentUsageSyncService, FilamentUsageSyncService>();
builder.Services.AddHostedService<FilamentUsageSyncJob>();
// ── Health Checks ─────────────────────────────────────────── // ── Health Checks ───────────────────────────────────────────
builder.Services.AddHealthChecks() builder.Services.AddHealthChecks()
.AddNpgSql(connectionString); .AddNpgSql(connectionString);

View File

@@ -8,5 +8,10 @@
}, },
"ConnectionStrings": { "ConnectionStrings": {
"ExtrudexDb": "Host=localhost;Port=5432;Database=extrudex_dev;Username=extrudex;Password=changeme" "ExtrudexDb": "Host=localhost;Port=5432;Database=extrudex_dev;Username=extrudex;Password=changeme"
},
"FilamentUsageSync": {
"PollingInterval": "00:01:00",
"RequestTimeout": "00:00:30",
"Enabled": true
} }
} }

View File

@@ -9,5 +9,10 @@
"AllowedHosts": "*", "AllowedHosts": "*",
"ConnectionStrings": { "ConnectionStrings": {
"ExtrudexDb": "Host=localhost;Port=5432;Database=extrudex;Username=extrudex;Password=changeme" "ExtrudexDb": "Host=localhost;Port=5432;Database=extrudex;Username=extrudex;Password=changeme"
},
"FilamentUsageSync": {
"PollingInterval": "00:05:00",
"RequestTimeout": "00:00:30",
"Enabled": true
} }
} }

View File

@@ -18,13 +18,14 @@ echo "📦 Building and starting services..."
$COMPOSE_CMD -f docker-compose.dev.yml up -d --build $COMPOSE_CMD -f docker-compose.dev.yml up -d --build
echo "⏳ Waiting for services to become healthy..." echo "⏳ Waiting for services to become healthy..."
sleep 10 sleep 15
echo "✅ Deployment complete!" echo "✅ Deployment complete!"
echo "" echo ""
echo "Services running:" echo "Services running:"
echo " • PostgreSQL: localhost:5433"
echo " • Extrudex API: http://localhost:5080" echo " • Extrudex API: http://localhost:5080"
echo " • Control Center Web: http://localhost:5081" echo " • Extrudex Web: http://localhost:5081"
echo "" echo ""
echo "To view logs:" echo "To view logs:"
echo " $COMPOSE_CMD -f docker-compose.dev.yml logs -f" echo " $COMPOSE_CMD -f docker-compose.dev.yml logs -f"

View File

@@ -1,6 +1,25 @@
version: '3.8'
services: services:
extrudex-db:
image: postgres:16-alpine
container_name: extrudex-db
environment:
POSTGRES_USER: extrudex
POSTGRES_PASSWORD: changeme
POSTGRES_DB: extrudex
ports:
- "5433:5432"
volumes:
- extrudex-db-data:/var/lib/postgresql/data
healthcheck:
test: ["CMD-SHELL", "pg_isready -U extrudex"]
interval: 10s
timeout: 5s
retries: 5
start_period: 10s
restart: unless-stopped
networks:
- extrudex-network
extrudex-api: extrudex-api:
build: build:
context: ./backend context: ./backend
@@ -11,6 +30,14 @@ services:
environment: environment:
- ASPNETCORE_ENVIRONMENT=Development - ASPNETCORE_ENVIRONMENT=Development
- ASPNETCORE_URLS=http://+:8080 - ASPNETCORE_URLS=http://+:8080
- EXTRUDEX_DB_HOST=extrudex-db
- EXTRUDEX_DB_PORT=5432
- EXTRUDEX_DB_NAME=extrudex
- EXTRUDEX_DB_USER=extrudex
- EXTRUDEX_DB_PASSWORD=changeme
depends_on:
extrudex-db:
condition: service_healthy
restart: unless-stopped restart: unless-stopped
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:8080/health"] test: ["CMD", "curl", "-f", "http://localhost:8080/health"]
@@ -21,11 +48,11 @@ services:
networks: networks:
- extrudex-network - extrudex-network
control-center-web: extrudex-web:
build: build:
context: ../Control-Center/frontend context: ./frontend
dockerfile: Dockerfile dockerfile: Dockerfile
container_name: control-center-web container_name: extrudex-web
ports: ports:
- "5081:80" - "5081:80"
depends_on: depends_on:
@@ -35,6 +62,9 @@ services:
networks: networks:
- extrudex-network - extrudex-network
volumes:
extrudex-db-data:
networks: networks:
extrudex-network: extrudex-network:
driver: bridge driver: bridge

View File

@@ -8,7 +8,6 @@
"name": "frontend", "name": "frontend",
"version": "0.0.0", "version": "0.0.0",
"dependencies": { "dependencies": {
"@angular/animations": "^21.2.10",
"@angular/cdk": "^21.2.8", "@angular/cdk": "^21.2.8",
"@angular/common": "^21.2.0", "@angular/common": "^21.2.0",
"@angular/compiler": "^21.2.0", "@angular/compiler": "^21.2.0",
@@ -327,21 +326,6 @@
"yarn": ">= 1.13.0" "yarn": ">= 1.13.0"
} }
}, },
"node_modules/@angular/animations": {
"version": "21.2.10",
"resolved": "https://registry.npmjs.org/@angular/animations/-/animations-21.2.10.tgz",
"integrity": "sha512-sIzAcxwtRCJ/fu0tK4mo1ooiEaDxJ+Nl6s9nK1D1NP1em12VX03Jx8CMixp/kVtgh4mZnm1x6psBB0FUz3U3Ug==",
"license": "MIT",
"dependencies": {
"tslib": "^2.3.0"
},
"engines": {
"node": "^20.19.0 || ^22.12.0 || >=24.0.0"
},
"peerDependencies": {
"@angular/core": "21.2.10"
}
},
"node_modules/@angular/build": { "node_modules/@angular/build": {
"version": "21.2.8", "version": "21.2.8",
"resolved": "https://registry.npmjs.org/@angular/build/-/build-21.2.8.tgz", "resolved": "https://registry.npmjs.org/@angular/build/-/build-21.2.8.tgz",

View File

@@ -11,7 +11,6 @@
"private": true, "private": true,
"packageManager": "npm@11.11.0", "packageManager": "npm@11.11.0",
"dependencies": { "dependencies": {
"@angular/animations": "^21.2.10",
"@angular/cdk": "^21.2.8", "@angular/cdk": "^21.2.8",
"@angular/common": "^21.2.0", "@angular/common": "^21.2.0",
"@angular/compiler": "^21.2.0", "@angular/compiler": "^21.2.0",

View File

@@ -1,15 +1,11 @@
import { ApplicationConfig, provideBrowserGlobalErrorListeners } from '@angular/core'; import { ApplicationConfig, provideBrowserGlobalErrorListeners } from '@angular/core';
import { provideRouter } from '@angular/router'; import { provideRouter } from '@angular/router';
import { provideHttpClient, withFetch } from '@angular/common/http';
import { provideAnimationsAsync } from '@angular/platform-browser/animations/async';
import { routes } from './app.routes'; import { routes } from './app.routes';
export const appConfig: ApplicationConfig = { export const appConfig: ApplicationConfig = {
providers: [ providers: [
provideBrowserGlobalErrorListeners(), provideBrowserGlobalErrorListeners(),
provideRouter(routes), provideRouter(routes)
provideHttpClient(withFetch()),
provideAnimationsAsync(),
] ]
}; };

View File

@@ -1,78 +0,0 @@
<!-- Delete Filament Confirmation Dialog -->
<h2 mat-dialog-title>
<mat-icon aria-hidden="true">warning</mat-icon>
Delete Filament Spool?
</h2>
<mat-dialog-content>
<p class="dialog-description">
You are about to permanently remove this filament spool from inventory.
</p>
<!-- Spool details card -->
<div class="spool-details" role="list" aria-label="Spool details">
<div class="detail-row" role="listitem">
<span class="detail-label">Material</span>
<span class="detail-value">{{ filament.materialBaseName }}{{ filament.materialFinishName ? ' — ' + filament.materialFinishName : '' }}{{ filament.materialModifierName ? ' (' + filament.materialModifierName + ')' : '' }}</span>
</div>
<div class="detail-row" role="listitem">
<span class="detail-label">Brand</span>
<span class="detail-value">{{ filament.brand }}</span>
</div>
<div class="detail-row" role="listitem">
<span class="detail-label">Color</span>
<span class="detail-value color-value">
<span class="color-swatch-inline"
[style.background-color]="filament.colorHex"
[attr.aria-label]="filament.colorName">
</span>
{{ filament.colorName }}
</span>
</div>
<div class="detail-row" role="listitem">
<span class="detail-label">Serial</span>
<span class="detail-value serial-value">{{ filament.spoolSerial }}</span>
</div>
<div class="detail-row" role="listitem">
<span class="detail-label">Remaining</span>
<span class="detail-value">{{ formatWeight(filament.weightRemainingGrams) }} / {{ formatWeight(filament.weightTotalGrams) }}</span>
</div>
<div class="detail-row" role="listitem">
<span class="detail-label">Status</span>
<span class="detail-value">
<span class="status-badge"
[class.active]="filament.isActive"
[class.inactive]="!filament.isActive">
{{ filament.isActive ? 'Active' : 'Inactive' }}
</span>
</span>
</div>
</div>
<p class="dialog-warning">
<mat-icon aria-hidden="true">info</mat-icon>
This action cannot be undone.
</p>
</mat-dialog-content>
<mat-dialog-actions align="end">
<button mat-button
type="button"
(click)="onCancel()"
class="cancel-button">
Cancel
</button>
<button mat-flat-button
type="button"
color="warn"
(click)="onConfirm()"
class="confirm-button">
<mat-icon aria-hidden="true">delete</mat-icon>
Delete Spool
</button>
</mat-dialog-actions>

View File

@@ -1,150 +0,0 @@
/**
* Delete Filament Dialog Styles
* Touch-optimized confirmation dialog for spool removal
*/
$spacing-unit: 8px;
$color-critical: #ef4444;
$color-inactive: #94a3b8;
$color-active: #22c55e;
// Dialog title
h2[mat-dialog-title] {
display: flex;
align-items: center;
gap: $spacing-unit;
color: $color-critical;
mat-icon {
font-size: 24px !important;
width: 24px !important;
height: 24px !important;
}
}
// Description text
.dialog-description {
margin: 0 0 $spacing-unit * 2;
font-size: 14px;
line-height: 1.5;
color: var(--mat-sys-on-surface);
}
// Spool details card
.spool-details {
display: flex;
flex-direction: column;
gap: $spacing-unit;
padding: $spacing-unit * 1.5;
background-color: var(--mat-sys-surface-container);
border-radius: 8px;
margin-bottom: $spacing-unit * 2;
}
.detail-row {
display: flex;
justify-content: space-between;
align-items: center;
padding: $spacing-unit * 0.5 0;
font-size: 14px;
&:not(:last-child) {
border-bottom: 1px solid var(--mat-sys-outline-variant);
padding-bottom: $spacing-unit;
}
}
.detail-label {
font-weight: 500;
color: var(--mat-sys-on-surface-variant);
flex-shrink: 0;
}
.detail-value {
font-weight: 400;
color: var(--mat-sys-on-surface);
text-align: right;
}
// Color swatch inline
.color-swatch-inline {
display: inline-block;
width: 18px;
height: 18px;
border-radius: 50%;
border: 1.5px solid rgba(0, 0, 0, 0.12);
vertical-align: middle;
margin-right: 4px;
}
.color-value {
display: flex;
align-items: center;
justify-content: flex-end;
gap: 4px;
}
// Serial value — monospace
.serial-value {
font-family: 'JetBrains Mono', 'Roboto Mono', monospace;
font-size: 13px;
letter-spacing: 0.02em;
}
// Status badge — matches filament table styling
.status-badge {
display: inline-flex;
align-items: center;
padding: 2px 8px;
border-radius: 10px;
font-size: 11px;
font-weight: 600;
text-transform: uppercase;
letter-spacing: 0.04em;
&.active {
background-color: rgba($color-active, 0.12);
color: $color-active;
}
&.inactive {
background-color: rgba($color-inactive, 0.12);
color: $color-inactive;
}
}
// Warning text
.dialog-warning {
display: flex;
align-items: center;
gap: $spacing-unit;
margin: 0;
font-size: 13px;
color: $color-critical;
mat-icon {
font-size: 18px !important;
width: 18px !important;
height: 18px !important;
}
}
// Dialog action buttons
mat-dialog-actions {
padding-top: $spacing-unit * 2;
.cancel-button {
min-width: 80px;
}
.confirm-button {
min-width: 120px;
mat-icon {
font-size: 18px !important;
width: 18px !important;
height: 18px !important;
margin-right: 4px;
}
}
}

View File

@@ -1,68 +0,0 @@
import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
import { CommonModule } from '@angular/common';
import {
MAT_DIALOG_DATA,
MatDialogRef,
MatDialogModule,
} from '@angular/material/dialog';
import { MatButtonModule } from '@angular/material/button';
import { MatIconModule } from '@angular/material/icon';
import { MatChipsModule } from '@angular/material/chips';
import { Filament } from '../../models/filament.model';
/**
* Data passed into the delete confirmation dialog.
*/
export interface DeleteFilamentDialogData {
filament: Filament;
}
/**
* Delete confirmation dialog for filament spool removal.
*
* Displays spool details (material, brand, color, serial, remaining weight)
* and requires the user to confirm before deletion proceeds.
* Cancel dismisses the dialog with no action.
*/
@Component({
selector: 'app-delete-filament-dialog',
standalone: true,
imports: [
CommonModule,
MatDialogModule,
MatButtonModule,
MatIconModule,
MatChipsModule,
],
templateUrl: './delete-filament-dialog.component.html',
styleUrl: './delete-filament-dialog.component.scss',
changeDetection: ChangeDetectionStrategy.OnPush,
})
export class DeleteFilamentDialogComponent {
private readonly dialogRef = inject(
MatDialogRef<DeleteFilamentDialogComponent, boolean>
);
readonly data: DeleteFilamentDialogData = inject(MAT_DIALOG_DATA);
/** The filament spool being considered for deletion */
readonly filament = this.data.filament;
/** Format weight for display in dialog */
formatWeight(grams: number): string {
if (grams >= 1000) {
return `${(grams / 1000).toFixed(1)}kg`;
}
return `${Math.round(grams)}g`;
}
/** Cancel — close dialog with false (no deletion) */
onCancel(): void {
this.dialogRef.close(false);
}
/** Confirm — close dialog with true (proceed with deletion) */
onConfirm(): void {
this.dialogRef.close(true);
}
}

View File

@@ -0,0 +1,76 @@
<!-- Filament Filter Bar — material type, color search, low stock, active-only -->
<div class="filament-filter-bar" role="search" aria-label="Filter filament inventory">
<!-- Material Type Multi-Select -->
<mat-form-field appearance="outline" class="filter-field material-filter">
<mat-label>Material</mat-label>
<mat-select multiple
[value]="selectedMaterials()"
(selectionChange)="onMaterialChange($event.value)"
aria-label="Filter by material type">
@for (material of materialOptions(); track material) {
<mat-option [value]="material">{{ material }}</mat-option>
}
</mat-select>
@if (selectedMaterials().length > 0) {
<mat-chip-set class="selected-chips" matSuffix>
@for (mat of selectedMaterials(); track mat) {
<mat-chip (removed)="removeMaterial(mat)"
class="filter-chip">
<span>{{ mat }}</span>
<mat-icon matChipRemove>cancel</mat-icon>
</mat-chip>
}
</mat-chip-set>
}
</mat-form-field>
<!-- Color Search -->
<mat-form-field appearance="outline" class="filter-field color-filter">
<mat-label>Color</mat-label>
<input matInput
type="text"
[value]="colorSearch()"
(input)="onColorSearchChange($any($event.target).value)"
placeholder="Search color..."
aria-label="Filter by color name" />
@if (colorSearch().trim()) {
<mat-icon matSuffix class="filter-active-icon">filter_list</mat-icon>
}
</mat-form-field>
<!-- Low Stock Toggle -->
<mat-checkbox [checked]="lowStockOnly()"
(change)="onLowStockToggle($event.checked)"
class="filter-checkbox"
aria-label="Show low stock only"
matTooltip="Show only spools at 25% or less remaining"
matTooltipPosition="below">
<mat-icon class="checkbox-icon" [class.active]="lowStockOnly()">warning</mat-icon>
Low Stock
</mat-checkbox>
<!-- Active Only Toggle -->
<mat-checkbox [checked]="activeOnly()"
(change)="onActiveOnlyToggle($event.checked)"
class="filter-checkbox"
aria-label="Show active spools only"
matTooltip="Show only spools currently in use"
matTooltipPosition="below">
<mat-icon class="checkbox-icon" [class.active]="activeOnly()">check_circle</mat-icon>
Active Only
</mat-checkbox>
<!-- Clear All Filters -->
@if (hasActiveFilters()) {
<button mat-button
class="clear-filters-btn"
(click)="clearAll()"
aria-label="Clear all filters"
matTooltip="Remove all filters"
matTooltipPosition="below">
<mat-icon>filter_alt_off</mat-icon>
Clear
</button>
}
</div>

View File

@@ -0,0 +1,134 @@
/**
* Filament Filter Bar Styles
* Responsive filter layout for kiosk and mobile
*/
$spacing-unit: 8px;
.filament-filter-bar {
display: flex;
align-items: center;
gap: $spacing-unit * 2;
flex-wrap: wrap;
padding: $spacing-unit * 2 0;
margin-bottom: $spacing-unit * 2;
}
// Form field sizing
.filter-field {
flex: 0 1 auto;
min-width: 160px;
&.material-filter {
min-width: 200px;
}
&.color-filter {
min-width: 180px;
}
// Reduce vertical spacing inside filter fields
.mat-mdc-form-field-subscript-wrapper {
display: none; // No hint/error text needed for filters
}
}
// Selected material chips
.selected-chips {
flex-wrap: wrap;
gap: 4px;
}
.filter-chip {
font-size: 12px !important;
min-height: 24px !important;
mat-icon {
font-size: 14px !important;
width: 14px !important;
height: 14px !important;
}
}
// Active filter icon
.filter-active-icon {
color: var(--mat-sys-primary);
font-size: 18px !important;
width: 18px !important;
height: 18px !important;
}
// Checkbox styling
.filter-checkbox {
display: flex;
align-items: center;
gap: 4px;
white-space: nowrap;
user-select: none;
touch-action: manipulation; // Prevent zoom on double-tap
.checkbox-icon {
font-size: 18px !important;
width: 18px !important;
height: 18px !important;
color: var(--mat-sys-on-surface-variant);
transition: color 0.2s ease;
&.active {
color: var(--mat-sys-primary);
}
}
}
// Clear filters button
.clear-filters-btn {
display: flex;
align-items: center;
gap: 4px;
font-size: 13px;
mat-icon {
font-size: 18px !important;
width: 18px !important;
height: 18px !important;
}
}
// Responsive: stack filters vertically on small screens
@media (max-width: 768px) {
.filament-filter-bar {
flex-direction: column;
align-items: stretch;
gap: $spacing-unit;
}
.filter-field {
width: 100%;
min-width: unset;
&.material-filter,
&.color-filter {
min-width: unset;
}
}
.filter-checkbox {
padding: $spacing-unit 0;
}
.clear-filters-btn {
align-self: flex-start;
}
}
// Extra-small screens (phone portrait)
@media (max-width: 480px) {
.filament-filter-bar {
padding: $spacing-unit 0;
margin-bottom: $spacing-unit;
}
.filter-checkbox {
font-size: 13px;
}
}

View File

@@ -0,0 +1,158 @@
import {
ChangeDetectionStrategy,
Component,
EventEmitter,
Input,
Output,
computed,
signal,
} from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { MatFormFieldModule } from '@angular/material/form-field';
import { MatSelectModule } from '@angular/material/select';
import { MatInputModule } from '@angular/material/input';
import { MatCheckboxModule } from '@angular/material/checkbox';
import { MatIconModule } from '@angular/material/icon';
import { MatChipsModule } from '@angular/material/chips';
import { MatButtonModule } from '@angular/material/button';
import { MatTooltipModule } from '@angular/material/tooltip';
import {
Filament,
StockLevel,
classifyStockLevel,
} from '../../models/filament.model';
/** Filter state emitted by the filament filter component */
export interface FilamentFilterState {
/** Selected material base names — empty means all */
materialBaseNames: string[];
/** Color search text — empty string means all */
colorSearch: string;
/** Whether to show only low/critical stock */
lowStockOnly: boolean;
/** Whether to show only active spools */
activeOnly: boolean;
}
/**
* FilamentFilterComponent — Filter bar for the filament inventory list.
*
* Provides:
* - Material type multi-select filter
* - Color name text search
* - Low stock toggle (shows only critical/low spools)
* - Active-only toggle
* - Clear all filters action
*/
@Component({
selector: 'app-filament-filter',
standalone: true,
imports: [
CommonModule,
FormsModule,
MatFormFieldModule,
MatSelectModule,
MatInputModule,
MatCheckboxModule,
MatIconModule,
MatChipsModule,
MatButtonModule,
MatTooltipModule,
],
templateUrl: './filament-filter.component.html',
styleUrl: './filament-filter.component.scss',
changeDetection: ChangeDetectionStrategy.OnPush,
})
export class FilamentFilterComponent {
/** Filament data input — used to derive material options */
@Input() set filaments(value: Filament[]) {
this._filaments.set(value);
const materials = [...new Set(value.map((f) => f.materialBaseName))].sort();
this.materialOptions.set(materials);
}
get filaments(): Filament[] {
return this._filaments();
}
private readonly _filaments = signal<Filament[]>([]);
/** Available material base names derived from filament data */
readonly materialOptions = signal<string[]>([]);
/** Selected material base names */
readonly selectedMaterials = signal<string[]>([]);
/** Color search text */
readonly colorSearch = signal('');
/** Low stock only toggle */
readonly lowStockOnly = signal(false);
/** Active only toggle */
readonly activeOnly = signal(false);
/** Computed: whether any filters are active */
readonly hasActiveFilters = computed(
() =>
this.selectedMaterials().length > 0 ||
this.colorSearch().trim().length > 0 ||
this.lowStockOnly() ||
this.activeOnly()
);
/** Emits the current filter state whenever filters change */
@Output() readonly filterChange = new EventEmitter<FilamentFilterState>();
/** Handle material selection change */
onMaterialChange(selected: string[]): void {
this.selectedMaterials.set(selected);
this.emitFilterState();
}
/** Handle color search input */
onColorSearchChange(value: string): void {
this.colorSearch.set(value);
this.emitFilterState();
}
/** Handle low stock toggle */
onLowStockToggle(checked: boolean): void {
this.lowStockOnly.set(checked);
this.emitFilterState();
}
/** Handle active-only toggle */
onActiveOnlyToggle(checked: boolean): void {
this.activeOnly.set(checked);
this.emitFilterState();
}
/** Remove a single material chip */
removeMaterial(material: string): void {
const updated = this.selectedMaterials().filter((m) => m !== material);
this.selectedMaterials.set(updated);
this.emitFilterState();
}
/** Clear all filters */
clearAll(): void {
this.selectedMaterials.set([]);
this.colorSearch.set('');
this.lowStockOnly.set(false);
this.activeOnly.set(false);
this.emitFilterState();
}
/** Emit the current filter state */
private emitFilterState(): void {
this.filterChange.emit({
materialBaseNames: this.selectedMaterials(),
colorSearch: this.colorSearch().trim().toLowerCase(),
lowStockOnly: this.lowStockOnly(),
activeOnly: this.activeOnly(),
});
}
}

View File

@@ -1,6 +1,12 @@
<!-- Filament Inventory Table — with low stock indicators and delete actions --> <!-- Filament Inventory Table — with filters and low stock indicators -->
<div class="filament-table-container" role="region" aria-label="Filament inventory"> <div class="filament-table-container" role="region" aria-label="Filament inventory">
<!-- Filter Bar -->
<app-filament-filter
[filaments]="allFilaments()"
(filterChange)="onFilterChange($event)"
aria-label="Filter filament inventory" />
<!-- Low Stock Alert Banner — shown when critical or low stock spools exist --> <!-- Low Stock Alert Banner — shown when critical or low stock spools exist -->
@if (criticalCount() > 0) { @if (criticalCount() > 0) {
<div class="alert-banner critical" role="alert"> <div class="alert-banner critical" role="alert">
@@ -16,7 +22,7 @@
<!-- Filament Table --> <!-- Filament Table -->
<table mat-table <table mat-table
[dataSource]="sortedFilaments()" [dataSource]="filteredFilaments()"
matSort matSort
(matSortChange)="sortData($event)" (matSortChange)="sortData($event)"
class="filament-table" class="filament-table"
@@ -106,36 +112,22 @@
</td> </td>
</ng-container> </ng-container>
<!-- Actions Column — delete button -->
<ng-container matColumnDef="actions">
<th mat-header-cell *matHeaderCellDef>Actions</th>
<td mat-cell *matCellDef="let filament">
<button mat-icon-button
type="button"
color="warn"
[attr.aria-label]="'Delete ' + filament.materialBaseName + ' ' + filament.colorName"
matTooltip="Delete spool"
matTooltipPosition="above"
[disabled]="deleting() === filament.id"
(click)="onDeleteClick(filament)">
@if (deleting() === filament.id) {
<mat-icon aria-hidden="true">hourglass_empty</mat-icon>
} @else {
<mat-icon aria-hidden="true">delete</mat-icon>
}
</button>
</td>
</ng-container>
<tr mat-header-row *matHeaderRowDef="columns()"></tr> <tr mat-header-row *matHeaderRowDef="columns()"></tr>
<tr mat-row *matRowDef="let row; columns: columns();" <tr mat-row *matRowDef="let row; columns: columns();"
[class.row-critical]="classifyStockLevel(row) === 'critical'" [class.row-critical]="classifyStockLevel(row) === 'critical'"
[class.row-low]="classifyStockLevel(row) === 'low'" [class.row-low]="classifyStockLevel(row) === 'low'">
[class.row-deleting]="deleting() === row.id">
</tr> </tr>
</table> </table>
<!-- Empty state --> <!-- Filtered empty state -->
@if (filteredFilaments().length === 0 && filaments().length > 0) {
<div class="empty-state" role="status">
<mat-icon aria-hidden="true">filter_alt_off</mat-icon>
<p>No filaments match the current filters</p>
</div>
}
<!-- No data empty state -->
@if (filaments().length === 0) { @if (filaments().length === 0) {
<div class="empty-state" role="status"> <div class="empty-state" role="status">
<mat-icon aria-hidden="true">inventory_2</mat-icon> <mat-icon aria-hidden="true">inventory_2</mat-icon>

View File

@@ -235,20 +235,6 @@ mat-chip {
} }
} }
// Actions column
.actions-cell {
display: flex;
align-items: center;
justify-content: center;
}
// Row being deleted — subtle fade
:host ::ng-deep .row-deleting {
opacity: 0.5;
pointer-events: none;
transition: opacity 0.3s ease;
}
// Empty state // Empty state
.empty-state { .empty-state {
display: flex; display: flex;

View File

@@ -3,7 +3,6 @@ import {
Component, Component,
Input, Input,
computed, computed,
inject,
signal, signal,
} from '@angular/core'; } from '@angular/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
@@ -13,21 +12,13 @@ import { MatIconModule } from '@angular/material/icon';
import { MatProgressBarModule } from '@angular/material/progress-bar'; import { MatProgressBarModule } from '@angular/material/progress-bar';
import { MatTooltipModule } from '@angular/material/tooltip'; import { MatTooltipModule } from '@angular/material/tooltip';
import { MatSortModule, Sort } from '@angular/material/sort'; import { MatSortModule, Sort } from '@angular/material/sort';
import { MatButtonModule } from '@angular/material/button'; import { FilamentFilterComponent, FilamentFilterState } from '../filament-filter/filament-filter.component';
import { MatDialog, MatDialogModule } from '@angular/material/dialog';
import { MatSnackBar, MatSnackBarModule } from '@angular/material/snack-bar';
import { import {
Filament, Filament,
StockLevel, StockLevel,
getRemainingPercent, getRemainingPercent,
classifyStockLevel, classifyStockLevel,
} from '../../models/filament.model'; } from '../../models/filament.model';
import { FilamentService } from '../../services/filament.service';
import {
DeleteFilamentDialogComponent,
DeleteFilamentDialogData,
} from '../delete-filament-dialog/delete-filament-dialog.component';
/** Display column definitions for the filament table */ /** Display column definitions for the filament table */
export type FilamentColumn = export type FilamentColumn =
@@ -37,8 +28,7 @@ export type FilamentColumn =
| 'serial' | 'serial'
| 'remaining' | 'remaining'
| 'stockLevel' | 'stockLevel'
| 'status' | 'status';
| 'actions';
@Component({ @Component({
selector: 'app-filament-table', selector: 'app-filament-table',
@@ -51,26 +41,17 @@ export type FilamentColumn =
MatProgressBarModule, MatProgressBarModule,
MatTooltipModule, MatTooltipModule,
MatSortModule, MatSortModule,
MatButtonModule, FilamentFilterComponent,
MatDialogModule,
MatSnackBarModule,
], ],
templateUrl: './filament-table.component.html', templateUrl: './filament-table.component.html',
styleUrl: './filament-table.component.scss', styleUrl: './filament-table.component.scss',
changeDetection: ChangeDetectionStrategy.OnPush, changeDetection: ChangeDetectionStrategy.OnPush,
}) })
export class FilamentTableComponent { export class FilamentTableComponent {
private readonly dialog = inject(MatDialog);
private readonly snackBar = inject(MatSnackBar);
private readonly filamentService = inject(FilamentService);
/** Filament data input — reactive signal for live updates */ /** Filament data input — reactive signal for live updates */
readonly filaments = signal<Filament[]>([]); readonly filaments = signal<Filament[]>([]);
/** Whether a delete operation is in progress */ /** Columns to display — defaults to all columns */
readonly deleting = signal<string | null>(null);
/** Columns to display — defaults to all columns including actions */
@Input() @Input()
set displayedColumns(cols: FilamentColumn[]) { set displayedColumns(cols: FilamentColumn[]) {
this._displayedColumns.set(cols); this._displayedColumns.set(cols);
@@ -86,15 +67,29 @@ export class FilamentTableComponent {
'remaining', 'remaining',
'stockLevel', 'stockLevel',
'status', 'status',
'actions',
]); ]);
/** Default columns for template binding */ /** Default columns for template binding */
readonly columns = this._displayedColumns; readonly columns = this._displayedColumns;
/** Current filter state */
readonly filterState = signal<FilamentFilterState>({
materialBaseNames: [],
colorSearch: '',
lowStockOnly: false,
activeOnly: false,
});
/** Sorted filament data */ /** Sorted filament data */
readonly sortedFilaments = signal<Filament[]>([]); readonly sortedFilaments = signal<Filament[]>([]);
/** Computed: filtered + sorted filament data for display */
readonly filteredFilaments = computed(() => {
const data = this.sortedFilaments();
const filters = this.filterState();
return data.filter((f) => this.matchesFilter(f, filters));
});
/** Computed: count of low/critical spools */ /** Computed: count of low/critical spools */
readonly lowStockCount = computed(() => readonly lowStockCount = computed(() =>
this.filaments().filter( this.filaments().filter(
@@ -233,6 +228,9 @@ export class FilamentTableComponent {
this.sortedFilaments.set([...data]); this.sortedFilaments.set([...data]);
} }
/** All filament data — for the filter component to derive material options */
readonly allFilaments = this.filaments;
/** Handle sort changes from MatSort */ /** Handle sort changes from MatSort */
sortData(sort: Sort): void { sortData(sort: Sort): void {
const data = [...this.filaments()]; const data = [...this.filaments()];
@@ -274,50 +272,44 @@ export class FilamentTableComponent {
this.sortedFilaments.set(sorted); this.sortedFilaments.set(sorted);
} }
/** /** Handle filter changes from FilamentFilterComponent */
* Open the delete confirmation dialog for a filament spool. onFilterChange(state: FilamentFilterState): void {
* On confirm: calls DELETE endpoint and removes the row on success. this.filterState.set(state);
* On cancel: dialog dismissed, no action taken.
*/
onDeleteClick(filament: Filament): void {
const dialogData: DeleteFilamentDialogData = { filament };
const dialogRef = this.dialog.open(DeleteFilamentDialogComponent, {
data: dialogData,
width: '480px',
disableClose: true,
});
dialogRef.afterClosed().subscribe((confirmed: boolean | undefined) => {
if (!confirmed) {
return; // User cancelled — no action
} }
// Mark as deleting for UI feedback /** Check if a filament matches the current filter state */
this.deleting.set(filament.id); private matchesFilter(filament: Filament, filters: FilamentFilterState): boolean {
// Material filter — empty means all
if (
filters.materialBaseNames.length > 0 &&
!filters.materialBaseNames.includes(filament.materialBaseName)
) {
return false;
}
this.filamentService.deleteFilament(filament.id).subscribe({ // Color search — empty means all
next: () => { if (
// Remove the deleted filament from local data filters.colorSearch &&
const updated = this.filaments().filter((f) => f.id !== filament.id); !filament.colorName.toLowerCase().includes(filters.colorSearch) &&
this.updateFilaments(updated); !filament.colorHex.toLowerCase().includes(filters.colorSearch)
this.deleting.set(null); ) {
return false;
}
this.snackBar.open( // Low stock filter — show only critical/low
`Deleted ${filament.materialBaseName}${filament.colorName}`, if (filters.lowStockOnly) {
'Dismiss', const level = classifyStockLevel(filament);
{ duration: 4000 } if (level !== 'critical' && level !== 'low') {
); return false;
}, }
error: () => { }
this.deleting.set(null);
this.snackBar.open( // Active only filter
`Failed to delete ${filament.materialBaseName}${filament.colorName}. Please try again.`, if (filters.activeOnly && !filament.isActive) {
'Dismiss', return false;
{ duration: 6000 } }
);
}, return true;
});
});
} }
/** Template helper: get remaining percent */ /** Template helper: get remaining percent */

View File

@@ -1,37 +0,0 @@
import { Injectable, inject } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { Observable } from 'rxjs';
import { Filament } from '../models/filament.model';
/**
* API base URL — matches the Extrudex backend default.
* TODO: Move to environment config when multi-environment support is added.
*/
const API_BASE_URL = '/api';
/**
* Service for CRUD operations on filament spools.
* Communicates with the Extrudex backend SpoolsController.
*/
@Injectable({ providedIn: 'root' })
export class FilamentService {
private readonly http = inject(HttpClient);
/**
* Fetch all filament spools from the backend.
* GET /api/spools
*/
getFilaments(): Observable<Filament[]> {
return this.http.get<Filament[]>(`${API_BASE_URL}/spools`);
}
/**
* Soft-delete a filament spool by ID.
* DELETE /api/spools/{id}
* Returns 204 No Content on success.
*/
deleteFilament(id: string): Observable<void> {
return this.http.delete<void>(`${API_BASE_URL}/spools/${id}`);
}
}