Compare commits
1 Commits
bb35ed1eab
...
agent/dex/
| Author | SHA1 | Date | |
|---|---|---|---|
| f5313b3362 |
@@ -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 }}"
|
||||||
5
.gitignore
vendored
5
.gitignore
vendored
@@ -3,8 +3,3 @@ obj/
|
|||||||
*.user
|
*.user
|
||||||
*.suo
|
*.suo
|
||||||
.vs/
|
.vs/
|
||||||
|
|
||||||
# Frontend build artifacts
|
|
||||||
frontend/dist/
|
|
||||||
frontend/node_modules/
|
|
||||||
frontend/.angular/
|
|
||||||
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}"
|
||||||
|
|||||||
@@ -413,92 +413,6 @@ public class PrintJobsController : ControllerBase
|
|||||||
return NoContent();
|
return NoContent();
|
||||||
}
|
}
|
||||||
|
|
||||||
// ── GET /api/printjobs/{id}/cost-summary ──────────────────────────
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets the material cost summary for a specific print job.
|
|
||||||
/// Calculates total material cost from filament usage (grams derived)
|
|
||||||
/// and the spool's purchase price. Returns warnings instead of errors
|
|
||||||
/// when cost data is unavailable.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="id">The unique identifier of the print job.</param>
|
|
||||||
/// <returns>A cost summary with breakdown and any warnings about missing data.</returns>
|
|
||||||
/// <response code="200">Returns the cost summary. Warnings field lists any missing data.</response>
|
|
||||||
/// <response code="404">If the print job with the given ID is not found.</response>
|
|
||||||
[HttpGet("{id:guid}/cost-summary")]
|
|
||||||
[ProducesResponseType(typeof(CostSummaryResponse), StatusCodes.Status200OK)]
|
|
||||||
[ProducesResponseType(StatusCodes.Status404NotFound)]
|
|
||||||
public async Task<ActionResult<CostSummaryResponse>> GetCostSummary(Guid id)
|
|
||||||
{
|
|
||||||
_logger.LogDebug("Getting cost summary for print job {Id}", id);
|
|
||||||
|
|
||||||
var job = await _dbContext.PrintJobs
|
|
||||||
.Include(j => j.Spool)
|
|
||||||
.ThenInclude(s => s!.MaterialBase)
|
|
||||||
.FirstOrDefaultAsync(j => j.Id == id);
|
|
||||||
|
|
||||||
if (job is null)
|
|
||||||
{
|
|
||||||
_logger.LogWarning("Print job {Id} not found for cost summary", id);
|
|
||||||
return NotFound(new { error = $"Print job with ID '{id}' not found." });
|
|
||||||
}
|
|
||||||
|
|
||||||
var warnings = new List<string>();
|
|
||||||
var spool = job.Spool;
|
|
||||||
|
|
||||||
// Build response with what we have
|
|
||||||
var response = new CostSummaryResponse
|
|
||||||
{
|
|
||||||
PrintJobId = job.Id,
|
|
||||||
PrintName = job.PrintName,
|
|
||||||
SpoolId = job.SpoolId,
|
|
||||||
SpoolSerial = spool?.SpoolSerial ?? string.Empty,
|
|
||||||
SpoolBrand = spool?.Brand ?? string.Empty,
|
|
||||||
SpoolColorName = spool?.ColorName ?? string.Empty,
|
|
||||||
MmExtruded = job.MmExtruded,
|
|
||||||
GramsDerived = job.GramsDerived,
|
|
||||||
SpoolPurchasePrice = spool?.PurchasePrice,
|
|
||||||
SpoolWeightTotalGrams = spool?.WeightTotalGrams,
|
|
||||||
StoredCostPerPrint = job.CostPerPrint
|
|
||||||
};
|
|
||||||
|
|
||||||
// Validate spool data availability
|
|
||||||
if (spool is null)
|
|
||||||
{
|
|
||||||
warnings.Add("Spool data is not available for this print job. Cost cannot be calculated.");
|
|
||||||
response.Warnings = warnings;
|
|
||||||
return Ok(response);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check if we can calculate cost
|
|
||||||
if (!spool.PurchasePrice.HasValue)
|
|
||||||
{
|
|
||||||
warnings.Add("Spool purchase price is not set. Cost per gram and total material cost cannot be calculated.");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (spool.WeightTotalGrams <= 0)
|
|
||||||
{
|
|
||||||
warnings.Add("Spool total weight is zero or invalid. Cost per gram and total material cost cannot be calculated.");
|
|
||||||
}
|
|
||||||
|
|
||||||
// If we have enough data, calculate the cost
|
|
||||||
if (spool.PurchasePrice.HasValue && spool.WeightTotalGrams > 0)
|
|
||||||
{
|
|
||||||
var pricePerGram = spool.PurchasePrice.Value / spool.WeightTotalGrams;
|
|
||||||
response.PricePerGram = Math.Round(pricePerGram, 4);
|
|
||||||
response.TotalMaterialCost = Math.Round(job.GramsDerived * pricePerGram, 4);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Warn if grams derived is zero but mm extruded is non-zero
|
|
||||||
if (job.GramsDerived == 0 && job.MmExtruded > 0)
|
|
||||||
{
|
|
||||||
warnings.Add("GramsDerived is zero despite MmExtruded being non-zero. Cost may be inaccurate. Consider re-deriving grams from filament parameters.");
|
|
||||||
}
|
|
||||||
|
|
||||||
response.Warnings = warnings;
|
|
||||||
return Ok(response);
|
|
||||||
}
|
|
||||||
|
|
||||||
// ── Gram Derivation Formula ────────────────────────────────────
|
// ── Gram Derivation Formula ────────────────────────────────────
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
@@ -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,55 +0,0 @@
|
|||||||
namespace Extrudex.API.DTOs.PrintJobs;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Response DTO for the cost summary of a print job.
|
|
||||||
/// Provides a breakdown of material cost based on filament usage
|
|
||||||
/// and spool pricing data. If cost data is incomplete, warnings
|
|
||||||
/// are returned instead of throwing an error.
|
|
||||||
/// </summary>
|
|
||||||
public class CostSummaryResponse
|
|
||||||
{
|
|
||||||
/// <summary>Unique identifier of the print job.</summary>
|
|
||||||
public Guid PrintJobId { get; set; }
|
|
||||||
|
|
||||||
/// <summary>Human-readable name of the print job.</summary>
|
|
||||||
public string PrintName { get; set; } = string.Empty;
|
|
||||||
|
|
||||||
/// <summary>Foreign key to the spool used for this print job.</summary>
|
|
||||||
public Guid SpoolId { get; set; }
|
|
||||||
|
|
||||||
/// <summary>Serial number of the spool.</summary>
|
|
||||||
public string SpoolSerial { get; set; } = string.Empty;
|
|
||||||
|
|
||||||
/// <summary>Brand of the spool.</summary>
|
|
||||||
public string SpoolBrand { get; set; } = string.Empty;
|
|
||||||
|
|
||||||
/// <summary>Color name of the spool.</summary>
|
|
||||||
public string SpoolColorName { get; set; } = string.Empty;
|
|
||||||
|
|
||||||
/// <summary>Total millimeters of filament extruded during this print.</summary>
|
|
||||||
public decimal MmExtruded { get; set; }
|
|
||||||
|
|
||||||
/// <summary>Derived grams consumed for this print job.</summary>
|
|
||||||
public decimal GramsDerived { get; set; }
|
|
||||||
|
|
||||||
/// <summary>Purchase price of the full spool, if available.</summary>
|
|
||||||
public decimal? SpoolPurchasePrice { get; set; }
|
|
||||||
|
|
||||||
/// <summary>Total weight of the spool in grams when full.</summary>
|
|
||||||
public decimal? SpoolWeightTotalGrams { get; set; }
|
|
||||||
|
|
||||||
/// <summary>Calculated price per gram (purchase price / total weight), if available.</summary>
|
|
||||||
public decimal? PricePerGram { get; set; }
|
|
||||||
|
|
||||||
/// <summary>Calculated total material cost for this print job, if available.</summary>
|
|
||||||
public decimal? TotalMaterialCost { get; set; }
|
|
||||||
|
|
||||||
/// <summary>The CostPerPrint stored on the print job entity, if set.</summary>
|
|
||||||
public decimal? StoredCostPerPrint { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Warnings about missing data that prevent cost calculation.
|
|
||||||
/// Empty if all data is available and cost was calculated successfully.
|
|
||||||
/// </summary>
|
|
||||||
public List<string> Warnings { get; set; } = new();
|
|
||||||
}
|
|
||||||
@@ -1,69 +0,0 @@
|
|||||||
using FluentValidation;
|
|
||||||
using Microsoft.AspNetCore.Mvc;
|
|
||||||
using Microsoft.AspNetCore.Mvc.Filters;
|
|
||||||
|
|
||||||
namespace Extrudex.API.Filters;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Action filter that automatically validates request DTOs using FluentValidation
|
|
||||||
/// validators registered in DI. Runs before the controller action executes.
|
|
||||||
/// Returns 400 Bad Request with validation errors if validation fails.
|
|
||||||
/// </summary>
|
|
||||||
public class FluentValidationFilter : IAsyncActionFilter
|
|
||||||
{
|
|
||||||
private readonly IServiceProvider _serviceProvider;
|
|
||||||
private readonly ILogger<FluentValidationFilter> _logger;
|
|
||||||
|
|
||||||
public FluentValidationFilter(IServiceProvider serviceProvider, ILogger<FluentValidationFilter> logger)
|
|
||||||
{
|
|
||||||
_serviceProvider = serviceProvider;
|
|
||||||
_logger = logger;
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next)
|
|
||||||
{
|
|
||||||
foreach (var argument in context.ActionArguments.Values)
|
|
||||||
{
|
|
||||||
if (argument is null) continue;
|
|
||||||
|
|
||||||
var argumentType = argument.GetType();
|
|
||||||
var validatorType = typeof(IValidator<>).MakeGenericType(argumentType);
|
|
||||||
|
|
||||||
// Try to resolve a validator for this argument type
|
|
||||||
var validator = _serviceProvider.GetService(validatorType) as IValidator;
|
|
||||||
if (validator is null) continue;
|
|
||||||
|
|
||||||
_logger.LogDebug("Validating {Type} with {Validator}", argumentType.Name, validator.GetType().Name);
|
|
||||||
|
|
||||||
var validationResult = await validator.ValidateAsync(
|
|
||||||
new ValidationContext<object>(argument), context.HttpContext.RequestAborted);
|
|
||||||
|
|
||||||
if (!validationResult.IsValid)
|
|
||||||
{
|
|
||||||
foreach (var error in validationResult.Errors)
|
|
||||||
{
|
|
||||||
context.ModelState.AddModelError(error.PropertyName, error.ErrorMessage);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!context.ModelState.IsValid)
|
|
||||||
{
|
|
||||||
var errors = context.ModelState
|
|
||||||
.Where(kvp => kvp.Value?.Errors.Count > 0)
|
|
||||||
.ToDictionary(
|
|
||||||
kvp => kvp.Key,
|
|
||||||
kvp => kvp.Value!.Errors.Select(e => e.ErrorMessage).ToArray());
|
|
||||||
|
|
||||||
context.Result = new BadRequestObjectResult(new
|
|
||||||
{
|
|
||||||
title = "Validation failed",
|
|
||||||
status = 400,
|
|
||||||
errors
|
|
||||||
});
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
await next();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -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");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,126 +0,0 @@
|
|||||||
using Extrudex.API.DTOs.Filaments;
|
|
||||||
using FluentValidation;
|
|
||||||
|
|
||||||
namespace Extrudex.API.Validators;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Validation rules for creating a Filament (Spool) via the /filaments route.
|
|
||||||
/// Mirrors the domain rules enforced in the controller and ensures consistent
|
|
||||||
/// validation regardless of the request pipeline entry point.
|
|
||||||
/// </summary>
|
|
||||||
public class CreateFilamentRequestValidator : AbstractValidator<CreateFilamentRequest>
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Initializes validation rules for <see cref="CreateFilamentRequest"/>.
|
|
||||||
/// </summary>
|
|
||||||
public CreateFilamentRequestValidator()
|
|
||||||
{
|
|
||||||
RuleFor(x => x.MaterialBaseId)
|
|
||||||
.NotEmpty().WithMessage("MaterialBaseId is required.");
|
|
||||||
|
|
||||||
RuleFor(x => x.MaterialFinishId)
|
|
||||||
.NotEmpty().WithMessage("MaterialFinishId is required.");
|
|
||||||
|
|
||||||
RuleFor(x => x.Brand)
|
|
||||||
.NotEmpty().WithMessage("Brand is required.")
|
|
||||||
.MaximumLength(200).WithMessage("Brand must not exceed 200 characters.");
|
|
||||||
|
|
||||||
RuleFor(x => x.ColorName)
|
|
||||||
.NotEmpty().WithMessage("ColorName is required.")
|
|
||||||
.MaximumLength(200).WithMessage("ColorName must not exceed 200 characters.");
|
|
||||||
|
|
||||||
RuleFor(x => x.ColorHex)
|
|
||||||
.NotEmpty().WithMessage("ColorHex is required.")
|
|
||||||
.Matches(@"^#[0-9A-Fa-f]{6}$").WithMessage("ColorHex must be a valid hex color code (e.g., #FF0000).");
|
|
||||||
|
|
||||||
RuleFor(x => x.WeightTotalGrams)
|
|
||||||
.GreaterThan(0).WithMessage("Total weight must be greater than zero.");
|
|
||||||
|
|
||||||
RuleFor(x => x.WeightRemainingGrams)
|
|
||||||
.GreaterThanOrEqualTo(0).WithMessage("Remaining weight must be non-negative.");
|
|
||||||
|
|
||||||
RuleFor(x => x.WeightRemainingGrams)
|
|
||||||
.LessThanOrEqualTo(x => x.WeightTotalGrams)
|
|
||||||
.WithMessage("WeightRemainingGrams cannot exceed WeightTotalGrams.");
|
|
||||||
|
|
||||||
RuleFor(x => x.FilamentDiameterMm)
|
|
||||||
.GreaterThan(0).WithMessage("Filament diameter must be greater than zero.");
|
|
||||||
|
|
||||||
RuleFor(x => x.SpoolSerial)
|
|
||||||
.NotEmpty().WithMessage("SpoolSerial is required.")
|
|
||||||
.MaximumLength(200).WithMessage("SpoolSerial must not exceed 200 characters.");
|
|
||||||
|
|
||||||
When(x => x.PurchasePrice.HasValue, () =>
|
|
||||||
{
|
|
||||||
RuleFor(x => x.PurchasePrice!.Value)
|
|
||||||
.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.");
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Validation rules for updating a Filament (Spool) via the /filaments route.
|
|
||||||
/// Enforces the same domain rules as creation, plus ensures the updated
|
|
||||||
/// WeightRemainingGrams does not exceed the updated WeightTotalGrams.
|
|
||||||
/// </summary>
|
|
||||||
public class UpdateFilamentRequestValidator : AbstractValidator<UpdateFilamentRequest>
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Initializes validation rules for <see cref="UpdateFilamentRequest"/>.
|
|
||||||
/// </summary>
|
|
||||||
public UpdateFilamentRequestValidator()
|
|
||||||
{
|
|
||||||
RuleFor(x => x.MaterialBaseId)
|
|
||||||
.NotEmpty().WithMessage("MaterialBaseId is required.");
|
|
||||||
|
|
||||||
RuleFor(x => x.MaterialFinishId)
|
|
||||||
.NotEmpty().WithMessage("MaterialFinishId is required.");
|
|
||||||
|
|
||||||
RuleFor(x => x.Brand)
|
|
||||||
.NotEmpty().WithMessage("Brand is required.")
|
|
||||||
.MaximumLength(200).WithMessage("Brand must not exceed 200 characters.");
|
|
||||||
|
|
||||||
RuleFor(x => x.ColorName)
|
|
||||||
.NotEmpty().WithMessage("ColorName is required.")
|
|
||||||
.MaximumLength(200).WithMessage("ColorName must not exceed 200 characters.");
|
|
||||||
|
|
||||||
RuleFor(x => x.ColorHex)
|
|
||||||
.NotEmpty().WithMessage("ColorHex is required.")
|
|
||||||
.Matches(@"^#[0-9A-Fa-f]{6}$").WithMessage("ColorHex must be a valid hex color code (e.g., #FF0000).");
|
|
||||||
|
|
||||||
RuleFor(x => x.WeightTotalGrams)
|
|
||||||
.GreaterThan(0).WithMessage("Total weight must be greater than zero.");
|
|
||||||
|
|
||||||
RuleFor(x => x.WeightRemainingGrams)
|
|
||||||
.GreaterThanOrEqualTo(0).WithMessage("Remaining weight must be non-negative.");
|
|
||||||
|
|
||||||
RuleFor(x => x.WeightRemainingGrams)
|
|
||||||
.LessThanOrEqualTo(x => x.WeightTotalGrams)
|
|
||||||
.WithMessage("WeightRemainingGrams cannot exceed WeightTotalGrams.");
|
|
||||||
|
|
||||||
RuleFor(x => x.FilamentDiameterMm)
|
|
||||||
.GreaterThan(0).WithMessage("Filament diameter must be greater than zero.");
|
|
||||||
|
|
||||||
RuleFor(x => x.SpoolSerial)
|
|
||||||
.NotEmpty().WithMessage("SpoolSerial is required.")
|
|
||||||
.MaximumLength(200).WithMessage("SpoolSerial must not exceed 200 characters.");
|
|
||||||
|
|
||||||
When(x => x.PurchasePrice.HasValue, () =>
|
|
||||||
{
|
|
||||||
RuleFor(x => x.PurchasePrice!.Value)
|
|
||||||
.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
|
||||||
@@ -30,8 +27,4 @@ COPY --from=build /app/publish .
|
|||||||
# ASP.NET Core listens on 8080 by default in .NET 8+
|
# ASP.NET Core listens on 8080 by default in .NET 8+
|
||||||
EXPOSE 8080
|
EXPOSE 8080
|
||||||
|
|
||||||
# Health check against /health endpoint
|
|
||||||
HEALTHCHECK --interval=30s --timeout=5s --start-period=10s --retries=3 \
|
|
||||||
CMD curl --fail http://localhost:8080/health || exit 1
|
|
||||||
|
|
||||||
ENTRYPOINT ["dotnet", "Extrudex.dll"]
|
ENTRYPOINT ["dotnet", "Extrudex.dll"]
|
||||||
@@ -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; } = [];
|
|
||||||
}
|
|
||||||
@@ -1,73 +0,0 @@
|
|||||||
using Extrudex.Domain.Base;
|
|
||||||
|
|
||||||
namespace Extrudex.Domain.Entities;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Tracks filament consumption for a specific print job on a specific spool.
|
|
||||||
/// Each record captures the grams used, which printer consumed it, and when the
|
|
||||||
/// usage was recorded. This enables granular per-job usage analytics, COGS
|
|
||||||
/// reconciliation, and spool weight depletion tracking.
|
|
||||||
///
|
|
||||||
/// A single PrintJob may have multiple FilamentUsage records if multiple spools
|
|
||||||
/// were consumed (e.g., multi-material prints via AMS).
|
|
||||||
/// </summary>
|
|
||||||
public class FilamentUsage : AuditableEntity
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Foreign key to the print job that consumed this filament.
|
|
||||||
/// A usage record is always tied to a print job.
|
|
||||||
/// </summary>
|
|
||||||
public Guid PrintJobId { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Navigation to the print job that consumed this filament.
|
|
||||||
/// </summary>
|
|
||||||
public PrintJob PrintJob { get; set; } = null!;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Foreign key to the spool (filament) that provided the material.
|
|
||||||
/// Links usage back to the specific physical spool for inventory tracking.
|
|
||||||
/// </summary>
|
|
||||||
public Guid SpoolId { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Navigation to the spool that provided the material.
|
|
||||||
/// </summary>
|
|
||||||
public Spool Spool { get; set; } = null!;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Foreign key to the printer that executed the print job.
|
|
||||||
/// Denormalized from PrintJob for direct querying of per-printer usage.
|
|
||||||
/// </summary>
|
|
||||||
public Guid PrinterId { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Navigation to the printer that executed the print job.
|
|
||||||
/// </summary>
|
|
||||||
public Printer Printer { get; set; } = null!;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Grams of filament consumed during this print job.
|
|
||||||
/// Derived from mm_extruded × cross_section_area × material_density,
|
|
||||||
/// or measured directly from AMS weight delta.
|
|
||||||
/// </summary>
|
|
||||||
public decimal GramsUsed { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Millimeters of filament extruded for this usage record.
|
|
||||||
/// The primary physical measurement; grams_used is derived from this.
|
|
||||||
/// </summary>
|
|
||||||
public decimal MmExtruded { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Timestamp when this usage record was created (UTC).
|
|
||||||
/// Represents when the usage was first logged, which may differ from
|
|
||||||
/// the print job's started_at or completed_at timestamps.
|
|
||||||
/// </summary>
|
|
||||||
public DateTime RecordedAt { get; set; } = DateTime.UtcNow;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Optional notes about this usage record (e.g., "AMS tray 3", "manual weight check").
|
|
||||||
/// </summary>
|
|
||||||
public string? Notes { get; set; }
|
|
||||||
}
|
|
||||||
@@ -97,10 +97,4 @@ public class PrintJob : AuditableEntity
|
|||||||
/// Optional notes about the print job (e.g., "First layer adhesion issues").
|
/// Optional notes about the print job (e.g., "First layer adhesion issues").
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string? Notes { get; set; }
|
public string? Notes { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Navigation collection of filament usage records for this print job.
|
|
||||||
/// Enables tracking granular per-spool consumption within a print.
|
|
||||||
/// </summary>
|
|
||||||
public ICollection<FilamentUsage> FilamentUsages { get; set; } = new List<FilamentUsage>();
|
|
||||||
}
|
}
|
||||||
@@ -94,10 +94,4 @@ public class Printer : AuditableEntity
|
|||||||
/// Navigation collection of print jobs executed on this printer.
|
/// Navigation collection of print jobs executed on this printer.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public ICollection<PrintJob> PrintJobs { get; set; } = new List<PrintJob>();
|
public ICollection<PrintJob> PrintJobs { get; set; } = new List<PrintJob>();
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Navigation collection of filament usage records tracking consumption on this printer.
|
|
||||||
/// Enables querying per-printer filament usage and COGS.
|
|
||||||
/// </summary>
|
|
||||||
public ICollection<FilamentUsage> FilamentUsages { get; set; } = new List<FilamentUsage>();
|
|
||||||
}
|
}
|
||||||
@@ -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>
|
||||||
@@ -116,10 +102,4 @@ public class Spool : AuditableEntity
|
|||||||
/// Navigation collection of print jobs that consumed filament from this spool.
|
/// Navigation collection of print jobs that consumed filament from this spool.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public ICollection<PrintJob> PrintJobs { get; set; } = new List<PrintJob>();
|
public ICollection<PrintJob> PrintJobs { get; set; } = new List<PrintJob>();
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Navigation collection of filament usage records tracking consumption from this spool.
|
|
||||||
/// Enables querying how much filament was consumed per print job.
|
|
||||||
/// </summary>
|
|
||||||
public ICollection<FilamentUsage> FilamentUsages { get; set; } = new List<FilamentUsage>();
|
|
||||||
}
|
}
|
||||||
@@ -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);
|
|
||||||
}
|
|
||||||
@@ -9,7 +9,6 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="AspNetCore.HealthChecks.NpgSql" Version="9.0.0" />
|
|
||||||
<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="12.1.1" />
|
<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="12.1.1" />
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.3" />
|
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.3" />
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.3" />
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.3" />
|
||||||
|
|||||||
@@ -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;
|
|
||||||
}
|
|
||||||
@@ -1,83 +0,0 @@
|
|||||||
using Extrudex.Domain.Entities;
|
|
||||||
using Microsoft.EntityFrameworkCore;
|
|
||||||
using Microsoft.EntityFrameworkCore.Metadata.Builders;
|
|
||||||
|
|
||||||
namespace Extrudex.Infrastructure.Data.Configurations;
|
|
||||||
|
|
||||||
public class FilamentUsageConfiguration : BaseEntityConfiguration<FilamentUsage>
|
|
||||||
{
|
|
||||||
public override void Configure(EntityTypeBuilder<FilamentUsage> builder)
|
|
||||||
{
|
|
||||||
base.Configure(builder);
|
|
||||||
|
|
||||||
builder.Property(e => e.PrintJobId)
|
|
||||||
.HasColumnName("print_job_id")
|
|
||||||
.IsRequired();
|
|
||||||
|
|
||||||
builder.Property(e => e.SpoolId)
|
|
||||||
.HasColumnName("spool_id")
|
|
||||||
.IsRequired();
|
|
||||||
|
|
||||||
builder.Property(e => e.PrinterId)
|
|
||||||
.HasColumnName("printer_id")
|
|
||||||
.IsRequired();
|
|
||||||
|
|
||||||
builder.Property(e => e.GramsUsed)
|
|
||||||
.HasColumnName("grams_used")
|
|
||||||
.HasPrecision(10, 2)
|
|
||||||
.IsRequired();
|
|
||||||
|
|
||||||
builder.Property(e => e.MmExtruded)
|
|
||||||
.HasColumnName("mm_extruded")
|
|
||||||
.HasPrecision(12, 2)
|
|
||||||
.IsRequired();
|
|
||||||
|
|
||||||
builder.Property(e => e.RecordedAt)
|
|
||||||
.HasColumnName("recorded_at")
|
|
||||||
.HasDefaultValueSql("now() at time zone 'utc'")
|
|
||||||
.IsRequired();
|
|
||||||
|
|
||||||
builder.Property(e => e.Notes)
|
|
||||||
.HasColumnName("notes")
|
|
||||||
.HasMaxLength(2000);
|
|
||||||
|
|
||||||
// Index on print_job_id for querying usage by print job
|
|
||||||
builder.HasIndex(e => e.PrintJobId)
|
|
||||||
.HasDatabaseName("ix_filament_usages_print_job_id");
|
|
||||||
|
|
||||||
// Index on spool_id for querying usage by spool (filament)
|
|
||||||
builder.HasIndex(e => e.SpoolId)
|
|
||||||
.HasDatabaseName("ix_filament_usages_spool_id");
|
|
||||||
|
|
||||||
// Index on printer_id for querying usage by printer
|
|
||||||
builder.HasIndex(e => e.PrinterId)
|
|
||||||
.HasDatabaseName("ix_filament_usages_printer_id");
|
|
||||||
|
|
||||||
// Index on recorded_at for time-range queries
|
|
||||||
builder.HasIndex(e => e.RecordedAt)
|
|
||||||
.HasDatabaseName("ix_filament_usages_recorded_at");
|
|
||||||
|
|
||||||
// Composite index for querying usage by spool within a date range
|
|
||||||
builder.HasIndex(e => new { e.SpoolId, e.RecordedAt })
|
|
||||||
.HasDatabaseName("ix_filament_usages_spool_id_recorded_at");
|
|
||||||
|
|
||||||
// Relationships
|
|
||||||
builder.HasOne(e => e.PrintJob)
|
|
||||||
.WithMany(e => e.FilamentUsages)
|
|
||||||
.HasForeignKey(e => e.PrintJobId)
|
|
||||||
.HasConstraintName("fk_filament_usages_print_job")
|
|
||||||
.OnDelete(DeleteBehavior.Cascade);
|
|
||||||
|
|
||||||
builder.HasOne(e => e.Spool)
|
|
||||||
.WithMany(e => e.FilamentUsages)
|
|
||||||
.HasForeignKey(e => e.SpoolId)
|
|
||||||
.HasConstraintName("fk_filament_usages_spool")
|
|
||||||
.OnDelete(DeleteBehavior.Restrict);
|
|
||||||
|
|
||||||
builder.HasOne(e => e.Printer)
|
|
||||||
.WithMany(e => e.FilamentUsages)
|
|
||||||
.HasForeignKey(e => e.PrinterId)
|
|
||||||
.HasConstraintName("fk_filament_usages_printer")
|
|
||||||
.OnDelete(DeleteBehavior.Restrict);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -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)
|
||||||
|
|||||||
@@ -23,7 +23,6 @@ public class ExtrudexDbContext : DbContext
|
|||||||
public DbSet<AmsUnit> AmsUnits => Set<AmsUnit>();
|
public DbSet<AmsUnit> AmsUnits => Set<AmsUnit>();
|
||||||
public DbSet<AmsSlot> AmsSlots => Set<AmsSlot>();
|
public DbSet<AmsSlot> AmsSlots => Set<AmsSlot>();
|
||||||
public DbSet<PrintJob> PrintJobs => Set<PrintJob>();
|
public DbSet<PrintJob> PrintJobs => Set<PrintJob>();
|
||||||
public DbSet<FilamentUsage> FilamentUsages => Set<FilamentUsage>();
|
|
||||||
|
|
||||||
protected override void OnModelCreating(ModelBuilder modelBuilder)
|
protected override void OnModelCreating(ModelBuilder modelBuilder)
|
||||||
{
|
{
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -1,533 +0,0 @@
|
|||||||
using System;
|
|
||||||
using Microsoft.EntityFrameworkCore.Migrations;
|
|
||||||
|
|
||||||
#nullable disable
|
|
||||||
|
|
||||||
namespace Extrudex.Infrastructure.Data.Migrations
|
|
||||||
{
|
|
||||||
/// <inheritdoc />
|
|
||||||
public partial class AddFilamentUsageTrackingModel : Migration
|
|
||||||
{
|
|
||||||
/// <inheritdoc />
|
|
||||||
protected override void Up(MigrationBuilder migrationBuilder)
|
|
||||||
{
|
|
||||||
migrationBuilder.CreateTable(
|
|
||||||
name: "filament_usages",
|
|
||||||
columns: table => new
|
|
||||||
{
|
|
||||||
id = table.Column<Guid>(type: "uuid", nullable: false),
|
|
||||||
print_job_id = table.Column<Guid>(type: "uuid", nullable: false),
|
|
||||||
spool_id = table.Column<Guid>(type: "uuid", nullable: false),
|
|
||||||
printer_id = table.Column<Guid>(type: "uuid", nullable: false),
|
|
||||||
grams_used = table.Column<decimal>(type: "numeric(10,2)", precision: 10, scale: 2, nullable: false),
|
|
||||||
mm_extruded = table.Column<decimal>(type: "numeric(12,2)", precision: 12, scale: 2, nullable: false),
|
|
||||||
recorded_at = table.Column<DateTime>(type: "timestamp with time zone", nullable: false, defaultValueSql: "now() at time zone 'utc'"),
|
|
||||||
notes = table.Column<string>(type: "character varying(2000)", maxLength: 2000, nullable: true),
|
|
||||||
created_at = table.Column<DateTime>(type: "timestamp with time zone", nullable: false, defaultValueSql: "now() at time zone 'utc'"),
|
|
||||||
updated_at = table.Column<DateTime>(type: "timestamp with time zone", nullable: false, defaultValueSql: "now() at time zone 'utc'")
|
|
||||||
},
|
|
||||||
constraints: table =>
|
|
||||||
{
|
|
||||||
table.PrimaryKey("PK_filament_usages", x => x.id);
|
|
||||||
table.ForeignKey(
|
|
||||||
name: "fk_filament_usages_print_job",
|
|
||||||
column: x => x.print_job_id,
|
|
||||||
principalTable: "print_jobs",
|
|
||||||
principalColumn: "id",
|
|
||||||
onDelete: ReferentialAction.Cascade);
|
|
||||||
table.ForeignKey(
|
|
||||||
name: "fk_filament_usages_printer",
|
|
||||||
column: x => x.printer_id,
|
|
||||||
principalTable: "printers",
|
|
||||||
principalColumn: "id",
|
|
||||||
onDelete: ReferentialAction.Restrict);
|
|
||||||
table.ForeignKey(
|
|
||||||
name: "fk_filament_usages_spool",
|
|
||||||
column: x => x.spool_id,
|
|
||||||
principalTable: "spools",
|
|
||||||
principalColumn: "id",
|
|
||||||
onDelete: ReferentialAction.Restrict);
|
|
||||||
});
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_bases",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("10000000-0000-0000-0000-000000000001"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 291, DateTimeKind.Utc).AddTicks(9388), new DateTime(2026, 4, 26, 18, 34, 33, 291, DateTimeKind.Utc).AddTicks(9388) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_bases",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("10000000-0000-0000-0000-000000000002"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 291, DateTimeKind.Utc).AddTicks(9871), new DateTime(2026, 4, 26, 18, 34, 33, 291, DateTimeKind.Utc).AddTicks(9871) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_bases",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("10000000-0000-0000-0000-000000000003"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 291, DateTimeKind.Utc).AddTicks(9881), new DateTime(2026, 4, 26, 18, 34, 33, 291, DateTimeKind.Utc).AddTicks(9881) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_bases",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("10000000-0000-0000-0000-000000000004"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 291, DateTimeKind.Utc).AddTicks(9888), new DateTime(2026, 4, 26, 18, 34, 33, 291, DateTimeKind.Utc).AddTicks(9888) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_bases",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("10000000-0000-0000-0000-000000000005"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 291, DateTimeKind.Utc).AddTicks(9895), new DateTime(2026, 4, 26, 18, 34, 33, 291, DateTimeKind.Utc).AddTicks(9895) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_bases",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("10000000-0000-0000-0000-000000000006"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 291, DateTimeKind.Utc).AddTicks(9901), new DateTime(2026, 4, 26, 18, 34, 33, 291, DateTimeKind.Utc).AddTicks(9902) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_finishes",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("20000000-0000-0000-0000-000000000001"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(90), new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(90) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_finishes",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("20000000-0000-0000-0000-000000000002"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(251), new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(251) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_finishes",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("20000000-0000-0000-0000-000000000003"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(259), new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(259) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_finishes",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("20000000-0000-0000-0000-000000000004"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(266), new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(266) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_finishes",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("20000000-0000-0000-0000-000000000005"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(272), new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(272) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_finishes",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("20000000-0000-0000-0000-000000000006"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(278), new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(278) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_finishes",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("20000000-0000-0000-0000-000000000007"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(285), new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(285) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_finishes",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("20000000-0000-0000-0000-000000000008"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(291), new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(291) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_finishes",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("20000000-0000-0000-0000-000000000009"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(297), new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(298) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_finishes",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("20000000-0000-0000-0000-000000000010"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(304), new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(304) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_finishes",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("20000000-0000-0000-0000-000000000011"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(310), new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(310) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_finishes",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("20000000-0000-0000-0000-000000000012"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(316), new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(317) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_finishes",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("20000000-0000-0000-0000-000000000013"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(323), new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(323) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_finishes",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("20000000-0000-0000-0000-000000000014"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(329), new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(329) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_finishes",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("20000000-0000-0000-0000-000000000015"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(336), new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(336) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_modifiers",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("30000000-0000-0000-0000-000000000001"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(482), new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(482) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_modifiers",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("30000000-0000-0000-0000-000000000002"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(805), new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(806) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_modifiers",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("30000000-0000-0000-0000-000000000003"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(815), new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(815) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_modifiers",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("30000000-0000-0000-0000-000000000004"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(821), new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(821) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_modifiers",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("30000000-0000-0000-0000-000000000005"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(828), new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(828) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_modifiers",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("30000000-0000-0000-0000-000000000006"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(834), new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(834) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_modifiers",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("30000000-0000-0000-0000-000000000007"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(840), new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(840) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_modifiers",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("30000000-0000-0000-0000-000000000008"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(847), new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(847) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_modifiers",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("30000000-0000-0000-0000-000000000009"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(853), new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(853) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_modifiers",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("30000000-0000-0000-0000-000000000010"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(859), new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(860) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_modifiers",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("30000000-0000-0000-0000-000000000011"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(866), new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(866) });
|
|
||||||
|
|
||||||
migrationBuilder.CreateIndex(
|
|
||||||
name: "ix_filament_usages_print_job_id",
|
|
||||||
table: "filament_usages",
|
|
||||||
column: "print_job_id");
|
|
||||||
|
|
||||||
migrationBuilder.CreateIndex(
|
|
||||||
name: "ix_filament_usages_printer_id",
|
|
||||||
table: "filament_usages",
|
|
||||||
column: "printer_id");
|
|
||||||
|
|
||||||
migrationBuilder.CreateIndex(
|
|
||||||
name: "ix_filament_usages_recorded_at",
|
|
||||||
table: "filament_usages",
|
|
||||||
column: "recorded_at");
|
|
||||||
|
|
||||||
migrationBuilder.CreateIndex(
|
|
||||||
name: "ix_filament_usages_spool_id",
|
|
||||||
table: "filament_usages",
|
|
||||||
column: "spool_id");
|
|
||||||
|
|
||||||
migrationBuilder.CreateIndex(
|
|
||||||
name: "ix_filament_usages_spool_id_recorded_at",
|
|
||||||
table: "filament_usages",
|
|
||||||
columns: new[] { "spool_id", "recorded_at" });
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
protected override void Down(MigrationBuilder migrationBuilder)
|
|
||||||
{
|
|
||||||
migrationBuilder.DropTable(
|
|
||||||
name: "filament_usages");
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_bases",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("10000000-0000-0000-0000-000000000001"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1096), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1096) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_bases",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("10000000-0000-0000-0000-000000000002"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1620), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1620) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_bases",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("10000000-0000-0000-0000-000000000003"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1630), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1630) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_bases",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("10000000-0000-0000-0000-000000000004"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1638), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1638) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_bases",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("10000000-0000-0000-0000-000000000005"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1645), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1645) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_bases",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("10000000-0000-0000-0000-000000000006"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1651), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1652) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_finishes",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("20000000-0000-0000-0000-000000000001"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1850), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1850) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_finishes",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("20000000-0000-0000-0000-000000000002"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2041), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2041) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_finishes",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("20000000-0000-0000-0000-000000000003"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2049), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2049) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_finishes",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("20000000-0000-0000-0000-000000000004"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2055), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2056) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_finishes",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("20000000-0000-0000-0000-000000000005"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2062), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2062) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_finishes",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("20000000-0000-0000-0000-000000000006"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2068), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2068) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_finishes",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("20000000-0000-0000-0000-000000000007"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2075), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2075) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_finishes",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("20000000-0000-0000-0000-000000000008"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2081), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2081) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_finishes",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("20000000-0000-0000-0000-000000000009"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2100), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2100) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_finishes",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("20000000-0000-0000-0000-000000000010"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2107), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2107) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_finishes",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("20000000-0000-0000-0000-000000000011"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2113), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2113) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_finishes",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("20000000-0000-0000-0000-000000000012"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2120), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2120) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_finishes",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("20000000-0000-0000-0000-000000000013"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2126), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2126) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_finishes",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("20000000-0000-0000-0000-000000000014"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2132), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2133) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_finishes",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("20000000-0000-0000-0000-000000000015"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2139), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2139) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_modifiers",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("30000000-0000-0000-0000-000000000001"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2304), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2304) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_modifiers",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("30000000-0000-0000-0000-000000000002"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2463), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2463) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_modifiers",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("30000000-0000-0000-0000-000000000003"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2471), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2471) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_modifiers",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("30000000-0000-0000-0000-000000000004"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2477), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2478) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_modifiers",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("30000000-0000-0000-0000-000000000005"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2484), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2484) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_modifiers",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("30000000-0000-0000-0000-000000000006"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2490), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2491) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_modifiers",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("30000000-0000-0000-0000-000000000007"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2497), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2497) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_modifiers",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("30000000-0000-0000-0000-000000000008"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2503), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2503) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_modifiers",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("30000000-0000-0000-0000-000000000009"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2510), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2510) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_modifiers",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("30000000-0000-0000-0000-000000000010"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2516), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2516) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_modifiers",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("30000000-0000-0000-0000-000000000011"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2522), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2523) });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -104,77 +104,6 @@ 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")
|
||||||
@@ -216,50 +145,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, 34, 33, 291, DateTimeKind.Utc).AddTicks(9388),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1096),
|
||||||
DensityGperCm3 = 1.24m,
|
DensityGperCm3 = 1.24m,
|
||||||
Name = "PLA",
|
Name = "PLA",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 291, DateTimeKind.Utc).AddTicks(9388)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1096)
|
||||||
},
|
},
|
||||||
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, 34, 33, 291, DateTimeKind.Utc).AddTicks(9871),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1620),
|
||||||
DensityGperCm3 = 1.27m,
|
DensityGperCm3 = 1.27m,
|
||||||
Name = "PETG",
|
Name = "PETG",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 291, DateTimeKind.Utc).AddTicks(9871)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1620)
|
||||||
},
|
},
|
||||||
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, 34, 33, 291, DateTimeKind.Utc).AddTicks(9881),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1630),
|
||||||
DensityGperCm3 = 1.04m,
|
DensityGperCm3 = 1.04m,
|
||||||
Name = "ABS",
|
Name = "ABS",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 291, DateTimeKind.Utc).AddTicks(9881)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1630)
|
||||||
},
|
},
|
||||||
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, 34, 33, 291, DateTimeKind.Utc).AddTicks(9888),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1638),
|
||||||
DensityGperCm3 = 1.07m,
|
DensityGperCm3 = 1.07m,
|
||||||
Name = "ASA",
|
Name = "ASA",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 291, DateTimeKind.Utc).AddTicks(9888)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1638)
|
||||||
},
|
},
|
||||||
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, 34, 33, 291, DateTimeKind.Utc).AddTicks(9895),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1645),
|
||||||
DensityGperCm3 = 1.21m,
|
DensityGperCm3 = 1.21m,
|
||||||
Name = "TPU",
|
Name = "TPU",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 291, DateTimeKind.Utc).AddTicks(9895)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1645)
|
||||||
},
|
},
|
||||||
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, 34, 33, 291, DateTimeKind.Utc).AddTicks(9901),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1651),
|
||||||
DensityGperCm3 = 1.14m,
|
DensityGperCm3 = 1.14m,
|
||||||
Name = "Nylon",
|
Name = "Nylon",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 291, DateTimeKind.Utc).AddTicks(9902)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1652)
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -303,122 +232,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, 34, 33, 292, DateTimeKind.Utc).AddTicks(90),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1850),
|
||||||
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, 34, 33, 292, DateTimeKind.Utc).AddTicks(90)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1850)
|
||||||
},
|
},
|
||||||
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, 34, 33, 292, DateTimeKind.Utc).AddTicks(251),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2041),
|
||||||
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, 34, 33, 292, DateTimeKind.Utc).AddTicks(251)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2041)
|
||||||
},
|
},
|
||||||
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, 34, 33, 292, DateTimeKind.Utc).AddTicks(259),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2049),
|
||||||
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, 34, 33, 292, DateTimeKind.Utc).AddTicks(259)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2049)
|
||||||
},
|
},
|
||||||
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, 34, 33, 292, DateTimeKind.Utc).AddTicks(266),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2055),
|
||||||
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, 34, 33, 292, DateTimeKind.Utc).AddTicks(266)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2056)
|
||||||
},
|
},
|
||||||
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, 34, 33, 292, DateTimeKind.Utc).AddTicks(272),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2062),
|
||||||
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, 34, 33, 292, DateTimeKind.Utc).AddTicks(272)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2062)
|
||||||
},
|
},
|
||||||
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, 34, 33, 292, DateTimeKind.Utc).AddTicks(278),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2068),
|
||||||
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, 34, 33, 292, DateTimeKind.Utc).AddTicks(278)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2068)
|
||||||
},
|
},
|
||||||
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, 34, 33, 292, DateTimeKind.Utc).AddTicks(285),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2075),
|
||||||
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, 34, 33, 292, DateTimeKind.Utc).AddTicks(285)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2075)
|
||||||
},
|
},
|
||||||
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, 34, 33, 292, DateTimeKind.Utc).AddTicks(291),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2081),
|
||||||
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, 34, 33, 292, DateTimeKind.Utc).AddTicks(291)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2081)
|
||||||
},
|
},
|
||||||
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, 34, 33, 292, DateTimeKind.Utc).AddTicks(297),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2100),
|
||||||
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, 34, 33, 292, DateTimeKind.Utc).AddTicks(298)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2100)
|
||||||
},
|
},
|
||||||
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, 34, 33, 292, DateTimeKind.Utc).AddTicks(304),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2107),
|
||||||
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, 34, 33, 292, DateTimeKind.Utc).AddTicks(304)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2107)
|
||||||
},
|
},
|
||||||
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, 34, 33, 292, DateTimeKind.Utc).AddTicks(310),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2113),
|
||||||
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, 34, 33, 292, DateTimeKind.Utc).AddTicks(310)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2113)
|
||||||
},
|
},
|
||||||
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, 34, 33, 292, DateTimeKind.Utc).AddTicks(316),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2120),
|
||||||
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, 34, 33, 292, DateTimeKind.Utc).AddTicks(317)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2120)
|
||||||
},
|
},
|
||||||
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, 34, 33, 292, DateTimeKind.Utc).AddTicks(323),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2126),
|
||||||
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, 34, 33, 292, DateTimeKind.Utc).AddTicks(323)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2126)
|
||||||
},
|
},
|
||||||
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, 34, 33, 292, DateTimeKind.Utc).AddTicks(329),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2132),
|
||||||
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, 34, 33, 292, DateTimeKind.Utc).AddTicks(329)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2133)
|
||||||
},
|
},
|
||||||
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, 34, 33, 292, DateTimeKind.Utc).AddTicks(336),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2139),
|
||||||
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, 34, 33, 292, DateTimeKind.Utc).AddTicks(336)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2139)
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -462,90 +391,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, 34, 33, 292, DateTimeKind.Utc).AddTicks(482),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2304),
|
||||||
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, 34, 33, 292, DateTimeKind.Utc).AddTicks(482)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2304)
|
||||||
},
|
},
|
||||||
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, 34, 33, 292, DateTimeKind.Utc).AddTicks(805),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2463),
|
||||||
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, 34, 33, 292, DateTimeKind.Utc).AddTicks(806)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2463)
|
||||||
},
|
},
|
||||||
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, 34, 33, 292, DateTimeKind.Utc).AddTicks(815),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2471),
|
||||||
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, 34, 33, 292, DateTimeKind.Utc).AddTicks(815)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2471)
|
||||||
},
|
},
|
||||||
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, 34, 33, 292, DateTimeKind.Utc).AddTicks(821),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2477),
|
||||||
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, 34, 33, 292, DateTimeKind.Utc).AddTicks(821)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2478)
|
||||||
},
|
},
|
||||||
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, 34, 33, 292, DateTimeKind.Utc).AddTicks(828),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2484),
|
||||||
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, 34, 33, 292, DateTimeKind.Utc).AddTicks(828)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2484)
|
||||||
},
|
},
|
||||||
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, 34, 33, 292, DateTimeKind.Utc).AddTicks(834),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2490),
|
||||||
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, 34, 33, 292, DateTimeKind.Utc).AddTicks(834)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2491)
|
||||||
},
|
},
|
||||||
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, 34, 33, 292, DateTimeKind.Utc).AddTicks(840),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2497),
|
||||||
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, 34, 33, 292, DateTimeKind.Utc).AddTicks(840)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2497)
|
||||||
},
|
},
|
||||||
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, 34, 33, 292, DateTimeKind.Utc).AddTicks(847),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2503),
|
||||||
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, 34, 33, 292, DateTimeKind.Utc).AddTicks(847)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2503)
|
||||||
},
|
},
|
||||||
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, 34, 33, 292, DateTimeKind.Utc).AddTicks(853),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2510),
|
||||||
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, 34, 33, 292, DateTimeKind.Utc).AddTicks(853)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2510)
|
||||||
},
|
},
|
||||||
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, 34, 33, 292, DateTimeKind.Utc).AddTicks(859),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2516),
|
||||||
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, 34, 33, 292, DateTimeKind.Utc).AddTicks(860)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2516)
|
||||||
},
|
},
|
||||||
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, 34, 33, 292, DateTimeKind.Utc).AddTicks(866),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2522),
|
||||||
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, 34, 33, 292, DateTimeKind.Utc).AddTicks(866)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2523)
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -909,36 +838,6 @@ 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")
|
||||||
@@ -1037,17 +936,10 @@ 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");
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -1055,8 +947,6 @@ 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,6 @@
|
|||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
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;
|
||||||
@@ -26,10 +23,7 @@ builder.Services.AddDbContext<ExtrudexDbContext>(options =>
|
|||||||
options.UseNpgsql(connectionString));
|
options.UseNpgsql(connectionString));
|
||||||
|
|
||||||
// ── API Services ───────────────────────────────────────────
|
// ── API Services ───────────────────────────────────────────
|
||||||
builder.Services.AddControllers(options =>
|
builder.Services.AddControllers();
|
||||||
{
|
|
||||||
options.Filters.AddService<FluentValidationFilter>();
|
|
||||||
});
|
|
||||||
builder.Services.AddEndpointsApiExplorer();
|
builder.Services.AddEndpointsApiExplorer();
|
||||||
builder.Services.AddSwaggerGen(c =>
|
builder.Services.AddSwaggerGen(c =>
|
||||||
{
|
{
|
||||||
@@ -52,17 +46,10 @@ builder.Services.AddSwaggerGen(c =>
|
|||||||
// ── QR Code Generation ──────────────────────────────────────
|
// ── QR Code Generation ──────────────────────────────────────
|
||||||
builder.Services.AddSingleton<IQrCodeService, QrCodeService>();
|
builder.Services.AddSingleton<IQrCodeService, QrCodeService>();
|
||||||
|
|
||||||
// ── Cost Per Print Calculation ─────────────────────────────
|
|
||||||
builder.Services.AddScoped<ICostPerPrintService, CostPerPrintService>();
|
|
||||||
|
|
||||||
// ── FluentValidation ──────────────────────────────────────
|
// ── FluentValidation ──────────────────────────────────────
|
||||||
// Registers all validators from the API assembly into DI.
|
// Registers all validators from the API assembly into DI.
|
||||||
builder.Services.AddValidatorsFromAssembly(Assembly.GetExecutingAssembly());
|
builder.Services.AddValidatorsFromAssembly(Assembly.GetExecutingAssembly());
|
||||||
|
|
||||||
// Register the FluentValidation action filter so validators run automatically
|
|
||||||
// on all API controller actions before the action executes.
|
|
||||||
builder.Services.AddScoped<FluentValidationFilter>();
|
|
||||||
|
|
||||||
// ── CORS (kiosk + remote browser) ─────────────────────────
|
// ── CORS (kiosk + remote browser) ─────────────────────────
|
||||||
// AllowAnyOrigin disallows credentials by spec; this is fine for
|
// AllowAnyOrigin disallows credentials by spec; this is fine for
|
||||||
// REST API calls. SignalR WebSockets negotiate without credentials
|
// REST API calls. SignalR WebSockets negotiate without credentials
|
||||||
@@ -82,26 +69,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 ───────────────────────────────────────────
|
|
||||||
builder.Services.AddHealthChecks()
|
|
||||||
.AddNpgSql(connectionString);
|
|
||||||
|
|
||||||
var app = builder.Build();
|
var app = builder.Build();
|
||||||
|
|
||||||
// ── Middleware ──────────────────────────────────────────────
|
// ── Middleware ──────────────────────────────────────────────
|
||||||
@@ -118,9 +85,6 @@ app.MapControllers();
|
|||||||
// ── Hub Endpoints ───────────────────────────────────────────
|
// ── Hub Endpoints ───────────────────────────────────────────
|
||||||
app.MapHub<PrinterHub>("/hubs/printer");
|
app.MapHub<PrinterHub>("/hubs/printer");
|
||||||
|
|
||||||
// ── Health Check Endpoint ──────────────────────────────────
|
|
||||||
app.MapHealthChecks("/health");
|
|
||||||
|
|
||||||
app.Run();
|
app.Run();
|
||||||
|
|
||||||
// Helper: builds a connection string from individual env vars.
|
// Helper: builds a connection string from individual env vars.
|
||||||
|
|||||||
@@ -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
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
34
deploy.sh
34
deploy.sh
@@ -1,34 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
set -e
|
|
||||||
|
|
||||||
echo "🔧 Deploying Extrudex Docker runtime..."
|
|
||||||
|
|
||||||
# Check if Docker Compose is available
|
|
||||||
if ! command -v docker-compose &> /dev/null && ! docker compose version &> /dev/null; then
|
|
||||||
echo "❌ Docker Compose is not installed"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
COMPOSE_CMD="docker compose"
|
|
||||||
if command -v docker-compose &> /dev/null; then
|
|
||||||
COMPOSE_CMD="docker-compose"
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "📦 Building and starting services..."
|
|
||||||
$COMPOSE_CMD -f docker-compose.dev.yml up -d --build
|
|
||||||
|
|
||||||
echo "⏳ Waiting for services to become healthy..."
|
|
||||||
sleep 15
|
|
||||||
|
|
||||||
echo "✅ Deployment complete!"
|
|
||||||
echo ""
|
|
||||||
echo "Services running:"
|
|
||||||
echo " • PostgreSQL: localhost:5433"
|
|
||||||
echo " • Extrudex API: http://localhost:5080"
|
|
||||||
echo " • Extrudex Web: http://localhost:5081"
|
|
||||||
echo ""
|
|
||||||
echo "To view logs:"
|
|
||||||
echo " $COMPOSE_CMD -f docker-compose.dev.yml logs -f"
|
|
||||||
echo ""
|
|
||||||
echo "To stop:"
|
|
||||||
echo " $COMPOSE_CMD -f docker-compose.dev.yml down"
|
|
||||||
@@ -1,70 +0,0 @@
|
|||||||
services:
|
|
||||||
extrudex-db:
|
|
||||||
image: postgres:16-alpine
|
|
||||||
container_name: extrudex-db
|
|
||||||
environment:
|
|
||||||
POSTGRES_USER: extrudex
|
|
||||||
POSTGRES_PASSWORD: changeme
|
|
||||||
POSTGRES_DB: extrudex
|
|
||||||
ports:
|
|
||||||
- "5433:5432"
|
|
||||||
volumes:
|
|
||||||
- extrudex-db-data:/var/lib/postgresql/data
|
|
||||||
healthcheck:
|
|
||||||
test: ["CMD-SHELL", "pg_isready -U extrudex"]
|
|
||||||
interval: 10s
|
|
||||||
timeout: 5s
|
|
||||||
retries: 5
|
|
||||||
start_period: 10s
|
|
||||||
restart: unless-stopped
|
|
||||||
networks:
|
|
||||||
- extrudex-network
|
|
||||||
|
|
||||||
extrudex-api:
|
|
||||||
build:
|
|
||||||
context: ./backend
|
|
||||||
dockerfile: Dockerfile
|
|
||||||
container_name: extrudex-api
|
|
||||||
ports:
|
|
||||||
- "5080:8080"
|
|
||||||
environment:
|
|
||||||
- ASPNETCORE_ENVIRONMENT=Development
|
|
||||||
- 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
|
|
||||||
healthcheck:
|
|
||||||
test: ["CMD", "curl", "-f", "http://localhost:8080/health"]
|
|
||||||
interval: 30s
|
|
||||||
timeout: 10s
|
|
||||||
retries: 3
|
|
||||||
start_period: 40s
|
|
||||||
networks:
|
|
||||||
- extrudex-network
|
|
||||||
|
|
||||||
extrudex-web:
|
|
||||||
build:
|
|
||||||
context: ./frontend
|
|
||||||
dockerfile: Dockerfile
|
|
||||||
container_name: extrudex-web
|
|
||||||
ports:
|
|
||||||
- "5081:80"
|
|
||||||
depends_on:
|
|
||||||
extrudex-api:
|
|
||||||
condition: service_healthy
|
|
||||||
restart: unless-stopped
|
|
||||||
networks:
|
|
||||||
- extrudex-network
|
|
||||||
|
|
||||||
volumes:
|
|
||||||
extrudex-db-data:
|
|
||||||
|
|
||||||
networks:
|
|
||||||
extrudex-network:
|
|
||||||
driver: bridge
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
node_modules
|
|
||||||
dist
|
|
||||||
.git
|
|
||||||
.gitignore
|
|
||||||
.angular
|
|
||||||
.vscode
|
|
||||||
*.md
|
|
||||||
.editorconfig
|
|
||||||
.prettierrc
|
|
||||||
src/test.ts
|
|
||||||
**/*.spec.ts
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
# Editor configuration, see https://editorconfig.org
|
|
||||||
root = true
|
|
||||||
|
|
||||||
[*]
|
|
||||||
charset = utf-8
|
|
||||||
indent_style = space
|
|
||||||
indent_size = 2
|
|
||||||
insert_final_newline = true
|
|
||||||
trim_trailing_whitespace = true
|
|
||||||
|
|
||||||
[*.ts]
|
|
||||||
quote_type = single
|
|
||||||
ij_typescript_use_double_quotes = false
|
|
||||||
|
|
||||||
[*.md]
|
|
||||||
max_line_length = off
|
|
||||||
trim_trailing_whitespace = false
|
|
||||||
44
frontend/.gitignore
vendored
44
frontend/.gitignore
vendored
@@ -1,44 +0,0 @@
|
|||||||
# See https://docs.github.com/get-started/getting-started-with-git/ignoring-files for more about ignoring files.
|
|
||||||
|
|
||||||
# Compiled output
|
|
||||||
/dist
|
|
||||||
/tmp
|
|
||||||
/out-tsc
|
|
||||||
/bazel-out
|
|
||||||
|
|
||||||
# Node
|
|
||||||
/node_modules
|
|
||||||
npm-debug.log
|
|
||||||
yarn-error.log
|
|
||||||
|
|
||||||
# IDEs and editors
|
|
||||||
.idea/
|
|
||||||
.project
|
|
||||||
.classpath
|
|
||||||
.c9/
|
|
||||||
*.launch
|
|
||||||
.settings/
|
|
||||||
*.sublime-workspace
|
|
||||||
|
|
||||||
# Visual Studio Code
|
|
||||||
.vscode/*
|
|
||||||
!.vscode/settings.json
|
|
||||||
!.vscode/tasks.json
|
|
||||||
!.vscode/launch.json
|
|
||||||
!.vscode/extensions.json
|
|
||||||
!.vscode/mcp.json
|
|
||||||
.history/*
|
|
||||||
|
|
||||||
# Miscellaneous
|
|
||||||
/.angular/cache
|
|
||||||
.sass-cache/
|
|
||||||
/connect.lock
|
|
||||||
/coverage
|
|
||||||
/libpeerconnection.log
|
|
||||||
testem.log
|
|
||||||
/typings
|
|
||||||
__screenshots__/
|
|
||||||
|
|
||||||
# System files
|
|
||||||
.DS_Store
|
|
||||||
Thumbs.db
|
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
{
|
|
||||||
"printWidth": 100,
|
|
||||||
"singleQuote": true,
|
|
||||||
"overrides": [
|
|
||||||
{
|
|
||||||
"files": "*.html",
|
|
||||||
"options": {
|
|
||||||
"parser": "angular"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
4
frontend/.vscode/extensions.json
vendored
4
frontend/.vscode/extensions.json
vendored
@@ -1,4 +0,0 @@
|
|||||||
{
|
|
||||||
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=827846
|
|
||||||
"recommendations": ["angular.ng-template"]
|
|
||||||
}
|
|
||||||
20
frontend/.vscode/launch.json
vendored
20
frontend/.vscode/launch.json
vendored
@@ -1,20 +0,0 @@
|
|||||||
{
|
|
||||||
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
|
|
||||||
"version": "0.2.0",
|
|
||||||
"configurations": [
|
|
||||||
{
|
|
||||||
"name": "ng serve",
|
|
||||||
"type": "chrome",
|
|
||||||
"request": "launch",
|
|
||||||
"preLaunchTask": "npm: start",
|
|
||||||
"url": "http://localhost:4200/"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "ng test",
|
|
||||||
"type": "chrome",
|
|
||||||
"request": "launch",
|
|
||||||
"preLaunchTask": "npm: test",
|
|
||||||
"url": "http://localhost:9876/debug.html"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
9
frontend/.vscode/mcp.json
vendored
9
frontend/.vscode/mcp.json
vendored
@@ -1,9 +0,0 @@
|
|||||||
{
|
|
||||||
// For more information, visit: https://angular.dev/ai/mcp
|
|
||||||
"servers": {
|
|
||||||
"angular-cli": {
|
|
||||||
"command": "npx",
|
|
||||||
"args": ["-y", "@angular/cli", "mcp"]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
42
frontend/.vscode/tasks.json
vendored
42
frontend/.vscode/tasks.json
vendored
@@ -1,42 +0,0 @@
|
|||||||
{
|
|
||||||
// For more information, visit: https://go.microsoft.com/fwlink/?LinkId=733558
|
|
||||||
"version": "2.0.0",
|
|
||||||
"tasks": [
|
|
||||||
{
|
|
||||||
"type": "npm",
|
|
||||||
"script": "start",
|
|
||||||
"isBackground": true,
|
|
||||||
"problemMatcher": {
|
|
||||||
"owner": "typescript",
|
|
||||||
"pattern": "$tsc",
|
|
||||||
"background": {
|
|
||||||
"activeOnStart": true,
|
|
||||||
"beginsPattern": {
|
|
||||||
"regexp": "Changes detected"
|
|
||||||
},
|
|
||||||
"endsPattern": {
|
|
||||||
"regexp": "bundle generation (complete|failed)"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "npm",
|
|
||||||
"script": "test",
|
|
||||||
"isBackground": true,
|
|
||||||
"problemMatcher": {
|
|
||||||
"owner": "typescript",
|
|
||||||
"pattern": "$tsc",
|
|
||||||
"background": {
|
|
||||||
"activeOnStart": true,
|
|
||||||
"beginsPattern": {
|
|
||||||
"regexp": "Changes detected"
|
|
||||||
},
|
|
||||||
"endsPattern": {
|
|
||||||
"regexp": "bundle generation (complete|failed)"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
# Stage 1: Build the Angular application
|
|
||||||
FROM node:22-alpine AS build
|
|
||||||
|
|
||||||
WORKDIR /app
|
|
||||||
|
|
||||||
# Copy package files first for better layer caching
|
|
||||||
COPY package.json package-lock.json ./
|
|
||||||
RUN npm ci
|
|
||||||
|
|
||||||
# Copy source and build
|
|
||||||
COPY . .
|
|
||||||
RUN npx ng build --configuration production
|
|
||||||
|
|
||||||
# Stage 2: Serve static files with nginx
|
|
||||||
FROM nginx:alpine
|
|
||||||
|
|
||||||
# Remove default nginx config
|
|
||||||
RUN rm /etc/nginx/conf.d/default.conf
|
|
||||||
|
|
||||||
# Copy custom nginx config
|
|
||||||
COPY nginx.conf /etc/nginx/conf.d/default.conf
|
|
||||||
|
|
||||||
# Copy built Angular artifacts from build stage
|
|
||||||
COPY --from=build /app/dist/frontend/browser /usr/share/nginx/html
|
|
||||||
|
|
||||||
EXPOSE 80
|
|
||||||
|
|
||||||
CMD ["nginx", "-g", "daemon off;"]
|
|
||||||
@@ -1,59 +0,0 @@
|
|||||||
# Frontend
|
|
||||||
|
|
||||||
This project was generated using [Angular CLI](https://github.com/angular/angular-cli) version 21.2.8.
|
|
||||||
|
|
||||||
## Development server
|
|
||||||
|
|
||||||
To start a local development server, run:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
ng serve
|
|
||||||
```
|
|
||||||
|
|
||||||
Once the server is running, open your browser and navigate to `http://localhost:4200/`. The application will automatically reload whenever you modify any of the source files.
|
|
||||||
|
|
||||||
## Code scaffolding
|
|
||||||
|
|
||||||
Angular CLI includes powerful code scaffolding tools. To generate a new component, run:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
ng generate component component-name
|
|
||||||
```
|
|
||||||
|
|
||||||
For a complete list of available schematics (such as `components`, `directives`, or `pipes`), run:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
ng generate --help
|
|
||||||
```
|
|
||||||
|
|
||||||
## Building
|
|
||||||
|
|
||||||
To build the project run:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
ng build
|
|
||||||
```
|
|
||||||
|
|
||||||
This will compile your project and store the build artifacts in the `dist/` directory. By default, the production build optimizes your application for performance and speed.
|
|
||||||
|
|
||||||
## Running unit tests
|
|
||||||
|
|
||||||
To execute unit tests with the [Vitest](https://vitest.dev/) test runner, use the following command:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
ng test
|
|
||||||
```
|
|
||||||
|
|
||||||
## Running end-to-end tests
|
|
||||||
|
|
||||||
For end-to-end (e2e) testing, run:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
ng e2e
|
|
||||||
```
|
|
||||||
|
|
||||||
Angular CLI does not come with an end-to-end testing framework by default. You can choose one that suits your needs.
|
|
||||||
|
|
||||||
## Additional Resources
|
|
||||||
|
|
||||||
For more information on using the Angular CLI, including detailed command references, visit the [Angular CLI Overview and Command Reference](https://angular.dev/tools/cli) page.
|
|
||||||
@@ -1,78 +0,0 @@
|
|||||||
{
|
|
||||||
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
|
|
||||||
"version": 1,
|
|
||||||
"cli": {
|
|
||||||
"packageManager": "npm"
|
|
||||||
},
|
|
||||||
"newProjectRoot": "projects",
|
|
||||||
"projects": {
|
|
||||||
"frontend": {
|
|
||||||
"projectType": "application",
|
|
||||||
"schematics": {
|
|
||||||
"@schematics/angular:component": {
|
|
||||||
"style": "scss"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"root": "",
|
|
||||||
"sourceRoot": "src",
|
|
||||||
"prefix": "app",
|
|
||||||
"architect": {
|
|
||||||
"build": {
|
|
||||||
"builder": "@angular/build:application",
|
|
||||||
"options": {
|
|
||||||
"browser": "src/main.ts",
|
|
||||||
"tsConfig": "tsconfig.app.json",
|
|
||||||
"inlineStyleLanguage": "scss",
|
|
||||||
"assets": [
|
|
||||||
{
|
|
||||||
"glob": "**/*",
|
|
||||||
"input": "public"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"styles": [
|
|
||||||
"src/styles.scss"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"configurations": {
|
|
||||||
"production": {
|
|
||||||
"budgets": [
|
|
||||||
{
|
|
||||||
"type": "initial",
|
|
||||||
"maximumWarning": "500kB",
|
|
||||||
"maximumError": "1MB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "anyComponentStyle",
|
|
||||||
"maximumWarning": "4kB",
|
|
||||||
"maximumError": "8kB"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"outputHashing": "all"
|
|
||||||
},
|
|
||||||
"development": {
|
|
||||||
"optimization": false,
|
|
||||||
"extractLicenses": false,
|
|
||||||
"sourceMap": true
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"defaultConfiguration": "production"
|
|
||||||
},
|
|
||||||
"serve": {
|
|
||||||
"builder": "@angular/build:dev-server",
|
|
||||||
"configurations": {
|
|
||||||
"production": {
|
|
||||||
"buildTarget": "frontend:build:production"
|
|
||||||
},
|
|
||||||
"development": {
|
|
||||||
"buildTarget": "frontend:build:development"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"defaultConfiguration": "development"
|
|
||||||
},
|
|
||||||
"test": {
|
|
||||||
"builder": "@angular/build:unit-test"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,42 +0,0 @@
|
|||||||
server {
|
|
||||||
listen 80;
|
|
||||||
server_name _;
|
|
||||||
root /usr/share/nginx/html;
|
|
||||||
index index.html;
|
|
||||||
|
|
||||||
# Gzip compression
|
|
||||||
gzip on;
|
|
||||||
gzip_types text/plain text/css application/json application/javascript text/xml application/xml text/javascript;
|
|
||||||
gzip_min_length 256;
|
|
||||||
|
|
||||||
# Angular SPA — fallback to index.html for client-side routing
|
|
||||||
location / {
|
|
||||||
try_files $uri $uri/ /index.html;
|
|
||||||
}
|
|
||||||
|
|
||||||
# Cache static assets aggressively
|
|
||||||
location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg|woff2?|ttf|eot)$ {
|
|
||||||
expires 1y;
|
|
||||||
add_header Cache-Control "public, immutable";
|
|
||||||
}
|
|
||||||
|
|
||||||
# Proxy API requests to backend
|
|
||||||
# Uses resolver so nginx doesn't crash if backend isn't available at startup
|
|
||||||
resolver 127.0.0.11 valid=30s ipv6=off;
|
|
||||||
set $backend "extrudex-api:8080";
|
|
||||||
|
|
||||||
location /api/ {
|
|
||||||
proxy_pass http://$backend;
|
|
||||||
proxy_set_header Host $host;
|
|
||||||
proxy_set_header X-Real-IP $remote_addr;
|
|
||||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
|
||||||
proxy_set_header X-Forwarded-Proto $scheme;
|
|
||||||
}
|
|
||||||
|
|
||||||
# Health check endpoint
|
|
||||||
location /health {
|
|
||||||
access_log off;
|
|
||||||
return 200 "ok";
|
|
||||||
add_header Content-Type text/plain;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
8873
frontend/package-lock.json
generated
8873
frontend/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -1,35 +0,0 @@
|
|||||||
{
|
|
||||||
"name": "frontend",
|
|
||||||
"version": "0.0.0",
|
|
||||||
"scripts": {
|
|
||||||
"ng": "ng",
|
|
||||||
"start": "ng serve",
|
|
||||||
"build": "ng build",
|
|
||||||
"watch": "ng build --watch --configuration development",
|
|
||||||
"test": "ng test"
|
|
||||||
},
|
|
||||||
"private": true,
|
|
||||||
"packageManager": "npm@11.11.0",
|
|
||||||
"dependencies": {
|
|
||||||
"@angular/cdk": "^21.2.8",
|
|
||||||
"@angular/common": "^21.2.0",
|
|
||||||
"@angular/compiler": "^21.2.0",
|
|
||||||
"@angular/core": "^21.2.0",
|
|
||||||
"@angular/forms": "^21.2.0",
|
|
||||||
"@angular/material": "^21.2.8",
|
|
||||||
"@angular/platform-browser": "^21.2.0",
|
|
||||||
"@angular/router": "^21.2.0",
|
|
||||||
"rxjs": "~7.8.0",
|
|
||||||
"tslib": "^2.3.0"
|
|
||||||
},
|
|
||||||
"devDependencies": {
|
|
||||||
"@angular/build": "^21.2.8",
|
|
||||||
"@angular/cli": "^21.2.8",
|
|
||||||
"@angular/compiler-cli": "^21.2.0",
|
|
||||||
"@vitest/browser-playwright": "^4.1.5",
|
|
||||||
"jsdom": "^28.0.0",
|
|
||||||
"prettier": "^3.8.1",
|
|
||||||
"typescript": "~5.9.2",
|
|
||||||
"vitest": "^4.0.8"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 15 KiB |
@@ -1,11 +0,0 @@
|
|||||||
import { ApplicationConfig, provideBrowserGlobalErrorListeners } from '@angular/core';
|
|
||||||
import { provideRouter } from '@angular/router';
|
|
||||||
|
|
||||||
import { routes } from './app.routes';
|
|
||||||
|
|
||||||
export const appConfig: ApplicationConfig = {
|
|
||||||
providers: [
|
|
||||||
provideBrowserGlobalErrorListeners(),
|
|
||||||
provideRouter(routes)
|
|
||||||
]
|
|
||||||
};
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
<!-- Extrudex — Homepage (Main Hub) -->
|
|
||||||
<main class="main-content">
|
|
||||||
<h1 class="sr-only">Extrudex Dashboard</h1>
|
|
||||||
|
|
||||||
<!-- Status Summary Bar — fleet-wide health at a glance -->
|
|
||||||
<app-dashboard-summary></app-dashboard-summary>
|
|
||||||
|
|
||||||
<!-- Filament Inventory — routed view -->
|
|
||||||
<router-outlet />
|
|
||||||
</main>
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
import { Routes } from '@angular/router';
|
|
||||||
import { FilamentTableComponent } from './components/filament-table/filament-table.component';
|
|
||||||
|
|
||||||
export const routes: Routes = [
|
|
||||||
{
|
|
||||||
path: '',
|
|
||||||
component: FilamentTableComponent,
|
|
||||||
},
|
|
||||||
];
|
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
:host {
|
|
||||||
display: block;
|
|
||||||
min-height: 100vh;
|
|
||||||
background: #1a1a2e;
|
|
||||||
color: #e0e0e0;
|
|
||||||
font-family: 'Inter', 'Segoe UI', Roboto, sans-serif;
|
|
||||||
}
|
|
||||||
|
|
||||||
.main-content {
|
|
||||||
padding: 16px;
|
|
||||||
|
|
||||||
@media (min-width: 800px) {
|
|
||||||
padding: 24px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.sr-only {
|
|
||||||
position: absolute;
|
|
||||||
width: 1px;
|
|
||||||
height: 1px;
|
|
||||||
padding: 0;
|
|
||||||
margin: -1px;
|
|
||||||
overflow: hidden;
|
|
||||||
clip: rect(0, 0, 0, 0);
|
|
||||||
white-space: nowrap;
|
|
||||||
border: 0;
|
|
||||||
}
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
import { TestBed } from '@angular/core/testing';
|
|
||||||
import { App } from './app';
|
|
||||||
|
|
||||||
describe('App', () => {
|
|
||||||
beforeEach(async () => {
|
|
||||||
await TestBed.configureTestingModule({
|
|
||||||
imports: [App],
|
|
||||||
}).compileComponents();
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should create the app', () => {
|
|
||||||
const fixture = TestBed.createComponent(App);
|
|
||||||
const app = fixture.componentInstance;
|
|
||||||
expect(app).toBeTruthy();
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should render title', async () => {
|
|
||||||
const fixture = TestBed.createComponent(App);
|
|
||||||
await fixture.whenStable();
|
|
||||||
const compiled = fixture.nativeElement as HTMLElement;
|
|
||||||
expect(compiled.querySelector('h1')?.textContent).toContain('Extrudex Dashboard');
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
import { Component, ViewChild } from '@angular/core';
|
|
||||||
import { RouterOutlet } from '@angular/router';
|
|
||||||
import { DashboardSummaryComponent } from './components/dashboard-summary/dashboard-summary.component';
|
|
||||||
import { AgentSummary, SystemHealth } from './models/agent.model';
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
selector: 'app-root',
|
|
||||||
imports: [RouterOutlet, DashboardSummaryComponent],
|
|
||||||
templateUrl: './app.html',
|
|
||||||
styleUrl: './app.scss'
|
|
||||||
})
|
|
||||||
export class App {
|
|
||||||
@ViewChild(DashboardSummaryComponent) summaryComponent!: DashboardSummaryComponent;
|
|
||||||
|
|
||||||
/** Sample data for development — will be replaced by real service data */
|
|
||||||
readonly sampleSummary: AgentSummary = {
|
|
||||||
total: 7,
|
|
||||||
active: 4,
|
|
||||||
idle: 1,
|
|
||||||
thinking: 1,
|
|
||||||
error: 1,
|
|
||||||
};
|
|
||||||
|
|
||||||
readonly sampleHealth: SystemHealth = {
|
|
||||||
connected: true,
|
|
||||||
status: 'healthy',
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,63 +0,0 @@
|
|||||||
<!-- Dashboard Summary Bar — Fleet-wide health at a glance -->
|
|
||||||
<section class="dashboard-summary" role="status" aria-label="Dashboard summary">
|
|
||||||
|
|
||||||
<!-- System Health Indicator -->
|
|
||||||
<div class="summary-item health-indicator"
|
|
||||||
[class.healthy]="health().status === 'healthy'"
|
|
||||||
[class.degraded]="isDegraded()"
|
|
||||||
[class.down]="isDown()"
|
|
||||||
[matTooltip]="statusLabel()"
|
|
||||||
matTooltipPosition="below">
|
|
||||||
<span class="connection-dot" [class.connected]="health().connected"></span>
|
|
||||||
<span class="health-label">{{ statusLabel() }}</span>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Total Active Agents -->
|
|
||||||
<div class="summary-item" matTooltip="Total active agents" matTooltipPosition="below">
|
|
||||||
<mat-icon aria-hidden="true">smart_toy</mat-icon>
|
|
||||||
<span class="metric-value">{{ summary().active }} / {{ summary().total }}</span>
|
|
||||||
<span class="metric-label">Active</span>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Status Breakdown -->
|
|
||||||
<div class="summary-item status-breakdown">
|
|
||||||
<mat-chip-set aria-label="Agent status breakdown">
|
|
||||||
<mat-chip
|
|
||||||
class="status-chip chip-active"
|
|
||||||
[class.has-count]="summary().active > 0"
|
|
||||||
matTooltip="Active agents">
|
|
||||||
<mat-icon matChipStart>check_circle</mat-icon>
|
|
||||||
<span class="chip-count">{{ summary().active }}</span>
|
|
||||||
<span class="chip-label">Active</span>
|
|
||||||
</mat-chip>
|
|
||||||
|
|
||||||
<mat-chip
|
|
||||||
class="status-chip chip-idle"
|
|
||||||
[class.has-count]="summary().idle > 0"
|
|
||||||
matTooltip="Idle agents">
|
|
||||||
<mat-icon matChipStart>pause_circle</mat-icon>
|
|
||||||
<span class="chip-count">{{ summary().idle }}</span>
|
|
||||||
<span class="chip-label">Idle</span>
|
|
||||||
</mat-chip>
|
|
||||||
|
|
||||||
<mat-chip
|
|
||||||
class="status-chip chip-thinking"
|
|
||||||
[class.has-count]="summary().thinking > 0"
|
|
||||||
matTooltip="Thinking agents">
|
|
||||||
<mat-icon matChipStart>psychology</mat-icon>
|
|
||||||
<span class="chip-count">{{ summary().thinking }}</span>
|
|
||||||
<span class="chip-label">Thinking</span>
|
|
||||||
</mat-chip>
|
|
||||||
|
|
||||||
<mat-chip
|
|
||||||
class="status-chip chip-error"
|
|
||||||
[class.has-count]="hasErrors()"
|
|
||||||
matTooltip="Agents in error">
|
|
||||||
<mat-icon matChipStart>error</mat-icon>
|
|
||||||
<span class="chip-count">{{ summary().error }}</span>
|
|
||||||
<span class="chip-label">Error</span>
|
|
||||||
</mat-chip>
|
|
||||||
</mat-chip-set>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</section>
|
|
||||||
@@ -1,174 +0,0 @@
|
|||||||
/**
|
|
||||||
* Dashboard Summary Component Styles
|
|
||||||
* Touch-optimized for kiosk (Raspberry Pi 5) and mobile PWA
|
|
||||||
* Uses Angular Material utility classes where possible
|
|
||||||
*/
|
|
||||||
|
|
||||||
// Touch-optimized sizing
|
|
||||||
$touch-target-min: 48px;
|
|
||||||
$kiosk-font-primary: 20px;
|
|
||||||
$mobile-font-primary: 16px;
|
|
||||||
$spacing-unit: 8px;
|
|
||||||
|
|
||||||
// Status colors — high contrast for workshop/bright environments
|
|
||||||
$color-active: #4ade70; // Green — printing/active
|
|
||||||
$color-idle: #94a3b8; // Gray — idle/offline
|
|
||||||
$color-thinking: #60a5fa; // Blue — thinking/processing
|
|
||||||
$color-error: #f87171; // Red — error/failed
|
|
||||||
$color-connected: #4ade70; // Green — SignalR connected
|
|
||||||
$color-disconnected: #f87171; // Red — disconnected
|
|
||||||
|
|
||||||
.dashboard-summary {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: $spacing-unit * 2;
|
|
||||||
padding: $spacing-unit * 2;
|
|
||||||
overflow-x: auto;
|
|
||||||
-webkit-overflow-scrolling: touch;
|
|
||||||
|
|
||||||
// Responsive: on mobile, allow horizontal scroll
|
|
||||||
@media (max-width: 480px) {
|
|
||||||
padding: $spacing-unit;
|
|
||||||
gap: $spacing-unit;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.summary-item {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: $spacing-unit;
|
|
||||||
min-height: $touch-target-min;
|
|
||||||
white-space: nowrap;
|
|
||||||
|
|
||||||
.metric-value {
|
|
||||||
font-size: $kiosk-font-primary;
|
|
||||||
font-weight: 600;
|
|
||||||
line-height: 1.2;
|
|
||||||
|
|
||||||
@media (max-width: 480px) {
|
|
||||||
font-size: $mobile-font-primary;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.metric-label {
|
|
||||||
font-size: 12px;
|
|
||||||
color: rgba(255, 255, 255, 0.7);
|
|
||||||
text-transform: uppercase;
|
|
||||||
letter-spacing: 0.05em;
|
|
||||||
|
|
||||||
@media (max-width: 480px) {
|
|
||||||
font-size: 10px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Health indicator
|
|
||||||
.health-indicator {
|
|
||||||
padding: $spacing-unit $spacing-unit * 2;
|
|
||||||
border-radius: 24px;
|
|
||||||
transition: background-color 0.3s ease;
|
|
||||||
|
|
||||||
&.healthy {
|
|
||||||
background-color: rgba($color-active, 0.15);
|
|
||||||
}
|
|
||||||
|
|
||||||
&.degraded {
|
|
||||||
background-color: rgba($color-thinking, 0.15);
|
|
||||||
}
|
|
||||||
|
|
||||||
&.down {
|
|
||||||
background-color: rgba($color-error, 0.15);
|
|
||||||
}
|
|
||||||
|
|
||||||
.connection-dot {
|
|
||||||
width: 12px;
|
|
||||||
height: 12px;
|
|
||||||
border-radius: 50%;
|
|
||||||
display: inline-block;
|
|
||||||
transition: background-color 0.3s ease;
|
|
||||||
|
|
||||||
&.connected {
|
|
||||||
background-color: $color-connected;
|
|
||||||
box-shadow: 0 0 6px $color-connected;
|
|
||||||
}
|
|
||||||
|
|
||||||
&:not(.connected) {
|
|
||||||
background-color: $color-disconnected;
|
|
||||||
box-shadow: 0 0 6px $color-disconnected;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.health-label {
|
|
||||||
font-size: 14px;
|
|
||||||
font-weight: 500;
|
|
||||||
|
|
||||||
@media (max-width: 480px) {
|
|
||||||
font-size: 12px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Status breakdown chips
|
|
||||||
.status-breakdown {
|
|
||||||
flex-shrink: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.status-chip {
|
|
||||||
min-height: $touch-target-min !important;
|
|
||||||
font-size: 14px !important;
|
|
||||||
|
|
||||||
@media (max-width: 480px) {
|
|
||||||
min-height: 40px !important;
|
|
||||||
font-size: 12px !important;
|
|
||||||
padding: 0 8px !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.chip-count {
|
|
||||||
font-weight: 700;
|
|
||||||
margin: 0 4px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.chip-label {
|
|
||||||
font-size: 12px;
|
|
||||||
opacity: 0.8;
|
|
||||||
}
|
|
||||||
|
|
||||||
mat-icon {
|
|
||||||
font-size: 18px !important;
|
|
||||||
width: 18px !important;
|
|
||||||
height: 18px !important;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Status chip color variants
|
|
||||||
.chip-active {
|
|
||||||
--mdc-chip-outline-color: #{$color-active};
|
|
||||||
|
|
||||||
&.has-count {
|
|
||||||
background-color: rgba($color-active, 0.15) !important;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.chip-idle {
|
|
||||||
--mdc-chip-outline-color: #{$color-idle};
|
|
||||||
|
|
||||||
&.has-count {
|
|
||||||
background-color: rgba($color-idle, 0.15) !important;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.chip-thinking {
|
|
||||||
--mdc-chip-outline-color: #{$color-thinking};
|
|
||||||
|
|
||||||
&.has-count {
|
|
||||||
background-color: rgba($color-thinking, 0.15) !important;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.chip-error {
|
|
||||||
--mdc-chip-outline-color: #{$color-error};
|
|
||||||
|
|
||||||
&.has-count {
|
|
||||||
background-color: rgba($color-error, 0.2) !important;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,103 +0,0 @@
|
|||||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
|
||||||
import { DashboardSummaryComponent } from './dashboard-summary.component';
|
|
||||||
import { AgentSummary, SystemHealth } from '../../models/agent.model';
|
|
||||||
|
|
||||||
describe('DashboardSummaryComponent', () => {
|
|
||||||
let component: DashboardSummaryComponent;
|
|
||||||
let fixture: ComponentFixture<DashboardSummaryComponent>;
|
|
||||||
|
|
||||||
const mockSummary: AgentSummary = {
|
|
||||||
total: 7,
|
|
||||||
active: 4,
|
|
||||||
idle: 1,
|
|
||||||
thinking: 1,
|
|
||||||
error: 1,
|
|
||||||
};
|
|
||||||
|
|
||||||
const mockHealthy: SystemHealth = {
|
|
||||||
connected: true,
|
|
||||||
status: 'healthy',
|
|
||||||
};
|
|
||||||
|
|
||||||
beforeEach(async () => {
|
|
||||||
await TestBed.configureTestingModule({
|
|
||||||
imports: [DashboardSummaryComponent],
|
|
||||||
}).compileComponents();
|
|
||||||
|
|
||||||
fixture = TestBed.createComponent(DashboardSummaryComponent);
|
|
||||||
component = fixture.componentInstance;
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should create', () => {
|
|
||||||
expect(component).toBeTruthy();
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should default to zeroed summary', () => {
|
|
||||||
const summary = component.summary();
|
|
||||||
expect(summary.total).toBe(0);
|
|
||||||
expect(summary.active).toBe(0);
|
|
||||||
expect(summary.idle).toBe(0);
|
|
||||||
expect(summary.thinking).toBe(0);
|
|
||||||
expect(summary.error).toBe(0);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should default to disconnected/down health', () => {
|
|
||||||
const health = component.health();
|
|
||||||
expect(health.connected).toBe(false);
|
|
||||||
expect(health.status).toBe('down');
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should update summary data', () => {
|
|
||||||
component.updateSummary(mockSummary);
|
|
||||||
expect(component.summary()).toEqual(mockSummary);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should update health data', () => {
|
|
||||||
component.updateHealth(mockHealthy);
|
|
||||||
expect(component.health()).toEqual(mockHealthy);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should compute hasErrors correctly', () => {
|
|
||||||
expect(component.hasErrors()).toBe(false);
|
|
||||||
component.updateSummary({ ...mockSummary, error: 2 });
|
|
||||||
expect(component.hasErrors()).toBe(true);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should compute connectionColor correctly', () => {
|
|
||||||
expect(component.connectionColor()).toBe('disconnected');
|
|
||||||
component.updateHealth({ connected: true, status: 'healthy' });
|
|
||||||
expect(component.connectionColor()).toBe('connected');
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should compute statusLabel for each state', () => {
|
|
||||||
component.updateHealth({ connected: true, status: 'healthy' });
|
|
||||||
expect(component.statusLabel()).toBe('All Systems Go');
|
|
||||||
|
|
||||||
component.updateHealth({ connected: true, status: 'degraded' });
|
|
||||||
expect(component.statusLabel()).toBe('Degraded');
|
|
||||||
|
|
||||||
component.updateHealth({ connected: false, status: 'down' });
|
|
||||||
expect(component.statusLabel()).toBe('Offline');
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should render summary values in template', () => {
|
|
||||||
component.updateSummary(mockSummary);
|
|
||||||
component.updateHealth(mockHealthy);
|
|
||||||
fixture.detectChanges();
|
|
||||||
|
|
||||||
const compiled = fixture.nativeElement as HTMLElement;
|
|
||||||
expect(compiled.textContent).toContain('4 / 7');
|
|
||||||
expect(compiled.textContent).toContain('Active');
|
|
||||||
expect(compiled.textContent).toContain('All Systems Go');
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should render status breakdown chips', () => {
|
|
||||||
component.updateSummary(mockSummary);
|
|
||||||
fixture.detectChanges();
|
|
||||||
|
|
||||||
const compiled = fixture.nativeElement as HTMLElement;
|
|
||||||
expect(compiled.textContent).toContain('4'); // active count
|
|
||||||
expect(compiled.textContent).toContain('1'); // idle count (multiple)
|
|
||||||
expect(compiled.textContent).toContain('Error');
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -1,80 +0,0 @@
|
|||||||
import { ChangeDetectionStrategy, Component, Input, OnDestroy, signal, computed } from '@angular/core';
|
|
||||||
import { CommonModule } from '@angular/common';
|
|
||||||
import { MatButtonModule } from '@angular/material/button';
|
|
||||||
import { MatIconModule } from '@angular/material/icon';
|
|
||||||
import { MatChipsModule } from '@angular/material/chips';
|
|
||||||
import { MatTooltipModule } from '@angular/material/tooltip';
|
|
||||||
import { AgentSummary, SystemHealth } from '../../models/agent.model';
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
selector: 'app-dashboard-summary',
|
|
||||||
standalone: true,
|
|
||||||
imports: [
|
|
||||||
CommonModule,
|
|
||||||
MatButtonModule,
|
|
||||||
MatIconModule,
|
|
||||||
MatChipsModule,
|
|
||||||
MatTooltipModule,
|
|
||||||
],
|
|
||||||
templateUrl: './dashboard-summary.component.html',
|
|
||||||
styleUrls: ['./dashboard-summary.component.scss'],
|
|
||||||
changeDetection: ChangeDetectionStrategy.OnPush,
|
|
||||||
})
|
|
||||||
export class DashboardSummaryComponent implements OnDestroy {
|
|
||||||
/** Agent summary data — reactive signal, updatable via updateSummary() */
|
|
||||||
readonly summary = signal<AgentSummary>({
|
|
||||||
total: 0,
|
|
||||||
active: 0,
|
|
||||||
idle: 0,
|
|
||||||
thinking: 0,
|
|
||||||
error: 0,
|
|
||||||
});
|
|
||||||
|
|
||||||
/** System health data — reactive signal, updatable via updateHealth() */
|
|
||||||
readonly health = signal<SystemHealth>({
|
|
||||||
connected: false,
|
|
||||||
status: 'down',
|
|
||||||
});
|
|
||||||
|
|
||||||
/** Computed signal: whether there are errors to highlight */
|
|
||||||
readonly hasErrors = computed(() => this.summary().error > 0);
|
|
||||||
|
|
||||||
/** Computed signal: whether system is degraded */
|
|
||||||
readonly isDegraded = computed(() => this.health().status === 'degraded');
|
|
||||||
|
|
||||||
/** Computed signal: whether system is down */
|
|
||||||
readonly isDown = computed(() => this.health().status === 'down');
|
|
||||||
|
|
||||||
/** Computed signal: connection indicator color */
|
|
||||||
readonly connectionColor = computed(() =>
|
|
||||||
this.health().connected ? 'connected' : 'disconnected'
|
|
||||||
);
|
|
||||||
|
|
||||||
/** Computed signal: overall status label */
|
|
||||||
readonly statusLabel = computed(() => {
|
|
||||||
const h = this.health();
|
|
||||||
if (h.status === 'healthy') return 'All Systems Go';
|
|
||||||
if (h.status === 'degraded') return 'Degraded';
|
|
||||||
return 'Offline';
|
|
||||||
});
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Update the agent summary. Called by the parent or a service
|
|
||||||
* when new data arrives (e.g., via SignalR).
|
|
||||||
*/
|
|
||||||
updateSummary(data: AgentSummary): void {
|
|
||||||
this.summary.set(data);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Update the system health. Called by the parent or a service
|
|
||||||
* when the connection state changes.
|
|
||||||
*/
|
|
||||||
updateHealth(data: SystemHealth): void {
|
|
||||||
this.health.set(data);
|
|
||||||
}
|
|
||||||
|
|
||||||
ngOnDestroy(): void {
|
|
||||||
// Cleanup handled by signals — no manual subscription teardown needed
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -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,137 +0,0 @@
|
|||||||
<!-- Filament Inventory Table — with filters and low stock indicators -->
|
|
||||||
<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 -->
|
|
||||||
@if (criticalCount() > 0) {
|
|
||||||
<div class="alert-banner critical" role="alert">
|
|
||||||
<mat-icon aria-hidden="true">error</mat-icon>
|
|
||||||
<span>{{ criticalCount() }} spool{{ criticalCount() > 1 ? 's' : '' }} critically low (≤10% remaining)</span>
|
|
||||||
</div>
|
|
||||||
} @else if (lowStockCount() > 0) {
|
|
||||||
<div class="alert-banner low" role="alert">
|
|
||||||
<mat-icon aria-hidden="true">warning</mat-icon>
|
|
||||||
<span>{{ lowStockCount() }} spool{{ lowStockCount() > 1 ? 's' : '' }} running low (≤25% remaining)</span>
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
|
|
||||||
<!-- Filament Table -->
|
|
||||||
<table mat-table
|
|
||||||
[dataSource]="filteredFilaments()"
|
|
||||||
matSort
|
|
||||||
(matSortChange)="sortData($event)"
|
|
||||||
class="filament-table"
|
|
||||||
aria-label="Filament inventory table">
|
|
||||||
|
|
||||||
<!-- Color Column -->
|
|
||||||
<ng-container matColumnDef="color">
|
|
||||||
<th mat-header-cell *matHeaderCellDef mat-sort-header="color">Color</th>
|
|
||||||
<td mat-cell *matCellDef="let filament">
|
|
||||||
<span class="color-swatch"
|
|
||||||
[style.background-color]="filament.colorHex"
|
|
||||||
[matTooltip]="filament.colorName"
|
|
||||||
matTooltipPosition="after"
|
|
||||||
[attr.aria-label]="filament.colorName">
|
|
||||||
</span>
|
|
||||||
</td>
|
|
||||||
</ng-container>
|
|
||||||
|
|
||||||
<!-- Material Column -->
|
|
||||||
<ng-container matColumnDef="material">
|
|
||||||
<th mat-header-cell *matHeaderCellDef mat-sort-header="material">Material</th>
|
|
||||||
<td mat-cell *matCellDef="let filament">
|
|
||||||
<span class="material-name">{{ filament.materialBaseName }}</span>
|
|
||||||
@if (filament.materialModifierName) {
|
|
||||||
<span class="material-modifier"> {{ filament.materialModifierName }}</span>
|
|
||||||
}
|
|
||||||
</td>
|
|
||||||
</ng-container>
|
|
||||||
|
|
||||||
<!-- Brand Column -->
|
|
||||||
<ng-container matColumnDef="brand">
|
|
||||||
<th mat-header-cell *matHeaderCellDef mat-sort-header="brand">Brand</th>
|
|
||||||
<td mat-cell *matCellDef="let filament">{{ filament.brand }}</td>
|
|
||||||
</ng-container>
|
|
||||||
|
|
||||||
<!-- Serial Column -->
|
|
||||||
<ng-container matColumnDef="serial">
|
|
||||||
<th mat-header-cell *matHeaderCellDef mat-sort-header="serial">Serial</th>
|
|
||||||
<td mat-cell *matCellDef="let filament" class="serial-cell">{{ filament.spoolSerial }}</td>
|
|
||||||
</ng-container>
|
|
||||||
|
|
||||||
<!-- Remaining Weight Column -->
|
|
||||||
<ng-container matColumnDef="remaining">
|
|
||||||
<th mat-header-cell *matHeaderCellDef mat-sort-header="remaining">Remaining</th>
|
|
||||||
<td mat-cell *matCellDef="let filament">
|
|
||||||
<div class="remaining-cell">
|
|
||||||
<span class="remaining-text">
|
|
||||||
{{ formatWeight(filament.weightRemainingGrams) }} / {{ formatWeight(filament.weightTotalGrams) }}
|
|
||||||
</span>
|
|
||||||
<mat-progress-bar
|
|
||||||
mode="determinate"
|
|
||||||
[value]="getRemainingPercent(filament)"
|
|
||||||
[ngClass]="classifyStockLevel(filament)"
|
|
||||||
[matTooltip]="getRemainingPercent(filament).toFixed(0) + '% remaining'"
|
|
||||||
matTooltipPosition="below">
|
|
||||||
</mat-progress-bar>
|
|
||||||
</div>
|
|
||||||
</td>
|
|
||||||
</ng-container>
|
|
||||||
|
|
||||||
<!-- Stock Level Indicator Column -->
|
|
||||||
<ng-container matColumnDef="stockLevel">
|
|
||||||
<th mat-header-cell *matHeaderCellDef mat-sort-header="stockLevel">Stock</th>
|
|
||||||
<td mat-cell *matCellDef="let filament">
|
|
||||||
@let level = classifyStockLevel(filament);
|
|
||||||
<mat-chip-set aria-label="Stock level">
|
|
||||||
<mat-chip
|
|
||||||
[ngClass]="level"
|
|
||||||
[matTooltip]="stockLevelLabel(level) + ' — ' + getRemainingPercent(filament).toFixed(0) + '% remaining'"
|
|
||||||
matTooltipPosition="below">
|
|
||||||
<mat-icon matChipStart [ngClass]="level">{{ stockLevelIcon(level) }}</mat-icon>
|
|
||||||
<span>{{ stockLevelLabel(level) }}</span>
|
|
||||||
</mat-chip>
|
|
||||||
</mat-chip-set>
|
|
||||||
</td>
|
|
||||||
</ng-container>
|
|
||||||
|
|
||||||
<!-- Status Column -->
|
|
||||||
<ng-container matColumnDef="status">
|
|
||||||
<th mat-header-cell *matHeaderCellDef mat-sort-header="status">Status</th>
|
|
||||||
<td mat-cell *matCellDef="let filament">
|
|
||||||
<span class="status-badge"
|
|
||||||
[class.active]="filament.isActive"
|
|
||||||
[class.inactive]="!filament.isActive">
|
|
||||||
{{ filament.isActive ? 'Active' : 'Inactive' }}
|
|
||||||
</span>
|
|
||||||
</td>
|
|
||||||
</ng-container>
|
|
||||||
|
|
||||||
<tr mat-header-row *matHeaderRowDef="columns()"></tr>
|
|
||||||
<tr mat-row *matRowDef="let row; columns: columns();"
|
|
||||||
[class.row-critical]="classifyStockLevel(row) === 'critical'"
|
|
||||||
[class.row-low]="classifyStockLevel(row) === 'low'">
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
|
|
||||||
<!-- Filtered empty state -->
|
|
||||||
@if (filteredFilaments().length === 0 && filaments().length > 0) {
|
|
||||||
<div class="empty-state" role="status">
|
|
||||||
<mat-icon aria-hidden="true">filter_alt_off</mat-icon>
|
|
||||||
<p>No filaments match the current filters</p>
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
|
|
||||||
<!-- No data empty state -->
|
|
||||||
@if (filaments().length === 0) {
|
|
||||||
<div class="empty-state" role="status">
|
|
||||||
<mat-icon aria-hidden="true">inventory_2</mat-icon>
|
|
||||||
<p>No filament spools found</p>
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
</div>
|
|
||||||
@@ -1,259 +0,0 @@
|
|||||||
/**
|
|
||||||
* Filament Table Component Styles
|
|
||||||
* Touch-optimized for kiosk (Raspberry Pi 5) and mobile PWA
|
|
||||||
* Low stock indicators use high-contrast colors for workshop visibility
|
|
||||||
*/
|
|
||||||
|
|
||||||
// Touch-optimized sizing
|
|
||||||
$touch-target-min: 48px;
|
|
||||||
$spacing-unit: 8px;
|
|
||||||
|
|
||||||
// Stock level colors — high contrast, accessible
|
|
||||||
$color-critical: #ef4444; // Red — critically low
|
|
||||||
$color-low: #f59e0b; // Amber — running low
|
|
||||||
$color-moderate: #3b82f6; // Blue — moderate
|
|
||||||
$color-healthy: #22c55e; // Green — healthy/OK
|
|
||||||
$color-active: #22c55e; // Green — active spool
|
|
||||||
$color-inactive: #94a3b8; // Gray — inactive spool
|
|
||||||
|
|
||||||
.filament-table-container {
|
|
||||||
width: 100%;
|
|
||||||
overflow-x: auto;
|
|
||||||
-webkit-overflow-scrolling: touch;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Alert banner for low stock warnings
|
|
||||||
.alert-banner {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: $spacing-unit;
|
|
||||||
padding: $spacing-unit * 1.5 $spacing-unit * 2;
|
|
||||||
border-radius: 8px;
|
|
||||||
margin-bottom: $spacing-unit * 2;
|
|
||||||
font-size: 14px;
|
|
||||||
font-weight: 500;
|
|
||||||
|
|
||||||
mat-icon {
|
|
||||||
font-size: 20px !important;
|
|
||||||
width: 20px !important;
|
|
||||||
height: 20px !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
&.critical {
|
|
||||||
background-color: rgba($color-critical, 0.12);
|
|
||||||
color: $color-critical;
|
|
||||||
border: 1px solid rgba($color-critical, 0.3);
|
|
||||||
}
|
|
||||||
|
|
||||||
&.low {
|
|
||||||
background-color: rgba($color-low, 0.12);
|
|
||||||
color: $color-low;
|
|
||||||
border: 1px solid rgba($color-low, 0.3);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Table styling
|
|
||||||
.filament-table {
|
|
||||||
width: 100%;
|
|
||||||
min-width: 700px;
|
|
||||||
|
|
||||||
th {
|
|
||||||
font-weight: 600;
|
|
||||||
font-size: 13px;
|
|
||||||
text-transform: uppercase;
|
|
||||||
letter-spacing: 0.04em;
|
|
||||||
color: var(--mat-sys-on-surface-variant);
|
|
||||||
}
|
|
||||||
|
|
||||||
td {
|
|
||||||
font-size: 14px;
|
|
||||||
padding: 12px 16px !important;
|
|
||||||
min-height: $touch-target-min;
|
|
||||||
|
|
||||||
@media (max-width: 480px) {
|
|
||||||
padding: 8px 12px !important;
|
|
||||||
font-size: 13px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Row highlight for low stock
|
|
||||||
.mat-mdc-row {
|
|
||||||
transition: background-color 0.2s ease;
|
|
||||||
}
|
|
||||||
|
|
||||||
&.row-critical {
|
|
||||||
background-color: rgba($color-critical, 0.06) !important;
|
|
||||||
|
|
||||||
&:hover {
|
|
||||||
background-color: rgba($color-critical, 0.1) !important;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
&.row-low {
|
|
||||||
background-color: rgba($color-low, 0.06) !important;
|
|
||||||
|
|
||||||
&:hover {
|
|
||||||
background-color: rgba($color-low, 0.1) !important;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Color swatch
|
|
||||||
.color-swatch {
|
|
||||||
display: inline-block;
|
|
||||||
width: 28px;
|
|
||||||
height: 28px;
|
|
||||||
border-radius: 50%;
|
|
||||||
border: 2px solid rgba(0, 0, 0, 0.12);
|
|
||||||
vertical-align: middle;
|
|
||||||
cursor: default;
|
|
||||||
|
|
||||||
@media (max-width: 480px) {
|
|
||||||
width: 24px;
|
|
||||||
height: 24px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Material name
|
|
||||||
.material-name {
|
|
||||||
font-weight: 500;
|
|
||||||
}
|
|
||||||
|
|
||||||
.material-modifier {
|
|
||||||
font-size: 12px;
|
|
||||||
color: var(--mat-sys-on-surface-variant);
|
|
||||||
margin-left: 4px;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Serial cell — monospace
|
|
||||||
.serial-cell {
|
|
||||||
font-family: 'JetBrains Mono', 'Roboto Mono', monospace;
|
|
||||||
font-size: 13px;
|
|
||||||
letter-spacing: 0.02em;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Remaining weight cell
|
|
||||||
.remaining-cell {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
gap: 4px;
|
|
||||||
min-width: 120px;
|
|
||||||
|
|
||||||
.remaining-text {
|
|
||||||
font-size: 13px;
|
|
||||||
color: var(--mat-sys-on-surface-variant);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Progress bar stock level variants
|
|
||||||
mat-progress-bar {
|
|
||||||
&.critical {
|
|
||||||
--mat-progress-bar-active-indicator-color: #{$color-critical};
|
|
||||||
}
|
|
||||||
|
|
||||||
&.low {
|
|
||||||
--mat-progress-bar-active-indicator-color: #{$color-low};
|
|
||||||
}
|
|
||||||
|
|
||||||
&.moderate {
|
|
||||||
--mat-progress-bar-active-indicator-color: #{$color-moderate};
|
|
||||||
}
|
|
||||||
|
|
||||||
&.healthy {
|
|
||||||
--mat-progress-bar-active-indicator-color: #{$color-healthy};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Stock level chip variants
|
|
||||||
mat-chip {
|
|
||||||
min-height: 32px !important;
|
|
||||||
font-size: 12px !important;
|
|
||||||
|
|
||||||
&.critical {
|
|
||||||
background-color: rgba($color-critical, 0.15) !important;
|
|
||||||
color: $color-critical;
|
|
||||||
|
|
||||||
mat-icon {
|
|
||||||
color: $color-critical;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
&.low {
|
|
||||||
background-color: rgba($color-low, 0.15) !important;
|
|
||||||
color: $color-low;
|
|
||||||
|
|
||||||
mat-icon {
|
|
||||||
color: $color-low;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
&.moderate {
|
|
||||||
background-color: rgba($color-moderate, 0.1) !important;
|
|
||||||
color: $color-moderate;
|
|
||||||
|
|
||||||
mat-icon {
|
|
||||||
color: $color-moderate;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
&.healthy {
|
|
||||||
background-color: rgba($color-healthy, 0.1) !important;
|
|
||||||
color: $color-healthy;
|
|
||||||
|
|
||||||
mat-icon {
|
|
||||||
color: $color-healthy;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
mat-icon {
|
|
||||||
font-size: 16px !important;
|
|
||||||
width: 16px !important;
|
|
||||||
height: 16px !important;
|
|
||||||
margin-right: 4px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Status badge
|
|
||||||
.status-badge {
|
|
||||||
display: inline-flex;
|
|
||||||
align-items: center;
|
|
||||||
padding: 4px 12px;
|
|
||||||
border-radius: 12px;
|
|
||||||
font-size: 12px;
|
|
||||||
font-weight: 600;
|
|
||||||
text-transform: uppercase;
|
|
||||||
letter-spacing: 0.04em;
|
|
||||||
|
|
||||||
&.active {
|
|
||||||
background-color: rgba($color-active, 0.12);
|
|
||||||
color: $color-active;
|
|
||||||
}
|
|
||||||
|
|
||||||
&.inactive {
|
|
||||||
background-color: rgba($color-inactive, 0.12);
|
|
||||||
color: $color-inactive;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Empty state
|
|
||||||
.empty-state {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
padding: 48px $spacing-unit * 2;
|
|
||||||
color: var(--mat-sys-on-surface-variant);
|
|
||||||
|
|
||||||
mat-icon {
|
|
||||||
font-size: 48px !important;
|
|
||||||
width: 48px !important;
|
|
||||||
height: 48px !important;
|
|
||||||
opacity: 0.4;
|
|
||||||
margin-bottom: $spacing-unit * 2;
|
|
||||||
}
|
|
||||||
|
|
||||||
p {
|
|
||||||
font-size: 16px;
|
|
||||||
margin: 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,88 +0,0 @@
|
|||||||
import { describe, it, expect } from 'vitest';
|
|
||||||
import {
|
|
||||||
Filament,
|
|
||||||
StockLevel,
|
|
||||||
getRemainingPercent,
|
|
||||||
classifyStockLevel,
|
|
||||||
} from '../../models/filament.model';
|
|
||||||
|
|
||||||
/** Create a test filament with defaults — override specific fields */
|
|
||||||
function createFilament(overrides: Partial<Filament> = {}): Filament {
|
|
||||||
return {
|
|
||||||
id: '00000000-0000-0000-0000-000000000001',
|
|
||||||
materialBaseId: '10000000-0000-0000-0000-000000000001',
|
|
||||||
materialBaseName: 'PLA',
|
|
||||||
materialFinishId: '20000000-0000-0000-0000-000000000001',
|
|
||||||
materialFinishName: 'Basic',
|
|
||||||
materialModifierId: null,
|
|
||||||
materialModifierName: null,
|
|
||||||
brand: 'Bambu Lab',
|
|
||||||
colorName: 'White',
|
|
||||||
colorHex: '#FFFFFF',
|
|
||||||
weightTotalGrams: 1000,
|
|
||||||
weightRemainingGrams: 750,
|
|
||||||
filamentDiameterMm: 1.75,
|
|
||||||
spoolSerial: 'SN-001',
|
|
||||||
purchasePrice: null,
|
|
||||||
purchaseDate: null,
|
|
||||||
isActive: true,
|
|
||||||
createdAt: '2026-01-01T00:00:00Z',
|
|
||||||
updatedAt: '2026-01-01T00:00:00Z',
|
|
||||||
qrCodeUrl: '',
|
|
||||||
...overrides,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
describe('getRemainingPercent', () => {
|
|
||||||
it('should return correct percentage', () => {
|
|
||||||
const filament = createFilament({ weightTotalGrams: 1000, weightRemainingGrams: 250 });
|
|
||||||
expect(getRemainingPercent(filament)).toBe(25);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should return 0 when total weight is 0', () => {
|
|
||||||
const filament = createFilament({ weightTotalGrams: 0, weightRemainingGrams: 0 });
|
|
||||||
expect(getRemainingPercent(filament)).toBe(0);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should cap at 100%', () => {
|
|
||||||
const filament = createFilament({ weightTotalGrams: 100, weightRemainingGrams: 200 });
|
|
||||||
expect(getRemainingPercent(filament)).toBe(100);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should floor at 0%', () => {
|
|
||||||
const filament = createFilament({ weightTotalGrams: 100, weightRemainingGrams: -10 });
|
|
||||||
expect(getRemainingPercent(filament)).toBe(0);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe('classifyStockLevel', () => {
|
|
||||||
it('should classify as critical when ≤10%', () => {
|
|
||||||
const filament = createFilament({ weightTotalGrams: 1000, weightRemainingGrams: 50 });
|
|
||||||
expect(classifyStockLevel(filament)).toBe('critical');
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should classify as critical at exactly 10%', () => {
|
|
||||||
const filament = createFilament({ weightTotalGrams: 1000, weightRemainingGrams: 100 });
|
|
||||||
expect(classifyStockLevel(filament)).toBe('critical');
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should classify as low when ≤25%', () => {
|
|
||||||
const filament = createFilament({ weightTotalGrams: 1000, weightRemainingGrams: 200 });
|
|
||||||
expect(classifyStockLevel(filament)).toBe('low');
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should classify as moderate when ≤50%', () => {
|
|
||||||
const filament = createFilament({ weightTotalGrams: 1000, weightRemainingGrams: 400 });
|
|
||||||
expect(classifyStockLevel(filament)).toBe('moderate');
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should classify as healthy when >50%', () => {
|
|
||||||
const filament = createFilament({ weightTotalGrams: 1000, weightRemainingGrams: 750 });
|
|
||||||
expect(classifyStockLevel(filament)).toBe('healthy');
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should classify 0 grams remaining as critical', () => {
|
|
||||||
const filament = createFilament({ weightTotalGrams: 1000, weightRemainingGrams: 0 });
|
|
||||||
expect(classifyStockLevel(filament)).toBe('critical');
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -1,375 +0,0 @@
|
|||||||
import {
|
|
||||||
ChangeDetectionStrategy,
|
|
||||||
Component,
|
|
||||||
Input,
|
|
||||||
computed,
|
|
||||||
signal,
|
|
||||||
} from '@angular/core';
|
|
||||||
import { CommonModule } from '@angular/common';
|
|
||||||
import { MatTableModule } from '@angular/material/table';
|
|
||||||
import { MatChipsModule } from '@angular/material/chips';
|
|
||||||
import { MatIconModule } from '@angular/material/icon';
|
|
||||||
import { MatProgressBarModule } from '@angular/material/progress-bar';
|
|
||||||
import { MatTooltipModule } from '@angular/material/tooltip';
|
|
||||||
import { MatSortModule, Sort } from '@angular/material/sort';
|
|
||||||
import { FilamentFilterComponent, FilamentFilterState } from '../filament-filter/filament-filter.component';
|
|
||||||
import {
|
|
||||||
Filament,
|
|
||||||
StockLevel,
|
|
||||||
getRemainingPercent,
|
|
||||||
classifyStockLevel,
|
|
||||||
} from '../../models/filament.model';
|
|
||||||
|
|
||||||
/** Display column definitions for the filament table */
|
|
||||||
export type FilamentColumn =
|
|
||||||
| 'color'
|
|
||||||
| 'material'
|
|
||||||
| 'brand'
|
|
||||||
| 'serial'
|
|
||||||
| 'remaining'
|
|
||||||
| 'stockLevel'
|
|
||||||
| 'status';
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
selector: 'app-filament-table',
|
|
||||||
standalone: true,
|
|
||||||
imports: [
|
|
||||||
CommonModule,
|
|
||||||
MatTableModule,
|
|
||||||
MatChipsModule,
|
|
||||||
MatIconModule,
|
|
||||||
MatProgressBarModule,
|
|
||||||
MatTooltipModule,
|
|
||||||
MatSortModule,
|
|
||||||
FilamentFilterComponent,
|
|
||||||
],
|
|
||||||
templateUrl: './filament-table.component.html',
|
|
||||||
styleUrl: './filament-table.component.scss',
|
|
||||||
changeDetection: ChangeDetectionStrategy.OnPush,
|
|
||||||
})
|
|
||||||
export class FilamentTableComponent {
|
|
||||||
/** Filament data input — reactive signal for live updates */
|
|
||||||
readonly filaments = signal<Filament[]>([]);
|
|
||||||
|
|
||||||
/** Columns to display — defaults to all columns */
|
|
||||||
@Input()
|
|
||||||
set displayedColumns(cols: FilamentColumn[]) {
|
|
||||||
this._displayedColumns.set(cols);
|
|
||||||
}
|
|
||||||
get displayedColumns(): FilamentColumn[] {
|
|
||||||
return this._displayedColumns();
|
|
||||||
}
|
|
||||||
private readonly _displayedColumns = signal<FilamentColumn[]>([
|
|
||||||
'color',
|
|
||||||
'material',
|
|
||||||
'brand',
|
|
||||||
'serial',
|
|
||||||
'remaining',
|
|
||||||
'stockLevel',
|
|
||||||
'status',
|
|
||||||
]);
|
|
||||||
|
|
||||||
/** Default columns for template binding */
|
|
||||||
readonly columns = this._displayedColumns;
|
|
||||||
|
|
||||||
/** Current filter state */
|
|
||||||
readonly filterState = signal<FilamentFilterState>({
|
|
||||||
materialBaseNames: [],
|
|
||||||
colorSearch: '',
|
|
||||||
lowStockOnly: false,
|
|
||||||
activeOnly: false,
|
|
||||||
});
|
|
||||||
|
|
||||||
/** Sorted filament data */
|
|
||||||
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 */
|
|
||||||
readonly lowStockCount = computed(() =>
|
|
||||||
this.filaments().filter(
|
|
||||||
(f) => classifyStockLevel(f) === 'low' || classifyStockLevel(f) === 'critical'
|
|
||||||
).length
|
|
||||||
);
|
|
||||||
|
|
||||||
/** Computed: count of critical spools */
|
|
||||||
readonly criticalCount = computed(() =>
|
|
||||||
this.filaments().filter((f) => classifyStockLevel(f) === 'critical').length
|
|
||||||
);
|
|
||||||
|
|
||||||
constructor() {
|
|
||||||
// Initialize sorted data from 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 by parent or service */
|
|
||||||
updateFilaments(data: Filament[]): void {
|
|
||||||
this.filaments.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 */
|
|
||||||
sortData(sort: Sort): void {
|
|
||||||
const data = [...this.filaments()];
|
|
||||||
if (!sort.active || sort.direction === '') {
|
|
||||||
this.sortedFilaments.set(data);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const sorted = data.sort((a, b) => {
|
|
||||||
const isAsc = sort.direction === 'asc';
|
|
||||||
switch (sort.active as FilamentColumn) {
|
|
||||||
case 'material':
|
|
||||||
return compare(a.materialBaseName, b.materialBaseName, isAsc);
|
|
||||||
case 'brand':
|
|
||||||
return compare(a.brand, b.brand, isAsc);
|
|
||||||
case 'serial':
|
|
||||||
return compare(a.spoolSerial, b.spoolSerial, isAsc);
|
|
||||||
case 'remaining':
|
|
||||||
return compare(
|
|
||||||
getRemainingPercent(a),
|
|
||||||
getRemainingPercent(b),
|
|
||||||
isAsc
|
|
||||||
);
|
|
||||||
case 'stockLevel':
|
|
||||||
return compare(
|
|
||||||
stockLevelOrder(classifyStockLevel(a)),
|
|
||||||
stockLevelOrder(classifyStockLevel(b)),
|
|
||||||
isAsc
|
|
||||||
);
|
|
||||||
case 'status':
|
|
||||||
return compare(
|
|
||||||
a.isActive ? 0 : 1,
|
|
||||||
b.isActive ? 0 : 1,
|
|
||||||
isAsc
|
|
||||||
);
|
|
||||||
default:
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
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 */
|
|
||||||
getRemainingPercent = getRemainingPercent;
|
|
||||||
|
|
||||||
/** Template helper: classify stock level */
|
|
||||||
classifyStockLevel = classifyStockLevel;
|
|
||||||
|
|
||||||
/** Template helper: stock level icon */
|
|
||||||
stockLevelIcon(level: StockLevel): string {
|
|
||||||
switch (level) {
|
|
||||||
case 'critical':
|
|
||||||
return 'error';
|
|
||||||
case 'low':
|
|
||||||
return 'warning';
|
|
||||||
case 'moderate':
|
|
||||||
return 'info';
|
|
||||||
case 'healthy':
|
|
||||||
return 'check_circle';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Template helper: stock level label */
|
|
||||||
stockLevelLabel(level: StockLevel): string {
|
|
||||||
switch (level) {
|
|
||||||
case 'critical':
|
|
||||||
return 'Critical';
|
|
||||||
case 'low':
|
|
||||||
return 'Low';
|
|
||||||
case 'moderate':
|
|
||||||
return 'Moderate';
|
|
||||||
case 'healthy':
|
|
||||||
return 'Healthy';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Template helper: format remaining weight */
|
|
||||||
formatWeight(grams: number): string {
|
|
||||||
if (grams >= 1000) {
|
|
||||||
return `${(grams / 1000).toFixed(1)}kg`;
|
|
||||||
}
|
|
||||||
return `${Math.round(grams)}g`;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Compare helper for sorting */
|
|
||||||
function compare(a: number | string, b: number | string, isAsc: boolean): number {
|
|
||||||
return (a < b ? -1 : a > b ? 1 : 0) * (isAsc ? 1 : -1);
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Stock level sort order (critical=0, healthy=3) */
|
|
||||||
function stockLevelOrder(level: StockLevel): number {
|
|
||||||
switch (level) {
|
|
||||||
case 'critical':
|
|
||||||
return 0;
|
|
||||||
case 'low':
|
|
||||||
return 1;
|
|
||||||
case 'moderate':
|
|
||||||
return 2;
|
|
||||||
case 'healthy':
|
|
||||||
return 3;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
/**
|
|
||||||
* Represents the status of a single agent/printer in the system.
|
|
||||||
*/
|
|
||||||
export type AgentStatus = 'active' | 'idle' | 'thinking' | 'error';
|
|
||||||
|
|
||||||
export interface AgentSummary {
|
|
||||||
/** Total number of agents in the system */
|
|
||||||
total: number;
|
|
||||||
/** Number of currently active agents */
|
|
||||||
active: number;
|
|
||||||
/** Number of currently idle agents */
|
|
||||||
idle: number;
|
|
||||||
/** Number of currently thinking/processing agents */
|
|
||||||
thinking: number;
|
|
||||||
/** Number of agents in error state */
|
|
||||||
error: number;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface SystemHealth {
|
|
||||||
/** Whether the SignalR connection is live */
|
|
||||||
connected: boolean;
|
|
||||||
/** Overall system health: healthy, degraded, or down */
|
|
||||||
status: 'healthy' | 'degraded' | 'down';
|
|
||||||
}
|
|
||||||
@@ -1,100 +0,0 @@
|
|||||||
/**
|
|
||||||
* Filament model matching the Extrudex backend FilamentResponse DTO.
|
|
||||||
* Used for displaying spool inventory in the filament table UI.
|
|
||||||
*/
|
|
||||||
export interface Filament {
|
|
||||||
/** Unique identifier for the filament spool. */
|
|
||||||
id: string;
|
|
||||||
|
|
||||||
/** Foreign key to the base material. */
|
|
||||||
materialBaseId: string;
|
|
||||||
|
|
||||||
/** Name of the base material (e.g., "PLA", "PETG"). */
|
|
||||||
materialBaseName: string;
|
|
||||||
|
|
||||||
/** Foreign key to the material finish. */
|
|
||||||
materialFinishId: string;
|
|
||||||
|
|
||||||
/** Name of the material finish (e.g., "Basic", "Matte"). */
|
|
||||||
materialFinishName: string;
|
|
||||||
|
|
||||||
/** Foreign key to the optional material modifier. */
|
|
||||||
materialModifierId: string | null;
|
|
||||||
|
|
||||||
/** Name of the material modifier (e.g., "Carbon Fiber"). Null if none. */
|
|
||||||
materialModifierName: string | null;
|
|
||||||
|
|
||||||
/** Brand name (e.g., "Bambu Lab", "Polymaker"). */
|
|
||||||
brand: string;
|
|
||||||
|
|
||||||
/** Human-readable color name (e.g., "Fire Engine Red"). */
|
|
||||||
colorName: string;
|
|
||||||
|
|
||||||
/** Hex color code (e.g., "#FF0000"). */
|
|
||||||
colorHex: string;
|
|
||||||
|
|
||||||
/** Total spool weight in grams when full. */
|
|
||||||
weightTotalGrams: number;
|
|
||||||
|
|
||||||
/** Current remaining weight in grams. */
|
|
||||||
weightRemainingGrams: number;
|
|
||||||
|
|
||||||
/** Filament diameter in millimeters. Typically 1.75mm. */
|
|
||||||
filamentDiameterMm: number;
|
|
||||||
|
|
||||||
/** Manufacturer-assigned serial number. */
|
|
||||||
spoolSerial: string;
|
|
||||||
|
|
||||||
/** Purchase price per spool. Null if not tracked. */
|
|
||||||
purchasePrice: number | null;
|
|
||||||
|
|
||||||
/** Date the spool was purchased or received. */
|
|
||||||
purchaseDate: string | null;
|
|
||||||
|
|
||||||
/** Whether the spool is currently active and available. */
|
|
||||||
isActive: boolean;
|
|
||||||
|
|
||||||
/** Timestamp when this record was created (UTC). */
|
|
||||||
createdAt: string;
|
|
||||||
|
|
||||||
/** Timestamp when this record was last updated (UTC). */
|
|
||||||
updatedAt: string;
|
|
||||||
|
|
||||||
/** URL to the QR code image for this spool. */
|
|
||||||
qrCodeUrl: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Stock level classification for low stock indicators.
|
|
||||||
* - critical: ≤ 10% remaining
|
|
||||||
* - low: ≤ 25% remaining
|
|
||||||
* - moderate: ≤ 50% remaining
|
|
||||||
* - healthy: > 50% remaining
|
|
||||||
*/
|
|
||||||
export type StockLevel = 'critical' | 'low' | 'moderate' | 'healthy';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Compute the remaining weight percentage for a filament spool.
|
|
||||||
* Returns a value from 0 to 100.
|
|
||||||
*/
|
|
||||||
export function getRemainingPercent(filament: Filament): number {
|
|
||||||
if (filament.weightTotalGrams <= 0) return 0;
|
|
||||||
const pct = (filament.weightRemainingGrams / filament.weightTotalGrams) * 100;
|
|
||||||
return Math.min(Math.max(pct, 0), 100);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Classify the stock level based on remaining percentage.
|
|
||||||
* Thresholds:
|
|
||||||
* critical — ≤ 10% (nearly empty, red alert)
|
|
||||||
* low — ≤ 25% (getting low, amber warning)
|
|
||||||
* moderate — ≤ 50% (half or less, yellow info)
|
|
||||||
* healthy — > 50% (plenty left, green OK)
|
|
||||||
*/
|
|
||||||
export function classifyStockLevel(filament: Filament): StockLevel {
|
|
||||||
const pct = getRemainingPercent(filament);
|
|
||||||
if (pct <= 10) return 'critical';
|
|
||||||
if (pct <= 25) return 'low';
|
|
||||||
if (pct <= 50) return 'moderate';
|
|
||||||
return 'healthy';
|
|
||||||
}
|
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
<!doctype html>
|
|
||||||
<html lang="en">
|
|
||||||
<head>
|
|
||||||
<meta charset="utf-8" />
|
|
||||||
<title>Frontend</title>
|
|
||||||
<base href="/" />
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
|
||||||
<link rel="icon" type="image/x-icon" href="favicon.ico" />
|
|
||||||
<link rel="preconnect" href="https://fonts.googleapis.com" />
|
|
||||||
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
|
|
||||||
<link
|
|
||||||
href="https://fonts.googleapis.com/css2?family=Roboto:wght@300;400;500&display=swap"
|
|
||||||
rel="stylesheet"
|
|
||||||
/>
|
|
||||||
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" />
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<app-root></app-root>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
import { bootstrapApplication } from '@angular/platform-browser';
|
|
||||||
import { appConfig } from './app/app.config';
|
|
||||||
import { App } from './app/app';
|
|
||||||
|
|
||||||
bootstrapApplication(App, appConfig)
|
|
||||||
.catch((err) => console.error(err));
|
|
||||||
@@ -1,39 +0,0 @@
|
|||||||
// Include theming for Angular Material with `mat.theme()`.
|
|
||||||
// This Sass mixin will define CSS variables that are used for styling Angular Material
|
|
||||||
// components according to the Material 3 design spec.
|
|
||||||
// Learn more about theming and how to use it for your application's
|
|
||||||
// custom components at https://material.angular.dev/guide/theming
|
|
||||||
@use '@angular/material' as mat;
|
|
||||||
|
|
||||||
html {
|
|
||||||
height: 100%;
|
|
||||||
@include mat.theme(
|
|
||||||
(
|
|
||||||
color: (
|
|
||||||
primary: mat.$azure-palette,
|
|
||||||
tertiary: mat.$blue-palette,
|
|
||||||
),
|
|
||||||
typography: Roboto,
|
|
||||||
density: 0,
|
|
||||||
)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
body {
|
|
||||||
// Default the application to a light color theme. This can be changed to
|
|
||||||
// `dark` to enable the dark color theme, or to `light dark` to defer to the
|
|
||||||
// user's system settings.
|
|
||||||
color-scheme: light;
|
|
||||||
|
|
||||||
// Set a default background, font and text colors for the application using
|
|
||||||
// Angular Material's system-level CSS variables. Learn more about these
|
|
||||||
// variables at https://material.angular.dev/guide/system-variables
|
|
||||||
background-color: var(--mat-sys-surface);
|
|
||||||
color: var(--mat-sys-on-surface);
|
|
||||||
font: var(--mat-sys-body-medium);
|
|
||||||
|
|
||||||
// Reset the user agent margin.
|
|
||||||
margin: 0;
|
|
||||||
height: 100%;
|
|
||||||
}
|
|
||||||
/* You can add global styles to this file, and also import other style files */
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
/* To learn more about Typescript configuration file: https://www.typescriptlang.org/docs/handbook/tsconfig-json.html. */
|
|
||||||
/* To learn more about Angular compiler options: https://angular.dev/reference/configs/angular-compiler-options. */
|
|
||||||
{
|
|
||||||
"extends": "./tsconfig.json",
|
|
||||||
"compilerOptions": {
|
|
||||||
"outDir": "./out-tsc/app",
|
|
||||||
"types": []
|
|
||||||
},
|
|
||||||
"include": [
|
|
||||||
"src/**/*.ts"
|
|
||||||
],
|
|
||||||
"exclude": [
|
|
||||||
"src/**/*.spec.ts"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
/* To learn more about Typescript configuration file: https://www.typescriptlang.org/docs/handbook/tsconfig-json.html. */
|
|
||||||
/* To learn more about Angular compiler options: https://angular.dev/reference/configs/angular-compiler-options. */
|
|
||||||
{
|
|
||||||
"compileOnSave": false,
|
|
||||||
"compilerOptions": {
|
|
||||||
"strict": true,
|
|
||||||
"noImplicitOverride": true,
|
|
||||||
"noPropertyAccessFromIndexSignature": true,
|
|
||||||
"noImplicitReturns": true,
|
|
||||||
"noFallthroughCasesInSwitch": true,
|
|
||||||
"skipLibCheck": true,
|
|
||||||
"isolatedModules": true,
|
|
||||||
"experimentalDecorators": true,
|
|
||||||
"importHelpers": true,
|
|
||||||
"target": "ES2022",
|
|
||||||
"module": "preserve"
|
|
||||||
},
|
|
||||||
"angularCompilerOptions": {
|
|
||||||
"enableI18nLegacyMessageIdFormat": false,
|
|
||||||
"strictInjectionParameters": true,
|
|
||||||
"strictInputAccessModifiers": true,
|
|
||||||
"strictTemplates": true
|
|
||||||
},
|
|
||||||
"files": [],
|
|
||||||
"references": [
|
|
||||||
{
|
|
||||||
"path": "./tsconfig.app.json"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"path": "./tsconfig.spec.json"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
/* To learn more about Typescript configuration file: https://www.typescriptlang.org/docs/handbook/tsconfig-json.html. */
|
|
||||||
/* To learn more about Angular compiler options: https://angular.dev/reference/configs/angular-compiler-options. */
|
|
||||||
{
|
|
||||||
"extends": "./tsconfig.json",
|
|
||||||
"compilerOptions": {
|
|
||||||
"outDir": "./out-tsc/spec",
|
|
||||||
"types": [
|
|
||||||
"vitest/globals"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"include": [
|
|
||||||
"src/**/*.d.ts",
|
|
||||||
"src/**/*.spec.ts"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user