Compare commits
1 Commits
agent/rex/
...
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
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,7 +1,6 @@
|
|||||||
using Extrudex.API.DTOs;
|
using Extrudex.API.DTOs;
|
||||||
using Extrudex.API.DTOs.Filaments;
|
using Extrudex.API.DTOs.Filaments;
|
||||||
using Extrudex.Domain.Entities;
|
using Extrudex.Domain.Entities;
|
||||||
using Extrudex.Domain.Interfaces;
|
|
||||||
using Extrudex.Infrastructure.Data;
|
using Extrudex.Infrastructure.Data;
|
||||||
using Microsoft.AspNetCore.Mvc;
|
using Microsoft.AspNetCore.Mvc;
|
||||||
using Microsoft.EntityFrameworkCore;
|
using Microsoft.EntityFrameworkCore;
|
||||||
@@ -18,22 +17,16 @@ namespace Extrudex.API.Controllers;
|
|||||||
public class FilamentsController : ControllerBase
|
public class FilamentsController : ControllerBase
|
||||||
{
|
{
|
||||||
private readonly ExtrudexDbContext _dbContext;
|
private readonly ExtrudexDbContext _dbContext;
|
||||||
private readonly ILowStockDetector _lowStockDetector;
|
|
||||||
private readonly ILogger<FilamentsController> _logger;
|
private readonly ILogger<FilamentsController> _logger;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Initializes a new instance of the <see cref="FilamentsController"/> class.
|
/// Initializes a new instance of the <see cref="FilamentsController"/> class.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="dbContext">The database context for data access.</param>
|
/// <param name="dbContext">The database context for data access.</param>
|
||||||
/// <param name="lowStockDetector">The low-stock detection service for filament alerts.</param>
|
|
||||||
/// <param name="logger">The logger for diagnostic output.</param>
|
/// <param name="logger">The logger for diagnostic output.</param>
|
||||||
public FilamentsController(
|
public FilamentsController(ExtrudexDbContext dbContext, ILogger<FilamentsController> logger)
|
||||||
ExtrudexDbContext dbContext,
|
|
||||||
ILowStockDetector lowStockDetector,
|
|
||||||
ILogger<FilamentsController> logger)
|
|
||||||
{
|
{
|
||||||
_dbContext = dbContext;
|
_dbContext = dbContext;
|
||||||
_lowStockDetector = lowStockDetector;
|
|
||||||
_logger = logger;
|
_logger = logger;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -47,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);
|
||||||
@@ -87,22 +77,13 @@ 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
|
||||||
.OrderByDescending(s => s.CreatedAt)
|
.OrderByDescending(s => s.CreatedAt)
|
||||||
.Skip((pageNumber - 1) * pageSize)
|
.Skip((pageNumber - 1) * pageSize)
|
||||||
.Take(pageSize)
|
.Take(pageSize)
|
||||||
.Select(s => MapToFilamentResponse(s, _lowStockDetector))
|
.Select(s => MapToFilamentResponse(s))
|
||||||
.ToListAsync();
|
.ToListAsync();
|
||||||
|
|
||||||
var response = new PagedResponse<FilamentResponse>
|
var response = new PagedResponse<FilamentResponse>
|
||||||
@@ -143,7 +124,7 @@ public class FilamentsController : ControllerBase
|
|||||||
return NotFound(new { error = $"Filament with ID '{id}' not found." });
|
return NotFound(new { error = $"Filament with ID '{id}' not found." });
|
||||||
}
|
}
|
||||||
|
|
||||||
return Ok(MapToFilamentResponse(spool, _lowStockDetector));
|
return Ok(MapToFilamentResponse(spool));
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -204,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);
|
||||||
@@ -218,7 +197,7 @@ public class FilamentsController : ControllerBase
|
|||||||
if (entity.MaterialModifierId.HasValue)
|
if (entity.MaterialModifierId.HasValue)
|
||||||
await _dbContext.Entry(entity).Reference(s => s.MaterialModifier).LoadAsync();
|
await _dbContext.Entry(entity).Reference(s => s.MaterialModifier).LoadAsync();
|
||||||
|
|
||||||
var response = MapToFilamentResponse(entity, _lowStockDetector);
|
var response = MapToFilamentResponse(entity);
|
||||||
return CreatedAtAction(nameof(GetFilament), new { id = entity.Id }, response);
|
return CreatedAtAction(nameof(GetFilament), new { id = entity.Id }, response);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -288,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();
|
||||||
|
|
||||||
@@ -299,97 +276,7 @@ public class FilamentsController : ControllerBase
|
|||||||
if (entity.MaterialModifierId.HasValue)
|
if (entity.MaterialModifierId.HasValue)
|
||||||
await _dbContext.Entry(entity).Reference(s => s.MaterialModifier).LoadAsync();
|
await _dbContext.Entry(entity).Reference(s => s.MaterialModifier).LoadAsync();
|
||||||
|
|
||||||
return Ok(MapToFilamentResponse(entity, _lowStockDetector));
|
return Ok(MapToFilamentResponse(entity));
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets only the filament spools that are flagged as low stock.
|
|
||||||
/// A spool is considered low stock when its remaining weight percentage
|
|
||||||
/// is at or below the configured threshold.
|
|
||||||
/// </summary>
|
|
||||||
/// <returns>A list of low-stock filament spools with alert metadata.</returns>
|
|
||||||
/// <response code="200">Returns the list of low-stock filament spools.</response>
|
|
||||||
[HttpGet("low-stock")]
|
|
||||||
[ProducesResponseType(typeof(List<FilamentResponse>), StatusCodes.Status200OK)]
|
|
||||||
public async Task<ActionResult<List<FilamentResponse>>> GetLowStockFilaments()
|
|
||||||
{
|
|
||||||
_logger.LogDebug("Getting low-stock filaments (threshold: {Threshold}%)",
|
|
||||||
_lowStockDetector.LowStockThresholdPercent);
|
|
||||||
|
|
||||||
var spools = await _dbContext.Spools
|
|
||||||
.Include(s => s.MaterialBase)
|
|
||||||
.Include(s => s.MaterialFinish)
|
|
||||||
.Include(s => s.MaterialModifier)
|
|
||||||
.Where(s => s.IsActive)
|
|
||||||
.OrderByDescending(s => s.CreatedAt)
|
|
||||||
.ToListAsync();
|
|
||||||
|
|
||||||
var lowStockItems = spools
|
|
||||||
.Where(s => _lowStockDetector.IsLowStock(s.WeightRemainingGrams, s.WeightTotalGrams))
|
|
||||||
.Select(s => MapToFilamentResponse(s, _lowStockDetector))
|
|
||||||
.ToList();
|
|
||||||
|
|
||||||
return Ok(lowStockItems);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <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 ─────────────────────────────────────────
|
||||||
@@ -398,12 +285,10 @@ public class FilamentsController : ControllerBase
|
|||||||
/// Maps a Spool domain entity to a FilamentResponse DTO.
|
/// Maps a Spool domain entity to a FilamentResponse DTO.
|
||||||
/// Denormalizes material names for display convenience.
|
/// Denormalizes material names for display convenience.
|
||||||
/// Populates the QrCodeUrl for easy frontend access to the spool's QR code.
|
/// Populates the QrCodeUrl for easy frontend access to the spool's QR code.
|
||||||
/// Calculates low-stock status and remaining weight percentage.
|
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="s">The spool entity to map.</param>
|
/// <param name="s">The spool entity to map.</param>
|
||||||
/// <param name="lowStockDetector">The low-stock detection service for computing alert flags.</param>
|
/// <returns>A FilamentResponse DTO with denormalized material names and QR code URL.</returns>
|
||||||
/// <returns>A FilamentResponse DTO with denormalized material names, QR code URL, and low-stock metadata.</returns>
|
private static FilamentResponse MapToFilamentResponse(Spool s) => new()
|
||||||
private static FilamentResponse MapToFilamentResponse(Spool s, ILowStockDetector lowStockDetector) => new()
|
|
||||||
{
|
{
|
||||||
Id = s.Id,
|
Id = s.Id,
|
||||||
MaterialBaseId = s.MaterialBaseId,
|
MaterialBaseId = s.MaterialBaseId,
|
||||||
@@ -422,12 +307,8 @@ public class FilamentsController : ControllerBase
|
|||||||
PurchasePrice = s.PurchasePrice,
|
PurchasePrice = s.PurchasePrice,
|
||||||
PurchaseDate = s.PurchaseDate,
|
PurchaseDate = s.PurchaseDate,
|
||||||
IsActive = s.IsActive,
|
IsActive = s.IsActive,
|
||||||
IsArchived = s.IsArchived,
|
|
||||||
StorageLocation = s.StorageLocation,
|
|
||||||
CreatedAt = s.CreatedAt,
|
CreatedAt = s.CreatedAt,
|
||||||
UpdatedAt = s.UpdatedAt,
|
UpdatedAt = s.UpdatedAt,
|
||||||
QrCodeUrl = $"/api/qr/spool/{s.Id}",
|
QrCodeUrl = $"/api/qr/spool/{s.Id}"
|
||||||
IsLowStock = lowStockDetector.IsLowStock(s.WeightRemainingGrams, s.WeightTotalGrams),
|
|
||||||
RemainingWeightPercent = lowStockDetector.GetRemainingWeightPercent(s.WeightRemainingGrams, s.WeightTotalGrams)
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -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>
|
||||||
|
|||||||
@@ -1,117 +0,0 @@
|
|||||||
using Extrudex.API.DTOs.UsageLogs;
|
|
||||||
using Extrudex.Domain.Enums;
|
|
||||||
using Extrudex.Domain.Interfaces;
|
|
||||||
using Microsoft.AspNetCore.Mvc;
|
|
||||||
|
|
||||||
namespace Extrudex.API.Controllers;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// API controller for recording and querying filament usage logs.
|
|
||||||
/// Usage logs provide a fine-grained audit trail of filament consumption
|
|
||||||
/// from printer integrations or manual input.
|
|
||||||
/// </summary>
|
|
||||||
[ApiController]
|
|
||||||
[Route("api/[controller]")]
|
|
||||||
[Produces("application/json")]
|
|
||||||
public class UsageLogsController : ControllerBase
|
|
||||||
{
|
|
||||||
private readonly IUsageLogService _usageLogService;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Initializes a new instance of the <see cref="UsageLogsController"/> class.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="usageLogService">The usage log service for recording and querying usage.</param>
|
|
||||||
public UsageLogsController(IUsageLogService usageLogService)
|
|
||||||
{
|
|
||||||
_usageLogService = usageLogService;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Records a new filament usage entry.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="request">The usage entry details.</param>
|
|
||||||
/// <returns>The created usage log entry.</returns>
|
|
||||||
[HttpPost]
|
|
||||||
[ProducesResponseType(typeof(UsageLogResponse), StatusCodes.Status201Created)]
|
|
||||||
[ProducesResponseType(StatusCodes.Status400BadRequest)]
|
|
||||||
public async Task<ActionResult<UsageLogResponse>> Create([FromBody] CreateUsageLogRequest request)
|
|
||||||
{
|
|
||||||
if (!Enum.TryParse<DataSource>(request.DataSource, ignoreCase: true, out var dataSource))
|
|
||||||
{
|
|
||||||
return BadRequest($"Invalid data source: '{request.DataSource}'. Valid values: Mqtt, Moonraker, Manual.");
|
|
||||||
}
|
|
||||||
|
|
||||||
var entry = await _usageLogService.RecordUsageAsync(
|
|
||||||
spoolId: request.SpoolId,
|
|
||||||
gramsUsed: request.GramsUsed,
|
|
||||||
dataSource: dataSource,
|
|
||||||
printerId: request.PrinterId,
|
|
||||||
printJobId: request.PrintJobId,
|
|
||||||
mmExtruded: request.MmExtruded,
|
|
||||||
usageTimestamp: request.UsageTimestamp,
|
|
||||||
notes: request.Notes
|
|
||||||
);
|
|
||||||
|
|
||||||
return CreatedAtAction(
|
|
||||||
nameof(GetBySpool),
|
|
||||||
new { spoolId = entry.SpoolId },
|
|
||||||
MapToResponse(entry));
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets usage logs for a specific spool, ordered by most recent first.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="spoolId">The spool ID to filter by.</param>
|
|
||||||
/// <returns>A collection of usage log entries for the spool.</returns>
|
|
||||||
[HttpGet("spool/{spoolId:guid}")]
|
|
||||||
[ProducesResponseType(typeof(IEnumerable<UsageLogResponse>), StatusCodes.Status200OK)]
|
|
||||||
public async Task<ActionResult<IEnumerable<UsageLogResponse>>> GetBySpool(Guid spoolId)
|
|
||||||
{
|
|
||||||
var logs = await _usageLogService.GetBySpoolAsync(spoolId);
|
|
||||||
return Ok(logs.Select(MapToResponse));
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets usage logs for a specific printer, ordered by most recent first.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="printerId">The printer ID to filter by.</param>
|
|
||||||
/// <returns>A collection of usage log entries for the printer.</returns>
|
|
||||||
[HttpGet("printer/{printerId:guid}")]
|
|
||||||
[ProducesResponseType(typeof(IEnumerable<UsageLogResponse>), StatusCodes.Status200OK)]
|
|
||||||
public async Task<ActionResult<IEnumerable<UsageLogResponse>>> GetByPrinter(Guid printerId)
|
|
||||||
{
|
|
||||||
var logs = await _usageLogService.GetByPrinterAsync(printerId);
|
|
||||||
return Ok(logs.Select(MapToResponse));
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets usage logs for a specific print job, ordered by most recent first.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="printJobId">The print job ID to filter by.</param>
|
|
||||||
/// <returns>A collection of usage log entries for the print job.</returns>
|
|
||||||
[HttpGet("print-job/{printJobId:guid}")]
|
|
||||||
[ProducesResponseType(typeof(IEnumerable<UsageLogResponse>), StatusCodes.Status200OK)]
|
|
||||||
public async Task<ActionResult<IEnumerable<UsageLogResponse>>> GetByPrintJob(Guid printJobId)
|
|
||||||
{
|
|
||||||
var logs = await _usageLogService.GetByPrintJobAsync(printJobId);
|
|
||||||
return Ok(logs.Select(MapToResponse));
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Maps a UsageLog domain entity to a UsageLogResponse DTO.
|
|
||||||
/// </summary>
|
|
||||||
private static UsageLogResponse MapToResponse(Domain.Entities.UsageLog log) => new()
|
|
||||||
{
|
|
||||||
Id = log.Id,
|
|
||||||
SpoolId = log.SpoolId,
|
|
||||||
PrinterId = log.PrinterId,
|
|
||||||
PrintJobId = log.PrintJobId,
|
|
||||||
GramsUsed = log.GramsUsed,
|
|
||||||
MmExtruded = log.MmExtruded,
|
|
||||||
UsageTimestamp = log.UsageTimestamp,
|
|
||||||
DataSource = log.DataSource.ToString(),
|
|
||||||
Notes = log.Notes,
|
|
||||||
CreatedAt = log.CreatedAt,
|
|
||||||
UpdatedAt = log.UpdatedAt
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -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; }
|
||||||
|
|
||||||
@@ -76,19 +70,6 @@ public class FilamentResponse
|
|||||||
/// Encodes a deep link to the spool's detail page.
|
/// Encodes a deep link to the spool's detail page.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string QrCodeUrl { get; set; } = string.Empty;
|
public string QrCodeUrl { get; set; } = string.Empty;
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Whether this spool is flagged as low stock — remaining weight is at or
|
|
||||||
/// below the configured low-stock threshold percentage.
|
|
||||||
/// Useful for UI alerts and inventory dashboards.
|
|
||||||
/// </summary>
|
|
||||||
public bool IsLowStock { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Remaining filament weight as a percentage of total weight (0–100).
|
|
||||||
/// Rounded to one decimal place. Returns 0 if total weight is zero.
|
|
||||||
/// </summary>
|
|
||||||
public decimal RemainingWeightPercent { get; set; }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -152,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>
|
||||||
@@ -224,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,115 +0,0 @@
|
|||||||
using System.ComponentModel.DataAnnotations;
|
|
||||||
|
|
||||||
namespace Extrudex.API.DTOs.UsageLogs;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Request DTO for recording a filament usage entry.
|
|
||||||
/// </summary>
|
|
||||||
public class CreateUsageLogRequest
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// The ID of the spool that provided the filament.
|
|
||||||
/// </summary>
|
|
||||||
[Required]
|
|
||||||
public Guid SpoolId { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// The number of grams of filament consumed.
|
|
||||||
/// </summary>
|
|
||||||
[Required]
|
|
||||||
[Range(0.01, double.MaxValue, ErrorMessage = "GramsUsed must be a positive value.")]
|
|
||||||
public decimal GramsUsed { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// The source of the usage data (Mqtt, Moonraker, Manual).
|
|
||||||
/// </summary>
|
|
||||||
[Required]
|
|
||||||
public string DataSource { get; set; } = string.Empty;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// The ID of the printer that consumed the filament. Optional.
|
|
||||||
/// </summary>
|
|
||||||
public Guid? PrinterId { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// The ID of the print job associated with this usage. Optional.
|
|
||||||
/// </summary>
|
|
||||||
public Guid? PrintJobId { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// The number of millimeters of filament extruded. Optional.
|
|
||||||
/// </summary>
|
|
||||||
public decimal? MmExtruded { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// When the usage occurred (UTC). Defaults to now if not specified.
|
|
||||||
/// </summary>
|
|
||||||
public DateTime? UsageTimestamp { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Optional notes about this usage entry.
|
|
||||||
/// </summary>
|
|
||||||
[MaxLength(2000)]
|
|
||||||
public string? Notes { get; set; }
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Response DTO for a usage log entry.
|
|
||||||
/// </summary>
|
|
||||||
public class UsageLogResponse
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Unique identifier for the usage log entry.
|
|
||||||
/// </summary>
|
|
||||||
public Guid Id { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// The spool that provided the filament.
|
|
||||||
/// </summary>
|
|
||||||
public Guid SpoolId { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// The printer that consumed the filament, if applicable.
|
|
||||||
/// </summary>
|
|
||||||
public Guid? PrinterId { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// The print job associated with this usage, if applicable.
|
|
||||||
/// </summary>
|
|
||||||
public Guid? PrintJobId { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Grams of filament consumed.
|
|
||||||
/// </summary>
|
|
||||||
public decimal GramsUsed { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Millimeters of filament extruded, if available.
|
|
||||||
/// </summary>
|
|
||||||
public decimal? MmExtruded { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// When the usage occurred (UTC).
|
|
||||||
/// </summary>
|
|
||||||
public DateTime UsageTimestamp { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Source of the usage data (Mqtt, Moonraker, Manual).
|
|
||||||
/// </summary>
|
|
||||||
public string DataSource { get; set; } = string.Empty;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Optional notes about this usage entry.
|
|
||||||
/// </summary>
|
|
||||||
public string? Notes { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// When the record was created (UTC).
|
|
||||||
/// </summary>
|
|
||||||
public DateTime CreatedAt { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// When the record was last updated (UTC).
|
|
||||||
/// </summary>
|
|
||||||
public DateTime UpdatedAt { get; set; }
|
|
||||||
}
|
|
||||||
@@ -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,72 +0,0 @@
|
|||||||
using Extrudex.Domain.Base;
|
|
||||||
using Extrudex.Domain.Enums;
|
|
||||||
|
|
||||||
namespace Extrudex.Domain.Entities;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Represents a single filament usage log entry. Records how much filament
|
|
||||||
/// was consumed, by which printer, at what time, and optionally linked to
|
|
||||||
/// a print job. This provides a fine-grained audit trail of filament consumption
|
|
||||||
/// independent of print job lifecycle.
|
|
||||||
/// </summary>
|
|
||||||
public class UsageLog : AuditableEntity
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Foreign key to the spool that provided the filament.
|
|
||||||
/// </summary>
|
|
||||||
public Guid SpoolId { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Navigation to the spool that provided the filament.
|
|
||||||
/// </summary>
|
|
||||||
public Spool Spool { get; set; } = null!;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Foreign key to the printer that consumed the filament.
|
|
||||||
/// Nullable to support manual entries without a specific printer.
|
|
||||||
/// </summary>
|
|
||||||
public Guid? PrinterId { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Navigation to the printer that consumed the filament.
|
|
||||||
/// </summary>
|
|
||||||
public Printer? Printer { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Foreign key to the print job associated with this usage entry.
|
|
||||||
/// Nullable because usage can be logged before or without a print job.
|
|
||||||
/// </summary>
|
|
||||||
public Guid? PrintJobId { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Navigation to the print job associated with this usage entry.
|
|
||||||
/// </summary>
|
|
||||||
public PrintJob? PrintJob { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// The number of grams of filament consumed in this usage event.
|
|
||||||
/// </summary>
|
|
||||||
public decimal GramsUsed { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// The number of millimeters of filament extruded in this usage event.
|
|
||||||
/// Optional — may not be available for all data sources.
|
|
||||||
/// </summary>
|
|
||||||
public decimal? MmExtruded { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Timestamp when the usage occurred (UTC). This is the actual time of
|
|
||||||
/// consumption, which may differ from CreatedAt if the entry was recorded later.
|
|
||||||
/// </summary>
|
|
||||||
public DateTime UsageTimestamp { get; set; } = DateTime.UtcNow;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// The source of the usage data (which integration path provided it).
|
|
||||||
/// </summary>
|
|
||||||
public DataSource DataSource { get; set; } = DataSource.Manual;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Optional notes about this usage entry.
|
|
||||||
/// </summary>
|
|
||||||
public string? Notes { get; set; }
|
|
||||||
}
|
|
||||||
@@ -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,50 +0,0 @@
|
|||||||
using Extrudex.Domain.Entities;
|
|
||||||
|
|
||||||
namespace Extrudex.Domain.Interfaces;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Service for persisting and querying filament usage records.
|
|
||||||
/// Tracks consumption per print job and per spool for COGS and inventory tracking.
|
|
||||||
/// </summary>
|
|
||||||
public interface IFilamentUsageService
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Records a new filament usage entry for a print job.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="printJobId">The print job that consumed the filament.</param>
|
|
||||||
/// <param name="spoolId">The spool that provided the filament.</param>
|
|
||||||
/// <param name="printerId">The printer that executed the print.</param>
|
|
||||||
/// <param name="gramsUsed">Grams of filament consumed.</param>
|
|
||||||
/// <param name="mmExtruded">Millimeters of filament extruded.</param>
|
|
||||||
/// <param name="notes">Optional notes about this usage record.</param>
|
|
||||||
/// <param name="cancellationToken">Cancellation token.</param>
|
|
||||||
/// <returns>The created FilamentUsage entity.</returns>
|
|
||||||
Task<FilamentUsage> RecordUsageAsync(
|
|
||||||
Guid printJobId,
|
|
||||||
Guid spoolId,
|
|
||||||
Guid printerId,
|
|
||||||
decimal gramsUsed,
|
|
||||||
decimal mmExtruded,
|
|
||||||
string? notes = null,
|
|
||||||
CancellationToken cancellationToken = default);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Retrieves all filament usage records for a specific print job.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="printJobId">The print job ID.</param>
|
|
||||||
/// <param name="cancellationToken">Cancellation token.</param>
|
|
||||||
/// <returns>Collection of filament usage records for the print job.</returns>
|
|
||||||
Task<IReadOnlyList<FilamentUsage>> GetByPrintJobAsync(
|
|
||||||
Guid printJobId,
|
|
||||||
CancellationToken cancellationToken = default);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Retrieves all filament usage records for a specific spool.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="spoolId">The spool ID.</param>
|
|
||||||
/// <param name="cancellationToken">Cancellation token.</param>
|
|
||||||
/// <returns>Collection of filament usage records for the spool.</returns>
|
|
||||||
Task<IReadOnlyList<FilamentUsage>> GetBySpoolAsync(
|
|
||||||
Guid spoolId,
|
|
||||||
CancellationToken cancellationToken = default);
|
|
||||||
}
|
|
||||||
@@ -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,39 +0,0 @@
|
|||||||
namespace Extrudex.Domain.Interfaces;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Detects low-stock filament spools based on configurable weight thresholds.
|
|
||||||
/// Determines whether a spool's remaining filament falls below a critical level
|
|
||||||
/// so that alerts and API flags can be surfaced to the user.
|
|
||||||
/// </summary>
|
|
||||||
public interface ILowStockDetector
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Determines whether a spool is considered low stock based on its remaining
|
|
||||||
/// weight relative to its total weight and the configured threshold percentage.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="weightRemainingGrams">The current remaining weight in grams.</param>
|
|
||||||
/// <param name="weightTotalGrams">The total spool weight in grams when full.</param>
|
|
||||||
/// <returns>
|
|
||||||
/// <c>true</c> if the remaining weight percentage is at or below the configured
|
|
||||||
/// low-stock threshold; <c>false</c> otherwise. Returns <c>false</c> for spools
|
|
||||||
/// with zero total weight to avoid division-by-zero.
|
|
||||||
/// </returns>
|
|
||||||
bool IsLowStock(decimal weightRemainingGrams, decimal weightTotalGrams);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Calculates the remaining weight as a percentage of total weight.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="weightRemainingGrams">The current remaining weight in grams.</param>
|
|
||||||
/// <param name="weightTotalGrams">The total spool weight in grams when full.</param>
|
|
||||||
/// <returns>
|
|
||||||
/// A value between 0 and 100 representing the percentage of filament remaining.
|
|
||||||
/// Returns 0 if total weight is zero to avoid division-by-zero.
|
|
||||||
/// </returns>
|
|
||||||
decimal GetRemainingWeightPercent(decimal weightRemainingGrams, decimal weightTotalGrams);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets the currently configured low-stock threshold percentage.
|
|
||||||
/// Useful for API responses so clients know what threshold is in effect.
|
|
||||||
/// </summary>
|
|
||||||
decimal LowStockThresholdPercent { get; }
|
|
||||||
}
|
|
||||||
@@ -1,131 +0,0 @@
|
|||||||
using Extrudex.Domain.DTOs.Moonraker;
|
|
||||||
|
|
||||||
namespace Extrudex.Domain.Interfaces;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Client interface for communicating with Moonraker REST API endpoints
|
|
||||||
/// on Klipper-based printers (e.g., Elegoo Centauri Carbon).
|
|
||||||
/// Provides strongly-typed methods for server discovery, printer status,
|
|
||||||
/// print job history, and real-time telemetry.
|
|
||||||
/// </summary>
|
|
||||||
public interface IMoonrakerClient
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Checks whether the Moonraker server is reachable and responding.
|
|
||||||
/// Calls the /server/info endpoint and returns the server information
|
|
||||||
/// if successful, or null if the server is unreachable.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="hostnameOrIp">The printer's hostname or IP address.</param>
|
|
||||||
/// <param name="port">The Moonraker API port (default: 7125).</param>
|
|
||||||
/// <param name="apiKey">Optional API key for authentication.</param>
|
|
||||||
/// <param name="cancellationToken">Cancellation token for the HTTP request.</param>
|
|
||||||
/// <returns>Server info if reachable; <c>null</c> if unreachable.</returns>
|
|
||||||
Task<MoonrakerServerInfo?> GetServerInfoAsync(
|
|
||||||
string hostnameOrIp,
|
|
||||||
int port,
|
|
||||||
string? apiKey,
|
|
||||||
CancellationToken cancellationToken = default);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Checks whether the Moonraker server is reachable and responding.
|
|
||||||
/// This is a convenience method equivalent to calling GetServerInfoAsync
|
|
||||||
/// and checking for a non-null result.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="hostnameOrIp">The printer's hostname or IP address.</param>
|
|
||||||
/// <param name="port">The Moonraker API port (default: 7125).</param>
|
|
||||||
/// <param name="apiKey">Optional API key for authentication.</param>
|
|
||||||
/// <param name="cancellationToken">Cancellation token for the HTTP request.</param>
|
|
||||||
/// <returns><c>true</c> if the server responded successfully; otherwise <c>false</c>.</returns>
|
|
||||||
Task<bool> IsReachableAsync(
|
|
||||||
string hostnameOrIp,
|
|
||||||
int port,
|
|
||||||
string? apiKey,
|
|
||||||
CancellationToken cancellationToken = default);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Fetches the current printer info from the /printer/info endpoint.
|
|
||||||
/// Returns the Klipper state and readiness status.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="hostnameOrIp">The printer's hostname or IP address.</param>
|
|
||||||
/// <param name="port">The Moonraker API port (default: 7125).</param>
|
|
||||||
/// <param name="apiKey">Optional API key for authentication.</param>
|
|
||||||
/// <param name="cancellationToken">Cancellation token for the HTTP request.</param>
|
|
||||||
/// <returns>Printer info if successful; <c>null</c> if the request failed.</returns>
|
|
||||||
Task<MoonrakerPrinterInfo?> GetPrinterInfoAsync(
|
|
||||||
string hostnameOrIp,
|
|
||||||
int port,
|
|
||||||
string? apiKey,
|
|
||||||
CancellationToken cancellationToken = default);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Fetches print job history from the /server/history/items endpoint.
|
|
||||||
/// Returns the most recent print jobs with filament usage data,
|
|
||||||
/// print duration, and completion status.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="hostnameOrIp">The printer's hostname or IP address.</param>
|
|
||||||
/// <param name="port">The Moonraker API port (default: 7125).</param>
|
|
||||||
/// <param name="apiKey">Optional API key for authentication.</param>
|
|
||||||
/// <param name="limit">Maximum number of history items to return. Default: 50.</param>
|
|
||||||
/// <param name="cancellationToken">Cancellation token for the HTTP request.</param>
|
|
||||||
/// <returns>History response with print jobs; empty list if request failed.</returns>
|
|
||||||
Task<MoonrakerHistoryResponse> GetPrintHistoryAsync(
|
|
||||||
string hostnameOrIp,
|
|
||||||
int port,
|
|
||||||
string? apiKey,
|
|
||||||
int limit = 50,
|
|
||||||
CancellationToken cancellationToken = default);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Fetches the current print statistics from the /printer/objects/query endpoint.
|
|
||||||
/// Returns real-time data including filament used, print duration,
|
|
||||||
/// and current print state for the active or most recent print.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="hostnameOrIp">The printer's hostname or IP address.</param>
|
|
||||||
/// <param name="port">The Moonraker API port (default: 7125).</param>
|
|
||||||
/// <param name="apiKey">Optional API key for authentication.</param>
|
|
||||||
/// <param name="cancellationToken">Cancellation token for the HTTP request.</param>
|
|
||||||
/// <returns>Print stats if successful; <c>null</c> if the request failed.</returns>
|
|
||||||
Task<MoonrakerPrintStats?> GetPrintStatsAsync(
|
|
||||||
string hostnameOrIp,
|
|
||||||
int port,
|
|
||||||
string? apiKey,
|
|
||||||
CancellationToken cancellationToken = default);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Fetches the current display status from the /printer/objects/query endpoint.
|
|
||||||
/// Returns progress percentage and status message for the active print.
|
|
||||||
/// Used by SignalR to push real-time progress updates to connected clients.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="hostnameOrIp">The printer's hostname or IP address.</param>
|
|
||||||
/// <param name="port">The Moonraker API port (default: 7125).</param>
|
|
||||||
/// <param name="apiKey">Optional API key for authentication.</param>
|
|
||||||
/// <param name="cancellationToken">Cancellation token for the HTTP request.</param>
|
|
||||||
/// <returns>Display status if successful; <c>null</c> if the request failed.</returns>
|
|
||||||
Task<MoonrakerDisplayStatus?> GetDisplayStatusAsync(
|
|
||||||
string hostnameOrIp,
|
|
||||||
int port,
|
|
||||||
string? apiKey,
|
|
||||||
CancellationToken cancellationToken = default);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Fetches the current filament usage data from the Moonraker server.
|
|
||||||
/// Returns a dictionary of usage metrics reported by the printer.
|
|
||||||
///
|
|
||||||
/// <para>
|
|
||||||
/// <b>Prefer GetPrintHistoryAsync or GetPrintStatsAsync for new code.</b>
|
|
||||||
/// This method is retained for backward compatibility with the
|
|
||||||
/// FilamentUsageSyncService and returns a dictionary of metric names
|
|
||||||
/// to their decimal values for callers that don't need typed DTOs.
|
|
||||||
/// </para>
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="hostnameOrIp">The printer's hostname or IP address.</param>
|
|
||||||
/// <param name="port">The Moonraker API port (default: 7125).</param>
|
|
||||||
/// <param name="apiKey">Optional API key for authentication.</param>
|
|
||||||
/// <param name="cancellationToken">Cancellation token for the HTTP request.</param>
|
|
||||||
/// <returns>A dictionary of usage metric names to their decimal values.</returns>
|
|
||||||
Task<Dictionary<string, decimal>> GetFilamentUsageAsync(
|
|
||||||
string hostnameOrIp,
|
|
||||||
int port,
|
|
||||||
string? apiKey,
|
|
||||||
CancellationToken cancellationToken = default);
|
|
||||||
}
|
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
using Extrudex.Domain.DTOs.Moonraker;
|
|
||||||
|
|
||||||
namespace Extrudex.Domain.Interfaces;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Service interface for syncing Moonraker printer data into the Extrudex database.
|
|
||||||
/// Handles periodic polling of printer status and mapping print job history
|
|
||||||
/// to PrintJob and FilamentUsage entities.
|
|
||||||
/// </summary>
|
|
||||||
public interface IMoonrakerPrinterSyncService
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Performs a single sync cycle: queries all active Moonraker printers,
|
|
||||||
/// fetches their current status and print job history, and persists
|
|
||||||
/// updates to the database.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="cancellationToken">Cancellation token for graceful shutdown.</param>
|
|
||||||
/// <returns>The number of printers successfully synced.</returns>
|
|
||||||
Task<int> SyncAllAsync(CancellationToken cancellationToken = default);
|
|
||||||
}
|
|
||||||
@@ -1,57 +0,0 @@
|
|||||||
using Extrudex.Domain.Entities;
|
|
||||||
using Extrudex.Domain.Enums;
|
|
||||||
|
|
||||||
namespace Extrudex.Domain.Interfaces;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Service for recording filament usage entries. Writes to the usage_logs table
|
|
||||||
/// and provides query capabilities for usage history.
|
|
||||||
/// </summary>
|
|
||||||
public interface IUsageLogService
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Records a filament usage entry.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="spoolId">The spool that provided the filament.</param>
|
|
||||||
/// <param name="gramsUsed">Grams of filament consumed.</param>
|
|
||||||
/// <param name="dataSource">Where the data came from.</param>
|
|
||||||
/// <param name="printerId">Optional printer ID.</param>
|
|
||||||
/// <param name="printJobId">Optional print job ID.</param>
|
|
||||||
/// <param name="mmExtruded">Optional mm extruded.</param>
|
|
||||||
/// <param name="usageTimestamp">When the usage occurred (defaults to UTC now).</param>
|
|
||||||
/// <param name="notes">Optional notes.</param>
|
|
||||||
/// <returns>The created UsageLog entity.</returns>
|
|
||||||
Task<UsageLog> RecordUsageAsync(
|
|
||||||
Guid spoolId,
|
|
||||||
decimal gramsUsed,
|
|
||||||
DataSource dataSource,
|
|
||||||
Guid? printerId = null,
|
|
||||||
Guid? printJobId = null,
|
|
||||||
decimal? mmExtruded = null,
|
|
||||||
DateTime? usageTimestamp = null,
|
|
||||||
string? notes = null);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Retrieves usage logs for a specific spool, ordered by usage timestamp descending.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="spoolId">The spool ID to filter by.</param>
|
|
||||||
/// <param name="cancellationToken">Cancellation token.</param>
|
|
||||||
/// <returns>A collection of usage logs for the spool.</returns>
|
|
||||||
Task<IEnumerable<UsageLog>> GetBySpoolAsync(Guid spoolId, CancellationToken cancellationToken = default);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Retrieves usage logs for a specific printer, ordered by usage timestamp descending.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="printerId">The printer ID to filter by.</param>
|
|
||||||
/// <param name="cancellationToken">Cancellation token.</param>
|
|
||||||
/// <returns>A collection of usage logs for the printer.</returns>
|
|
||||||
Task<IEnumerable<UsageLog>> GetByPrinterAsync(Guid printerId, CancellationToken cancellationToken = default);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Retrieves usage logs for a specific print job, ordered by usage timestamp descending.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="printJobId">The print job ID to filter by.</param>
|
|
||||||
/// <param name="cancellationToken">Cancellation token.</param>
|
|
||||||
/// <returns>A collection of usage logs for the print job.</returns>
|
|
||||||
Task<IEnumerable<UsageLog>> GetByPrintJobAsync(Guid printJobId, 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)
|
||||||
|
|||||||
@@ -1,91 +0,0 @@
|
|||||||
using Extrudex.Domain.Entities;
|
|
||||||
using Extrudex.Domain.Enums;
|
|
||||||
using Microsoft.EntityFrameworkCore;
|
|
||||||
using Microsoft.EntityFrameworkCore.Metadata.Builders;
|
|
||||||
|
|
||||||
namespace Extrudex.Infrastructure.Data.Configurations;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// EF Core configuration for the UsageLog entity.
|
|
||||||
/// Maps to the usage_logs table with snake_case columns and appropriate indexes.
|
|
||||||
/// </summary>
|
|
||||||
public class UsageLogConfiguration : BaseEntityConfiguration<UsageLog>
|
|
||||||
{
|
|
||||||
/// <inheritdoc/>
|
|
||||||
public override void Configure(EntityTypeBuilder<UsageLog> builder)
|
|
||||||
{
|
|
||||||
base.Configure(builder);
|
|
||||||
|
|
||||||
builder.Property(e => e.SpoolId)
|
|
||||||
.HasColumnName("spool_id")
|
|
||||||
.IsRequired();
|
|
||||||
|
|
||||||
builder.Property(e => e.PrinterId)
|
|
||||||
.HasColumnName("printer_id");
|
|
||||||
|
|
||||||
builder.Property(e => e.PrintJobId)
|
|
||||||
.HasColumnName("print_job_id");
|
|
||||||
|
|
||||||
builder.Property(e => e.GramsUsed)
|
|
||||||
.HasColumnName("grams_used")
|
|
||||||
.HasPrecision(10, 2)
|
|
||||||
.IsRequired();
|
|
||||||
|
|
||||||
builder.Property(e => e.MmExtruded)
|
|
||||||
.HasColumnName("mm_extruded")
|
|
||||||
.HasPrecision(12, 2);
|
|
||||||
|
|
||||||
builder.Property(e => e.UsageTimestamp)
|
|
||||||
.HasColumnName("usage_timestamp")
|
|
||||||
.IsRequired();
|
|
||||||
|
|
||||||
builder.Property(e => e.DataSource)
|
|
||||||
.HasColumnName("data_source")
|
|
||||||
.HasConversion<string>()
|
|
||||||
.HasMaxLength(50)
|
|
||||||
.IsRequired();
|
|
||||||
|
|
||||||
builder.Property(e => e.Notes)
|
|
||||||
.HasColumnName("notes")
|
|
||||||
.HasMaxLength(2000);
|
|
||||||
|
|
||||||
// Index on spool_id for querying usage by spool
|
|
||||||
builder.HasIndex(e => e.SpoolId)
|
|
||||||
.HasDatabaseName("ix_usage_logs_spool_id");
|
|
||||||
|
|
||||||
// Index on printer_id for querying usage by printer
|
|
||||||
builder.HasIndex(e => e.PrinterId)
|
|
||||||
.HasDatabaseName("ix_usage_logs_printer_id");
|
|
||||||
|
|
||||||
// Index on print_job_id for querying usage by print job
|
|
||||||
builder.HasIndex(e => e.PrintJobId)
|
|
||||||
.HasDatabaseName("ix_usage_logs_print_job_id");
|
|
||||||
|
|
||||||
// Index on usage_timestamp for chronological queries
|
|
||||||
builder.HasIndex(e => e.UsageTimestamp)
|
|
||||||
.HasDatabaseName("ix_usage_logs_usage_timestamp");
|
|
||||||
|
|
||||||
// Index on data_source for filtering by integration path
|
|
||||||
builder.HasIndex(e => e.DataSource)
|
|
||||||
.HasDatabaseName("ix_usage_logs_data_source");
|
|
||||||
|
|
||||||
// Relationships
|
|
||||||
builder.HasOne(e => e.Spool)
|
|
||||||
.WithMany()
|
|
||||||
.HasForeignKey(e => e.SpoolId)
|
|
||||||
.HasConstraintName("fk_usage_logs_spool")
|
|
||||||
.OnDelete(DeleteBehavior.Restrict);
|
|
||||||
|
|
||||||
builder.HasOne(e => e.Printer)
|
|
||||||
.WithMany()
|
|
||||||
.HasForeignKey(e => e.PrinterId)
|
|
||||||
.HasConstraintName("fk_usage_logs_printer")
|
|
||||||
.OnDelete(DeleteBehavior.SetNull);
|
|
||||||
|
|
||||||
builder.HasOne(e => e.PrintJob)
|
|
||||||
.WithMany()
|
|
||||||
.HasForeignKey(e => e.PrintJobId)
|
|
||||||
.HasConstraintName("fk_usage_logs_print_job")
|
|
||||||
.OnDelete(DeleteBehavior.SetNull);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -23,8 +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>();
|
|
||||||
public DbSet<UsageLog> UsageLogs => Set<UsageLog>();
|
|
||||||
|
|
||||||
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) });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -1,534 +0,0 @@
|
|||||||
using System;
|
|
||||||
using Microsoft.EntityFrameworkCore.Migrations;
|
|
||||||
|
|
||||||
#nullable disable
|
|
||||||
|
|
||||||
namespace Extrudex.Infrastructure.Data.Migrations
|
|
||||||
{
|
|
||||||
/// <inheritdoc />
|
|
||||||
public partial class AddUsageLogTable : Migration
|
|
||||||
{
|
|
||||||
/// <inheritdoc />
|
|
||||||
protected override void Up(MigrationBuilder migrationBuilder)
|
|
||||||
{
|
|
||||||
migrationBuilder.CreateTable(
|
|
||||||
name: "usage_logs",
|
|
||||||
columns: table => new
|
|
||||||
{
|
|
||||||
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: true),
|
|
||||||
print_job_id = table.Column<Guid>(type: "uuid", nullable: true),
|
|
||||||
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: true),
|
|
||||||
usage_timestamp = table.Column<DateTime>(type: "timestamp with time zone", nullable: false),
|
|
||||||
data_source = table.Column<string>(type: "character varying(50)", maxLength: 50, nullable: false),
|
|
||||||
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_usage_logs", x => x.id);
|
|
||||||
table.ForeignKey(
|
|
||||||
name: "fk_usage_logs_print_job",
|
|
||||||
column: x => x.print_job_id,
|
|
||||||
principalTable: "print_jobs",
|
|
||||||
principalColumn: "id",
|
|
||||||
onDelete: ReferentialAction.SetNull);
|
|
||||||
table.ForeignKey(
|
|
||||||
name: "fk_usage_logs_printer",
|
|
||||||
column: x => x.printer_id,
|
|
||||||
principalTable: "printers",
|
|
||||||
principalColumn: "id",
|
|
||||||
onDelete: ReferentialAction.SetNull);
|
|
||||||
table.ForeignKey(
|
|
||||||
name: "fk_usage_logs_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, 43, 28, 895, DateTimeKind.Utc).AddTicks(6535), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(6535) });
|
|
||||||
|
|
||||||
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7016), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7016) });
|
|
||||||
|
|
||||||
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7027), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7028) });
|
|
||||||
|
|
||||||
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7034), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7035) });
|
|
||||||
|
|
||||||
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7042), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7042) });
|
|
||||||
|
|
||||||
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7049), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7049) });
|
|
||||||
|
|
||||||
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7291), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7292) });
|
|
||||||
|
|
||||||
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7453), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7453) });
|
|
||||||
|
|
||||||
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7461), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7461) });
|
|
||||||
|
|
||||||
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7468), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7468) });
|
|
||||||
|
|
||||||
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7474), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7474) });
|
|
||||||
|
|
||||||
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7480), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7481) });
|
|
||||||
|
|
||||||
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7487), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7487) });
|
|
||||||
|
|
||||||
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7493), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7493) });
|
|
||||||
|
|
||||||
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7500), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7500) });
|
|
||||||
|
|
||||||
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7507), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7507) });
|
|
||||||
|
|
||||||
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7513), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7513) });
|
|
||||||
|
|
||||||
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7519), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7520) });
|
|
||||||
|
|
||||||
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7526), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7526) });
|
|
||||||
|
|
||||||
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7532), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7532) });
|
|
||||||
|
|
||||||
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7538), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7539) });
|
|
||||||
|
|
||||||
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7690), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7690) });
|
|
||||||
|
|
||||||
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7838), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7838) });
|
|
||||||
|
|
||||||
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7846), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7846) });
|
|
||||||
|
|
||||||
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7853), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7853) });
|
|
||||||
|
|
||||||
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7859), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7859) });
|
|
||||||
|
|
||||||
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7865), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7866) });
|
|
||||||
|
|
||||||
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7872), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7872) });
|
|
||||||
|
|
||||||
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7878), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7879) });
|
|
||||||
|
|
||||||
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7885), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7885) });
|
|
||||||
|
|
||||||
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7891), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7891) });
|
|
||||||
|
|
||||||
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7898), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7898) });
|
|
||||||
|
|
||||||
migrationBuilder.CreateIndex(
|
|
||||||
name: "ix_usage_logs_data_source",
|
|
||||||
table: "usage_logs",
|
|
||||||
column: "data_source");
|
|
||||||
|
|
||||||
migrationBuilder.CreateIndex(
|
|
||||||
name: "ix_usage_logs_print_job_id",
|
|
||||||
table: "usage_logs",
|
|
||||||
column: "print_job_id");
|
|
||||||
|
|
||||||
migrationBuilder.CreateIndex(
|
|
||||||
name: "ix_usage_logs_printer_id",
|
|
||||||
table: "usage_logs",
|
|
||||||
column: "printer_id");
|
|
||||||
|
|
||||||
migrationBuilder.CreateIndex(
|
|
||||||
name: "ix_usage_logs_spool_id",
|
|
||||||
table: "usage_logs",
|
|
||||||
column: "spool_id");
|
|
||||||
|
|
||||||
migrationBuilder.CreateIndex(
|
|
||||||
name: "ix_usage_logs_usage_timestamp",
|
|
||||||
table: "usage_logs",
|
|
||||||
column: "usage_timestamp");
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
protected override void Down(MigrationBuilder migrationBuilder)
|
|
||||||
{
|
|
||||||
migrationBuilder.DropTable(
|
|
||||||
name: "usage_logs");
|
|
||||||
|
|
||||||
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) });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -145,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, 43, 28, 895, DateTimeKind.Utc).AddTicks(6535),
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(6535)
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7016),
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7016)
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7027),
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7028)
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7034),
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7035)
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7042),
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7042)
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7049),
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7049)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1652)
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -232,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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7291),
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7292)
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7453),
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7453)
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7461),
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7461)
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7468),
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7468)
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7474),
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7474)
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7480),
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7481)
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7487),
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7487)
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7493),
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7493)
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7500),
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7500)
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7507),
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7507)
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7513),
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7513)
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7519),
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7520)
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7526),
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7526)
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7532),
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7532)
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7538),
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7539)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2139)
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -391,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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7690),
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7690)
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7838),
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7838)
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7846),
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7846)
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7853),
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7853)
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7859),
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7859)
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7865),
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7866)
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7872),
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7872)
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7878),
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7879)
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7885),
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7885)
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7891),
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7891)
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7898),
|
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, 43, 28, 895, DateTimeKind.Utc).AddTicks(7898)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2523)
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -806,81 +806,6 @@ namespace Extrudex.Infrastructure.Data.Migrations
|
|||||||
b.ToTable("spools", (string)null);
|
b.ToTable("spools", (string)null);
|
||||||
});
|
});
|
||||||
|
|
||||||
modelBuilder.Entity("Extrudex.Domain.Entities.UsageLog", b =>
|
|
||||||
{
|
|
||||||
b.Property<Guid>("Id")
|
|
||||||
.HasColumnType("uuid")
|
|
||||||
.HasColumnName("id");
|
|
||||||
|
|
||||||
b.Property<DateTime>("CreatedAt")
|
|
||||||
.ValueGeneratedOnAdd()
|
|
||||||
.HasColumnType("timestamp with time zone")
|
|
||||||
.HasColumnName("created_at")
|
|
||||||
.HasDefaultValueSql("now() at time zone 'utc'");
|
|
||||||
|
|
||||||
b.Property<string>("DataSource")
|
|
||||||
.IsRequired()
|
|
||||||
.HasMaxLength(50)
|
|
||||||
.HasColumnType("character varying(50)")
|
|
||||||
.HasColumnName("data_source");
|
|
||||||
|
|
||||||
b.Property<decimal>("GramsUsed")
|
|
||||||
.HasPrecision(10, 2)
|
|
||||||
.HasColumnType("numeric(10,2)")
|
|
||||||
.HasColumnName("grams_used");
|
|
||||||
|
|
||||||
b.Property<decimal?>("MmExtruded")
|
|
||||||
.HasPrecision(12, 2)
|
|
||||||
.HasColumnType("numeric(12,2)")
|
|
||||||
.HasColumnName("mm_extruded");
|
|
||||||
|
|
||||||
b.Property<string>("Notes")
|
|
||||||
.HasMaxLength(2000)
|
|
||||||
.HasColumnType("character varying(2000)")
|
|
||||||
.HasColumnName("notes");
|
|
||||||
|
|
||||||
b.Property<Guid?>("PrintJobId")
|
|
||||||
.HasColumnType("uuid")
|
|
||||||
.HasColumnName("print_job_id");
|
|
||||||
|
|
||||||
b.Property<Guid?>("PrinterId")
|
|
||||||
.HasColumnType("uuid")
|
|
||||||
.HasColumnName("printer_id");
|
|
||||||
|
|
||||||
b.Property<Guid>("SpoolId")
|
|
||||||
.HasColumnType("uuid")
|
|
||||||
.HasColumnName("spool_id");
|
|
||||||
|
|
||||||
b.Property<DateTime>("UpdatedAt")
|
|
||||||
.ValueGeneratedOnAdd()
|
|
||||||
.HasColumnType("timestamp with time zone")
|
|
||||||
.HasColumnName("updated_at")
|
|
||||||
.HasDefaultValueSql("now() at time zone 'utc'");
|
|
||||||
|
|
||||||
b.Property<DateTime>("UsageTimestamp")
|
|
||||||
.HasColumnType("timestamp with time zone")
|
|
||||||
.HasColumnName("usage_timestamp");
|
|
||||||
|
|
||||||
b.HasKey("Id");
|
|
||||||
|
|
||||||
b.HasIndex("DataSource")
|
|
||||||
.HasDatabaseName("ix_usage_logs_data_source");
|
|
||||||
|
|
||||||
b.HasIndex("PrintJobId")
|
|
||||||
.HasDatabaseName("ix_usage_logs_print_job_id");
|
|
||||||
|
|
||||||
b.HasIndex("PrinterId")
|
|
||||||
.HasDatabaseName("ix_usage_logs_printer_id");
|
|
||||||
|
|
||||||
b.HasIndex("SpoolId")
|
|
||||||
.HasDatabaseName("ix_usage_logs_spool_id");
|
|
||||||
|
|
||||||
b.HasIndex("UsageTimestamp")
|
|
||||||
.HasDatabaseName("ix_usage_logs_usage_timestamp");
|
|
||||||
|
|
||||||
b.ToTable("usage_logs", (string)null);
|
|
||||||
});
|
|
||||||
|
|
||||||
modelBuilder.Entity("Extrudex.Domain.Entities.AmsSlot", b =>
|
modelBuilder.Entity("Extrudex.Domain.Entities.AmsSlot", b =>
|
||||||
{
|
{
|
||||||
b.HasOne("Extrudex.Domain.Entities.AmsUnit", "AmsUnit")
|
b.HasOne("Extrudex.Domain.Entities.AmsUnit", "AmsUnit")
|
||||||
@@ -987,34 +912,6 @@ namespace Extrudex.Infrastructure.Data.Migrations
|
|||||||
b.Navigation("MaterialModifier");
|
b.Navigation("MaterialModifier");
|
||||||
});
|
});
|
||||||
|
|
||||||
modelBuilder.Entity("Extrudex.Domain.Entities.UsageLog", b =>
|
|
||||||
{
|
|
||||||
b.HasOne("Extrudex.Domain.Entities.PrintJob", "PrintJob")
|
|
||||||
.WithMany()
|
|
||||||
.HasForeignKey("PrintJobId")
|
|
||||||
.OnDelete(DeleteBehavior.SetNull)
|
|
||||||
.HasConstraintName("fk_usage_logs_print_job");
|
|
||||||
|
|
||||||
b.HasOne("Extrudex.Domain.Entities.Printer", "Printer")
|
|
||||||
.WithMany()
|
|
||||||
.HasForeignKey("PrinterId")
|
|
||||||
.OnDelete(DeleteBehavior.SetNull)
|
|
||||||
.HasConstraintName("fk_usage_logs_printer");
|
|
||||||
|
|
||||||
b.HasOne("Extrudex.Domain.Entities.Spool", "Spool")
|
|
||||||
.WithMany()
|
|
||||||
.HasForeignKey("SpoolId")
|
|
||||||
.OnDelete(DeleteBehavior.Restrict)
|
|
||||||
.IsRequired()
|
|
||||||
.HasConstraintName("fk_usage_logs_spool");
|
|
||||||
|
|
||||||
b.Navigation("PrintJob");
|
|
||||||
|
|
||||||
b.Navigation("Printer");
|
|
||||||
|
|
||||||
b.Navigation("Spool");
|
|
||||||
});
|
|
||||||
|
|
||||||
modelBuilder.Entity("Extrudex.Domain.Entities.AmsUnit", b =>
|
modelBuilder.Entity("Extrudex.Domain.Entities.AmsUnit", b =>
|
||||||
{
|
{
|
||||||
b.Navigation("Slots");
|
b.Navigation("Slots");
|
||||||
|
|||||||
@@ -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,79 +0,0 @@
|
|||||||
using Extrudex.Domain.Entities;
|
|
||||||
using Extrudex.Domain.Interfaces;
|
|
||||||
using Extrudex.Infrastructure.Data;
|
|
||||||
using Microsoft.EntityFrameworkCore;
|
|
||||||
using Microsoft.Extensions.Logging;
|
|
||||||
|
|
||||||
namespace Extrudex.Infrastructure.Services;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// EF Core–backed implementation of the filament usage service.
|
|
||||||
/// Persists usage records to the database and provides query methods
|
|
||||||
/// for retrieving usage by print job or spool.
|
|
||||||
/// </summary>
|
|
||||||
public class FilamentUsageService : IFilamentUsageService
|
|
||||||
{
|
|
||||||
private readonly ExtrudexDbContext _dbContext;
|
|
||||||
private readonly ILogger<FilamentUsageService> _logger;
|
|
||||||
|
|
||||||
public FilamentUsageService(
|
|
||||||
ExtrudexDbContext dbContext,
|
|
||||||
ILogger<FilamentUsageService> logger)
|
|
||||||
{
|
|
||||||
_dbContext = dbContext;
|
|
||||||
_logger = logger;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public async Task<FilamentUsage> RecordUsageAsync(
|
|
||||||
Guid printJobId,
|
|
||||||
Guid spoolId,
|
|
||||||
Guid printerId,
|
|
||||||
decimal gramsUsed,
|
|
||||||
decimal mmExtruded,
|
|
||||||
string? notes = null,
|
|
||||||
CancellationToken cancellationToken = default)
|
|
||||||
{
|
|
||||||
var usage = new FilamentUsage
|
|
||||||
{
|
|
||||||
PrintJobId = printJobId,
|
|
||||||
SpoolId = spoolId,
|
|
||||||
PrinterId = printerId,
|
|
||||||
GramsUsed = gramsUsed,
|
|
||||||
MmExtruded = mmExtruded,
|
|
||||||
RecordedAt = DateTime.UtcNow,
|
|
||||||
Notes = notes
|
|
||||||
};
|
|
||||||
|
|
||||||
_dbContext.FilamentUsages.Add(usage);
|
|
||||||
await _dbContext.SaveChangesAsync(cancellationToken);
|
|
||||||
|
|
||||||
_logger.LogInformation(
|
|
||||||
"Recorded filament usage: {Grams}g / {Mm}mm for print job {JobId} on spool {SpoolId}",
|
|
||||||
gramsUsed, mmExtruded, printJobId, spoolId);
|
|
||||||
|
|
||||||
return usage;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public async Task<IReadOnlyList<FilamentUsage>> GetByPrintJobAsync(
|
|
||||||
Guid printJobId,
|
|
||||||
CancellationToken cancellationToken = default)
|
|
||||||
{
|
|
||||||
return await _dbContext.FilamentUsages
|
|
||||||
.Where(u => u.PrintJobId == printJobId)
|
|
||||||
.OrderByDescending(u => u.RecordedAt)
|
|
||||||
.ToListAsync(cancellationToken);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public async Task<IReadOnlyList<FilamentUsage>> GetBySpoolAsync(
|
|
||||||
Guid spoolId,
|
|
||||||
CancellationToken cancellationToken = default)
|
|
||||||
{
|
|
||||||
return await _dbContext.FilamentUsages
|
|
||||||
.Where(u => u.SpoolId == spoolId)
|
|
||||||
.OrderByDescending(u => u.RecordedAt)
|
|
||||||
.ToListAsync(cancellationToken);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -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,95 +0,0 @@
|
|||||||
using Extrudex.Domain.Interfaces;
|
|
||||||
using Microsoft.Extensions.Configuration;
|
|
||||||
using Microsoft.Extensions.Logging;
|
|
||||||
|
|
||||||
namespace Extrudex.Infrastructure.Services;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Detects low-stock filament spools by comparing the remaining weight percentage
|
|
||||||
/// against a configurable threshold. The threshold can be set via:
|
|
||||||
/// 1. EXTRUDEX_LOW_STOCK_THRESHOLD env var (highest priority, e.g. "25")
|
|
||||||
/// 2. FilamentAlerts:LowStockThresholdPercent in appsettings.json
|
|
||||||
/// 3. Default: 20% (a standard spool is "low" when ≤20% remains)
|
|
||||||
/// </summary>
|
|
||||||
public class LowStockDetector : ILowStockDetector
|
|
||||||
{
|
|
||||||
private readonly ILogger<LowStockDetector> _logger;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// The percentage threshold below which a spool is considered low stock.
|
|
||||||
/// For example, 20 means a spool is "low" when ≤20% of its filament remains.
|
|
||||||
/// </summary>
|
|
||||||
public decimal LowStockThresholdPercent { get; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Initializes a new instance of the <see cref="LowStockDetector"/> class.
|
|
||||||
/// Reads the low-stock threshold from configuration with env var override support.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="configuration">Application configuration for threshold settings.</param>
|
|
||||||
/// <param name="logger">Logger for diagnostic output.</param>
|
|
||||||
public LowStockDetector(IConfiguration configuration, ILogger<LowStockDetector> logger)
|
|
||||||
{
|
|
||||||
_logger = logger;
|
|
||||||
|
|
||||||
// Priority: env var > appsettings > default (20%)
|
|
||||||
var envThreshold = Environment.GetEnvironmentVariable("EXTRUDEX_LOW_STOCK_THRESHOLD");
|
|
||||||
var configThreshold = configuration.GetValue<decimal?>("FilamentAlerts:LowStockThresholdPercent");
|
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(envThreshold) && decimal.TryParse(envThreshold, out var parsedEnv))
|
|
||||||
{
|
|
||||||
LowStockThresholdPercent = Math.Clamp(parsedEnv, 0m, 100m);
|
|
||||||
_logger.LogInformation(
|
|
||||||
"Low-stock threshold set from env var EXTRUDEX_LOW_STOCK_THRESHOLD: {Threshold}%",
|
|
||||||
LowStockThresholdPercent);
|
|
||||||
}
|
|
||||||
else if (configThreshold.HasValue)
|
|
||||||
{
|
|
||||||
LowStockThresholdPercent = Math.Clamp(configThreshold.Value, 0m, 100m);
|
|
||||||
_logger.LogInformation(
|
|
||||||
"Low-stock threshold set from config FilamentAlerts:LowStockThresholdPercent: {Threshold}%",
|
|
||||||
LowStockThresholdPercent);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
LowStockThresholdPercent = 20m;
|
|
||||||
_logger.LogInformation(
|
|
||||||
"Low-stock threshold using default: {Threshold}%", LowStockThresholdPercent);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public bool IsLowStock(decimal weightRemainingGrams, decimal weightTotalGrams)
|
|
||||||
{
|
|
||||||
if (weightTotalGrams <= 0m)
|
|
||||||
{
|
|
||||||
_logger.LogDebug(
|
|
||||||
"Spool with total weight {Total}g cannot be evaluated for low stock — treating as not low",
|
|
||||||
weightTotalGrams);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
var remainingPercent = GetRemainingWeightPercent(weightRemainingGrams, weightTotalGrams);
|
|
||||||
var isLow = remainingPercent <= LowStockThresholdPercent;
|
|
||||||
|
|
||||||
if (isLow)
|
|
||||||
{
|
|
||||||
_logger.LogDebug(
|
|
||||||
"Spool is LOW STOCK: {Remaining}g / {Total}g = {Percent:F1}% (threshold: {Threshold}%)",
|
|
||||||
weightRemainingGrams, weightTotalGrams, remainingPercent, LowStockThresholdPercent);
|
|
||||||
}
|
|
||||||
|
|
||||||
return isLow;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public decimal GetRemainingWeightPercent(decimal weightRemainingGrams, decimal weightTotalGrams)
|
|
||||||
{
|
|
||||||
if (weightTotalGrams <= 0m)
|
|
||||||
return 0m;
|
|
||||||
|
|
||||||
return Math.Round(
|
|
||||||
(weightRemainingGrams / weightTotalGrams) * 100m,
|
|
||||||
1,
|
|
||||||
MidpointRounding.AwayFromZero);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -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,390 +0,0 @@
|
|||||||
using Extrudex.Domain.DTOs.Moonraker;
|
|
||||||
using Extrudex.Domain.Entities;
|
|
||||||
using Extrudex.Domain.Enums;
|
|
||||||
using Extrudex.Domain.Interfaces;
|
|
||||||
using Extrudex.Infrastructure.Data;
|
|
||||||
using Microsoft.EntityFrameworkCore;
|
|
||||||
using Microsoft.Extensions.Logging;
|
|
||||||
using Microsoft.Extensions.Options;
|
|
||||||
|
|
||||||
namespace Extrudex.Infrastructure.Services;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Configuration options for the Moonraker usage polling service.
|
|
||||||
/// </summary>
|
|
||||||
public class MoonrakerPollerOptions
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// How often to poll each Moonraker printer for filament usage data.
|
|
||||||
/// Default: 30 seconds.
|
|
||||||
/// </summary>
|
|
||||||
public TimeSpan PollInterval { get; set; } = TimeSpan.FromSeconds(30);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Timeout for individual Moonraker HTTP requests.
|
|
||||||
/// Default: 10 seconds.
|
|
||||||
/// </summary>
|
|
||||||
public TimeSpan RequestTimeout { get; set; } = TimeSpan.FromSeconds(10);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Whether the polling service is enabled. Default: true.
|
|
||||||
/// Set to false to disable polling (e.g., in development or testing).
|
|
||||||
/// </summary>
|
|
||||||
public bool Enabled { get; set; } = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Background service that periodically polls Moonraker-connected printers
|
|
||||||
/// for filament usage data. When a print job is detected as complete,
|
|
||||||
/// the usage data is persisted to the FilamentUsage table via
|
|
||||||
/// <see cref="IFilamentUsageService"/>.
|
|
||||||
///
|
|
||||||
/// <para>Polling logic:</para>
|
|
||||||
/// <list type="number">
|
|
||||||
/// <item>Query the database for all active printers with ConnectionType == Moonraker.</item>
|
|
||||||
/// <item>For each printer, call <see cref="IMoonrakerClient.GetPrintStatsAsync"/> for live data
|
|
||||||
/// and <see cref="IMoonrakerClient.GetPrintHistoryAsync"/> for completed job history.</item>
|
|
||||||
/// <item>If usage data is available and the print state is "complete",
|
|
||||||
/// create or update a FilamentUsage record.</item>
|
|
||||||
/// <item>If the printer is unreachable or returns malformed data, log a warning
|
|
||||||
/// and continue to the next printer (no crash).</item>
|
|
||||||
/// </list>
|
|
||||||
///
|
|
||||||
/// <para>Error handling:</para>
|
|
||||||
/// <list type="bullet">
|
|
||||||
/// <item>API unreachable: logged as warning, poller continues for other printers.</item>
|
|
||||||
/// <item>Malformed response: logged as warning, poller continues.</item>
|
|
||||||
/// <item>Database errors: logged as error, poller continues.</item>
|
|
||||||
/// </list>
|
|
||||||
/// </summary>
|
|
||||||
public class MoonrakerUsagePoller : BackgroundService
|
|
||||||
{
|
|
||||||
private readonly IServiceScopeFactory _scopeFactory;
|
|
||||||
private readonly ILogger<MoonrakerUsagePoller> _logger;
|
|
||||||
private readonly MoonrakerPollerOptions _options;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Tracks which Moonraker print jobs have already been recorded,
|
|
||||||
/// keyed by "printerId:gcodeFileName" to avoid duplicate recording.
|
|
||||||
/// </summary>
|
|
||||||
private readonly HashSet<string> _recordedJobs = new();
|
|
||||||
|
|
||||||
public MoonrakerUsagePoller(
|
|
||||||
IServiceScopeFactory scopeFactory,
|
|
||||||
ILogger<MoonrakerUsagePoller> logger,
|
|
||||||
IOptions<MoonrakerPollerOptions> options)
|
|
||||||
{
|
|
||||||
_scopeFactory = scopeFactory;
|
|
||||||
_logger = logger;
|
|
||||||
_options = options.Value;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override async Task ExecuteAsync(CancellationToken stoppingToken)
|
|
||||||
{
|
|
||||||
if (!_options.Enabled)
|
|
||||||
{
|
|
||||||
_logger.LogInformation("Moonraker usage poller is disabled via configuration.");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
_logger.LogInformation(
|
|
||||||
"Moonraker usage poller starting. Poll interval: {Interval}",
|
|
||||||
_options.PollInterval);
|
|
||||||
|
|
||||||
while (!stoppingToken.IsCancellationRequested)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
await PollAllPrintersAsync(stoppingToken);
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
_logger.LogError(ex,
|
|
||||||
"Unexpected error in Moonraker usage poller cycle. Continuing.");
|
|
||||||
}
|
|
||||||
|
|
||||||
await Task.Delay(_options.PollInterval, stoppingToken);
|
|
||||||
}
|
|
||||||
|
|
||||||
_logger.LogInformation("Moonraker usage poller stopping.");
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task PollAllPrintersAsync(CancellationToken cancellationToken)
|
|
||||||
{
|
|
||||||
using var scope = _scopeFactory.CreateScope();
|
|
||||||
var dbContext = scope.ServiceProvider.GetRequiredService<ExtrudexDbContext>();
|
|
||||||
var moonrakerClient = scope.ServiceProvider.GetRequiredService<IMoonrakerClient>();
|
|
||||||
var usageService = scope.ServiceProvider.GetRequiredService<IFilamentUsageService>();
|
|
||||||
|
|
||||||
var printers = await dbContext.Printers
|
|
||||||
.Where(p => p.IsActive && p.ConnectionType == ConnectionType.Moonraker)
|
|
||||||
.ToListAsync(cancellationToken);
|
|
||||||
|
|
||||||
if (printers.Count == 0)
|
|
||||||
{
|
|
||||||
_logger.LogDebug("No active Moonraker printers found.");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
_logger.LogDebug("Polling {Count} Moonraker printer(s).", printers.Count);
|
|
||||||
|
|
||||||
foreach (var printer in printers)
|
|
||||||
{
|
|
||||||
await PollPrinterAsync(
|
|
||||||
printer, moonrakerClient, usageService, dbContext, cancellationToken);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task PollPrinterAsync(
|
|
||||||
Printer printer,
|
|
||||||
IMoonrakerClient moonrakerClient,
|
|
||||||
IFilamentUsageService usageService,
|
|
||||||
ExtrudexDbContext dbContext,
|
|
||||||
CancellationToken cancellationToken)
|
|
||||||
{
|
|
||||||
_logger.LogDebug(
|
|
||||||
"Polling Moonraker printer {PrinterName} ({Host}:{Port})",
|
|
||||||
printer.Name, printer.HostnameOrIp, printer.Port);
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var printStats = await moonrakerClient.GetPrintStatsAsync(
|
|
||||||
printer.HostnameOrIp,
|
|
||||||
printer.Port,
|
|
||||||
printer.ApiKey,
|
|
||||||
cancellationToken);
|
|
||||||
|
|
||||||
if (printStats is null)
|
|
||||||
{
|
|
||||||
_logger.LogDebug(
|
|
||||||
"No print stats available from printer {PrinterName}.", printer.Name);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
printer.LastSeenAt = DateTime.UtcNow;
|
|
||||||
await dbContext.SaveChangesAsync(cancellationToken);
|
|
||||||
|
|
||||||
_logger.LogDebug(
|
|
||||||
"Printer {PrinterName}: state={State}, filament={Mm}mm, file={File}",
|
|
||||||
printer.Name, printStats.State, printStats.FilamentUsedMm, printStats.Filename);
|
|
||||||
|
|
||||||
decimal mmExtruded = printStats.FilamentUsedMm;
|
|
||||||
if (mmExtruded <= 0)
|
|
||||||
{
|
|
||||||
_logger.LogDebug(
|
|
||||||
"Printer {PrinterName} has no filament usage to record.", printer.Name);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!IsCompleteState(printStats.State))
|
|
||||||
{
|
|
||||||
_logger.LogDebug(
|
|
||||||
"Printer {PrinterName} print state '{State}' is not complete; skipping.",
|
|
||||||
printer.Name, printStats.State);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
string gcodeFileName = printStats.Filename ?? $"unknown-{Guid.NewGuid():N}";
|
|
||||||
var deduplicationKey = $"{printer.Id}:{gcodeFileName}";
|
|
||||||
if (_recordedJobs.Contains(deduplicationKey))
|
|
||||||
{
|
|
||||||
_logger.LogDebug(
|
|
||||||
"Printer {PrinterName} job '{File}' already recorded; skipping.",
|
|
||||||
printer.Name, gcodeFileName);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
DateTime? startedAt = null;
|
|
||||||
DateTime? completedAt = null;
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var history = await moonrakerClient.GetPrintHistoryAsync(
|
|
||||||
printer.HostnameOrIp, printer.Port, printer.ApiKey,
|
|
||||||
limit: 1, cancellationToken);
|
|
||||||
|
|
||||||
if (history.Items.Count > 0)
|
|
||||||
{
|
|
||||||
var latestJob = history.Items[0];
|
|
||||||
startedAt = latestJob.StartTime;
|
|
||||||
completedAt = latestJob.EndTime;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
_logger.LogDebug(ex,
|
|
||||||
"Could not fetch history for printer {PrinterName}; proceeding with stats only.",
|
|
||||||
printer.Name);
|
|
||||||
}
|
|
||||||
|
|
||||||
var printJob = await FindOrCreatePrintJobAsync(
|
|
||||||
dbContext, printer, mmExtruded, gcodeFileName,
|
|
||||||
startedAt, completedAt, cancellationToken);
|
|
||||||
|
|
||||||
if (printJob is null)
|
|
||||||
{
|
|
||||||
_logger.LogWarning(
|
|
||||||
"Could not find or create print job for printer {PrinterName}. No active spool found.",
|
|
||||||
printer.Name);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
var spool = await dbContext.Spools.FindAsync(
|
|
||||||
new object[] { printJob.SpoolId }, cancellationToken);
|
|
||||||
|
|
||||||
var gramsUsed = CalculateGramsUsed(mmExtruded, spool);
|
|
||||||
|
|
||||||
await usageService.RecordUsageAsync(
|
|
||||||
printJobId: printJob.Id,
|
|
||||||
spoolId: printJob.SpoolId,
|
|
||||||
printerId: printer.Id,
|
|
||||||
gramsUsed: gramsUsed,
|
|
||||||
mmExtruded: mmExtruded,
|
|
||||||
notes: $"Moonraker auto-recorded: {gcodeFileName}",
|
|
||||||
cancellationToken: cancellationToken);
|
|
||||||
|
|
||||||
_recordedJobs.Add(deduplicationKey);
|
|
||||||
|
|
||||||
_logger.LogInformation(
|
|
||||||
"Recorded Moonraker usage for printer {PrinterName}: {Mm}mm / {Grams}g, job '{File}'",
|
|
||||||
printer.Name, mmExtruded, gramsUsed, gcodeFileName);
|
|
||||||
}
|
|
||||||
catch (HttpRequestException ex)
|
|
||||||
{
|
|
||||||
_logger.LogWarning(ex,
|
|
||||||
"Moonraker API unreachable for printer {PrinterName} ({Host}:{Port}). Will retry next cycle.",
|
|
||||||
printer.Name, printer.HostnameOrIp, printer.Port);
|
|
||||||
}
|
|
||||||
catch (TaskCanceledException) when (cancellationToken.IsCancellationRequested)
|
|
||||||
{
|
|
||||||
throw;
|
|
||||||
}
|
|
||||||
catch (TaskCanceledException ex)
|
|
||||||
{
|
|
||||||
_logger.LogWarning(ex,
|
|
||||||
"Moonraker request timed out for printer {PrinterName} ({Host}:{Port}).",
|
|
||||||
printer.Name, printer.HostnameOrIp, printer.Port);
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
_logger.LogError(ex,
|
|
||||||
"Unexpected error polling Moonraker printer {PrinterName}. Continuing to next printer.",
|
|
||||||
printer.Name);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static bool IsCompleteState(string state) =>
|
|
||||||
state.Equals("complete", StringComparison.OrdinalIgnoreCase) ||
|
|
||||||
state.Equals("completed", StringComparison.OrdinalIgnoreCase);
|
|
||||||
|
|
||||||
private async Task<PrintJob?> FindOrCreatePrintJobAsync(
|
|
||||||
ExtrudexDbContext dbContext,
|
|
||||||
Printer printer,
|
|
||||||
decimal mmExtruded,
|
|
||||||
string gcodeFileName,
|
|
||||||
DateTime? startedAt,
|
|
||||||
DateTime? completedAt,
|
|
||||||
CancellationToken cancellationToken)
|
|
||||||
{
|
|
||||||
if (!string.IsNullOrEmpty(gcodeFileName))
|
|
||||||
{
|
|
||||||
var existingJob = await dbContext.PrintJobs
|
|
||||||
.Where(j => j.PrinterId == printer.Id &&
|
|
||||||
j.GcodeFilePath == gcodeFileName &&
|
|
||||||
j.DataSource == DataSource.Moonraker &&
|
|
||||||
j.Status != JobStatus.Cancelled)
|
|
||||||
.OrderByDescending(j => j.CreatedAt)
|
|
||||||
.FirstOrDefaultAsync(cancellationToken);
|
|
||||||
|
|
||||||
if (existingJob is not null)
|
|
||||||
{
|
|
||||||
existingJob.MmExtruded = mmExtruded;
|
|
||||||
existingJob.GramsDerived = CalculateGramsUsed(
|
|
||||||
mmExtruded,
|
|
||||||
await dbContext.Spools.FindAsync(
|
|
||||||
new object[] { existingJob.SpoolId }, cancellationToken));
|
|
||||||
existingJob.Status = JobStatus.Completed;
|
|
||||||
existingJob.CompletedAt = completedAt ?? DateTime.UtcNow;
|
|
||||||
existingJob.StartedAt ??= startedAt;
|
|
||||||
await dbContext.SaveChangesAsync(cancellationToken);
|
|
||||||
return existingJob;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
var spool = await FindActiveSpoolForPrinterAsync(dbContext, printer, cancellationToken);
|
|
||||||
if (spool is null) return null;
|
|
||||||
|
|
||||||
var gramsDerived = CalculateGramsUsed(mmExtruded, spool);
|
|
||||||
|
|
||||||
var newJob = new PrintJob
|
|
||||||
{
|
|
||||||
PrinterId = printer.Id,
|
|
||||||
SpoolId = spool.Id,
|
|
||||||
PrintName = gcodeFileName ?? "Moonraker Print",
|
|
||||||
GcodeFilePath = gcodeFileName,
|
|
||||||
MmExtruded = mmExtruded,
|
|
||||||
GramsDerived = gramsDerived,
|
|
||||||
FilamentDiameterAtPrintMm = spool.FilamentDiameterMm,
|
|
||||||
MaterialDensityAtPrint = GetMaterialDensity(spool),
|
|
||||||
DataSource = DataSource.Moonraker,
|
|
||||||
Status = JobStatus.Completed,
|
|
||||||
StartedAt = startedAt ?? DateTime.UtcNow,
|
|
||||||
CompletedAt = completedAt ?? DateTime.UtcNow,
|
|
||||||
Notes = "Auto-created by Moonraker usage poller"
|
|
||||||
};
|
|
||||||
|
|
||||||
dbContext.PrintJobs.Add(newJob);
|
|
||||||
await dbContext.SaveChangesAsync(cancellationToken);
|
|
||||||
|
|
||||||
return newJob;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static async Task<Spool?> FindActiveSpoolForPrinterAsync(
|
|
||||||
ExtrudexDbContext dbContext,
|
|
||||||
Printer printer,
|
|
||||||
CancellationToken cancellationToken)
|
|
||||||
{
|
|
||||||
var amsSpool = await dbContext.AmsSlots
|
|
||||||
.Include(s => s.Spool)
|
|
||||||
.ThenInclude(s => s!.MaterialBase)
|
|
||||||
.Include(s => s.AmsUnit)
|
|
||||||
.Where(s => s.AmsUnit.PrinterId == printer.Id && s.Spool != null && s.Spool.IsActive)
|
|
||||||
.Select(s => s.Spool)
|
|
||||||
.FirstOrDefaultAsync(cancellationToken);
|
|
||||||
|
|
||||||
if (amsSpool is not null) return amsSpool;
|
|
||||||
|
|
||||||
return await dbContext.Spools
|
|
||||||
.Include(s => s.MaterialBase)
|
|
||||||
.Where(s => s.IsActive)
|
|
||||||
.OrderByDescending(s => s.WeightRemainingGrams)
|
|
||||||
.FirstOrDefaultAsync(cancellationToken);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static decimal CalculateGramsUsed(decimal mmExtruded, Spool? spool)
|
|
||||||
{
|
|
||||||
if (spool is null) return 0m;
|
|
||||||
var diameterMm = spool.FilamentDiameterMm;
|
|
||||||
var densityGcm3 = GetMaterialDensity(spool);
|
|
||||||
var radiusMm = diameterMm / 2m;
|
|
||||||
var crossSectionArea = Math.PI * (double)radiusMm * (double)radiusMm;
|
|
||||||
var volumeMm3 = (double)mmExtruded * crossSectionArea;
|
|
||||||
var volumeCm3 = volumeMm3 / 1000.0;
|
|
||||||
var grams = volumeCm3 * (double)densityGcm3;
|
|
||||||
return Math.Round((decimal)grams, 2);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static decimal GetMaterialDensity(Spool? spool)
|
|
||||||
{
|
|
||||||
return spool?.MaterialBase?.Name?.ToUpperInvariant() switch
|
|
||||||
{
|
|
||||||
"PLA" => 1.24m,
|
|
||||||
"PETG" => 1.27m,
|
|
||||||
"ABS" => 1.04m,
|
|
||||||
"ASA" => 1.07m,
|
|
||||||
"TPU" => 1.21m,
|
|
||||||
"NYLON" or "PA" => 1.13m,
|
|
||||||
"PC" => 1.20m,
|
|
||||||
_ => 1.24m
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,81 +0,0 @@
|
|||||||
using Extrudex.Domain.Entities;
|
|
||||||
using Extrudex.Domain.Enums;
|
|
||||||
using Extrudex.Domain.Interfaces;
|
|
||||||
using Extrudex.Infrastructure.Data;
|
|
||||||
using Microsoft.EntityFrameworkCore;
|
|
||||||
|
|
||||||
namespace Extrudex.Infrastructure.Services;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Implementation of <see cref="IUsageLogService"/> that persists usage entries
|
|
||||||
/// to the usage_logs table via EF Core.
|
|
||||||
/// </summary>
|
|
||||||
public class UsageLogService : IUsageLogService
|
|
||||||
{
|
|
||||||
private readonly ExtrudexDbContext _dbContext;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Initializes a new instance of the <see cref="UsageLogService"/> class.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="dbContext">The EF Core database context for data persistence.</param>
|
|
||||||
public UsageLogService(ExtrudexDbContext dbContext)
|
|
||||||
{
|
|
||||||
_dbContext = dbContext;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc/>
|
|
||||||
public async Task<UsageLog> RecordUsageAsync(
|
|
||||||
Guid spoolId,
|
|
||||||
decimal gramsUsed,
|
|
||||||
DataSource dataSource,
|
|
||||||
Guid? printerId = null,
|
|
||||||
Guid? printJobId = null,
|
|
||||||
decimal? mmExtruded = null,
|
|
||||||
DateTime? usageTimestamp = null,
|
|
||||||
string? notes = null)
|
|
||||||
{
|
|
||||||
var entry = new UsageLog
|
|
||||||
{
|
|
||||||
SpoolId = spoolId,
|
|
||||||
GramsUsed = gramsUsed,
|
|
||||||
DataSource = dataSource,
|
|
||||||
PrinterId = printerId,
|
|
||||||
PrintJobId = printJobId,
|
|
||||||
MmExtruded = mmExtruded,
|
|
||||||
UsageTimestamp = usageTimestamp ?? DateTime.UtcNow,
|
|
||||||
Notes = notes
|
|
||||||
};
|
|
||||||
|
|
||||||
_dbContext.UsageLogs.Add(entry);
|
|
||||||
await _dbContext.SaveChangesAsync();
|
|
||||||
|
|
||||||
return entry;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc/>
|
|
||||||
public async Task<IEnumerable<UsageLog>> GetBySpoolAsync(Guid spoolId, CancellationToken cancellationToken = default)
|
|
||||||
{
|
|
||||||
return await _dbContext.UsageLogs
|
|
||||||
.Where(u => u.SpoolId == spoolId)
|
|
||||||
.OrderByDescending(u => u.UsageTimestamp)
|
|
||||||
.ToListAsync(cancellationToken);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc/>
|
|
||||||
public async Task<IEnumerable<UsageLog>> GetByPrinterAsync(Guid printerId, CancellationToken cancellationToken = default)
|
|
||||||
{
|
|
||||||
return await _dbContext.UsageLogs
|
|
||||||
.Where(u => u.PrinterId == printerId)
|
|
||||||
.OrderByDescending(u => u.UsageTimestamp)
|
|
||||||
.ToListAsync(cancellationToken);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc/>
|
|
||||||
public async Task<IEnumerable<UsageLog>> GetByPrintJobAsync(Guid printJobId, CancellationToken cancellationToken = default)
|
|
||||||
{
|
|
||||||
return await _dbContext.UsageLogs
|
|
||||||
.Where(u => u.PrintJobId == printJobId)
|
|
||||||
.OrderByDescending(u => u.UsageTimestamp)
|
|
||||||
.ToListAsync(cancellationToken);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -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,31 +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>();
|
|
||||||
|
|
||||||
// ── Low Stock Detection ────────────────────────────────────
|
|
||||||
builder.Services.AddSingleton<ILowStockDetector, LowStockDetector>();
|
|
||||||
|
|
||||||
// ── Usage Logging ───────────────────────────────────────────
|
|
||||||
builder.Services.AddScoped<IUsageLogService, UsageLogService>();
|
|
||||||
|
|
||||||
// ── Filament Usage Service ──────────────────────────────────
|
|
||||||
builder.Services.AddScoped<IFilamentUsageService, FilamentUsageService>();
|
|
||||||
|
|
||||||
// ── Moonraker Usage Poller (Background Service) ─────────────
|
|
||||||
builder.Services.Configure<MoonrakerPollerOptions>(
|
|
||||||
builder.Configuration.GetSection("MoonrakerPoller"));
|
|
||||||
builder.Services.AddHostedService<MoonrakerUsagePoller>();
|
|
||||||
|
|
||||||
// ── 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
|
||||||
@@ -96,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 ──────────────────────────────────────────────
|
||||||
@@ -132,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,25 +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
|
|
||||||
},
|
|
||||||
"FilamentAlerts": {
|
|
||||||
"LowStockThresholdPercent": 20
|
|
||||||
},
|
|
||||||
"MoonrakerPoller": {
|
|
||||||
"Enabled": true,
|
|
||||||
"PollInterval": "00:00:30",
|
|
||||||
"RequestTimeout": "00:00:10"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
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
|
|
||||||
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,20 +0,0 @@
|
|||||||
# Multi-stage build for production
|
|
||||||
FROM node:22-alpine AS builder
|
|
||||||
|
|
||||||
WORKDIR /app
|
|
||||||
|
|
||||||
COPY package*.json ./
|
|
||||||
RUN npm ci
|
|
||||||
|
|
||||||
COPY . .
|
|
||||||
RUN npm run build
|
|
||||||
|
|
||||||
# Production stage — serve with nginx
|
|
||||||
FROM nginx:alpine
|
|
||||||
|
|
||||||
COPY --from=builder /app/dist /usr/share/nginx/html
|
|
||||||
COPY nginx.conf /etc/nginx/conf.d/default.conf
|
|
||||||
|
|
||||||
EXPOSE 80
|
|
||||||
|
|
||||||
CMD ["nginx", "-g", "daemon off;"]
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
import js from '@eslint/js'
|
|
||||||
import globals from 'globals'
|
|
||||||
import reactHooks from 'eslint-plugin-react-hooks'
|
|
||||||
import reactRefresh from 'eslint-plugin-react-refresh'
|
|
||||||
import tseslint from 'typescript-eslint'
|
|
||||||
|
|
||||||
export default tseslint.config(
|
|
||||||
{ ignores: ['dist'] },
|
|
||||||
{
|
|
||||||
extends: [js.configs.recommended, ...tseslint.configs.recommended],
|
|
||||||
files: ['**/*.{ts,tsx}'],
|
|
||||||
languageOptions: {
|
|
||||||
ecmaVersion: 2023,
|
|
||||||
globals: globals.browser,
|
|
||||||
},
|
|
||||||
plugins: {
|
|
||||||
'react-hooks': reactHooks,
|
|
||||||
'react-refresh': reactRefresh,
|
|
||||||
},
|
|
||||||
rules: {
|
|
||||||
...reactHooks.configs.recommended.rules,
|
|
||||||
'react-refresh/only-export-components': [
|
|
||||||
'warn',
|
|
||||||
{ allowConstantExport: true },
|
|
||||||
],
|
|
||||||
},
|
|
||||||
},
|
|
||||||
)
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
<!doctype html>
|
|
||||||
<html lang="en">
|
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8" />
|
|
||||||
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
|
||||||
<meta name="theme-color" content="#0f172a" />
|
|
||||||
<title>Extrudex</title>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<div id="root"></div>
|
|
||||||
<script type="module" src="/src/main.tsx"></script>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
server {
|
|
||||||
listen 80;
|
|
||||||
listen [::]:80;
|
|
||||||
server_name localhost;
|
|
||||||
|
|
||||||
location / {
|
|
||||||
root /usr/share/nginx/html;
|
|
||||||
index index.html;
|
|
||||||
try_files $uri $uri/ /index.html;
|
|
||||||
}
|
|
||||||
|
|
||||||
error_page 500 502 503 504 /50x.html;
|
|
||||||
location = /50x.html {
|
|
||||||
root /usr/share/nginx/html;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
3198
frontend/package-lock.json
generated
3198
frontend/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -1,36 +0,0 @@
|
|||||||
{
|
|
||||||
"name": "extrudex-frontend",
|
|
||||||
"private": true,
|
|
||||||
"version": "0.0.0",
|
|
||||||
"type": "module",
|
|
||||||
"scripts": {
|
|
||||||
"dev": "vite",
|
|
||||||
"build": "tsc -b && vite build",
|
|
||||||
"lint": "eslint .",
|
|
||||||
"preview": "vite preview"
|
|
||||||
},
|
|
||||||
"dependencies": {
|
|
||||||
"@tailwindcss/vite": "^4.2.4",
|
|
||||||
"@tanstack/react-query": "^5.100.9",
|
|
||||||
"axios": "^1.16.0",
|
|
||||||
"react": "^19.2.5",
|
|
||||||
"react-dom": "^19.2.5",
|
|
||||||
"react-router-dom": "^7.15.0",
|
|
||||||
"tailwindcss": "^4.2.4",
|
|
||||||
"zustand": "^5.0.13"
|
|
||||||
},
|
|
||||||
"devDependencies": {
|
|
||||||
"@eslint/js": "^10.0.1",
|
|
||||||
"@types/react": "^19.2.14",
|
|
||||||
"@types/react-dom": "^19.2.3",
|
|
||||||
"@types/react-router-dom": "^5.3.3",
|
|
||||||
"@vitejs/plugin-react": "^6.0.1",
|
|
||||||
"eslint": "^10.2.1",
|
|
||||||
"eslint-plugin-react-hooks": "^7.1.1",
|
|
||||||
"eslint-plugin-react-refresh": "^0.5.2",
|
|
||||||
"globals": "^17.5.0",
|
|
||||||
"typescript": "~6.0.2",
|
|
||||||
"typescript-eslint": "^8.58.2",
|
|
||||||
"vite": "^8.0.10"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 15 KiB |
@@ -1,17 +0,0 @@
|
|||||||
import { Routes, Route } from 'react-router-dom'
|
|
||||||
import ErrorBoundary from './components/ErrorBoundary'
|
|
||||||
import HomePage from './pages/HomePage'
|
|
||||||
|
|
||||||
function App() {
|
|
||||||
return (
|
|
||||||
<ErrorBoundary>
|
|
||||||
<div className="min-h-screen bg-slate-900 text-slate-100">
|
|
||||||
<Routes>
|
|
||||||
<Route path="/" element={<HomePage />} />
|
|
||||||
</Routes>
|
|
||||||
</div>
|
|
||||||
</ErrorBoundary>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
export default App
|
|
||||||
@@ -1,50 +0,0 @@
|
|||||||
import { Component, type ReactNode } from 'react'
|
|
||||||
|
|
||||||
interface Props {
|
|
||||||
children: ReactNode
|
|
||||||
}
|
|
||||||
|
|
||||||
interface State {
|
|
||||||
hasError: boolean
|
|
||||||
error?: Error
|
|
||||||
}
|
|
||||||
|
|
||||||
class ErrorBoundary extends Component<Props, State> {
|
|
||||||
constructor(props: Props) {
|
|
||||||
super(props)
|
|
||||||
this.state = { hasError: false }
|
|
||||||
}
|
|
||||||
|
|
||||||
static getDerivedStateFromError(error: Error): State {
|
|
||||||
return { hasError: true, error }
|
|
||||||
}
|
|
||||||
|
|
||||||
componentDidCatch(error: Error, info: React.ErrorInfo) {
|
|
||||||
// eslint-disable-next-line no-console
|
|
||||||
console.error('ErrorBoundary caught:', error, info)
|
|
||||||
}
|
|
||||||
|
|
||||||
render() {
|
|
||||||
if (this.state.hasError) {
|
|
||||||
return (
|
|
||||||
<div className="flex min-h-screen items-center justify-center p-4">
|
|
||||||
<div className="rounded-xl border border-red-500/30 bg-red-950/40 p-6 text-center shadow-lg backdrop-blur-sm">
|
|
||||||
<h2 className="mb-2 text-xl font-semibold text-red-400">Something went wrong</h2>
|
|
||||||
<p className="mb-4 text-sm text-red-300">
|
|
||||||
{this.state.error?.message || 'An unexpected error occurred.'}
|
|
||||||
</p>
|
|
||||||
<button
|
|
||||||
onClick={() => window.location.reload()}
|
|
||||||
className="rounded-lg bg-red-600 px-4 py-2 text-sm font-medium text-white hover:bg-red-700"
|
|
||||||
>
|
|
||||||
Reload Page
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
return this.props.children
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export default ErrorBoundary
|
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
export default function ErrorState({
|
|
||||||
message = 'Something went wrong.',
|
|
||||||
onRetry,
|
|
||||||
}: {
|
|
||||||
message?: string
|
|
||||||
onRetry?: () => void
|
|
||||||
}) {
|
|
||||||
return (
|
|
||||||
<div className="flex min-h-[120px] flex-col items-center justify-center gap-3 rounded-xl border border-red-500/20 bg-red-950/30 p-6 text-center">
|
|
||||||
<p className="text-sm text-red-300">{message}</p>
|
|
||||||
{onRetry && (
|
|
||||||
<button
|
|
||||||
onClick={onRetry}
|
|
||||||
className="rounded-lg bg-red-600 px-3 py-1.5 text-xs font-medium text-white hover:bg-red-700"
|
|
||||||
>
|
|
||||||
Retry
|
|
||||||
</button>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
export default function LoadingSpinner({ size = 'md' }: { size?: 'sm' | 'md' | 'lg' }) {
|
|
||||||
const sizeClass =
|
|
||||||
size === 'sm' ? 'h-4 w-4 border-2' : size === 'lg' ? 'h-10 w-10 border-4' : 'h-6 w-6 border-2'
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="flex items-center justify-center p-4">
|
|
||||||
<div
|
|
||||||
className={`${sizeClass} animate-spin rounded-full border-slate-600 border-t-sky-400`}
|
|
||||||
role="status"
|
|
||||||
aria-label="Loading"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
import { useQuery } from '@tanstack/react-query'
|
|
||||||
import { healthCheck } from '../services/api'
|
|
||||||
|
|
||||||
export function useHealth() {
|
|
||||||
return useQuery({
|
|
||||||
queryKey: ['health'],
|
|
||||||
queryFn: healthCheck,
|
|
||||||
retry: 2,
|
|
||||||
refetchInterval: 30000,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
@import "tailwindcss";
|
|
||||||
|
|
||||||
body {
|
|
||||||
margin: 0;
|
|
||||||
min-width: 320px;
|
|
||||||
min-height: 100vh;
|
|
||||||
background-color: #0f172a;
|
|
||||||
color: #e2e8f0;
|
|
||||||
font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif;
|
|
||||||
}
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
import { StrictMode } from 'react'
|
|
||||||
import { createRoot } from 'react-dom/client'
|
|
||||||
import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
|
|
||||||
import { BrowserRouter } from 'react-router-dom'
|
|
||||||
import './index.css'
|
|
||||||
import App from './App.tsx'
|
|
||||||
|
|
||||||
const queryClient = new QueryClient()
|
|
||||||
|
|
||||||
createRoot(document.getElementById('root')!).render(
|
|
||||||
<StrictMode>
|
|
||||||
<QueryClientProvider client={queryClient}>
|
|
||||||
<BrowserRouter>
|
|
||||||
<App />
|
|
||||||
</BrowserRouter>
|
|
||||||
</QueryClientProvider>
|
|
||||||
</StrictMode>,
|
|
||||||
)
|
|
||||||
@@ -1,36 +0,0 @@
|
|||||||
import LoadingSpinner from '../components/LoadingSpinner'
|
|
||||||
import ErrorState from '../components/ErrorState'
|
|
||||||
import { useHealth } from '../hooks/useHealth'
|
|
||||||
|
|
||||||
export default function HomePage() {
|
|
||||||
const { data, isLoading, isError, refetch } = useHealth()
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="flex min-h-screen flex-col items-center justify-center gap-6 p-6">
|
|
||||||
<h1 className="text-3xl font-bold tracking-tight text-sky-400">Extrudex</h1>
|
|
||||||
<p className="text-slate-400">Filament inventory & print tracking</p>
|
|
||||||
|
|
||||||
<div className="w-full max-w-md rounded-xl border border-slate-700 bg-slate-800/60 p-6 shadow-lg backdrop-blur-sm">
|
|
||||||
<h2 className="mb-3 text-sm font-semibold uppercase tracking-wider text-slate-400">
|
|
||||||
Backend Health
|
|
||||||
</h2>
|
|
||||||
|
|
||||||
{isLoading && <LoadingSpinner />}
|
|
||||||
|
|
||||||
{isError && (
|
|
||||||
<ErrorState
|
|
||||||
message="Backend is unreachable."
|
|
||||||
onRetry={() => refetch()}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{data && (
|
|
||||||
<div className="flex items-center gap-2 text-emerald-400">
|
|
||||||
<span className="h-2 w-2 rounded-full bg-emerald-400" />
|
|
||||||
<span className="text-sm font-medium">{data.status || 'ok'}</span>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
import axios from 'axios'
|
|
||||||
|
|
||||||
const API_BASE_URL = import.meta.env.VITE_API_BASE_URL || 'http://localhost:8080'
|
|
||||||
|
|
||||||
export const api = axios.create({
|
|
||||||
baseURL: API_BASE_URL,
|
|
||||||
headers: {
|
|
||||||
'Content-Type': 'application/json',
|
|
||||||
},
|
|
||||||
timeout: 10000,
|
|
||||||
})
|
|
||||||
|
|
||||||
api.interceptors.response.use(
|
|
||||||
(response) => response,
|
|
||||||
(error) => {
|
|
||||||
// eslint-disable-next-line no-console
|
|
||||||
console.error('API error:', error)
|
|
||||||
return Promise.reject(error)
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
export async function healthCheck(): Promise<{ status: string }> {
|
|
||||||
const { data } = await api.get('/health')
|
|
||||||
return data
|
|
||||||
}
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
// Shared TypeScript types for Extrudex frontend
|
|
||||||
// Placeholder — expand as API contracts stabilize
|
|
||||||
|
|
||||||
export interface HealthResponse {
|
|
||||||
status: string
|
|
||||||
}
|
|
||||||
9
frontend/src/vite-env.d.ts
vendored
9
frontend/src/vite-env.d.ts
vendored
@@ -1,9 +0,0 @@
|
|||||||
/// <reference types="vite/client" />
|
|
||||||
|
|
||||||
interface ImportMetaEnv {
|
|
||||||
readonly VITE_API_BASE_URL: string
|
|
||||||
}
|
|
||||||
|
|
||||||
interface ImportMeta {
|
|
||||||
readonly env: ImportMetaEnv
|
|
||||||
}
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
/** @type {import('tailwindcss').Config} */
|
|
||||||
export default {
|
|
||||||
content: [
|
|
||||||
"./index.html",
|
|
||||||
"./src/**/*.{js,ts,jsx,tsx}",
|
|
||||||
],
|
|
||||||
theme: {
|
|
||||||
extend: {
|
|
||||||
colors: {
|
|
||||||
slate: {
|
|
||||||
850: '#1e293b',
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
plugins: [],
|
|
||||||
}
|
|
||||||
@@ -1,38 +0,0 @@
|
|||||||
{
|
|
||||||
"compilerOptions": {
|
|
||||||
"tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
|
|
||||||
"target": "ES2023",
|
|
||||||
"lib": ["ES2023", "DOM", "DOM.Iterable"],
|
|
||||||
"module": "ESNext",
|
|
||||||
"types": ["vite/client"],
|
|
||||||
"skipLibCheck": true,
|
|
||||||
|
|
||||||
/* Bundler mode */
|
|
||||||
"moduleResolution": "bundler",
|
|
||||||
"allowImportingTsExtensions": true,
|
|
||||||
"verbatimModuleSyntax": true,
|
|
||||||
"moduleDetection": "force",
|
|
||||||
"noEmit": true,
|
|
||||||
"jsx": "react-jsx",
|
|
||||||
|
|
||||||
/* Linting */
|
|
||||||
"noUnusedLocals": true,
|
|
||||||
"noUnusedParameters": true,
|
|
||||||
"erasableSyntaxOnly": true,
|
|
||||||
"noFallthroughCasesInSwitch": true,
|
|
||||||
|
|
||||||
/* Strict mode */
|
|
||||||
"strict": true,
|
|
||||||
"noImplicitAny": true,
|
|
||||||
"strictNullChecks": true,
|
|
||||||
"strictFunctionTypes": true,
|
|
||||||
"strictBindCallApply": true,
|
|
||||||
"strictPropertyInitialization": true,
|
|
||||||
"noImplicitThis": true,
|
|
||||||
"alwaysStrict": true,
|
|
||||||
"noUncheckedIndexedAccess": true,
|
|
||||||
"exactOptionalPropertyTypes": true,
|
|
||||||
"noImplicitReturns": true
|
|
||||||
},
|
|
||||||
"include": ["src"]
|
|
||||||
}
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
{
|
|
||||||
"files": [],
|
|
||||||
"references": [
|
|
||||||
{ "path": "./tsconfig.app.json" },
|
|
||||||
{ "path": "./tsconfig.node.json" }
|
|
||||||
]
|
|
||||||
}
|
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
{
|
|
||||||
"compilerOptions": {
|
|
||||||
"tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo",
|
|
||||||
"target": "es2023",
|
|
||||||
"lib": ["ES2023"],
|
|
||||||
"module": "esnext",
|
|
||||||
"types": ["node"],
|
|
||||||
"skipLibCheck": true,
|
|
||||||
|
|
||||||
/* Bundler mode */
|
|
||||||
"moduleResolution": "bundler",
|
|
||||||
"allowImportingTsExtensions": true,
|
|
||||||
"verbatimModuleSyntax": true,
|
|
||||||
"moduleDetection": "force",
|
|
||||||
"noEmit": true,
|
|
||||||
|
|
||||||
/* Linting */
|
|
||||||
"noUnusedLocals": true,
|
|
||||||
"noUnusedParameters": true,
|
|
||||||
"erasableSyntaxOnly": true,
|
|
||||||
"noFallthroughCasesInSwitch": true
|
|
||||||
},
|
|
||||||
"include": ["vite.config.ts"]
|
|
||||||
}
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
import { defineConfig } from 'vite'
|
|
||||||
import react from '@vitejs/plugin-react'
|
|
||||||
import tailwindcss from '@tailwindcss/vite'
|
|
||||||
|
|
||||||
// https://vite.dev/config/
|
|
||||||
export default defineConfig({
|
|
||||||
plugins: [react(), tailwindcss()],
|
|
||||||
server: {
|
|
||||||
port: 5173,
|
|
||||||
host: true,
|
|
||||||
},
|
|
||||||
build: {
|
|
||||||
outDir: 'dist',
|
|
||||||
sourcemap: true,
|
|
||||||
},
|
|
||||||
})
|
|
||||||
Reference in New Issue
Block a user