Compare commits
4 Commits
feca1e3ee9
...
6aeb344d3f
| Author | SHA1 | Date | |
|---|---|---|---|
| 6aeb344d3f | |||
| e0e4fabaed | |||
| 432ce39e62 | |||
| 42e90f028a |
@@ -20,15 +20,12 @@ jobs:
|
|||||||
|
|
||||||
- name: Restore backend
|
- name: Restore backend
|
||||||
run: dotnet restore
|
run: dotnet restore
|
||||||
working-directory: ./backend
|
|
||||||
|
|
||||||
- name: Build backend
|
- name: Build backend
|
||||||
run: dotnet build --no-restore --configuration Release
|
run: dotnet build --no-restore --configuration Release
|
||||||
working-directory: ./backend
|
|
||||||
|
|
||||||
- name: Test backend
|
- name: Test backend
|
||||||
run: dotnet test --no-build --configuration Release
|
run: dotnet test --no-build --configuration Release
|
||||||
working-directory: ./backend
|
|
||||||
|
|
||||||
- name: Setup Node
|
- name: Setup Node
|
||||||
uses: actions/setup-node@v4
|
uses: actions/setup-node@v4
|
||||||
@@ -42,3 +39,39 @@ jobs:
|
|||||||
- name: Build frontend
|
- name: Build frontend
|
||||||
run: npm run build
|
run: npm run build
|
||||||
working-directory: ./frontend
|
working-directory: ./frontend
|
||||||
|
|
||||||
|
deploy-dev:
|
||||||
|
needs: build-test
|
||||||
|
if: gitea.event_name == 'push'
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Deploy dev
|
||||||
|
run: |
|
||||||
|
echo "${{ secrets.DEV_DEPLOY_SSH_KEY }}" > /tmp/dev_key
|
||||||
|
chmod 600 /tmp/dev_key
|
||||||
|
ssh -i /tmp/dev_key -o StrictHostKeyChecking=no \
|
||||||
|
${{ secrets.DEV_DEPLOY_USER }}@${{ secrets.DEV_DEPLOY_HOST }} \
|
||||||
|
"${{ secrets.DEV_DEPLOY_PATH }}/deploy.sh"
|
||||||
|
|
||||||
|
notify-success:
|
||||||
|
needs: [build-test, deploy-dev]
|
||||||
|
if: success() && gitea.event_name == 'push'
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Notify Slack success
|
||||||
|
run: |
|
||||||
|
curl -X POST -H 'Content-type: application/json' \
|
||||||
|
--data "{\"text\":\"✅ Extrudex dev deployed successfully from dev branch.\"}" \
|
||||||
|
"${{ secrets.SLACK_WEBHOOK_URL }}"
|
||||||
|
|
||||||
|
notify-failure:
|
||||||
|
needs: [build-test, deploy-dev]
|
||||||
|
if: failure()
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Notify Slack failure
|
||||||
|
run: |
|
||||||
|
curl -X POST -H 'Content-type: application/json' \
|
||||||
|
--data "{\"text\":\"🚨 Extrudex dev pipeline failed. Check Gitea Actions for details.\"}" \
|
||||||
|
"${{ secrets.SLACK_WEBHOOK_URL }}"
|
||||||
220
README.md
220
README.md
@@ -1,220 +0,0 @@
|
|||||||
# 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*
|
|
||||||
|
|||||||
@@ -1,108 +0,0 @@
|
|||||||
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
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -40,18 +40,15 @@ 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);
|
||||||
@@ -80,15 +77,6 @@ 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
|
||||||
@@ -197,9 +185,7 @@ 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);
|
||||||
@@ -281,8 +267,6 @@ 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();
|
||||||
|
|
||||||
@@ -295,66 +279,6 @@ public class FilamentsController : ControllerBase
|
|||||||
return Ok(MapToFilamentResponse(entity));
|
return Ok(MapToFilamentResponse(entity));
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Deletes a filament spool by its unique identifier.
|
|
||||||
/// If the spool has associated print jobs, the deletion is rejected with a 409 Conflict
|
|
||||||
/// to preserve COGS and print history — the caller should archive the spool instead.
|
|
||||||
/// Associated filament usage records are removed before the spool is deleted.
|
|
||||||
/// AMS slots referencing this spool will have their SpoolId set to null by the database.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="id">The unique identifier of the filament spool to delete.</param>
|
|
||||||
/// <returns>No content on successful deletion.</returns>
|
|
||||||
/// <response code="204">The filament spool was successfully deleted.</response>
|
|
||||||
/// <response code="404">If the filament spool with the given ID is not found.</response>
|
|
||||||
/// <response code="409">If the spool has associated print jobs and cannot be deleted.</response>
|
|
||||||
[HttpDelete("{id:guid}")]
|
|
||||||
[ProducesResponseType(StatusCodes.Status204NoContent)]
|
|
||||||
[ProducesResponseType(StatusCodes.Status404NotFound)]
|
|
||||||
[ProducesResponseType(StatusCodes.Status409Conflict)]
|
|
||||||
public async Task<IActionResult> DeleteFilament(Guid id)
|
|
||||||
{
|
|
||||||
_logger.LogInformation("Deleting filament {Id}", id);
|
|
||||||
|
|
||||||
var entity = await _dbContext.Spools.FindAsync(id);
|
|
||||||
if (entity is null)
|
|
||||||
{
|
|
||||||
_logger.LogWarning("Filament {Id} not found for deletion", id);
|
|
||||||
return NotFound(new { error = $"Filament with ID '{id}' not found." });
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check for associated print jobs — these cannot be orphaned
|
|
||||||
var hasPrintJobs = await _dbContext.PrintJobs.AnyAsync(pj => pj.SpoolId == id);
|
|
||||||
if (hasPrintJobs)
|
|
||||||
{
|
|
||||||
_logger.LogWarning(
|
|
||||||
"Cannot delete filament {Id}: associated print jobs exist. Suggest archiving instead.", id);
|
|
||||||
return Conflict(new
|
|
||||||
{
|
|
||||||
error = $"Cannot delete filament '{id}' because it has associated print jobs. " +
|
|
||||||
"Archive the filament instead to preserve print history and COGS data."
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// Remove associated filament usage records (usage tracking data for this spool)
|
|
||||||
var usageRecords = await _dbContext.FilamentUsages
|
|
||||||
.Where(fu => fu.SpoolId == id)
|
|
||||||
.ToListAsync();
|
|
||||||
|
|
||||||
if (usageRecords.Count > 0)
|
|
||||||
{
|
|
||||||
_logger.LogInformation(
|
|
||||||
"Removing {Count} filament usage records for spool {Id}",
|
|
||||||
usageRecords.Count, id);
|
|
||||||
_dbContext.FilamentUsages.RemoveRange(usageRecords);
|
|
||||||
}
|
|
||||||
|
|
||||||
_dbContext.Spools.Remove(entity);
|
|
||||||
await _dbContext.SaveChangesAsync();
|
|
||||||
|
|
||||||
_logger.LogInformation("Filament {Id} deleted successfully", id);
|
|
||||||
return NoContent();
|
|
||||||
}
|
|
||||||
|
|
||||||
// ── Mapping helper ─────────────────────────────────────────
|
// ── Mapping helper ─────────────────────────────────────────
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -383,8 +307,6 @@ 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}"
|
||||||
|
|||||||
@@ -59,12 +59,6 @@ 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; }
|
||||||
|
|
||||||
@@ -139,15 +133,6 @@ 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>
|
||||||
@@ -211,11 +196,4 @@ 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; }
|
|
||||||
}
|
}
|
||||||
@@ -30,11 +30,4 @@ 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; }
|
|
||||||
}
|
}
|
||||||
@@ -1,99 +0,0 @@
|
|||||||
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();
|
|
||||||
}
|
|
||||||
@@ -1,79 +0,0 @@
|
|||||||
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");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,80 +0,0 @@
|
|||||||
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 service that periodically syncs Moonraker printer status
|
|
||||||
/// and print job history into the Extrudex database. Runs as a hosted
|
|
||||||
/// service and polls all active Moonraker printers on a configurable
|
|
||||||
/// interval to update printer state and map completed print jobs
|
|
||||||
/// to PrintJob and FilamentUsage entities.
|
|
||||||
///
|
|
||||||
/// Configuration is bound from the "MoonrakerPrinterSync" section in
|
|
||||||
/// appsettings.json. Set Enabled=false to disable without removing
|
|
||||||
/// the service registration.
|
|
||||||
/// </summary>
|
|
||||||
public class MoonrakerPrinterSyncJob : BackgroundService
|
|
||||||
{
|
|
||||||
private readonly IMoonrakerPrinterSyncService _syncService;
|
|
||||||
private readonly MoonrakerPrinterSyncOptions _options;
|
|
||||||
private readonly ILogger<MoonrakerPrinterSyncJob> _logger;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Creates a new MoonrakerPrinterSyncJob.
|
|
||||||
/// </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 MoonrakerPrinterSyncJob(
|
|
||||||
IMoonrakerPrinterSyncService syncService,
|
|
||||||
IOptions<MoonrakerPrinterSyncOptions> options,
|
|
||||||
ILogger<MoonrakerPrinterSyncJob> logger)
|
|
||||||
{
|
|
||||||
_syncService = syncService;
|
|
||||||
_options = options.Value;
|
|
||||||
_logger = logger;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
protected override async Task ExecuteAsync(CancellationToken stoppingToken)
|
|
||||||
{
|
|
||||||
if (!_options.Enabled)
|
|
||||||
{
|
|
||||||
_logger.LogInformation("Moonraker printer sync job is disabled via configuration — exiting");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
_logger.LogInformation(
|
|
||||||
"Moonraker printer 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(15), stoppingToken);
|
|
||||||
|
|
||||||
while (!stoppingToken.IsCancellationRequested)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var syncedCount = await _syncService.SyncAllAsync(stoppingToken);
|
|
||||||
|
|
||||||
_logger.LogInformation(
|
|
||||||
"Moonraker printer 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 Moonraker printer sync cycle — will retry in {Interval}",
|
|
||||||
_options.PollingInterval);
|
|
||||||
}
|
|
||||||
|
|
||||||
await Task.Delay(_options.PollingInterval, stoppingToken);
|
|
||||||
}
|
|
||||||
|
|
||||||
_logger.LogInformation("Moonraker printer sync job shutting down");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -10,9 +10,6 @@ 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)
|
||||||
@@ -55,12 +52,6 @@ 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.");
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -71,9 +62,6 @@ 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)
|
||||||
@@ -116,11 +104,5 @@ 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.");
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -17,9 +17,6 @@ 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
|
||||||
|
|||||||
@@ -1,19 +0,0 @@
|
|||||||
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;
|
|
||||||
}
|
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
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; }
|
|
||||||
}
|
|
||||||
@@ -1,56 +0,0 @@
|
|||||||
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();
|
|
||||||
}
|
|
||||||
@@ -1,36 +0,0 @@
|
|||||||
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; }
|
|
||||||
}
|
|
||||||
@@ -1,26 +0,0 @@
|
|||||||
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; }
|
|
||||||
}
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
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; }
|
|
||||||
}
|
|
||||||
@@ -1,44 +0,0 @@
|
|||||||
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; } = [];
|
|
||||||
}
|
|
||||||
@@ -93,20 +93,6 @@ 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>
|
||||||
|
|||||||
@@ -1,76 +0,0 @@
|
|||||||
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();
|
|
||||||
}
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
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);
|
|
||||||
}
|
|
||||||
@@ -1,131 +0,0 @@
|
|||||||
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);
|
|
||||||
}
|
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
using Extrudex.Domain.DTOs.Moonraker;
|
|
||||||
|
|
||||||
namespace Extrudex.Domain.Interfaces;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Service interface for syncing Moonraker printer data into the Extrudex database.
|
|
||||||
/// Handles periodic polling of printer status and mapping print job history
|
|
||||||
/// to PrintJob and FilamentUsage entities.
|
|
||||||
/// </summary>
|
|
||||||
public interface IMoonrakerPrinterSyncService
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Performs a single sync cycle: queries all active Moonraker printers,
|
|
||||||
/// fetches their current status and print job history, 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);
|
|
||||||
}
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
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;
|
|
||||||
}
|
|
||||||
@@ -1,41 +0,0 @@
|
|||||||
namespace Extrudex.Infrastructure.Configuration;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Configuration options for the MoonrakerPrinterSync background service.
|
|
||||||
/// Bound from appsettings.json under the "MoonrakerPrinterSync" section.
|
|
||||||
/// Controls polling interval, timeouts, and feature toggles for the
|
|
||||||
/// printer status and print job mapping service.
|
|
||||||
/// </summary>
|
|
||||||
public class MoonrakerPrinterSyncOptions
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// The section name in appsettings.json where these options are bound.
|
|
||||||
/// </summary>
|
|
||||||
public const string SectionName = "MoonrakerPrinterSync";
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// How often the background service polls Moonraker printers for status
|
|
||||||
/// and print job data. Default: 1 minute.
|
|
||||||
/// </summary>
|
|
||||||
public TimeSpan PollingInterval { get; set; } = TimeSpan.FromMinutes(1);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Timeout for individual HTTP requests to a Moonraker printer.
|
|
||||||
/// Default: 15 seconds.
|
|
||||||
/// </summary>
|
|
||||||
public TimeSpan RequestTimeout { get; set; } = TimeSpan.FromSeconds(15);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Whether the Moonraker printer sync service is enabled.
|
|
||||||
/// Set to false to disable without removing the service registration.
|
|
||||||
/// Default: true.
|
|
||||||
/// </summary>
|
|
||||||
public bool Enabled { get; set; } = true;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Maximum number of print history items to fetch per printer per sync cycle.
|
|
||||||
/// Controls the batch size when syncing print jobs from Moonraker.
|
|
||||||
/// Default: 25.
|
|
||||||
/// </summary>
|
|
||||||
public int HistoryBatchSize { get; set; } = 25;
|
|
||||||
}
|
|
||||||
@@ -68,15 +68,6 @@ 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()
|
||||||
@@ -98,14 +89,6 @@ 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)
|
||||||
|
|||||||
@@ -1,80 +1 @@
|
|||||||
using Extrudex.Domain.Base;
|
|
||||||
using Extrudex.Domain.Entities;
|
|
||||||
using Microsoft.EntityFrameworkCore;
|
|
||||||
|
|
||||||
namespace Extrudex.Infrastructure.Data;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Main EF Core database context for the Extrudex system.
|
|
||||||
/// Handles entity registration, snake_case naming, and automatic timestamp management.
|
|
||||||
/// </summary>
|
|
||||||
public class ExtrudexDbContext : DbContext
|
|
||||||
{
|
|
||||||
public ExtrudexDbContext(DbContextOptions<ExtrudexDbContext> options) : base(options) { }
|
|
||||||
|
|
||||||
// Lookup tables
|
|
||||||
public DbSet<MaterialBase> MaterialBases => Set<MaterialBase>();
|
|
||||||
public DbSet<MaterialFinish> MaterialFinishes => Set<MaterialFinish>();
|
|
||||||
public DbSet<MaterialModifier> MaterialModifiers => Set<MaterialModifier>();
|
|
||||||
|
|
||||||
// Core entities
|
|
||||||
public DbSet<Spool> Spools => Set<Spool>();
|
|
||||||
public DbSet<Printer> Printers => Set<Printer>();
|
|
||||||
public DbSet<AmsUnit> AmsUnits => Set<AmsUnit>();
|
|
||||||
public DbSet<AmsSlot> AmsSlots => Set<AmsSlot>();
|
|
||||||
public DbSet<PrintJob> PrintJobs => Set<PrintJob>();
|
|
||||||
public DbSet<FilamentUsage> FilamentUsages => Set<FilamentUsage>();
|
|
||||||
public DbSet<UsageLog> UsageLogs => Set<UsageLog>();
|
|
||||||
|
|
||||||
protected override void OnModelCreating(ModelBuilder modelBuilder)
|
|
||||||
{
|
|
||||||
base.OnModelCreating(modelBuilder);
|
|
||||||
|
|
||||||
// Apply all entity type configurations from the assembly
|
|
||||||
modelBuilder.ApplyConfigurationsFromAssembly(typeof(ExtrudexDbContext).Assembly);
|
|
||||||
|
|
||||||
// Apply seed data
|
|
||||||
modelBuilder.Entity<MaterialBase>().HasData(SeedData.MaterialBases);
|
|
||||||
modelBuilder.Entity<MaterialFinish>().HasData(SeedData.MaterialFinishes);
|
|
||||||
modelBuilder.Entity<MaterialModifier>().HasData(SeedData.MaterialModifiers);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Automatically set UpdatedAt on auditable entities during SaveChanges.
|
|
||||||
/// </summary>
|
|
||||||
public override int SaveChanges(bool acceptAllChangesOnSuccess)
|
|
||||||
{
|
|
||||||
SetAuditTimestamps();
|
|
||||||
return base.SaveChanges(acceptAllChangesOnSuccess);
|
|
||||||
}
|
|
||||||
|
|
||||||
public override async Task<int> SaveChangesAsync(
|
|
||||||
bool acceptAllChangesOnSuccess,
|
|
||||||
CancellationToken cancellationToken = default)
|
|
||||||
{
|
|
||||||
SetAuditTimestamps();
|
|
||||||
return await base.SaveChangesAsync(acceptAllChangesOnSuccess, cancellationToken);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Sets UpdatedAt on all auditable entities that have been modified.
|
|
||||||
/// Sets CreatedAt on all auditable entities that are being added.
|
|
||||||
/// </summary>
|
|
||||||
private void SetAuditTimestamps()
|
|
||||||
{
|
|
||||||
var entries = ChangeTracker.Entries<AuditableEntity>();
|
|
||||||
|
|
||||||
foreach (var entry in entries)
|
|
||||||
{
|
|
||||||
if (entry.State == EntityState.Added)
|
|
||||||
{
|
|
||||||
entry.Entity.CreatedAt = DateTime.UtcNow;
|
|
||||||
entry.Entity.UpdatedAt = DateTime.UtcNow;
|
|
||||||
}
|
|
||||||
else if (entry.State == EntityState.Modified)
|
|
||||||
{
|
|
||||||
entry.Entity.UpdatedAt = DateTime.UtcNow;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -104,6 +104,77 @@ namespace Extrudex.Infrastructure.Data.Migrations
|
|||||||
b.ToTable("ams_units", (string)null);
|
b.ToTable("ams_units", (string)null);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("Extrudex.Domain.Entities.FilamentUsage", b =>
|
||||||
|
{
|
||||||
|
b.Property<Guid>("Id")
|
||||||
|
.HasColumnType("uuid")
|
||||||
|
.HasColumnName("id");
|
||||||
|
|
||||||
|
b.Property<DateTime>("CreatedAt")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("timestamp with time zone")
|
||||||
|
.HasColumnName("created_at")
|
||||||
|
.HasDefaultValueSql("now() at time zone 'utc'");
|
||||||
|
|
||||||
|
b.Property<decimal>("GramsUsed")
|
||||||
|
.HasPrecision(10, 2)
|
||||||
|
.HasColumnType("numeric(10,2)")
|
||||||
|
.HasColumnName("grams_used");
|
||||||
|
|
||||||
|
b.Property<decimal>("MmExtruded")
|
||||||
|
.HasPrecision(12, 2)
|
||||||
|
.HasColumnType("numeric(12,2)")
|
||||||
|
.HasColumnName("mm_extruded");
|
||||||
|
|
||||||
|
b.Property<string>("Notes")
|
||||||
|
.HasMaxLength(2000)
|
||||||
|
.HasColumnType("character varying(2000)")
|
||||||
|
.HasColumnName("notes");
|
||||||
|
|
||||||
|
b.Property<Guid>("PrintJobId")
|
||||||
|
.HasColumnType("uuid")
|
||||||
|
.HasColumnName("print_job_id");
|
||||||
|
|
||||||
|
b.Property<Guid>("PrinterId")
|
||||||
|
.HasColumnType("uuid")
|
||||||
|
.HasColumnName("printer_id");
|
||||||
|
|
||||||
|
b.Property<DateTime>("RecordedAt")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("timestamp with time zone")
|
||||||
|
.HasColumnName("recorded_at")
|
||||||
|
.HasDefaultValueSql("now() at time zone 'utc'");
|
||||||
|
|
||||||
|
b.Property<Guid>("SpoolId")
|
||||||
|
.HasColumnType("uuid")
|
||||||
|
.HasColumnName("spool_id");
|
||||||
|
|
||||||
|
b.Property<DateTime>("UpdatedAt")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("timestamp with time zone")
|
||||||
|
.HasColumnName("updated_at")
|
||||||
|
.HasDefaultValueSql("now() at time zone 'utc'");
|
||||||
|
|
||||||
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
b.HasIndex("PrintJobId")
|
||||||
|
.HasDatabaseName("ix_filament_usages_print_job_id");
|
||||||
|
|
||||||
|
b.HasIndex("PrinterId")
|
||||||
|
.HasDatabaseName("ix_filament_usages_printer_id");
|
||||||
|
|
||||||
|
b.HasIndex("RecordedAt")
|
||||||
|
.HasDatabaseName("ix_filament_usages_recorded_at");
|
||||||
|
|
||||||
|
b.HasIndex("SpoolId")
|
||||||
|
.HasDatabaseName("ix_filament_usages_spool_id");
|
||||||
|
|
||||||
|
b.HasIndex("SpoolId", "RecordedAt")
|
||||||
|
.HasDatabaseName("ix_filament_usages_spool_id_recorded_at");
|
||||||
|
|
||||||
|
b.ToTable("filament_usages", (string)null);
|
||||||
|
});
|
||||||
|
|
||||||
modelBuilder.Entity("Extrudex.Domain.Entities.MaterialBase", b =>
|
modelBuilder.Entity("Extrudex.Domain.Entities.MaterialBase", b =>
|
||||||
{
|
{
|
||||||
b.Property<Guid>("Id")
|
b.Property<Guid>("Id")
|
||||||
@@ -145,50 +216,50 @@ namespace Extrudex.Infrastructure.Data.Migrations
|
|||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("10000000-0000-0000-0000-000000000001"),
|
Id = new Guid("10000000-0000-0000-0000-000000000001"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(6535),
|
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 291, DateTimeKind.Utc).AddTicks(9388),
|
||||||
DensityGperCm3 = 1.24m,
|
DensityGperCm3 = 1.24m,
|
||||||
Name = "PLA",
|
Name = "PLA",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(6535)
|
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 291, DateTimeKind.Utc).AddTicks(9388)
|
||||||
},
|
},
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("10000000-0000-0000-0000-000000000002"),
|
Id = new Guid("10000000-0000-0000-0000-000000000002"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7016),
|
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 291, DateTimeKind.Utc).AddTicks(9871),
|
||||||
DensityGperCm3 = 1.27m,
|
DensityGperCm3 = 1.27m,
|
||||||
Name = "PETG",
|
Name = "PETG",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7016)
|
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 291, DateTimeKind.Utc).AddTicks(9871)
|
||||||
},
|
},
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("10000000-0000-0000-0000-000000000003"),
|
Id = new Guid("10000000-0000-0000-0000-000000000003"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7027),
|
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 291, DateTimeKind.Utc).AddTicks(9881),
|
||||||
DensityGperCm3 = 1.04m,
|
DensityGperCm3 = 1.04m,
|
||||||
Name = "ABS",
|
Name = "ABS",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7028)
|
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 291, DateTimeKind.Utc).AddTicks(9881)
|
||||||
},
|
},
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("10000000-0000-0000-0000-000000000004"),
|
Id = new Guid("10000000-0000-0000-0000-000000000004"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7034),
|
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 291, DateTimeKind.Utc).AddTicks(9888),
|
||||||
DensityGperCm3 = 1.07m,
|
DensityGperCm3 = 1.07m,
|
||||||
Name = "ASA",
|
Name = "ASA",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7035)
|
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 291, DateTimeKind.Utc).AddTicks(9888)
|
||||||
},
|
},
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("10000000-0000-0000-0000-000000000005"),
|
Id = new Guid("10000000-0000-0000-0000-000000000005"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7042),
|
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 291, DateTimeKind.Utc).AddTicks(9895),
|
||||||
DensityGperCm3 = 1.21m,
|
DensityGperCm3 = 1.21m,
|
||||||
Name = "TPU",
|
Name = "TPU",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7042)
|
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 291, DateTimeKind.Utc).AddTicks(9895)
|
||||||
},
|
},
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("10000000-0000-0000-0000-000000000006"),
|
Id = new Guid("10000000-0000-0000-0000-000000000006"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7049),
|
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 291, DateTimeKind.Utc).AddTicks(9901),
|
||||||
DensityGperCm3 = 1.14m,
|
DensityGperCm3 = 1.14m,
|
||||||
Name = "Nylon",
|
Name = "Nylon",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7049)
|
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 291, DateTimeKind.Utc).AddTicks(9902)
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -232,122 +303,122 @@ namespace Extrudex.Infrastructure.Data.Migrations
|
|||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("20000000-0000-0000-0000-000000000001"),
|
Id = new Guid("20000000-0000-0000-0000-000000000001"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7291),
|
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(90),
|
||||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000001"),
|
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000001"),
|
||||||
Name = "Basic",
|
Name = "Basic",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7292)
|
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(90)
|
||||||
},
|
},
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("20000000-0000-0000-0000-000000000002"),
|
Id = new Guid("20000000-0000-0000-0000-000000000002"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7453),
|
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(251),
|
||||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000001"),
|
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000001"),
|
||||||
Name = "Matte",
|
Name = "Matte",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7453)
|
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(251)
|
||||||
},
|
},
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("20000000-0000-0000-0000-000000000003"),
|
Id = new Guid("20000000-0000-0000-0000-000000000003"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7461),
|
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(259),
|
||||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000001"),
|
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000001"),
|
||||||
Name = "Silk",
|
Name = "Silk",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7461)
|
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(259)
|
||||||
},
|
},
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("20000000-0000-0000-0000-000000000004"),
|
Id = new Guid("20000000-0000-0000-0000-000000000004"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7468),
|
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(266),
|
||||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000001"),
|
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000001"),
|
||||||
Name = "Glitter",
|
Name = "Glitter",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7468)
|
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(266)
|
||||||
},
|
},
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("20000000-0000-0000-0000-000000000005"),
|
Id = new Guid("20000000-0000-0000-0000-000000000005"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7474),
|
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(272),
|
||||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000001"),
|
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000001"),
|
||||||
Name = "Marble",
|
Name = "Marble",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7474)
|
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(272)
|
||||||
},
|
},
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("20000000-0000-0000-0000-000000000006"),
|
Id = new Guid("20000000-0000-0000-0000-000000000006"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7480),
|
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(278),
|
||||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000001"),
|
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000001"),
|
||||||
Name = "Sparkle",
|
Name = "Sparkle",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7481)
|
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(278)
|
||||||
},
|
},
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("20000000-0000-0000-0000-000000000007"),
|
Id = new Guid("20000000-0000-0000-0000-000000000007"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7487),
|
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(285),
|
||||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000002"),
|
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000002"),
|
||||||
Name = "Basic",
|
Name = "Basic",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7487)
|
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(285)
|
||||||
},
|
},
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("20000000-0000-0000-0000-000000000008"),
|
Id = new Guid("20000000-0000-0000-0000-000000000008"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7493),
|
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(291),
|
||||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000002"),
|
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000002"),
|
||||||
Name = "Matte",
|
Name = "Matte",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7493)
|
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(291)
|
||||||
},
|
},
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("20000000-0000-0000-0000-000000000009"),
|
Id = new Guid("20000000-0000-0000-0000-000000000009"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7500),
|
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(297),
|
||||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000002"),
|
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000002"),
|
||||||
Name = "Silk",
|
Name = "Silk",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7500)
|
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(298)
|
||||||
},
|
},
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("20000000-0000-0000-0000-000000000010"),
|
Id = new Guid("20000000-0000-0000-0000-000000000010"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7507),
|
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(304),
|
||||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000003"),
|
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000003"),
|
||||||
Name = "Basic",
|
Name = "Basic",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7507)
|
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(304)
|
||||||
},
|
},
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("20000000-0000-0000-0000-000000000011"),
|
Id = new Guid("20000000-0000-0000-0000-000000000011"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7513),
|
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(310),
|
||||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000003"),
|
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000003"),
|
||||||
Name = "Matte",
|
Name = "Matte",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7513)
|
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(310)
|
||||||
},
|
},
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("20000000-0000-0000-0000-000000000012"),
|
Id = new Guid("20000000-0000-0000-0000-000000000012"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7519),
|
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(316),
|
||||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000004"),
|
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000004"),
|
||||||
Name = "Basic",
|
Name = "Basic",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7520)
|
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(317)
|
||||||
},
|
},
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("20000000-0000-0000-0000-000000000013"),
|
Id = new Guid("20000000-0000-0000-0000-000000000013"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7526),
|
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(323),
|
||||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000004"),
|
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000004"),
|
||||||
Name = "Matte",
|
Name = "Matte",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7526)
|
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(323)
|
||||||
},
|
},
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("20000000-0000-0000-0000-000000000014"),
|
Id = new Guid("20000000-0000-0000-0000-000000000014"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7532),
|
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(329),
|
||||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000005"),
|
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000005"),
|
||||||
Name = "Basic",
|
Name = "Basic",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7532)
|
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(329)
|
||||||
},
|
},
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("20000000-0000-0000-0000-000000000015"),
|
Id = new Guid("20000000-0000-0000-0000-000000000015"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7538),
|
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(336),
|
||||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000006"),
|
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000006"),
|
||||||
Name = "Basic",
|
Name = "Basic",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7539)
|
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(336)
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -391,90 +462,90 @@ namespace Extrudex.Infrastructure.Data.Migrations
|
|||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("30000000-0000-0000-0000-000000000001"),
|
Id = new Guid("30000000-0000-0000-0000-000000000001"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7690),
|
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(482),
|
||||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000001"),
|
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000001"),
|
||||||
Name = "Carbon Fiber",
|
Name = "Carbon Fiber",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7690)
|
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(482)
|
||||||
},
|
},
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("30000000-0000-0000-0000-000000000002"),
|
Id = new Guid("30000000-0000-0000-0000-000000000002"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7838),
|
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(805),
|
||||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000001"),
|
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000001"),
|
||||||
Name = "Glass Fiber",
|
Name = "Glass Fiber",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7838)
|
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(806)
|
||||||
},
|
},
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("30000000-0000-0000-0000-000000000003"),
|
Id = new Guid("30000000-0000-0000-0000-000000000003"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7846),
|
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(815),
|
||||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000001"),
|
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000001"),
|
||||||
Name = "Wood Fill",
|
Name = "Wood Fill",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7846)
|
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(815)
|
||||||
},
|
},
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("30000000-0000-0000-0000-000000000004"),
|
Id = new Guid("30000000-0000-0000-0000-000000000004"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7853),
|
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(821),
|
||||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000001"),
|
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000001"),
|
||||||
Name = "Glow-in-the-Dark",
|
Name = "Glow-in-the-Dark",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7853)
|
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(821)
|
||||||
},
|
},
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("30000000-0000-0000-0000-000000000005"),
|
Id = new Guid("30000000-0000-0000-0000-000000000005"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7859),
|
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(828),
|
||||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000002"),
|
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000002"),
|
||||||
Name = "Carbon Fiber",
|
Name = "Carbon Fiber",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7859)
|
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(828)
|
||||||
},
|
},
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("30000000-0000-0000-0000-000000000006"),
|
Id = new Guid("30000000-0000-0000-0000-000000000006"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7865),
|
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(834),
|
||||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000002"),
|
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000002"),
|
||||||
Name = "Glass Fiber",
|
Name = "Glass Fiber",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7866)
|
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(834)
|
||||||
},
|
},
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("30000000-0000-0000-0000-000000000007"),
|
Id = new Guid("30000000-0000-0000-0000-000000000007"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7872),
|
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(840),
|
||||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000003"),
|
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000003"),
|
||||||
Name = "Carbon Fiber",
|
Name = "Carbon Fiber",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7872)
|
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(840)
|
||||||
},
|
},
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("30000000-0000-0000-0000-000000000008"),
|
Id = new Guid("30000000-0000-0000-0000-000000000008"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7878),
|
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(847),
|
||||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000003"),
|
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000003"),
|
||||||
Name = "Glass Fiber",
|
Name = "Glass Fiber",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7879)
|
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(847)
|
||||||
},
|
},
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("30000000-0000-0000-0000-000000000009"),
|
Id = new Guid("30000000-0000-0000-0000-000000000009"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7885),
|
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(853),
|
||||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000004"),
|
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000004"),
|
||||||
Name = "Carbon Fiber",
|
Name = "Carbon Fiber",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7885)
|
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(853)
|
||||||
},
|
},
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("30000000-0000-0000-0000-000000000010"),
|
Id = new Guid("30000000-0000-0000-0000-000000000010"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7891),
|
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(859),
|
||||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000006"),
|
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000006"),
|
||||||
Name = "Carbon Fiber",
|
Name = "Carbon Fiber",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7891)
|
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(860)
|
||||||
},
|
},
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("30000000-0000-0000-0000-000000000011"),
|
Id = new Guid("30000000-0000-0000-0000-000000000011"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7898),
|
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(866),
|
||||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000006"),
|
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000006"),
|
||||||
Name = "Glass Fiber",
|
Name = "Glass Fiber",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7898)
|
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(866)
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -806,81 +877,6 @@ namespace Extrudex.Infrastructure.Data.Migrations
|
|||||||
b.ToTable("spools", (string)null);
|
b.ToTable("spools", (string)null);
|
||||||
});
|
});
|
||||||
|
|
||||||
modelBuilder.Entity("Extrudex.Domain.Entities.UsageLog", b =>
|
|
||||||
{
|
|
||||||
b.Property<Guid>("Id")
|
|
||||||
.HasColumnType("uuid")
|
|
||||||
.HasColumnName("id");
|
|
||||||
|
|
||||||
b.Property<DateTime>("CreatedAt")
|
|
||||||
.ValueGeneratedOnAdd()
|
|
||||||
.HasColumnType("timestamp with time zone")
|
|
||||||
.HasColumnName("created_at")
|
|
||||||
.HasDefaultValueSql("now() at time zone 'utc'");
|
|
||||||
|
|
||||||
b.Property<string>("DataSource")
|
|
||||||
.IsRequired()
|
|
||||||
.HasMaxLength(50)
|
|
||||||
.HasColumnType("character varying(50)")
|
|
||||||
.HasColumnName("data_source");
|
|
||||||
|
|
||||||
b.Property<decimal>("GramsUsed")
|
|
||||||
.HasPrecision(10, 2)
|
|
||||||
.HasColumnType("numeric(10,2)")
|
|
||||||
.HasColumnName("grams_used");
|
|
||||||
|
|
||||||
b.Property<decimal?>("MmExtruded")
|
|
||||||
.HasPrecision(12, 2)
|
|
||||||
.HasColumnType("numeric(12,2)")
|
|
||||||
.HasColumnName("mm_extruded");
|
|
||||||
|
|
||||||
b.Property<string>("Notes")
|
|
||||||
.HasMaxLength(2000)
|
|
||||||
.HasColumnType("character varying(2000)")
|
|
||||||
.HasColumnName("notes");
|
|
||||||
|
|
||||||
b.Property<Guid?>("PrintJobId")
|
|
||||||
.HasColumnType("uuid")
|
|
||||||
.HasColumnName("print_job_id");
|
|
||||||
|
|
||||||
b.Property<Guid?>("PrinterId")
|
|
||||||
.HasColumnType("uuid")
|
|
||||||
.HasColumnName("printer_id");
|
|
||||||
|
|
||||||
b.Property<Guid>("SpoolId")
|
|
||||||
.HasColumnType("uuid")
|
|
||||||
.HasColumnName("spool_id");
|
|
||||||
|
|
||||||
b.Property<DateTime>("UpdatedAt")
|
|
||||||
.ValueGeneratedOnAdd()
|
|
||||||
.HasColumnType("timestamp with time zone")
|
|
||||||
.HasColumnName("updated_at")
|
|
||||||
.HasDefaultValueSql("now() at time zone 'utc'");
|
|
||||||
|
|
||||||
b.Property<DateTime>("UsageTimestamp")
|
|
||||||
.HasColumnType("timestamp with time zone")
|
|
||||||
.HasColumnName("usage_timestamp");
|
|
||||||
|
|
||||||
b.HasKey("Id");
|
|
||||||
|
|
||||||
b.HasIndex("DataSource")
|
|
||||||
.HasDatabaseName("ix_usage_logs_data_source");
|
|
||||||
|
|
||||||
b.HasIndex("PrintJobId")
|
|
||||||
.HasDatabaseName("ix_usage_logs_print_job_id");
|
|
||||||
|
|
||||||
b.HasIndex("PrinterId")
|
|
||||||
.HasDatabaseName("ix_usage_logs_printer_id");
|
|
||||||
|
|
||||||
b.HasIndex("SpoolId")
|
|
||||||
.HasDatabaseName("ix_usage_logs_spool_id");
|
|
||||||
|
|
||||||
b.HasIndex("UsageTimestamp")
|
|
||||||
.HasDatabaseName("ix_usage_logs_usage_timestamp");
|
|
||||||
|
|
||||||
b.ToTable("usage_logs", (string)null);
|
|
||||||
});
|
|
||||||
|
|
||||||
modelBuilder.Entity("Extrudex.Domain.Entities.AmsSlot", b =>
|
modelBuilder.Entity("Extrudex.Domain.Entities.AmsSlot", b =>
|
||||||
{
|
{
|
||||||
b.HasOne("Extrudex.Domain.Entities.AmsUnit", "AmsUnit")
|
b.HasOne("Extrudex.Domain.Entities.AmsUnit", "AmsUnit")
|
||||||
@@ -913,6 +909,36 @@ namespace Extrudex.Infrastructure.Data.Migrations
|
|||||||
b.Navigation("Printer");
|
b.Navigation("Printer");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("Extrudex.Domain.Entities.FilamentUsage", b =>
|
||||||
|
{
|
||||||
|
b.HasOne("Extrudex.Domain.Entities.PrintJob", "PrintJob")
|
||||||
|
.WithMany("FilamentUsages")
|
||||||
|
.HasForeignKey("PrintJobId")
|
||||||
|
.OnDelete(DeleteBehavior.Cascade)
|
||||||
|
.IsRequired()
|
||||||
|
.HasConstraintName("fk_filament_usages_print_job");
|
||||||
|
|
||||||
|
b.HasOne("Extrudex.Domain.Entities.Printer", "Printer")
|
||||||
|
.WithMany("FilamentUsages")
|
||||||
|
.HasForeignKey("PrinterId")
|
||||||
|
.OnDelete(DeleteBehavior.Restrict)
|
||||||
|
.IsRequired()
|
||||||
|
.HasConstraintName("fk_filament_usages_printer");
|
||||||
|
|
||||||
|
b.HasOne("Extrudex.Domain.Entities.Spool", "Spool")
|
||||||
|
.WithMany("FilamentUsages")
|
||||||
|
.HasForeignKey("SpoolId")
|
||||||
|
.OnDelete(DeleteBehavior.Restrict)
|
||||||
|
.IsRequired()
|
||||||
|
.HasConstraintName("fk_filament_usages_spool");
|
||||||
|
|
||||||
|
b.Navigation("PrintJob");
|
||||||
|
|
||||||
|
b.Navigation("Printer");
|
||||||
|
|
||||||
|
b.Navigation("Spool");
|
||||||
|
});
|
||||||
|
|
||||||
modelBuilder.Entity("Extrudex.Domain.Entities.MaterialFinish", b =>
|
modelBuilder.Entity("Extrudex.Domain.Entities.MaterialFinish", b =>
|
||||||
{
|
{
|
||||||
b.HasOne("Extrudex.Domain.Entities.MaterialBase", "MaterialBase")
|
b.HasOne("Extrudex.Domain.Entities.MaterialBase", "MaterialBase")
|
||||||
@@ -987,34 +1013,6 @@ namespace Extrudex.Infrastructure.Data.Migrations
|
|||||||
b.Navigation("MaterialModifier");
|
b.Navigation("MaterialModifier");
|
||||||
});
|
});
|
||||||
|
|
||||||
modelBuilder.Entity("Extrudex.Domain.Entities.UsageLog", b =>
|
|
||||||
{
|
|
||||||
b.HasOne("Extrudex.Domain.Entities.PrintJob", "PrintJob")
|
|
||||||
.WithMany()
|
|
||||||
.HasForeignKey("PrintJobId")
|
|
||||||
.OnDelete(DeleteBehavior.SetNull)
|
|
||||||
.HasConstraintName("fk_usage_logs_print_job");
|
|
||||||
|
|
||||||
b.HasOne("Extrudex.Domain.Entities.Printer", "Printer")
|
|
||||||
.WithMany()
|
|
||||||
.HasForeignKey("PrinterId")
|
|
||||||
.OnDelete(DeleteBehavior.SetNull)
|
|
||||||
.HasConstraintName("fk_usage_logs_printer");
|
|
||||||
|
|
||||||
b.HasOne("Extrudex.Domain.Entities.Spool", "Spool")
|
|
||||||
.WithMany()
|
|
||||||
.HasForeignKey("SpoolId")
|
|
||||||
.OnDelete(DeleteBehavior.Restrict)
|
|
||||||
.IsRequired()
|
|
||||||
.HasConstraintName("fk_usage_logs_spool");
|
|
||||||
|
|
||||||
b.Navigation("PrintJob");
|
|
||||||
|
|
||||||
b.Navigation("Printer");
|
|
||||||
|
|
||||||
b.Navigation("Spool");
|
|
||||||
});
|
|
||||||
|
|
||||||
modelBuilder.Entity("Extrudex.Domain.Entities.AmsUnit", b =>
|
modelBuilder.Entity("Extrudex.Domain.Entities.AmsUnit", b =>
|
||||||
{
|
{
|
||||||
b.Navigation("Slots");
|
b.Navigation("Slots");
|
||||||
@@ -1039,10 +1037,17 @@ namespace Extrudex.Infrastructure.Data.Migrations
|
|||||||
b.Navigation("Spools");
|
b.Navigation("Spools");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("Extrudex.Domain.Entities.PrintJob", b =>
|
||||||
|
{
|
||||||
|
b.Navigation("FilamentUsages");
|
||||||
|
});
|
||||||
|
|
||||||
modelBuilder.Entity("Extrudex.Domain.Entities.Printer", b =>
|
modelBuilder.Entity("Extrudex.Domain.Entities.Printer", b =>
|
||||||
{
|
{
|
||||||
b.Navigation("AmsUnits");
|
b.Navigation("AmsUnits");
|
||||||
|
|
||||||
|
b.Navigation("FilamentUsages");
|
||||||
|
|
||||||
b.Navigation("PrintJobs");
|
b.Navigation("PrintJobs");
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -1050,6 +1055,8 @@ namespace Extrudex.Infrastructure.Data.Migrations
|
|||||||
{
|
{
|
||||||
b.Navigation("AmsSlots");
|
b.Navigation("AmsSlots");
|
||||||
|
|
||||||
|
b.Navigation("FilamentUsages");
|
||||||
|
|
||||||
b.Navigation("PrintJobs");
|
b.Navigation("PrintJobs");
|
||||||
});
|
});
|
||||||
#pragma warning restore 612, 618
|
#pragma warning restore 612, 618
|
||||||
|
|||||||
@@ -1,158 +0,0 @@
|
|||||||
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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,139 +0,0 @@
|
|||||||
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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,447 +0,0 @@
|
|||||||
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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,320 +0,0 @@
|
|||||||
using Extrudex.Domain.DTOs.Moonraker;
|
|
||||||
using Extrudex.Domain.Entities;
|
|
||||||
using Extrudex.Domain.Enums;
|
|
||||||
using Extrudex.Domain.Interfaces;
|
|
||||||
using Extrudex.Infrastructure.Configuration;
|
|
||||||
using Extrudex.Infrastructure.Data;
|
|
||||||
using Microsoft.EntityFrameworkCore;
|
|
||||||
using Microsoft.Extensions.Logging;
|
|
||||||
|
|
||||||
namespace Extrudex.Infrastructure.Services;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Service that syncs Moonraker printer status and print job history into the
|
|
||||||
/// Extrudex database. Queries all active Moonraker printers, fetches their
|
|
||||||
/// current operational state, and maps completed print jobs to PrintJob and
|
|
||||||
/// FilamentUsage entities with derived gram calculations.
|
|
||||||
/// </summary>
|
|
||||||
public class MoonrakerPrinterSyncService : IMoonrakerPrinterSyncService
|
|
||||||
{
|
|
||||||
private readonly ExtrudexDbContext _dbContext;
|
|
||||||
private readonly IMoonrakerClient _moonrakerClient;
|
|
||||||
private readonly ILogger<MoonrakerPrinterSyncService> _logger;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Creates a new MoonrakerPrinterSyncService.
|
|
||||||
/// </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 MoonrakerPrinterSyncService(
|
|
||||||
ExtrudexDbContext dbContext,
|
|
||||||
IMoonrakerClient moonrakerClient,
|
|
||||||
ILogger<MoonrakerPrinterSyncService> logger)
|
|
||||||
{
|
|
||||||
_dbContext = dbContext;
|
|
||||||
_moonrakerClient = moonrakerClient;
|
|
||||||
_logger = logger;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public async Task<int> SyncAllAsync(CancellationToken cancellationToken = default)
|
|
||||||
{
|
|
||||||
_logger.LogInformation("Starting Moonraker printer 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)
|
|
||||||
.ThenInclude(s => s.MaterialBase)
|
|
||||||
.Include(p => p.PrintJobs)
|
|
||||||
.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
|
|
||||||
{
|
|
||||||
await SyncPrinterAsync(printer, cancellationToken);
|
|
||||||
syncedCount++;
|
|
||||||
}
|
|
||||||
catch (Exception ex) when (ex is not OperationCanceledException)
|
|
||||||
{
|
|
||||||
_logger.LogError(ex,
|
|
||||||
"Error syncing printer {PrinterName} ({Host}:{Port})",
|
|
||||||
printer.Name, printer.HostnameOrIp, printer.Port);
|
|
||||||
|
|
||||||
// Mark printer as offline if we can't reach it
|
|
||||||
printer.Status = PrinterStatus.Offline;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
await _dbContext.SaveChangesAsync(cancellationToken);
|
|
||||||
|
|
||||||
_logger.LogInformation(
|
|
||||||
"Moonraker printer sync cycle complete — {SyncedCount}/{TotalCount} printers synced",
|
|
||||||
syncedCount, printers.Count);
|
|
||||||
|
|
||||||
return syncedCount;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Syncs a single Moonraker printer: updates its status, fetches print history,
|
|
||||||
/// and maps new print jobs to database entities.
|
|
||||||
/// </summary>
|
|
||||||
private async Task SyncPrinterAsync(Printer printer, CancellationToken cancellationToken)
|
|
||||||
{
|
|
||||||
// Step 1: Fetch printer status
|
|
||||||
var printerInfo = await _moonrakerClient.GetPrinterInfoAsync(
|
|
||||||
printer.HostnameOrIp, printer.Port, printer.ApiKey, cancellationToken);
|
|
||||||
|
|
||||||
var printStats = await _moonrakerClient.GetPrintStatsAsync(
|
|
||||||
printer.HostnameOrIp, printer.Port, printer.ApiKey, cancellationToken);
|
|
||||||
|
|
||||||
// Step 2: Update printer status
|
|
||||||
UpdatePrinterStatus(printer, printerInfo, printStats);
|
|
||||||
printer.LastSeenAt = DateTime.UtcNow;
|
|
||||||
|
|
||||||
_logger.LogDebug(
|
|
||||||
"Printer {PrinterName} status updated to {Status}",
|
|
||||||
printer.Name, printer.Status);
|
|
||||||
|
|
||||||
// Step 3: Fetch and map print job history
|
|
||||||
var history = await _moonrakerClient.GetPrintHistoryAsync(
|
|
||||||
printer.HostnameOrIp, printer.Port, printer.ApiKey,
|
|
||||||
limit: 25,
|
|
||||||
cancellationToken);
|
|
||||||
|
|
||||||
if (history.Items.Count == 0)
|
|
||||||
{
|
|
||||||
_logger.LogDebug("No print history returned for printer {PrinterName}", printer.Name);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
var newJobsCount = await MapPrintJobsAsync(printer, history.Items, cancellationToken);
|
|
||||||
|
|
||||||
if (newJobsCount > 0)
|
|
||||||
{
|
|
||||||
_logger.LogInformation(
|
|
||||||
"Mapped {NewJobsCount} new print job(s) from printer {PrinterName}",
|
|
||||||
newJobsCount, printer.Name);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Updates the printer's operational status based on Moonraker telemetry.
|
|
||||||
/// Maps Klipper/Moonraker state strings to the PrinterStatus enum.
|
|
||||||
/// </summary>
|
|
||||||
private void UpdatePrinterStatus(
|
|
||||||
Printer printer,
|
|
||||||
MoonrakerPrinterInfo? printerInfo,
|
|
||||||
MoonrakerPrintStats? printStats)
|
|
||||||
{
|
|
||||||
// Prefer print_stats state — it's the most authoritative
|
|
||||||
if (printStats != null)
|
|
||||||
{
|
|
||||||
printer.Status = printStats.State.ToLowerInvariant() switch
|
|
||||||
{
|
|
||||||
"printing" => PrinterStatus.Printing,
|
|
||||||
"paused" => PrinterStatus.Paused,
|
|
||||||
"complete" => PrinterStatus.Idle,
|
|
||||||
"standby" => PrinterStatus.Idle,
|
|
||||||
"cancelled" => PrinterStatus.Idle,
|
|
||||||
"error" => PrinterStatus.Error,
|
|
||||||
_ => PrinterStatus.Idle
|
|
||||||
};
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Fall back to printer_info state
|
|
||||||
if (printerInfo != null)
|
|
||||||
{
|
|
||||||
printer.Status = printerInfo.State.ToLowerInvariant() switch
|
|
||||||
{
|
|
||||||
"ready" => PrinterStatus.Idle,
|
|
||||||
"startup" => PrinterStatus.Idle,
|
|
||||||
"shutdown" => PrinterStatus.Offline,
|
|
||||||
"error" => PrinterStatus.Error,
|
|
||||||
"cancelled" => PrinterStatus.Idle,
|
|
||||||
_ => printer.Status // Preserve existing status if unknown
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Maps Moonraker print job history items to Extrudex PrintJob and FilamentUsage entities.
|
|
||||||
/// Only creates records for jobs not already tracked (by Moonraker JobId stored in GcodeFilePath).
|
|
||||||
/// </summary>
|
|
||||||
private async Task<int> MapPrintJobsAsync(
|
|
||||||
Printer printer,
|
|
||||||
List<MoonrakerPrintJob> historyItems,
|
|
||||||
CancellationToken cancellationToken)
|
|
||||||
{
|
|
||||||
// Build a set of already-tracked Moonraker JobIds for this printer
|
|
||||||
// We store the Moonraker JobId in the GcodeFilePath field with a "moonraker:" prefix
|
|
||||||
var trackedJobIds = await _dbContext.PrintJobs
|
|
||||||
.Where(pj => pj.PrinterId == printer.Id && pj.GcodeFilePath != null && pj.GcodeFilePath.StartsWith("moonraker:"))
|
|
||||||
.Select(pj => pj.GcodeFilePath!)
|
|
||||||
.ToListAsync(cancellationToken);
|
|
||||||
|
|
||||||
var trackedIdSet = new HashSet<string>(trackedJobIds);
|
|
||||||
var newJobsCount = 0;
|
|
||||||
|
|
||||||
// Find the default spool for this printer (first active spool in AMS, or first active spool overall)
|
|
||||||
var defaultSpool = FindDefaultSpool(printer);
|
|
||||||
|
|
||||||
foreach (var moonrakerJob in historyItems)
|
|
||||||
{
|
|
||||||
var jobIdKey = $"moonraker:{moonrakerJob.JobId}";
|
|
||||||
|
|
||||||
if (trackedIdSet.Contains(jobIdKey))
|
|
||||||
{
|
|
||||||
continue; // Already tracked — skip
|
|
||||||
}
|
|
||||||
|
|
||||||
// Only map completed, cancelled, or errored jobs (not in_progress)
|
|
||||||
// In-progress jobs will be captured on the next cycle once they finish
|
|
||||||
if (moonrakerJob.Status == "in_progress")
|
|
||||||
{
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Map Moonraker job status to JobStatus enum
|
|
||||||
var jobStatus = moonrakerJob.Status.ToLowerInvariant() switch
|
|
||||||
{
|
|
||||||
"completed" => JobStatus.Completed,
|
|
||||||
"cancelled" => JobStatus.Cancelled,
|
|
||||||
"error" => JobStatus.Failed,
|
|
||||||
_ => JobStatus.Completed
|
|
||||||
};
|
|
||||||
|
|
||||||
// Calculate derived grams if we have a spool and filament data
|
|
||||||
decimal gramsDerived = 0m;
|
|
||||||
decimal filamentDiameterMm = 1.75m;
|
|
||||||
decimal materialDensity = 1.24m; // PLA default
|
|
||||||
|
|
||||||
if (defaultSpool != null)
|
|
||||||
{
|
|
||||||
filamentDiameterMm = defaultSpool.FilamentDiameterMm;
|
|
||||||
materialDensity = defaultSpool.MaterialBase.DensityGperCm3;
|
|
||||||
gramsDerived = CalculateGrams(moonrakerJob.FilamentUsedMm, filamentDiameterMm, materialDensity);
|
|
||||||
}
|
|
||||||
else if (moonrakerJob.FilamentUsedMm > 0)
|
|
||||||
{
|
|
||||||
gramsDerived = CalculateGrams(moonrakerJob.FilamentUsedMm, 1.75m, 1.24m);
|
|
||||||
_logger.LogWarning(
|
|
||||||
"No default spool found for printer {PrinterName} — using PLA defaults for grams derivation on job {JobId}",
|
|
||||||
printer.Name, moonrakerJob.JobId);
|
|
||||||
}
|
|
||||||
|
|
||||||
var printJob = new PrintJob
|
|
||||||
{
|
|
||||||
PrinterId = printer.Id,
|
|
||||||
SpoolId = defaultSpool?.Id ?? Guid.Empty,
|
|
||||||
PrintName = moonrakerJob.Filename,
|
|
||||||
GcodeFilePath = jobIdKey,
|
|
||||||
MmExtruded = moonrakerJob.FilamentUsedMm,
|
|
||||||
GramsDerived = gramsDerived,
|
|
||||||
StartedAt = moonrakerJob.StartTime,
|
|
||||||
CompletedAt = moonrakerJob.EndTime,
|
|
||||||
Status = jobStatus,
|
|
||||||
DataSource = DataSource.Moonraker,
|
|
||||||
FilamentDiameterAtPrintMm = filamentDiameterMm,
|
|
||||||
MaterialDensityAtPrint = materialDensity,
|
|
||||||
Notes = $"Auto-imported from Moonraker (JobId: {moonrakerJob.JobId})"
|
|
||||||
};
|
|
||||||
|
|
||||||
_dbContext.PrintJobs.Add(printJob);
|
|
||||||
|
|
||||||
// Create a FilamentUsage record if filament was consumed
|
|
||||||
if (moonrakerJob.FilamentUsedMm > 0 && defaultSpool != null)
|
|
||||||
{
|
|
||||||
var usage = new FilamentUsage
|
|
||||||
{
|
|
||||||
PrintJob = printJob,
|
|
||||||
SpoolId = defaultSpool.Id,
|
|
||||||
PrinterId = printer.Id,
|
|
||||||
GramsUsed = gramsDerived,
|
|
||||||
MmExtruded = moonrakerJob.FilamentUsedMm,
|
|
||||||
RecordedAt = DateTime.UtcNow,
|
|
||||||
Notes = $"Auto-imported from Moonraker history (JobId: {moonrakerJob.JobId})"
|
|
||||||
};
|
|
||||||
|
|
||||||
_dbContext.FilamentUsages.Add(usage);
|
|
||||||
}
|
|
||||||
|
|
||||||
newJobsCount++;
|
|
||||||
trackedIdSet.Add(jobIdKey); // Prevent duplicates within this batch
|
|
||||||
}
|
|
||||||
|
|
||||||
return newJobsCount;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Finds the default spool for a printer. Returns the first spool loaded
|
|
||||||
/// in an AMS slot, or null if no spool is available.
|
|
||||||
/// </summary>
|
|
||||||
private static Spool? FindDefaultSpool(Printer printer)
|
|
||||||
{
|
|
||||||
// Prefer the first active spool in an AMS slot
|
|
||||||
foreach (var amsUnit in printer.AmsUnits)
|
|
||||||
{
|
|
||||||
foreach (var slot in amsUnit.Slots)
|
|
||||||
{
|
|
||||||
if (slot.Spool != null && slot.Spool.IsActive && !slot.Spool.IsArchived)
|
|
||||||
{
|
|
||||||
return slot.Spool;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Calculates derived grams from millimeters extruded using the standard formula:
|
|
||||||
/// grams = mm_extruded × cross_section_area × material_density
|
|
||||||
/// where cross_section_area = π × (diameter / 2)²
|
|
||||||
/// </summary>
|
|
||||||
private static decimal CalculateGrams(decimal mmExtruded, decimal diameterMm, decimal densityGperCm3)
|
|
||||||
{
|
|
||||||
if (mmExtruded <= 0) return 0m;
|
|
||||||
|
|
||||||
var radiusCm = (double)diameterMm / 2.0 / 10.0; // mm to cm
|
|
||||||
var crossSectionAreaCm2 = Math.PI * radiusCm * radiusCm;
|
|
||||||
var mmToCm = (double)mmExtruded / 10.0;
|
|
||||||
|
|
||||||
var grams = mmToCm * crossSectionAreaCm2 * (double)densityGperCm3;
|
|
||||||
return (decimal)grams;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,9 +1,7 @@
|
|||||||
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;
|
||||||
@@ -52,9 +50,6 @@ 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>();
|
|
||||||
|
|
||||||
// ── Usage Logging ───────────────────────────────────────────
|
// ── Usage Logging ───────────────────────────────────────────
|
||||||
builder.Services.AddScoped<IUsageLogService, UsageLogService>();
|
builder.Services.AddScoped<IUsageLogService, UsageLogService>();
|
||||||
|
|
||||||
@@ -85,22 +80,6 @@ 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>();
|
|
||||||
|
|
||||||
// ── Moonraker Printer Sync (Background Service) ──────────
|
|
||||||
builder.Services.Configure<MoonrakerPrinterSyncOptions>(
|
|
||||||
builder.Configuration.GetSection(MoonrakerPrinterSyncOptions.SectionName));
|
|
||||||
builder.Services.AddScoped<IMoonrakerPrinterSyncService, MoonrakerPrinterSyncService>();
|
|
||||||
builder.Services.AddHostedService<MoonrakerPrinterSyncJob>();
|
|
||||||
|
|
||||||
// ── Health Checks ───────────────────────────────────────────
|
// ── Health Checks ───────────────────────────────────────────
|
||||||
builder.Services.AddHealthChecks()
|
builder.Services.AddHealthChecks()
|
||||||
.AddNpgSql(connectionString);
|
.AddNpgSql(connectionString);
|
||||||
|
|||||||
@@ -8,10 +8,5 @@
|
|||||||
},
|
},
|
||||||
"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
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -9,16 +9,5 @@
|
|||||||
"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
|
|
||||||
},
|
|
||||||
"MoonrakerPrinterSync": {
|
|
||||||
"PollingInterval": "00:01:00",
|
|
||||||
"RequestTimeout": "00:00:15",
|
|
||||||
"Enabled": true,
|
|
||||||
"HistoryBatchSize": 25
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -18,14 +18,13 @@ 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 15
|
sleep 10
|
||||||
|
|
||||||
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 " • Extrudex Web: http://localhost:5081"
|
echo " • Control Center 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"
|
||||||
|
|||||||
@@ -1,25 +1,6 @@
|
|||||||
services:
|
version: '3.8'
|
||||||
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
|
|
||||||
|
|
||||||
|
services:
|
||||||
extrudex-api:
|
extrudex-api:
|
||||||
build:
|
build:
|
||||||
context: ./backend
|
context: ./backend
|
||||||
@@ -30,14 +11,6 @@ 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"]
|
||||||
@@ -48,11 +21,11 @@ services:
|
|||||||
networks:
|
networks:
|
||||||
- extrudex-network
|
- extrudex-network
|
||||||
|
|
||||||
extrudex-web:
|
control-center-web:
|
||||||
build:
|
build:
|
||||||
context: ./frontend
|
context: ../Control-Center/frontend
|
||||||
dockerfile: Dockerfile
|
dockerfile: Dockerfile
|
||||||
container_name: extrudex-web
|
container_name: control-center-web
|
||||||
ports:
|
ports:
|
||||||
- "5081:80"
|
- "5081:80"
|
||||||
depends_on:
|
depends_on:
|
||||||
@@ -62,9 +35,6 @@ services:
|
|||||||
networks:
|
networks:
|
||||||
- extrudex-network
|
- extrudex-network
|
||||||
|
|
||||||
volumes:
|
|
||||||
extrudex-db-data:
|
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
extrudex-network:
|
extrudex-network:
|
||||||
driver: bridge
|
driver: bridge
|
||||||
@@ -1,13 +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 } from '@angular/common/http';
|
|
||||||
|
|
||||||
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(),
|
|
||||||
]
|
]
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -5,9 +5,6 @@
|
|||||||
<!-- Status Summary Bar — fleet-wide health at a glance -->
|
<!-- Status Summary Bar — fleet-wide health at a glance -->
|
||||||
<app-dashboard-summary></app-dashboard-summary>
|
<app-dashboard-summary></app-dashboard-summary>
|
||||||
|
|
||||||
<!-- Inventory Summary — filament metrics at a glance -->
|
|
||||||
<app-inventory-summary></app-inventory-summary>
|
|
||||||
|
|
||||||
<!-- Filament Inventory — routed view -->
|
<!-- Filament Inventory — routed view -->
|
||||||
<router-outlet />
|
<router-outlet />
|
||||||
</main>
|
</main>
|
||||||
@@ -1,12 +1,11 @@
|
|||||||
import { Component, ViewChild } from '@angular/core';
|
import { Component, ViewChild } from '@angular/core';
|
||||||
import { RouterOutlet } from '@angular/router';
|
import { RouterOutlet } from '@angular/router';
|
||||||
import { DashboardSummaryComponent } from './components/dashboard-summary/dashboard-summary.component';
|
import { DashboardSummaryComponent } from './components/dashboard-summary/dashboard-summary.component';
|
||||||
import { InventorySummaryComponent } from './components/inventory-summary/inventory-summary.component';
|
|
||||||
import { AgentSummary, SystemHealth } from './models/agent.model';
|
import { AgentSummary, SystemHealth } from './models/agent.model';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-root',
|
selector: 'app-root',
|
||||||
imports: [RouterOutlet, DashboardSummaryComponent, InventorySummaryComponent],
|
imports: [RouterOutlet, DashboardSummaryComponent],
|
||||||
templateUrl: './app.html',
|
templateUrl: './app.html',
|
||||||
styleUrl: './app.scss'
|
styleUrl: './app.scss'
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -1,76 +0,0 @@
|
|||||||
<!-- 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>
|
|
||||||
@@ -1,134 +0,0 @@
|
|||||||
/**
|
|
||||||
* 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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,158 +0,0 @@
|
|||||||
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(),
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,12 +1,6 @@
|
|||||||
<!-- Filament Inventory Table — with filters and low stock indicators -->
|
<!-- Filament Inventory Table — with 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">
|
||||||
@@ -22,7 +16,7 @@
|
|||||||
|
|
||||||
<!-- Filament Table -->
|
<!-- Filament Table -->
|
||||||
<table mat-table
|
<table mat-table
|
||||||
[dataSource]="filteredFilaments()"
|
[dataSource]="sortedFilaments()"
|
||||||
matSort
|
matSort
|
||||||
(matSortChange)="sortData($event)"
|
(matSortChange)="sortData($event)"
|
||||||
class="filament-table"
|
class="filament-table"
|
||||||
@@ -119,15 +113,7 @@
|
|||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
<!-- Filtered empty state -->
|
<!-- 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>
|
||||||
|
|||||||
@@ -2,12 +2,9 @@ import {
|
|||||||
ChangeDetectionStrategy,
|
ChangeDetectionStrategy,
|
||||||
Component,
|
Component,
|
||||||
Input,
|
Input,
|
||||||
OnInit,
|
|
||||||
computed,
|
computed,
|
||||||
inject,
|
|
||||||
signal,
|
signal,
|
||||||
} from '@angular/core';
|
} from '@angular/core';
|
||||||
import { FilamentService } from '../../services/filament.service';
|
|
||||||
import { CommonModule } from '@angular/common';
|
import { CommonModule } from '@angular/common';
|
||||||
import { MatTableModule } from '@angular/material/table';
|
import { MatTableModule } from '@angular/material/table';
|
||||||
import { MatChipsModule } from '@angular/material/chips';
|
import { MatChipsModule } from '@angular/material/chips';
|
||||||
@@ -15,7 +12,6 @@ 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 { FilamentFilterComponent, FilamentFilterState } from '../filament-filter/filament-filter.component';
|
|
||||||
import {
|
import {
|
||||||
Filament,
|
Filament,
|
||||||
StockLevel,
|
StockLevel,
|
||||||
@@ -44,17 +40,14 @@ export type FilamentColumn =
|
|||||||
MatProgressBarModule,
|
MatProgressBarModule,
|
||||||
MatTooltipModule,
|
MatTooltipModule,
|
||||||
MatSortModule,
|
MatSortModule,
|
||||||
FilamentFilterComponent,
|
|
||||||
],
|
],
|
||||||
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 implements OnInit {
|
export class FilamentTableComponent {
|
||||||
private readonly filamentService = inject(FilamentService);
|
/** Filament data input — reactive signal for live updates */
|
||||||
|
readonly filaments = signal<Filament[]>([]);
|
||||||
/** Filament data — reactive signal driven by FilamentService */
|
|
||||||
readonly filaments = this.filamentService.filaments;
|
|
||||||
|
|
||||||
/** Columns to display — defaults to all columns */
|
/** Columns to display — defaults to all columns */
|
||||||
@Input()
|
@Input()
|
||||||
@@ -77,24 +70,9 @@ export class FilamentTableComponent implements OnInit {
|
|||||||
/** 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(
|
||||||
@@ -107,20 +85,132 @@ export class FilamentTableComponent implements OnInit {
|
|||||||
this.filaments().filter((f) => classifyStockLevel(f) === 'critical').length
|
this.filaments().filter((f) => classifyStockLevel(f) === 'critical').length
|
||||||
);
|
);
|
||||||
|
|
||||||
ngOnInit(): void {
|
constructor() {
|
||||||
// Initialize sorted data from FilamentService
|
// Initialize sorted data from filaments
|
||||||
this.sortedFilaments.set([...this.filaments()]);
|
// (MatSort handles sorting via sortChange; we start unsorted)
|
||||||
|
|
||||||
|
// Development: seed with sample data for visual testing
|
||||||
|
// TODO: Replace with service data from FilamentService / SignalR
|
||||||
|
this.updateFilaments([
|
||||||
|
{
|
||||||
|
id: '1',
|
||||||
|
materialBaseId: 'm1',
|
||||||
|
materialBaseName: 'PLA',
|
||||||
|
materialFinishId: 'f1',
|
||||||
|
materialFinishName: 'Basic',
|
||||||
|
materialModifierId: null,
|
||||||
|
materialModifierName: null,
|
||||||
|
brand: 'Bambu Lab',
|
||||||
|
colorName: 'White',
|
||||||
|
colorHex: '#F5F5F5',
|
||||||
|
weightTotalGrams: 1000,
|
||||||
|
weightRemainingGrams: 850,
|
||||||
|
filamentDiameterMm: 1.75,
|
||||||
|
spoolSerial: 'SN-001',
|
||||||
|
purchasePrice: 25.00,
|
||||||
|
purchaseDate: '2026-01-15T00:00:00Z',
|
||||||
|
isActive: true,
|
||||||
|
createdAt: '2026-01-15T00:00:00Z',
|
||||||
|
updatedAt: '2026-04-20T00:00:00Z',
|
||||||
|
qrCodeUrl: '',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: '2',
|
||||||
|
materialBaseId: 'm2',
|
||||||
|
materialBaseName: 'PETG',
|
||||||
|
materialFinishId: 'f2',
|
||||||
|
materialFinishName: 'Matte',
|
||||||
|
materialModifierId: 'mod1',
|
||||||
|
materialModifierName: 'Carbon Fiber',
|
||||||
|
brand: 'Polymaker',
|
||||||
|
colorName: 'Fire Engine Red',
|
||||||
|
colorHex: '#FF0000',
|
||||||
|
weightTotalGrams: 1000,
|
||||||
|
weightRemainingGrams: 80,
|
||||||
|
filamentDiameterMm: 1.75,
|
||||||
|
spoolSerial: 'SN-002',
|
||||||
|
purchasePrice: 35.00,
|
||||||
|
purchaseDate: '2026-02-01T00:00:00Z',
|
||||||
|
isActive: true,
|
||||||
|
createdAt: '2026-02-01T00:00:00Z',
|
||||||
|
updatedAt: '2026-04-25T00:00:00Z',
|
||||||
|
qrCodeUrl: '',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: '3',
|
||||||
|
materialBaseId: 'm1',
|
||||||
|
materialBaseName: 'PLA',
|
||||||
|
materialFinishId: 'f1',
|
||||||
|
materialFinishName: 'Basic',
|
||||||
|
materialModifierId: null,
|
||||||
|
materialModifierName: null,
|
||||||
|
brand: 'eSun',
|
||||||
|
colorName: 'Sky Blue',
|
||||||
|
colorHex: '#87CEEB',
|
||||||
|
weightTotalGrams: 1000,
|
||||||
|
weightRemainingGrams: 200,
|
||||||
|
filamentDiameterMm: 1.75,
|
||||||
|
spoolSerial: 'SN-003',
|
||||||
|
purchasePrice: 20.00,
|
||||||
|
purchaseDate: '2026-03-10T00:00:00Z',
|
||||||
|
isActive: true,
|
||||||
|
createdAt: '2026-03-10T00:00:00Z',
|
||||||
|
updatedAt: '2026-04-26T00:00:00Z',
|
||||||
|
qrCodeUrl: '',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: '4',
|
||||||
|
materialBaseId: 'm3',
|
||||||
|
materialBaseName: 'ABS',
|
||||||
|
materialFinishId: 'f1',
|
||||||
|
materialFinishName: 'Basic',
|
||||||
|
materialModifierId: null,
|
||||||
|
materialModifierName: null,
|
||||||
|
brand: 'Hatchbox',
|
||||||
|
colorName: 'Black',
|
||||||
|
colorHex: '#1A1A1A',
|
||||||
|
weightTotalGrams: 1000,
|
||||||
|
weightRemainingGrams: 450,
|
||||||
|
filamentDiameterMm: 1.75,
|
||||||
|
spoolSerial: 'SN-004',
|
||||||
|
purchasePrice: 22.00,
|
||||||
|
purchaseDate: null,
|
||||||
|
isActive: true,
|
||||||
|
createdAt: '2026-01-20T00:00:00Z',
|
||||||
|
updatedAt: '2026-04-18T00:00:00Z',
|
||||||
|
qrCodeUrl: '',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: '5',
|
||||||
|
materialBaseId: 'm1',
|
||||||
|
materialBaseName: 'PLA',
|
||||||
|
materialFinishId: 'f3',
|
||||||
|
materialFinishName: 'Silk',
|
||||||
|
materialModifierId: null,
|
||||||
|
materialModifierName: null,
|
||||||
|
brand: 'Overturn',
|
||||||
|
colorName: 'Gold',
|
||||||
|
colorHex: '#FFD700',
|
||||||
|
weightTotalGrams: 500,
|
||||||
|
weightRemainingGrams: 15,
|
||||||
|
filamentDiameterMm: 1.75,
|
||||||
|
spoolSerial: 'SN-005',
|
||||||
|
purchasePrice: 28.00,
|
||||||
|
purchaseDate: null,
|
||||||
|
isActive: false,
|
||||||
|
createdAt: '2025-12-01T00:00:00Z',
|
||||||
|
updatedAt: '2026-04-01T00:00:00Z',
|
||||||
|
qrCodeUrl: '',
|
||||||
|
},
|
||||||
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Update filament data — called externally or from a SignalR handler */
|
/** Update filament data — called by parent or service */
|
||||||
updateFilaments(data: Filament[]): void {
|
updateFilaments(data: Filament[]): void {
|
||||||
this.filamentService.setFilaments(data);
|
this.filaments.set(data);
|
||||||
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()];
|
||||||
@@ -162,46 +252,6 @@ export class FilamentTableComponent implements OnInit {
|
|||||||
this.sortedFilaments.set(sorted);
|
this.sortedFilaments.set(sorted);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Handle filter changes from FilamentFilterComponent */
|
|
||||||
onFilterChange(state: FilamentFilterState): void {
|
|
||||||
this.filterState.set(state);
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Check if a filament matches the current filter state */
|
|
||||||
private matchesFilter(filament: Filament, filters: FilamentFilterState): boolean {
|
|
||||||
// Material filter — empty means all
|
|
||||||
if (
|
|
||||||
filters.materialBaseNames.length > 0 &&
|
|
||||||
!filters.materialBaseNames.includes(filament.materialBaseName)
|
|
||||||
) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Color search — empty means all
|
|
||||||
if (
|
|
||||||
filters.colorSearch &&
|
|
||||||
!filament.colorName.toLowerCase().includes(filters.colorSearch) &&
|
|
||||||
!filament.colorHex.toLowerCase().includes(filters.colorSearch)
|
|
||||||
) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Low stock filter — show only critical/low
|
|
||||||
if (filters.lowStockOnly) {
|
|
||||||
const level = classifyStockLevel(filament);
|
|
||||||
if (level !== 'critical' && level !== 'low') {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Active only filter
|
|
||||||
if (filters.activeOnly && !filament.isActive) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Template helper: get remaining percent */
|
/** Template helper: get remaining percent */
|
||||||
getRemainingPercent = getRemainingPercent;
|
getRemainingPercent = getRemainingPercent;
|
||||||
|
|
||||||
|
|||||||
@@ -1,108 +0,0 @@
|
|||||||
<!-- Inventory Dashboard Summary — filament metrics at a glance -->
|
|
||||||
<section class="inventory-summary" role="region" aria-label="Inventory summary">
|
|
||||||
|
|
||||||
<!-- Loading State -->
|
|
||||||
@if (loading()) {
|
|
||||||
<div class="summary-loading" role="status" aria-live="polite">
|
|
||||||
<mat-icon aria-hidden="true" class="spin">sync</mat-icon>
|
|
||||||
<span>Loading inventory...</span>
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
|
|
||||||
<!-- Error State -->
|
|
||||||
@else if (error()) {
|
|
||||||
<div class="summary-error" role="alert" aria-live="assertive">
|
|
||||||
<mat-icon aria-hidden="true">error_outline</mat-icon>
|
|
||||||
<span>{{ error() }}</span>
|
|
||||||
<button class="retry-btn" (click)="refresh()" aria-label="Retry loading inventory">
|
|
||||||
<mat-icon aria-hidden="true">refresh</mat-icon>
|
|
||||||
Retry
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
|
|
||||||
<!-- Loaded State -->
|
|
||||||
@else {
|
|
||||||
<!-- Health Status Indicator -->
|
|
||||||
<div class="summary-item health-status"
|
|
||||||
[class]="healthClass()"
|
|
||||||
[matTooltip]="healthLabel()"
|
|
||||||
matTooltipPosition="below">
|
|
||||||
<mat-icon aria-hidden="true">
|
|
||||||
@switch (healthClass()) {
|
|
||||||
@case ('critical') { error }
|
|
||||||
@case ('low') { warning }
|
|
||||||
@default { check_circle }
|
|
||||||
}
|
|
||||||
</mat-icon>
|
|
||||||
<span class="health-text">{{ healthLabel() }}</span>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Total Spool Count -->
|
|
||||||
<div class="summary-item metric-card"
|
|
||||||
matTooltip="Total filament spools in inventory"
|
|
||||||
matTooltipPosition="below">
|
|
||||||
<mat-icon aria-hidden="true" class="metric-icon">inventory_2</mat-icon>
|
|
||||||
<div class="metric-content">
|
|
||||||
<span class="metric-value">{{ totalCount() }}</span>
|
|
||||||
<span class="metric-label">Total Spools</span>
|
|
||||||
</div>
|
|
||||||
@if (activeCount() < totalCount()) {
|
|
||||||
<span class="metric-detail">{{ activeCount() }} active</span>
|
|
||||||
}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Low Stock Count -->
|
|
||||||
<div class="summary-item metric-card"
|
|
||||||
[class.has-alert]="hasLowStock()"
|
|
||||||
[class.has-critical]="hasCritical()"
|
|
||||||
[matTooltip]="hasCritical()
|
|
||||||
? criticalCount() + ' critical, ' + (lowStockCount() - criticalCount()) + ' low'
|
|
||||||
: hasLowStock()
|
|
||||||
? lowStockCount() + ' spools at or below 25% remaining'
|
|
||||||
: 'All spools above 25% remaining'"
|
|
||||||
matTooltipPosition="below">
|
|
||||||
<mat-icon aria-hidden="true" class="metric-icon">
|
|
||||||
@if (hasCritical()) { error }
|
|
||||||
@else if (hasLowStock()) { warning }
|
|
||||||
@else { check_circle }
|
|
||||||
</mat-icon>
|
|
||||||
<div class="metric-content">
|
|
||||||
<span class="metric-value">{{ lowStockCount() }}</span>
|
|
||||||
<span class="metric-label">Low Stock</span>
|
|
||||||
</div>
|
|
||||||
@if (hasCritical()) {
|
|
||||||
<span class="metric-detail critical-detail">{{ criticalCount() }} critical</span>
|
|
||||||
}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Estimated Total Value -->
|
|
||||||
<div class="summary-item metric-card"
|
|
||||||
matTooltip="Estimated total value of active spools"
|
|
||||||
matTooltipPosition="below">
|
|
||||||
<mat-icon aria-hidden="true" class="metric-icon">payments</mat-icon>
|
|
||||||
<div class="metric-content">
|
|
||||||
<span class="metric-value">{{ formatCurrency(totalValue()) }}</span>
|
|
||||||
<span class="metric-label">Est. Value</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Overall Remaining Stock Bar -->
|
|
||||||
<div class="summary-item metric-card stock-bar-card"
|
|
||||||
matTooltip="{{ formatWeight(totalRemainingGrams()) }} of {{ formatWeight(totalCapacityGrams()) }} remaining"
|
|
||||||
matTooltipPosition="below">
|
|
||||||
<mat-icon aria-hidden="true" class="metric-icon">line_weight</mat-icon>
|
|
||||||
<div class="metric-content stock-bar-content">
|
|
||||||
<div class="stock-bar-header">
|
|
||||||
<span class="metric-value">{{ overallRemainingPercent() }}%</span>
|
|
||||||
<span class="metric-label">Remaining</span>
|
|
||||||
</div>
|
|
||||||
<mat-progress-bar
|
|
||||||
mode="determinate"
|
|
||||||
[value]="overallRemainingPercent()"
|
|
||||||
[ngClass]="healthClass()">
|
|
||||||
</mat-progress-bar>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
</section>
|
|
||||||
@@ -1,257 +0,0 @@
|
|||||||
/**
|
|
||||||
* Inventory Summary Component Styles
|
|
||||||
* Touch-optimized for kiosk (Raspberry Pi 5) and mobile PWA
|
|
||||||
* Matches the existing dark theme from app.scss
|
|
||||||
*/
|
|
||||||
|
|
||||||
// Touch-optimized sizing
|
|
||||||
$touch-target-min: 48px;
|
|
||||||
$kiosk-font-primary: 24px;
|
|
||||||
$mobile-font-primary: 18px;
|
|
||||||
$spacing-unit: 8px;
|
|
||||||
|
|
||||||
// Status colors — high contrast for workshop/bright environments
|
|
||||||
$color-healthy: #4ade70; // Green
|
|
||||||
$color-low: #fbbf24; // Amber/Yellow
|
|
||||||
$color-critical: #f87171; // Red
|
|
||||||
$color-bg: #1a1a2e; // Matches app.scss
|
|
||||||
$color-text: #e0e0e0;
|
|
||||||
$color-text-muted: rgba(255, 255, 255, 0.7);
|
|
||||||
$color-card-bg: rgba(255, 255, 255, 0.05);
|
|
||||||
$color-card-border: rgba(255, 255, 255, 0.1);
|
|
||||||
|
|
||||||
.inventory-summary {
|
|
||||||
display: flex;
|
|
||||||
align-items: stretch;
|
|
||||||
gap: $spacing-unit * 2;
|
|
||||||
padding: $spacing-unit * 2;
|
|
||||||
overflow-x: auto;
|
|
||||||
-webkit-overflow-scrolling: touch;
|
|
||||||
scrollbar-width: thin;
|
|
||||||
|
|
||||||
@media (max-width: 600px) {
|
|
||||||
flex-wrap: wrap;
|
|
||||||
padding: $spacing-unit;
|
|
||||||
gap: $spacing-unit;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Health status indicator
|
|
||||||
.health-status {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: $spacing-unit;
|
|
||||||
padding: $spacing-unit $spacing-unit * 2;
|
|
||||||
border-radius: 24px;
|
|
||||||
min-height: $touch-target-min;
|
|
||||||
white-space: nowrap;
|
|
||||||
transition: background-color 0.3s ease;
|
|
||||||
|
|
||||||
&.healthy {
|
|
||||||
background-color: rgba($color-healthy, 0.15);
|
|
||||||
color: $color-healthy;
|
|
||||||
}
|
|
||||||
|
|
||||||
&.low {
|
|
||||||
background-color: rgba($color-low, 0.15);
|
|
||||||
color: $color-low;
|
|
||||||
}
|
|
||||||
|
|
||||||
&.critical {
|
|
||||||
background-color: rgba($color-critical, 0.15);
|
|
||||||
color: $color-critical;
|
|
||||||
}
|
|
||||||
|
|
||||||
.health-text {
|
|
||||||
font-size: 14px;
|
|
||||||
font-weight: 600;
|
|
||||||
letter-spacing: 0.02em;
|
|
||||||
|
|
||||||
@media (max-width: 480px) {
|
|
||||||
font-size: 12px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
mat-icon {
|
|
||||||
font-size: 20px !important;
|
|
||||||
width: 20px !important;
|
|
||||||
height: 20px !important;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Metric card
|
|
||||||
.metric-card {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: $spacing-unit;
|
|
||||||
padding: $spacing-unit $spacing-unit * 2;
|
|
||||||
background-color: $color-card-bg;
|
|
||||||
border: 1px solid $color-card-border;
|
|
||||||
border-radius: 12px;
|
|
||||||
min-height: $touch-target-min;
|
|
||||||
white-space: nowrap;
|
|
||||||
transition: border-color 0.2s ease, background-color 0.2s ease;
|
|
||||||
|
|
||||||
&:hover {
|
|
||||||
border-color: rgba(255, 255, 255, 0.2);
|
|
||||||
background-color: rgba(255, 255, 255, 0.08);
|
|
||||||
}
|
|
||||||
|
|
||||||
@media (max-width: 480px) {
|
|
||||||
padding: $spacing-unit;
|
|
||||||
}
|
|
||||||
|
|
||||||
&.has-alert {
|
|
||||||
border-color: rgba($color-low, 0.4);
|
|
||||||
}
|
|
||||||
|
|
||||||
&.has-critical {
|
|
||||||
border-color: rgba($color-critical, 0.5);
|
|
||||||
background-color: rgba($color-critical, 0.08);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.metric-icon {
|
|
||||||
color: $color-text-muted;
|
|
||||||
font-size: 22px !important;
|
|
||||||
width: 22px !important;
|
|
||||||
height: 22px !important;
|
|
||||||
|
|
||||||
.has-alert & {
|
|
||||||
color: $color-low;
|
|
||||||
}
|
|
||||||
|
|
||||||
.has-critical & {
|
|
||||||
color: $color-critical;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.metric-content {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
gap: 2px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.metric-value {
|
|
||||||
font-size: $kiosk-font-primary;
|
|
||||||
font-weight: 700;
|
|
||||||
line-height: 1.2;
|
|
||||||
color: $color-text;
|
|
||||||
|
|
||||||
@media (max-width: 480px) {
|
|
||||||
font-size: $mobile-font-primary;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.metric-label {
|
|
||||||
font-size: 11px;
|
|
||||||
color: $color-text-muted;
|
|
||||||
text-transform: uppercase;
|
|
||||||
letter-spacing: 0.08em;
|
|
||||||
}
|
|
||||||
|
|
||||||
.metric-detail {
|
|
||||||
font-size: 11px;
|
|
||||||
color: $color-text-muted;
|
|
||||||
margin-left: $spacing-unit;
|
|
||||||
|
|
||||||
&.critical-detail {
|
|
||||||
color: $color-critical;
|
|
||||||
font-weight: 600;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Stock bar card
|
|
||||||
.stock-bar-card {
|
|
||||||
flex: 1 1 200px;
|
|
||||||
min-width: 180px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.stock-bar-content {
|
|
||||||
flex: 1;
|
|
||||||
min-width: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.stock-bar-header {
|
|
||||||
display: flex;
|
|
||||||
align-items: baseline;
|
|
||||||
gap: $spacing-unit;
|
|
||||||
margin-bottom: 4px;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Progress bar color classes
|
|
||||||
::ng-deep .mat-mdc-progress-bar {
|
|
||||||
&.healthy .mdc-linear-progress__bar-inner {
|
|
||||||
background-color: $color-healthy !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
&.low .mdc-linear-progress__bar-inner {
|
|
||||||
background-color: $color-low !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
&.critical .mdc-linear-progress__bar-inner {
|
|
||||||
background-color: $color-critical !important;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Loading state
|
|
||||||
.summary-loading {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: $spacing-unit;
|
|
||||||
padding: $spacing-unit * 2;
|
|
||||||
color: $color-text-muted;
|
|
||||||
font-size: 14px;
|
|
||||||
|
|
||||||
.spin {
|
|
||||||
animation: spin 1s linear infinite;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@keyframes spin {
|
|
||||||
0% { transform: rotate(0deg); }
|
|
||||||
100% { transform: rotate(360deg); }
|
|
||||||
}
|
|
||||||
|
|
||||||
// Error state
|
|
||||||
.summary-error {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: $spacing-unit;
|
|
||||||
padding: $spacing-unit * 2;
|
|
||||||
background-color: rgba($color-critical, 0.1);
|
|
||||||
border: 1px solid rgba($color-critical, 0.3);
|
|
||||||
border-radius: 12px;
|
|
||||||
color: $color-critical;
|
|
||||||
font-size: 14px;
|
|
||||||
|
|
||||||
.retry-btn {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 4px;
|
|
||||||
background: transparent;
|
|
||||||
border: 1px solid rgba($color-critical, 0.4);
|
|
||||||
color: $color-critical;
|
|
||||||
padding: 4px 12px;
|
|
||||||
border-radius: 8px;
|
|
||||||
cursor: pointer;
|
|
||||||
font-size: 13px;
|
|
||||||
min-height: $touch-target-min - 8px;
|
|
||||||
transition: background-color 0.2s ease;
|
|
||||||
|
|
||||||
&:hover {
|
|
||||||
background-color: rgba($color-critical, 0.15);
|
|
||||||
}
|
|
||||||
|
|
||||||
mat-icon {
|
|
||||||
font-size: 16px !important;
|
|
||||||
width: 16px !important;
|
|
||||||
height: 16px !important;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Summary item base
|
|
||||||
.summary-item {
|
|
||||||
flex-shrink: 0;
|
|
||||||
}
|
|
||||||
@@ -1,176 +0,0 @@
|
|||||||
import {
|
|
||||||
ChangeDetectionStrategy,
|
|
||||||
Component,
|
|
||||||
OnDestroy,
|
|
||||||
OnInit,
|
|
||||||
computed,
|
|
||||||
inject,
|
|
||||||
signal,
|
|
||||||
} from '@angular/core';
|
|
||||||
import { CommonModule } from '@angular/common';
|
|
||||||
import { MatIconModule } from '@angular/material/icon';
|
|
||||||
import { MatChipsModule } from '@angular/material/chips';
|
|
||||||
import { MatTooltipModule } from '@angular/material/tooltip';
|
|
||||||
import { MatProgressBarModule } from '@angular/material/progress-bar';
|
|
||||||
import { FilamentService } from '../../services/filament.service';
|
|
||||||
import {
|
|
||||||
classifyStockLevel,
|
|
||||||
} from '../../models/filament.model';
|
|
||||||
import { Subscription } from 'rxjs';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Inventory Dashboard Summary — shows filament inventory at a glance.
|
|
||||||
*
|
|
||||||
* Displays:
|
|
||||||
* - Total filament spool count
|
|
||||||
* - Low stock count (spools ≤25% remaining, i.e. "low" or "critical")
|
|
||||||
* - Estimated total filament value (sum of purchase prices for active spools)
|
|
||||||
*
|
|
||||||
* Data is sourced from the shared FilamentService signal,
|
|
||||||
* which is loaded on init and can be refreshed via refresh().
|
|
||||||
*/
|
|
||||||
@Component({
|
|
||||||
selector: 'app-inventory-summary',
|
|
||||||
standalone: true,
|
|
||||||
imports: [
|
|
||||||
CommonModule,
|
|
||||||
MatIconModule,
|
|
||||||
MatChipsModule,
|
|
||||||
MatTooltipModule,
|
|
||||||
MatProgressBarModule,
|
|
||||||
],
|
|
||||||
templateUrl: './inventory-summary.component.html',
|
|
||||||
styleUrls: ['./inventory-summary.component.scss'],
|
|
||||||
changeDetection: ChangeDetectionStrategy.OnPush,
|
|
||||||
})
|
|
||||||
export class InventorySummaryComponent implements OnInit, OnDestroy {
|
|
||||||
private readonly filamentService = inject(FilamentService);
|
|
||||||
private subscription: Subscription | null = null;
|
|
||||||
|
|
||||||
/** All filament data — reactive signal from shared service */
|
|
||||||
readonly filaments = this.filamentService.filaments;
|
|
||||||
|
|
||||||
/** Loading state */
|
|
||||||
readonly loading = signal<boolean>(true);
|
|
||||||
|
|
||||||
/** Error state */
|
|
||||||
readonly error = signal<string | null>(null);
|
|
||||||
|
|
||||||
/** Computed: total number of filament spools */
|
|
||||||
readonly totalCount = computed(() => this.filaments().length);
|
|
||||||
|
|
||||||
/** Computed: count of active spools */
|
|
||||||
readonly activeCount = computed(
|
|
||||||
() => this.filaments().filter((f) => f.isActive).length
|
|
||||||
);
|
|
||||||
|
|
||||||
/** Computed: count of low/critical stock spools (≤25% remaining) */
|
|
||||||
readonly lowStockCount = computed(
|
|
||||||
() =>
|
|
||||||
this.filaments().filter(
|
|
||||||
(f) =>
|
|
||||||
classifyStockLevel(f) === 'low' ||
|
|
||||||
classifyStockLevel(f) === 'critical'
|
|
||||||
).length
|
|
||||||
);
|
|
||||||
|
|
||||||
/** Computed: count of critically low spools (≤10% remaining) */
|
|
||||||
readonly criticalCount = computed(
|
|
||||||
() =>
|
|
||||||
this.filaments().filter((f) => classifyStockLevel(f) === 'critical')
|
|
||||||
.length
|
|
||||||
);
|
|
||||||
|
|
||||||
/** Computed: estimated total value of active spools */
|
|
||||||
readonly totalValue = computed(() =>
|
|
||||||
this.filaments()
|
|
||||||
.filter((f) => f.isActive && f.purchasePrice !== null)
|
|
||||||
.reduce((sum, f) => sum + (f.purchasePrice ?? 0), 0)
|
|
||||||
);
|
|
||||||
|
|
||||||
/** Computed: total remaining weight across all spools in grams */
|
|
||||||
readonly totalRemainingGrams = computed(() =>
|
|
||||||
this.filaments().reduce((sum, f) => sum + f.weightRemainingGrams, 0)
|
|
||||||
);
|
|
||||||
|
|
||||||
/** Computed: total capacity weight across all spools in grams */
|
|
||||||
readonly totalCapacityGrams = computed(() =>
|
|
||||||
this.filaments().reduce((sum, f) => sum + f.weightTotalGrams, 0)
|
|
||||||
);
|
|
||||||
|
|
||||||
/** Computed: overall remaining percentage */
|
|
||||||
readonly overallRemainingPercent = computed(() => {
|
|
||||||
const capacity = this.totalCapacityGrams();
|
|
||||||
if (capacity <= 0) return 0;
|
|
||||||
return Math.round(
|
|
||||||
(this.totalRemainingGrams() / capacity) * 100
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
/** Computed: whether to show a low-stock alert */
|
|
||||||
readonly hasLowStock = computed(() => this.lowStockCount() > 0);
|
|
||||||
|
|
||||||
/** Computed: whether to show a critical-stock alert */
|
|
||||||
readonly hasCritical = computed(() => this.criticalCount() > 0);
|
|
||||||
|
|
||||||
/** Computed: status label for the inventory health */
|
|
||||||
readonly healthLabel = computed(() => {
|
|
||||||
if (this.hasCritical()) return 'Critical Stock';
|
|
||||||
if (this.hasLowStock()) return 'Low Stock Alert';
|
|
||||||
return 'Stock Healthy';
|
|
||||||
});
|
|
||||||
|
|
||||||
/** Computed: health status color class */
|
|
||||||
readonly healthClass = computed(() => {
|
|
||||||
if (this.hasCritical()) return 'critical';
|
|
||||||
if (this.hasLowStock()) return 'low';
|
|
||||||
return 'healthy';
|
|
||||||
});
|
|
||||||
|
|
||||||
ngOnInit(): void {
|
|
||||||
this.loadFilaments();
|
|
||||||
}
|
|
||||||
|
|
||||||
ngOnDestroy(): void {
|
|
||||||
this.subscription?.unsubscribe();
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Load filament data from the API via FilamentService */
|
|
||||||
loadFilaments(): void {
|
|
||||||
this.loading.set(true);
|
|
||||||
this.error.set(null);
|
|
||||||
this.subscription = this.filamentService.getFilaments().subscribe({
|
|
||||||
next: () => {
|
|
||||||
this.loading.set(false);
|
|
||||||
},
|
|
||||||
error: (err) => {
|
|
||||||
console.error('Failed to load filaments:', err);
|
|
||||||
this.error.set('Failed to load inventory data');
|
|
||||||
this.loading.set(false);
|
|
||||||
},
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Refresh data — called externally when data changes (e.g., SignalR notification) */
|
|
||||||
refresh(): void {
|
|
||||||
this.loadFilaments();
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Format weight for display */
|
|
||||||
formatWeight(grams: number): string {
|
|
||||||
if (grams >= 1000) {
|
|
||||||
return `${(grams / 1000).toFixed(1)}kg`;
|
|
||||||
}
|
|
||||||
return `${Math.round(grams)}g`;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Format currency for display */
|
|
||||||
formatCurrency(value: number): string {
|
|
||||||
return new Intl.NumberFormat('en-US', {
|
|
||||||
style: 'currency',
|
|
||||||
currency: 'USD',
|
|
||||||
minimumFractionDigits: 0,
|
|
||||||
maximumFractionDigits: 0,
|
|
||||||
}).format(value);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,52 +0,0 @@
|
|||||||
import { Injectable, inject } from '@angular/core';
|
|
||||||
import { HttpClient } from '@angular/common/http';
|
|
||||||
import { Observable, Subscription } from 'rxjs';
|
|
||||||
import { signal } from '@angular/core';
|
|
||||||
import { Filament } from '../models/filament.model';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* API base URL — matches the Extrudex backend.
|
|
||||||
* TODO: Move to environment config when environments are set up.
|
|
||||||
*/
|
|
||||||
const API_BASE_URL = '/api/filaments';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Service for managing filament inventory data.
|
|
||||||
*
|
|
||||||
* Provides:
|
|
||||||
* - A reactive `filaments` signal for components to bind to
|
|
||||||
* - REST methods for GET, POST, DELETE endpoints
|
|
||||||
* - Real-time updates via SignalR should be layered on top when the hub is ready
|
|
||||||
*/
|
|
||||||
@Injectable({ providedIn: 'root' })
|
|
||||||
export class FilamentService {
|
|
||||||
private readonly http = inject(HttpClient);
|
|
||||||
|
|
||||||
/** Reactive filament data — components read from this signal */
|
|
||||||
readonly filaments = signal<Filament[]>([]);
|
|
||||||
|
|
||||||
/** Fetch all filament spools and update the signal */
|
|
||||||
getFilaments(): Observable<Filament[]> {
|
|
||||||
const req = this.http.get<Filament[]>(API_BASE_URL);
|
|
||||||
req.subscribe({
|
|
||||||
next: (data) => this.filaments.set(data),
|
|
||||||
error: (err) => console.error('Failed to load filaments:', err),
|
|
||||||
});
|
|
||||||
return req;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Fetch a single filament by ID */
|
|
||||||
getFilament(id: string): Observable<Filament> {
|
|
||||||
return this.http.get<Filament>(`${API_BASE_URL}/${id}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Set filament data directly — used by components or SignalR handlers */
|
|
||||||
setFilaments(data: Filament[]): void {
|
|
||||||
this.filaments.set(data);
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Delete a filament spool by ID */
|
|
||||||
deleteFilament(id: string): Observable<void> {
|
|
||||||
return this.http.delete<void>(`${API_BASE_URL}/${id}`);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user