Compare commits
3 Commits
agent/Dex/
...
7fe06cf565
| Author | SHA1 | Date | |
|---|---|---|---|
| 7fe06cf565 | |||
| 20a22d2dd9 | |||
| 4c91bb7862 |
@@ -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,6 +1,7 @@
|
|||||||
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;
|
||||||
@@ -17,16 +18,22 @@ 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(ExtrudexDbContext dbContext, ILogger<FilamentsController> logger)
|
public FilamentsController(
|
||||||
|
ExtrudexDbContext dbContext,
|
||||||
|
ILowStockDetector lowStockDetector,
|
||||||
|
ILogger<FilamentsController> logger)
|
||||||
{
|
{
|
||||||
_dbContext = dbContext;
|
_dbContext = dbContext;
|
||||||
|
_lowStockDetector = lowStockDetector;
|
||||||
_logger = logger;
|
_logger = logger;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -83,7 +90,7 @@ public class FilamentsController : ControllerBase
|
|||||||
.OrderByDescending(s => s.CreatedAt)
|
.OrderByDescending(s => s.CreatedAt)
|
||||||
.Skip((pageNumber - 1) * pageSize)
|
.Skip((pageNumber - 1) * pageSize)
|
||||||
.Take(pageSize)
|
.Take(pageSize)
|
||||||
.Select(s => MapToFilamentResponse(s))
|
.Select(s => MapToFilamentResponse(s, _lowStockDetector))
|
||||||
.ToListAsync();
|
.ToListAsync();
|
||||||
|
|
||||||
var response = new PagedResponse<FilamentResponse>
|
var response = new PagedResponse<FilamentResponse>
|
||||||
@@ -124,7 +131,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));
|
return Ok(MapToFilamentResponse(spool, _lowStockDetector));
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -197,7 +204,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);
|
var response = MapToFilamentResponse(entity, _lowStockDetector);
|
||||||
return CreatedAtAction(nameof(GetFilament), new { id = entity.Id }, response);
|
return CreatedAtAction(nameof(GetFilament), new { id = entity.Id }, response);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -276,7 +283,37 @@ 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));
|
return Ok(MapToFilamentResponse(entity, _lowStockDetector));
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <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);
|
||||||
}
|
}
|
||||||
|
|
||||||
// ── Mapping helper ─────────────────────────────────────────
|
// ── Mapping helper ─────────────────────────────────────────
|
||||||
@@ -285,10 +322,12 @@ 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>
|
||||||
/// <returns>A FilamentResponse DTO with denormalized material names and QR code URL.</returns>
|
/// <param name="lowStockDetector">The low-stock detection service for computing alert flags.</param>
|
||||||
private static FilamentResponse MapToFilamentResponse(Spool s) => new()
|
/// <returns>A FilamentResponse DTO with denormalized material names, QR code URL, and low-stock metadata.</returns>
|
||||||
|
private static FilamentResponse MapToFilamentResponse(Spool s, ILowStockDetector lowStockDetector) => new()
|
||||||
{
|
{
|
||||||
Id = s.Id,
|
Id = s.Id,
|
||||||
MaterialBaseId = s.MaterialBaseId,
|
MaterialBaseId = s.MaterialBaseId,
|
||||||
@@ -309,6 +348,8 @@ public class FilamentsController : ControllerBase
|
|||||||
IsActive = s.IsActive,
|
IsActive = s.IsActive,
|
||||||
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>
|
||||||
|
|||||||
@@ -70,6 +70,19 @@ 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>
|
||||||
|
|||||||
@@ -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,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");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -17,9 +17,6 @@ RUN dotnet publish Extrudex.csproj \
|
|||||||
FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS runtime
|
FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS runtime
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
# Install curl for health check (not included in aspnet base image)
|
|
||||||
RUN apt-get update && apt-get install -y --no-install-recommends curl && rm -rf /var/lib/apt/lists/*
|
|
||||||
|
|
||||||
# Non-root user for security
|
# Non-root user for security
|
||||||
RUN adduser --disabled-password --gecos "" appuser
|
RUN adduser --disabled-password --gecos "" appuser
|
||||||
USER appuser
|
USER appuser
|
||||||
|
|||||||
@@ -1,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>();
|
|
||||||
}
|
}
|
||||||
@@ -102,10 +102,4 @@ public class Spool : AuditableEntity
|
|||||||
/// Navigation collection of print jobs that consumed filament from this spool.
|
/// Navigation collection of print jobs that consumed filament from this spool.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public ICollection<PrintJob> PrintJobs { get; set; } = new List<PrintJob>();
|
public ICollection<PrintJob> PrintJobs { get; set; } = new List<PrintJob>();
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Navigation collection of filament usage records tracking consumption from this spool.
|
|
||||||
/// Enables querying how much filament was consumed per print job.
|
|
||||||
/// </summary>
|
|
||||||
public ICollection<FilamentUsage> FilamentUsages { get; set; } = new List<FilamentUsage>();
|
|
||||||
}
|
}
|
||||||
@@ -1,76 +0,0 @@
|
|||||||
namespace Extrudex.Domain.Interfaces;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Service interface for calculating the cost of goods sold (COGS) per print job.
|
|
||||||
/// Uses the spool's purchase price and the print job's derived grams consumed
|
|
||||||
/// to produce a cost breakdown. Handles missing cost data gracefully by returning
|
|
||||||
/// warnings rather than throwing exceptions.
|
|
||||||
/// </summary>
|
|
||||||
public interface ICostPerPrintService
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Calculates the cost per print for a specific print job.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="printJobId">The unique identifier of the print job.</param>
|
|
||||||
/// <param name="cancellationToken">Optional cancellation token.</param>
|
|
||||||
/// <returns>
|
|
||||||
/// A <see cref="CostPerPrintResult"/> containing the cost breakdown,
|
|
||||||
/// or warnings if cost data is missing or incomplete.
|
|
||||||
/// </returns>
|
|
||||||
Task<CostPerPrintResult> CalculateAsync(Guid printJobId, CancellationToken cancellationToken = default);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Calculates cost breakdowns for all print jobs associated with a specific spool.
|
|
||||||
/// Useful for spool-level COGS reporting.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="spoolId">The unique identifier of the spool.</param>
|
|
||||||
/// <param name="cancellationToken">Optional cancellation token.</param>
|
|
||||||
/// <returns>
|
|
||||||
/// A list of <see cref="CostPerPrintResult"/> for each print job on the spool.
|
|
||||||
/// Jobs with missing cost data will include warnings.
|
|
||||||
/// </returns>
|
|
||||||
Task<IReadOnlyList<CostPerPrintResult>> CalculateBySpoolAsync(Guid spoolId, CancellationToken cancellationToken = default);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Result of a cost-per-print calculation. Contains the cost breakdown
|
|
||||||
/// and any warnings about missing or incomplete cost data.
|
|
||||||
/// </summary>
|
|
||||||
public class CostPerPrintResult
|
|
||||||
{
|
|
||||||
/// <summary>The print job identifier this result belongs to.</summary>
|
|
||||||
public Guid PrintJobId { get; set; }
|
|
||||||
|
|
||||||
/// <summary>Human-readable name of the print job.</summary>
|
|
||||||
public string PrintName { get; set; } = string.Empty;
|
|
||||||
|
|
||||||
/// <summary>The spool identifier that provided filament.</summary>
|
|
||||||
public Guid SpoolId { get; set; }
|
|
||||||
|
|
||||||
/// <summary>Serial number of the spool.</summary>
|
|
||||||
public string SpoolSerial { get; set; } = string.Empty;
|
|
||||||
|
|
||||||
/// <summary>Total millimeters of filament extruded.</summary>
|
|
||||||
public decimal MmExtruded { get; set; }
|
|
||||||
|
|
||||||
/// <summary>Derived grams consumed for this print.</summary>
|
|
||||||
public decimal GramsDerived { get; set; }
|
|
||||||
|
|
||||||
/// <summary>The spool's purchase price. Null if not recorded.</summary>
|
|
||||||
public decimal? PurchasePrice { get; set; }
|
|
||||||
|
|
||||||
/// <summary>The spool's total weight in grams when full.</summary>
|
|
||||||
public decimal? WeightTotalGrams { get; set; }
|
|
||||||
|
|
||||||
/// <summary>Cost per gram of filament. Null if purchase price or total weight is missing.</summary>
|
|
||||||
public decimal? CostPerGram { get; set; }
|
|
||||||
|
|
||||||
/// <summary>Calculated cost of this print job. Null if cost data is incomplete.</summary>
|
|
||||||
public decimal? CostPerPrint { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Warnings about missing or incomplete data that prevented a full calculation.
|
|
||||||
/// Empty when all data is available and the calculation succeeded.
|
|
||||||
/// </summary>
|
|
||||||
public List<string> Warnings { get; set; } = new();
|
|
||||||
}
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
namespace Extrudex.Domain.Interfaces;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Service interface for syncing filament usage data from printers
|
|
||||||
/// into the Extrudex database. Handles querying Moonraker printers,
|
|
||||||
/// computing derived usage metrics, and persisting updates to spools
|
|
||||||
/// and print job records.
|
|
||||||
/// </summary>
|
|
||||||
public interface IFilamentUsageSyncService
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Performs a single sync cycle: queries all active Moonraker printers,
|
|
||||||
/// fetches their current filament usage data, and persists updates to
|
|
||||||
/// the database.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="cancellationToken">Cancellation token for graceful shutdown.</param>
|
|
||||||
/// <returns>The number of printers successfully synced.</returns>
|
|
||||||
Task<int> SyncAllAsync(CancellationToken cancellationToken = default);
|
|
||||||
}
|
|
||||||
39
backend/Domain/Interfaces/ILowStockDetector.cs
Normal file
39
backend/Domain/Interfaces/ILowStockDetector.cs
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
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,39 +0,0 @@
|
|||||||
namespace Extrudex.Domain.Interfaces;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Client interface for communicating with Moonraker REST API endpoints
|
|
||||||
/// on Klipper-based printers (e.g., Elegoo Centauri Carbon).
|
|
||||||
/// Used to retrieve filament usage data, print job status, and
|
|
||||||
/// remaining spool weight from the printer.
|
|
||||||
/// </summary>
|
|
||||||
public interface IMoonrakerClient
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Fetches the current filament usage data from the Moonraker server.
|
|
||||||
/// Returns a dictionary of usage metrics reported by the printer.
|
|
||||||
/// </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);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Checks whether the Moonraker server is reachable and responding.
|
|
||||||
/// </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);
|
|
||||||
}
|
|
||||||
@@ -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,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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -23,7 +23,6 @@ public class ExtrudexDbContext : DbContext
|
|||||||
public DbSet<AmsUnit> AmsUnits => Set<AmsUnit>();
|
public DbSet<AmsUnit> AmsUnits => Set<AmsUnit>();
|
||||||
public DbSet<AmsSlot> AmsSlots => Set<AmsSlot>();
|
public DbSet<AmsSlot> AmsSlots => Set<AmsSlot>();
|
||||||
public DbSet<PrintJob> PrintJobs => Set<PrintJob>();
|
public DbSet<PrintJob> PrintJobs => Set<PrintJob>();
|
||||||
public DbSet<FilamentUsage> FilamentUsages => Set<FilamentUsage>();
|
|
||||||
|
|
||||||
protected override void OnModelCreating(ModelBuilder modelBuilder)
|
protected override void OnModelCreating(ModelBuilder modelBuilder)
|
||||||
{
|
{
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -1,533 +0,0 @@
|
|||||||
using System;
|
|
||||||
using Microsoft.EntityFrameworkCore.Migrations;
|
|
||||||
|
|
||||||
#nullable disable
|
|
||||||
|
|
||||||
namespace Extrudex.Infrastructure.Data.Migrations
|
|
||||||
{
|
|
||||||
/// <inheritdoc />
|
|
||||||
public partial class AddFilamentUsageTrackingModel : Migration
|
|
||||||
{
|
|
||||||
/// <inheritdoc />
|
|
||||||
protected override void Up(MigrationBuilder migrationBuilder)
|
|
||||||
{
|
|
||||||
migrationBuilder.CreateTable(
|
|
||||||
name: "filament_usages",
|
|
||||||
columns: table => new
|
|
||||||
{
|
|
||||||
id = table.Column<Guid>(type: "uuid", nullable: false),
|
|
||||||
print_job_id = table.Column<Guid>(type: "uuid", nullable: false),
|
|
||||||
spool_id = table.Column<Guid>(type: "uuid", nullable: false),
|
|
||||||
printer_id = table.Column<Guid>(type: "uuid", nullable: false),
|
|
||||||
grams_used = table.Column<decimal>(type: "numeric(10,2)", precision: 10, scale: 2, nullable: false),
|
|
||||||
mm_extruded = table.Column<decimal>(type: "numeric(12,2)", precision: 12, scale: 2, nullable: false),
|
|
||||||
recorded_at = table.Column<DateTime>(type: "timestamp with time zone", nullable: false, defaultValueSql: "now() at time zone 'utc'"),
|
|
||||||
notes = table.Column<string>(type: "character varying(2000)", maxLength: 2000, nullable: true),
|
|
||||||
created_at = table.Column<DateTime>(type: "timestamp with time zone", nullable: false, defaultValueSql: "now() at time zone 'utc'"),
|
|
||||||
updated_at = table.Column<DateTime>(type: "timestamp with time zone", nullable: false, defaultValueSql: "now() at time zone 'utc'")
|
|
||||||
},
|
|
||||||
constraints: table =>
|
|
||||||
{
|
|
||||||
table.PrimaryKey("PK_filament_usages", x => x.id);
|
|
||||||
table.ForeignKey(
|
|
||||||
name: "fk_filament_usages_print_job",
|
|
||||||
column: x => x.print_job_id,
|
|
||||||
principalTable: "print_jobs",
|
|
||||||
principalColumn: "id",
|
|
||||||
onDelete: ReferentialAction.Cascade);
|
|
||||||
table.ForeignKey(
|
|
||||||
name: "fk_filament_usages_printer",
|
|
||||||
column: x => x.printer_id,
|
|
||||||
principalTable: "printers",
|
|
||||||
principalColumn: "id",
|
|
||||||
onDelete: ReferentialAction.Restrict);
|
|
||||||
table.ForeignKey(
|
|
||||||
name: "fk_filament_usages_spool",
|
|
||||||
column: x => x.spool_id,
|
|
||||||
principalTable: "spools",
|
|
||||||
principalColumn: "id",
|
|
||||||
onDelete: ReferentialAction.Restrict);
|
|
||||||
});
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_bases",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("10000000-0000-0000-0000-000000000001"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 291, DateTimeKind.Utc).AddTicks(9388), new DateTime(2026, 4, 26, 18, 34, 33, 291, DateTimeKind.Utc).AddTicks(9388) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_bases",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("10000000-0000-0000-0000-000000000002"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 291, DateTimeKind.Utc).AddTicks(9871), new DateTime(2026, 4, 26, 18, 34, 33, 291, DateTimeKind.Utc).AddTicks(9871) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_bases",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("10000000-0000-0000-0000-000000000003"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 291, DateTimeKind.Utc).AddTicks(9881), new DateTime(2026, 4, 26, 18, 34, 33, 291, DateTimeKind.Utc).AddTicks(9881) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_bases",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("10000000-0000-0000-0000-000000000004"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 291, DateTimeKind.Utc).AddTicks(9888), new DateTime(2026, 4, 26, 18, 34, 33, 291, DateTimeKind.Utc).AddTicks(9888) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_bases",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("10000000-0000-0000-0000-000000000005"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 291, DateTimeKind.Utc).AddTicks(9895), new DateTime(2026, 4, 26, 18, 34, 33, 291, DateTimeKind.Utc).AddTicks(9895) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_bases",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("10000000-0000-0000-0000-000000000006"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 291, DateTimeKind.Utc).AddTicks(9901), new DateTime(2026, 4, 26, 18, 34, 33, 291, DateTimeKind.Utc).AddTicks(9902) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_finishes",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("20000000-0000-0000-0000-000000000001"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(90), new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(90) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_finishes",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("20000000-0000-0000-0000-000000000002"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(251), new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(251) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_finishes",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("20000000-0000-0000-0000-000000000003"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(259), new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(259) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_finishes",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("20000000-0000-0000-0000-000000000004"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(266), new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(266) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_finishes",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("20000000-0000-0000-0000-000000000005"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(272), new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(272) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_finishes",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("20000000-0000-0000-0000-000000000006"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(278), new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(278) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_finishes",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("20000000-0000-0000-0000-000000000007"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(285), new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(285) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_finishes",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("20000000-0000-0000-0000-000000000008"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(291), new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(291) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_finishes",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("20000000-0000-0000-0000-000000000009"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(297), new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(298) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_finishes",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("20000000-0000-0000-0000-000000000010"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(304), new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(304) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_finishes",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("20000000-0000-0000-0000-000000000011"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(310), new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(310) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_finishes",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("20000000-0000-0000-0000-000000000012"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(316), new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(317) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_finishes",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("20000000-0000-0000-0000-000000000013"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(323), new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(323) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_finishes",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("20000000-0000-0000-0000-000000000014"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(329), new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(329) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_finishes",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("20000000-0000-0000-0000-000000000015"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(336), new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(336) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_modifiers",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("30000000-0000-0000-0000-000000000001"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(482), new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(482) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_modifiers",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("30000000-0000-0000-0000-000000000002"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(805), new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(806) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_modifiers",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("30000000-0000-0000-0000-000000000003"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(815), new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(815) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_modifiers",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("30000000-0000-0000-0000-000000000004"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(821), new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(821) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_modifiers",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("30000000-0000-0000-0000-000000000005"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(828), new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(828) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_modifiers",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("30000000-0000-0000-0000-000000000006"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(834), new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(834) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_modifiers",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("30000000-0000-0000-0000-000000000007"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(840), new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(840) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_modifiers",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("30000000-0000-0000-0000-000000000008"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(847), new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(847) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_modifiers",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("30000000-0000-0000-0000-000000000009"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(853), new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(853) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_modifiers",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("30000000-0000-0000-0000-000000000010"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(859), new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(860) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_modifiers",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("30000000-0000-0000-0000-000000000011"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(866), new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(866) });
|
|
||||||
|
|
||||||
migrationBuilder.CreateIndex(
|
|
||||||
name: "ix_filament_usages_print_job_id",
|
|
||||||
table: "filament_usages",
|
|
||||||
column: "print_job_id");
|
|
||||||
|
|
||||||
migrationBuilder.CreateIndex(
|
|
||||||
name: "ix_filament_usages_printer_id",
|
|
||||||
table: "filament_usages",
|
|
||||||
column: "printer_id");
|
|
||||||
|
|
||||||
migrationBuilder.CreateIndex(
|
|
||||||
name: "ix_filament_usages_recorded_at",
|
|
||||||
table: "filament_usages",
|
|
||||||
column: "recorded_at");
|
|
||||||
|
|
||||||
migrationBuilder.CreateIndex(
|
|
||||||
name: "ix_filament_usages_spool_id",
|
|
||||||
table: "filament_usages",
|
|
||||||
column: "spool_id");
|
|
||||||
|
|
||||||
migrationBuilder.CreateIndex(
|
|
||||||
name: "ix_filament_usages_spool_id_recorded_at",
|
|
||||||
table: "filament_usages",
|
|
||||||
columns: new[] { "spool_id", "recorded_at" });
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
protected override void Down(MigrationBuilder migrationBuilder)
|
|
||||||
{
|
|
||||||
migrationBuilder.DropTable(
|
|
||||||
name: "filament_usages");
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_bases",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("10000000-0000-0000-0000-000000000001"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1096), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1096) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_bases",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("10000000-0000-0000-0000-000000000002"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1620), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1620) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_bases",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("10000000-0000-0000-0000-000000000003"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1630), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1630) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_bases",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("10000000-0000-0000-0000-000000000004"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1638), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1638) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_bases",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("10000000-0000-0000-0000-000000000005"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1645), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1645) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_bases",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("10000000-0000-0000-0000-000000000006"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1651), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1652) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_finishes",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("20000000-0000-0000-0000-000000000001"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1850), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1850) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_finishes",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("20000000-0000-0000-0000-000000000002"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2041), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2041) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_finishes",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("20000000-0000-0000-0000-000000000003"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2049), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2049) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_finishes",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("20000000-0000-0000-0000-000000000004"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2055), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2056) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_finishes",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("20000000-0000-0000-0000-000000000005"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2062), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2062) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_finishes",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("20000000-0000-0000-0000-000000000006"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2068), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2068) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_finishes",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("20000000-0000-0000-0000-000000000007"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2075), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2075) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_finishes",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("20000000-0000-0000-0000-000000000008"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2081), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2081) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_finishes",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("20000000-0000-0000-0000-000000000009"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2100), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2100) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_finishes",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("20000000-0000-0000-0000-000000000010"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2107), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2107) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_finishes",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("20000000-0000-0000-0000-000000000011"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2113), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2113) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_finishes",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("20000000-0000-0000-0000-000000000012"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2120), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2120) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_finishes",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("20000000-0000-0000-0000-000000000013"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2126), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2126) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_finishes",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("20000000-0000-0000-0000-000000000014"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2132), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2133) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_finishes",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("20000000-0000-0000-0000-000000000015"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2139), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2139) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_modifiers",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("30000000-0000-0000-0000-000000000001"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2304), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2304) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_modifiers",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("30000000-0000-0000-0000-000000000002"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2463), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2463) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_modifiers",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("30000000-0000-0000-0000-000000000003"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2471), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2471) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_modifiers",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("30000000-0000-0000-0000-000000000004"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2477), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2478) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_modifiers",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("30000000-0000-0000-0000-000000000005"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2484), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2484) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_modifiers",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("30000000-0000-0000-0000-000000000006"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2490), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2491) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_modifiers",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("30000000-0000-0000-0000-000000000007"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2497), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2497) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_modifiers",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("30000000-0000-0000-0000-000000000008"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2503), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2503) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_modifiers",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("30000000-0000-0000-0000-000000000009"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2510), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2510) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_modifiers",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("30000000-0000-0000-0000-000000000010"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2516), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2516) });
|
|
||||||
|
|
||||||
migrationBuilder.UpdateData(
|
|
||||||
table: "material_modifiers",
|
|
||||||
keyColumn: "id",
|
|
||||||
keyValue: new Guid("30000000-0000-0000-0000-000000000011"),
|
|
||||||
columns: new[] { "created_at", "updated_at" },
|
|
||||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2522), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2523) });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -104,77 +104,6 @@ namespace Extrudex.Infrastructure.Data.Migrations
|
|||||||
b.ToTable("ams_units", (string)null);
|
b.ToTable("ams_units", (string)null);
|
||||||
});
|
});
|
||||||
|
|
||||||
modelBuilder.Entity("Extrudex.Domain.Entities.FilamentUsage", b =>
|
|
||||||
{
|
|
||||||
b.Property<Guid>("Id")
|
|
||||||
.HasColumnType("uuid")
|
|
||||||
.HasColumnName("id");
|
|
||||||
|
|
||||||
b.Property<DateTime>("CreatedAt")
|
|
||||||
.ValueGeneratedOnAdd()
|
|
||||||
.HasColumnType("timestamp with time zone")
|
|
||||||
.HasColumnName("created_at")
|
|
||||||
.HasDefaultValueSql("now() at time zone 'utc'");
|
|
||||||
|
|
||||||
b.Property<decimal>("GramsUsed")
|
|
||||||
.HasPrecision(10, 2)
|
|
||||||
.HasColumnType("numeric(10,2)")
|
|
||||||
.HasColumnName("grams_used");
|
|
||||||
|
|
||||||
b.Property<decimal>("MmExtruded")
|
|
||||||
.HasPrecision(12, 2)
|
|
||||||
.HasColumnType("numeric(12,2)")
|
|
||||||
.HasColumnName("mm_extruded");
|
|
||||||
|
|
||||||
b.Property<string>("Notes")
|
|
||||||
.HasMaxLength(2000)
|
|
||||||
.HasColumnType("character varying(2000)")
|
|
||||||
.HasColumnName("notes");
|
|
||||||
|
|
||||||
b.Property<Guid>("PrintJobId")
|
|
||||||
.HasColumnType("uuid")
|
|
||||||
.HasColumnName("print_job_id");
|
|
||||||
|
|
||||||
b.Property<Guid>("PrinterId")
|
|
||||||
.HasColumnType("uuid")
|
|
||||||
.HasColumnName("printer_id");
|
|
||||||
|
|
||||||
b.Property<DateTime>("RecordedAt")
|
|
||||||
.ValueGeneratedOnAdd()
|
|
||||||
.HasColumnType("timestamp with time zone")
|
|
||||||
.HasColumnName("recorded_at")
|
|
||||||
.HasDefaultValueSql("now() at time zone 'utc'");
|
|
||||||
|
|
||||||
b.Property<Guid>("SpoolId")
|
|
||||||
.HasColumnType("uuid")
|
|
||||||
.HasColumnName("spool_id");
|
|
||||||
|
|
||||||
b.Property<DateTime>("UpdatedAt")
|
|
||||||
.ValueGeneratedOnAdd()
|
|
||||||
.HasColumnType("timestamp with time zone")
|
|
||||||
.HasColumnName("updated_at")
|
|
||||||
.HasDefaultValueSql("now() at time zone 'utc'");
|
|
||||||
|
|
||||||
b.HasKey("Id");
|
|
||||||
|
|
||||||
b.HasIndex("PrintJobId")
|
|
||||||
.HasDatabaseName("ix_filament_usages_print_job_id");
|
|
||||||
|
|
||||||
b.HasIndex("PrinterId")
|
|
||||||
.HasDatabaseName("ix_filament_usages_printer_id");
|
|
||||||
|
|
||||||
b.HasIndex("RecordedAt")
|
|
||||||
.HasDatabaseName("ix_filament_usages_recorded_at");
|
|
||||||
|
|
||||||
b.HasIndex("SpoolId")
|
|
||||||
.HasDatabaseName("ix_filament_usages_spool_id");
|
|
||||||
|
|
||||||
b.HasIndex("SpoolId", "RecordedAt")
|
|
||||||
.HasDatabaseName("ix_filament_usages_spool_id_recorded_at");
|
|
||||||
|
|
||||||
b.ToTable("filament_usages", (string)null);
|
|
||||||
});
|
|
||||||
|
|
||||||
modelBuilder.Entity("Extrudex.Domain.Entities.MaterialBase", b =>
|
modelBuilder.Entity("Extrudex.Domain.Entities.MaterialBase", b =>
|
||||||
{
|
{
|
||||||
b.Property<Guid>("Id")
|
b.Property<Guid>("Id")
|
||||||
@@ -216,50 +145,50 @@ namespace Extrudex.Infrastructure.Data.Migrations
|
|||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("10000000-0000-0000-0000-000000000001"),
|
Id = new Guid("10000000-0000-0000-0000-000000000001"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 291, DateTimeKind.Utc).AddTicks(9388),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1096),
|
||||||
DensityGperCm3 = 1.24m,
|
DensityGperCm3 = 1.24m,
|
||||||
Name = "PLA",
|
Name = "PLA",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 291, DateTimeKind.Utc).AddTicks(9388)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1096)
|
||||||
},
|
},
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("10000000-0000-0000-0000-000000000002"),
|
Id = new Guid("10000000-0000-0000-0000-000000000002"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 291, DateTimeKind.Utc).AddTicks(9871),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1620),
|
||||||
DensityGperCm3 = 1.27m,
|
DensityGperCm3 = 1.27m,
|
||||||
Name = "PETG",
|
Name = "PETG",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 291, DateTimeKind.Utc).AddTicks(9871)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1620)
|
||||||
},
|
},
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("10000000-0000-0000-0000-000000000003"),
|
Id = new Guid("10000000-0000-0000-0000-000000000003"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 291, DateTimeKind.Utc).AddTicks(9881),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1630),
|
||||||
DensityGperCm3 = 1.04m,
|
DensityGperCm3 = 1.04m,
|
||||||
Name = "ABS",
|
Name = "ABS",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 291, DateTimeKind.Utc).AddTicks(9881)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1630)
|
||||||
},
|
},
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("10000000-0000-0000-0000-000000000004"),
|
Id = new Guid("10000000-0000-0000-0000-000000000004"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 291, DateTimeKind.Utc).AddTicks(9888),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1638),
|
||||||
DensityGperCm3 = 1.07m,
|
DensityGperCm3 = 1.07m,
|
||||||
Name = "ASA",
|
Name = "ASA",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 291, DateTimeKind.Utc).AddTicks(9888)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1638)
|
||||||
},
|
},
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("10000000-0000-0000-0000-000000000005"),
|
Id = new Guid("10000000-0000-0000-0000-000000000005"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 291, DateTimeKind.Utc).AddTicks(9895),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1645),
|
||||||
DensityGperCm3 = 1.21m,
|
DensityGperCm3 = 1.21m,
|
||||||
Name = "TPU",
|
Name = "TPU",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 291, DateTimeKind.Utc).AddTicks(9895)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1645)
|
||||||
},
|
},
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("10000000-0000-0000-0000-000000000006"),
|
Id = new Guid("10000000-0000-0000-0000-000000000006"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 291, DateTimeKind.Utc).AddTicks(9901),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1651),
|
||||||
DensityGperCm3 = 1.14m,
|
DensityGperCm3 = 1.14m,
|
||||||
Name = "Nylon",
|
Name = "Nylon",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 291, DateTimeKind.Utc).AddTicks(9902)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1652)
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -303,122 +232,122 @@ namespace Extrudex.Infrastructure.Data.Migrations
|
|||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("20000000-0000-0000-0000-000000000001"),
|
Id = new Guid("20000000-0000-0000-0000-000000000001"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(90),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1850),
|
||||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000001"),
|
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000001"),
|
||||||
Name = "Basic",
|
Name = "Basic",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(90)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1850)
|
||||||
},
|
},
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("20000000-0000-0000-0000-000000000002"),
|
Id = new Guid("20000000-0000-0000-0000-000000000002"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(251),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2041),
|
||||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000001"),
|
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000001"),
|
||||||
Name = "Matte",
|
Name = "Matte",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(251)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2041)
|
||||||
},
|
},
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("20000000-0000-0000-0000-000000000003"),
|
Id = new Guid("20000000-0000-0000-0000-000000000003"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(259),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2049),
|
||||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000001"),
|
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000001"),
|
||||||
Name = "Silk",
|
Name = "Silk",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(259)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2049)
|
||||||
},
|
},
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("20000000-0000-0000-0000-000000000004"),
|
Id = new Guid("20000000-0000-0000-0000-000000000004"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(266),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2055),
|
||||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000001"),
|
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000001"),
|
||||||
Name = "Glitter",
|
Name = "Glitter",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(266)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2056)
|
||||||
},
|
},
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("20000000-0000-0000-0000-000000000005"),
|
Id = new Guid("20000000-0000-0000-0000-000000000005"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(272),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2062),
|
||||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000001"),
|
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000001"),
|
||||||
Name = "Marble",
|
Name = "Marble",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(272)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2062)
|
||||||
},
|
},
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("20000000-0000-0000-0000-000000000006"),
|
Id = new Guid("20000000-0000-0000-0000-000000000006"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(278),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2068),
|
||||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000001"),
|
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000001"),
|
||||||
Name = "Sparkle",
|
Name = "Sparkle",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(278)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2068)
|
||||||
},
|
},
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("20000000-0000-0000-0000-000000000007"),
|
Id = new Guid("20000000-0000-0000-0000-000000000007"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(285),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2075),
|
||||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000002"),
|
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000002"),
|
||||||
Name = "Basic",
|
Name = "Basic",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(285)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2075)
|
||||||
},
|
},
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("20000000-0000-0000-0000-000000000008"),
|
Id = new Guid("20000000-0000-0000-0000-000000000008"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(291),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2081),
|
||||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000002"),
|
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000002"),
|
||||||
Name = "Matte",
|
Name = "Matte",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(291)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2081)
|
||||||
},
|
},
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("20000000-0000-0000-0000-000000000009"),
|
Id = new Guid("20000000-0000-0000-0000-000000000009"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(297),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2100),
|
||||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000002"),
|
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000002"),
|
||||||
Name = "Silk",
|
Name = "Silk",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(298)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2100)
|
||||||
},
|
},
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("20000000-0000-0000-0000-000000000010"),
|
Id = new Guid("20000000-0000-0000-0000-000000000010"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(304),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2107),
|
||||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000003"),
|
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000003"),
|
||||||
Name = "Basic",
|
Name = "Basic",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(304)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2107)
|
||||||
},
|
},
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("20000000-0000-0000-0000-000000000011"),
|
Id = new Guid("20000000-0000-0000-0000-000000000011"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(310),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2113),
|
||||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000003"),
|
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000003"),
|
||||||
Name = "Matte",
|
Name = "Matte",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(310)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2113)
|
||||||
},
|
},
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("20000000-0000-0000-0000-000000000012"),
|
Id = new Guid("20000000-0000-0000-0000-000000000012"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(316),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2120),
|
||||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000004"),
|
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000004"),
|
||||||
Name = "Basic",
|
Name = "Basic",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(317)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2120)
|
||||||
},
|
},
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("20000000-0000-0000-0000-000000000013"),
|
Id = new Guid("20000000-0000-0000-0000-000000000013"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(323),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2126),
|
||||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000004"),
|
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000004"),
|
||||||
Name = "Matte",
|
Name = "Matte",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(323)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2126)
|
||||||
},
|
},
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("20000000-0000-0000-0000-000000000014"),
|
Id = new Guid("20000000-0000-0000-0000-000000000014"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(329),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2132),
|
||||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000005"),
|
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000005"),
|
||||||
Name = "Basic",
|
Name = "Basic",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(329)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2133)
|
||||||
},
|
},
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("20000000-0000-0000-0000-000000000015"),
|
Id = new Guid("20000000-0000-0000-0000-000000000015"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(336),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2139),
|
||||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000006"),
|
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000006"),
|
||||||
Name = "Basic",
|
Name = "Basic",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(336)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2139)
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -462,90 +391,90 @@ namespace Extrudex.Infrastructure.Data.Migrations
|
|||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("30000000-0000-0000-0000-000000000001"),
|
Id = new Guid("30000000-0000-0000-0000-000000000001"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(482),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2304),
|
||||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000001"),
|
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000001"),
|
||||||
Name = "Carbon Fiber",
|
Name = "Carbon Fiber",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(482)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2304)
|
||||||
},
|
},
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("30000000-0000-0000-0000-000000000002"),
|
Id = new Guid("30000000-0000-0000-0000-000000000002"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(805),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2463),
|
||||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000001"),
|
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000001"),
|
||||||
Name = "Glass Fiber",
|
Name = "Glass Fiber",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(806)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2463)
|
||||||
},
|
},
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("30000000-0000-0000-0000-000000000003"),
|
Id = new Guid("30000000-0000-0000-0000-000000000003"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(815),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2471),
|
||||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000001"),
|
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000001"),
|
||||||
Name = "Wood Fill",
|
Name = "Wood Fill",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(815)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2471)
|
||||||
},
|
},
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("30000000-0000-0000-0000-000000000004"),
|
Id = new Guid("30000000-0000-0000-0000-000000000004"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(821),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2477),
|
||||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000001"),
|
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000001"),
|
||||||
Name = "Glow-in-the-Dark",
|
Name = "Glow-in-the-Dark",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(821)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2478)
|
||||||
},
|
},
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("30000000-0000-0000-0000-000000000005"),
|
Id = new Guid("30000000-0000-0000-0000-000000000005"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(828),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2484),
|
||||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000002"),
|
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000002"),
|
||||||
Name = "Carbon Fiber",
|
Name = "Carbon Fiber",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(828)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2484)
|
||||||
},
|
},
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("30000000-0000-0000-0000-000000000006"),
|
Id = new Guid("30000000-0000-0000-0000-000000000006"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(834),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2490),
|
||||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000002"),
|
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000002"),
|
||||||
Name = "Glass Fiber",
|
Name = "Glass Fiber",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(834)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2491)
|
||||||
},
|
},
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("30000000-0000-0000-0000-000000000007"),
|
Id = new Guid("30000000-0000-0000-0000-000000000007"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(840),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2497),
|
||||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000003"),
|
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000003"),
|
||||||
Name = "Carbon Fiber",
|
Name = "Carbon Fiber",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(840)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2497)
|
||||||
},
|
},
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("30000000-0000-0000-0000-000000000008"),
|
Id = new Guid("30000000-0000-0000-0000-000000000008"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(847),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2503),
|
||||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000003"),
|
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000003"),
|
||||||
Name = "Glass Fiber",
|
Name = "Glass Fiber",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(847)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2503)
|
||||||
},
|
},
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("30000000-0000-0000-0000-000000000009"),
|
Id = new Guid("30000000-0000-0000-0000-000000000009"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(853),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2510),
|
||||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000004"),
|
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000004"),
|
||||||
Name = "Carbon Fiber",
|
Name = "Carbon Fiber",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(853)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2510)
|
||||||
},
|
},
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("30000000-0000-0000-0000-000000000010"),
|
Id = new Guid("30000000-0000-0000-0000-000000000010"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(859),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2516),
|
||||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000006"),
|
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000006"),
|
||||||
Name = "Carbon Fiber",
|
Name = "Carbon Fiber",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(860)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2516)
|
||||||
},
|
},
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
Id = new Guid("30000000-0000-0000-0000-000000000011"),
|
Id = new Guid("30000000-0000-0000-0000-000000000011"),
|
||||||
CreatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(866),
|
CreatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2522),
|
||||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000006"),
|
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000006"),
|
||||||
Name = "Glass Fiber",
|
Name = "Glass Fiber",
|
||||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(866)
|
UpdatedAt = new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2523)
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -909,36 +838,6 @@ namespace Extrudex.Infrastructure.Data.Migrations
|
|||||||
b.Navigation("Printer");
|
b.Navigation("Printer");
|
||||||
});
|
});
|
||||||
|
|
||||||
modelBuilder.Entity("Extrudex.Domain.Entities.FilamentUsage", b =>
|
|
||||||
{
|
|
||||||
b.HasOne("Extrudex.Domain.Entities.PrintJob", "PrintJob")
|
|
||||||
.WithMany("FilamentUsages")
|
|
||||||
.HasForeignKey("PrintJobId")
|
|
||||||
.OnDelete(DeleteBehavior.Cascade)
|
|
||||||
.IsRequired()
|
|
||||||
.HasConstraintName("fk_filament_usages_print_job");
|
|
||||||
|
|
||||||
b.HasOne("Extrudex.Domain.Entities.Printer", "Printer")
|
|
||||||
.WithMany("FilamentUsages")
|
|
||||||
.HasForeignKey("PrinterId")
|
|
||||||
.OnDelete(DeleteBehavior.Restrict)
|
|
||||||
.IsRequired()
|
|
||||||
.HasConstraintName("fk_filament_usages_printer");
|
|
||||||
|
|
||||||
b.HasOne("Extrudex.Domain.Entities.Spool", "Spool")
|
|
||||||
.WithMany("FilamentUsages")
|
|
||||||
.HasForeignKey("SpoolId")
|
|
||||||
.OnDelete(DeleteBehavior.Restrict)
|
|
||||||
.IsRequired()
|
|
||||||
.HasConstraintName("fk_filament_usages_spool");
|
|
||||||
|
|
||||||
b.Navigation("PrintJob");
|
|
||||||
|
|
||||||
b.Navigation("Printer");
|
|
||||||
|
|
||||||
b.Navigation("Spool");
|
|
||||||
});
|
|
||||||
|
|
||||||
modelBuilder.Entity("Extrudex.Domain.Entities.MaterialFinish", b =>
|
modelBuilder.Entity("Extrudex.Domain.Entities.MaterialFinish", b =>
|
||||||
{
|
{
|
||||||
b.HasOne("Extrudex.Domain.Entities.MaterialBase", "MaterialBase")
|
b.HasOne("Extrudex.Domain.Entities.MaterialBase", "MaterialBase")
|
||||||
@@ -1037,17 +936,10 @@ namespace Extrudex.Infrastructure.Data.Migrations
|
|||||||
b.Navigation("Spools");
|
b.Navigation("Spools");
|
||||||
});
|
});
|
||||||
|
|
||||||
modelBuilder.Entity("Extrudex.Domain.Entities.PrintJob", b =>
|
|
||||||
{
|
|
||||||
b.Navigation("FilamentUsages");
|
|
||||||
});
|
|
||||||
|
|
||||||
modelBuilder.Entity("Extrudex.Domain.Entities.Printer", b =>
|
modelBuilder.Entity("Extrudex.Domain.Entities.Printer", b =>
|
||||||
{
|
{
|
||||||
b.Navigation("AmsUnits");
|
b.Navigation("AmsUnits");
|
||||||
|
|
||||||
b.Navigation("FilamentUsages");
|
|
||||||
|
|
||||||
b.Navigation("PrintJobs");
|
b.Navigation("PrintJobs");
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -1055,8 +947,6 @@ namespace Extrudex.Infrastructure.Data.Migrations
|
|||||||
{
|
{
|
||||||
b.Navigation("AmsSlots");
|
b.Navigation("AmsSlots");
|
||||||
|
|
||||||
b.Navigation("FilamentUsages");
|
|
||||||
|
|
||||||
b.Navigation("PrintJobs");
|
b.Navigation("PrintJobs");
|
||||||
});
|
});
|
||||||
#pragma warning restore 612, 618
|
#pragma warning restore 612, 618
|
||||||
|
|||||||
@@ -1,158 +0,0 @@
|
|||||||
using Extrudex.Domain.Interfaces;
|
|
||||||
using Extrudex.Infrastructure.Data;
|
|
||||||
using Microsoft.EntityFrameworkCore;
|
|
||||||
using Microsoft.Extensions.Logging;
|
|
||||||
|
|
||||||
namespace Extrudex.Infrastructure.Services;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Calculates the cost of goods sold (COGS) per print job using the spool's
|
|
||||||
/// purchase price and the print job's derived grams consumed.
|
|
||||||
///
|
|
||||||
/// Formula:
|
|
||||||
/// cost_per_gram = purchase_price / weight_total_grams
|
|
||||||
/// cost_per_print = grams_derived × cost_per_gram
|
|
||||||
///
|
|
||||||
/// Handles missing data gracefully — if the spool has no purchase price or
|
|
||||||
/// weight recorded, the result includes warnings and null cost fields
|
|
||||||
/// instead of throwing exceptions.
|
|
||||||
/// </summary>
|
|
||||||
public class CostPerPrintService : ICostPerPrintService
|
|
||||||
{
|
|
||||||
private readonly ExtrudexDbContext _dbContext;
|
|
||||||
private readonly ILogger<CostPerPrintService> _logger;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Initializes a new instance of the <see cref="CostPerPrintService"/> class.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="dbContext">The database context for data access.</param>
|
|
||||||
/// <param name="logger">The logger for diagnostic output.</param>
|
|
||||||
public CostPerPrintService(ExtrudexDbContext dbContext, ILogger<CostPerPrintService> logger)
|
|
||||||
{
|
|
||||||
_dbContext = dbContext;
|
|
||||||
_logger = logger;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public async Task<CostPerPrintResult> CalculateAsync(Guid printJobId, CancellationToken cancellationToken = default)
|
|
||||||
{
|
|
||||||
_logger.LogDebug("Calculating cost per print for job {PrintJobId}", printJobId);
|
|
||||||
|
|
||||||
var job = await _dbContext.PrintJobs
|
|
||||||
.Include(j => j.Spool)
|
|
||||||
.ThenInclude(s => s!.MaterialBase)
|
|
||||||
.FirstOrDefaultAsync(j => j.Id == printJobId, cancellationToken);
|
|
||||||
|
|
||||||
if (job is null)
|
|
||||||
{
|
|
||||||
_logger.LogWarning("Print job {PrintJobId} not found for cost calculation", printJobId);
|
|
||||||
return new CostPerPrintResult
|
|
||||||
{
|
|
||||||
PrintJobId = printJobId,
|
|
||||||
Warnings = new List<string> { $"Print job with ID '{printJobId}' not found." }
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
return BuildResult(job);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public async Task<IReadOnlyList<CostPerPrintResult>> CalculateBySpoolAsync(
|
|
||||||
Guid spoolId, CancellationToken cancellationToken = default)
|
|
||||||
{
|
|
||||||
_logger.LogDebug("Calculating cost per print for all jobs on spool {SpoolId}", spoolId);
|
|
||||||
|
|
||||||
var jobs = await _dbContext.PrintJobs
|
|
||||||
.Include(j => j.Spool)
|
|
||||||
.ThenInclude(s => s!.MaterialBase)
|
|
||||||
.Where(j => j.SpoolId == spoolId)
|
|
||||||
.OrderByDescending(j => j.CreatedAt)
|
|
||||||
.ToListAsync(cancellationToken);
|
|
||||||
|
|
||||||
if (jobs.Count == 0)
|
|
||||||
{
|
|
||||||
_logger.LogDebug("No print jobs found for spool {SpoolId}", spoolId);
|
|
||||||
return Array.Empty<CostPerPrintResult>();
|
|
||||||
}
|
|
||||||
|
|
||||||
return jobs.Select(BuildResult).ToList();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Builds a <see cref="CostPerPrintResult"/> from a print job entity.
|
|
||||||
/// Computes cost_per_gram and cost_per_print when all required data is available.
|
|
||||||
/// Populates warnings when data is missing or incomplete.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="job">The print job entity with Spool navigation loaded.</param>
|
|
||||||
/// <returns>A cost calculation result with breakdown and any warnings.</returns>
|
|
||||||
private CostPerPrintResult BuildResult(Domain.Entities.PrintJob job)
|
|
||||||
{
|
|
||||||
var warnings = new List<string>();
|
|
||||||
var spool = job.Spool;
|
|
||||||
|
|
||||||
// Map what we always have
|
|
||||||
var result = new CostPerPrintResult
|
|
||||||
{
|
|
||||||
PrintJobId = job.Id,
|
|
||||||
PrintName = job.PrintName,
|
|
||||||
SpoolId = job.SpoolId,
|
|
||||||
SpoolSerial = spool?.SpoolSerial ?? string.Empty,
|
|
||||||
MmExtruded = job.MmExtruded,
|
|
||||||
GramsDerived = job.GramsDerived,
|
|
||||||
};
|
|
||||||
|
|
||||||
// Guard: spool must be loaded
|
|
||||||
if (spool is null)
|
|
||||||
{
|
|
||||||
warnings.Add("Spool data is not available for this print job.");
|
|
||||||
result.Warnings = warnings;
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Capture purchase price
|
|
||||||
result.PurchasePrice = spool.PurchasePrice;
|
|
||||||
result.WeightTotalGrams = spool.WeightTotalGrams;
|
|
||||||
|
|
||||||
// Check for missing purchase price
|
|
||||||
if (!spool.PurchasePrice.HasValue)
|
|
||||||
{
|
|
||||||
warnings.Add(
|
|
||||||
"Spool purchase price is not recorded. Cost calculation requires a purchase price on the spool.");
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check for zero or negative weight — prevents division by zero
|
|
||||||
if (spool.WeightTotalGrams <= 0)
|
|
||||||
{
|
|
||||||
warnings.Add(
|
|
||||||
"Spool total weight is zero or not recorded. Cost calculation requires a positive weight_total_grams on the spool.");
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check for zero grams derived
|
|
||||||
if (job.GramsDerived <= 0)
|
|
||||||
{
|
|
||||||
warnings.Add(
|
|
||||||
"Derived grams consumed is zero. Ensure mm_extruded, filament diameter, and material density are recorded for this print job.");
|
|
||||||
}
|
|
||||||
|
|
||||||
// If all data is present and valid, compute the cost
|
|
||||||
if (spool.PurchasePrice.HasValue && spool.WeightTotalGrams > 0 && job.GramsDerived > 0)
|
|
||||||
{
|
|
||||||
var costPerGram = spool.PurchasePrice.Value / spool.WeightTotalGrams;
|
|
||||||
result.CostPerGram = Math.Round(costPerGram, 6);
|
|
||||||
result.CostPerPrint = Math.Round(job.GramsDerived * costPerGram, 4);
|
|
||||||
|
|
||||||
_logger.LogDebug(
|
|
||||||
"Cost calculated for job {PrintJobId}: {GramsDerived}g × {CostPerGram:C}/g = {CostPerPrint:C}",
|
|
||||||
job.Id, job.GramsDerived, result.CostPerGram, result.CostPerPrint);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
_logger.LogDebug(
|
|
||||||
"Cost calculation incomplete for job {PrintJobId}: missing data (warnings: {WarningCount})",
|
|
||||||
job.Id, warnings.Count);
|
|
||||||
}
|
|
||||||
|
|
||||||
result.Warnings = warnings;
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,139 +0,0 @@
|
|||||||
using Extrudex.Domain.Enums;
|
|
||||||
using Extrudex.Domain.Interfaces;
|
|
||||||
using Extrudex.Infrastructure.Data;
|
|
||||||
using Microsoft.EntityFrameworkCore;
|
|
||||||
using Microsoft.Extensions.Logging;
|
|
||||||
|
|
||||||
namespace Extrudex.Infrastructure.Configuration;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Service that syncs filament usage data from Moonraker printers into the
|
|
||||||
/// Extrudex database. Queries all active Moonraker printers, fetches their
|
|
||||||
/// current filament usage metrics, and updates spool remaining weights and
|
|
||||||
/// print job records.
|
|
||||||
/// </summary>
|
|
||||||
public class FilamentUsageSyncService : IFilamentUsageSyncService
|
|
||||||
{
|
|
||||||
private readonly ExtrudexDbContext _dbContext;
|
|
||||||
private readonly IMoonrakerClient _moonrakerClient;
|
|
||||||
private readonly ILogger<FilamentUsageSyncService> _logger;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Creates a new FilamentUsageSyncService.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="dbContext">The EF Core database context for persisting updates.</param>
|
|
||||||
/// <param name="moonrakerClient">The Moonraker HTTP client for fetching printer data.</param>
|
|
||||||
/// <param name="logger">Logger for diagnostic output.</param>
|
|
||||||
public FilamentUsageSyncService(
|
|
||||||
ExtrudexDbContext dbContext,
|
|
||||||
IMoonrakerClient moonrakerClient,
|
|
||||||
ILogger<FilamentUsageSyncService> logger)
|
|
||||||
{
|
|
||||||
_dbContext = dbContext;
|
|
||||||
_moonrakerClient = moonrakerClient;
|
|
||||||
_logger = logger;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public async Task<int> SyncAllAsync(CancellationToken cancellationToken = default)
|
|
||||||
{
|
|
||||||
_logger.LogInformation("Starting filament usage sync cycle");
|
|
||||||
|
|
||||||
var printers = await _dbContext.Printers
|
|
||||||
.Where(p => p.IsActive && p.ConnectionType == ConnectionType.Moonraker)
|
|
||||||
.Include(p => p.AmsUnits)
|
|
||||||
.ThenInclude(u => u.Slots)
|
|
||||||
.ThenInclude(s => s.Spool)
|
|
||||||
.ToListAsync(cancellationToken);
|
|
||||||
|
|
||||||
if (printers.Count == 0)
|
|
||||||
{
|
|
||||||
_logger.LogInformation("No active Moonraker printers found — skipping sync");
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
_logger.LogInformation("Found {PrinterCount} active Moonraker printer(s) to sync", printers.Count);
|
|
||||||
|
|
||||||
var syncedCount = 0;
|
|
||||||
|
|
||||||
foreach (var printer in printers)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var usageData = await _moonrakerClient.GetFilamentUsageAsync(
|
|
||||||
printer.HostnameOrIp,
|
|
||||||
printer.Port,
|
|
||||||
printer.ApiKey,
|
|
||||||
cancellationToken);
|
|
||||||
|
|
||||||
if (usageData.Count == 0)
|
|
||||||
{
|
|
||||||
_logger.LogWarning(
|
|
||||||
"No usage data returned from printer {PrinterName} ({Host}:{Port})",
|
|
||||||
printer.Name, printer.HostnameOrIp, printer.Port);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Update spool remaining weights from AMS data
|
|
||||||
UpdateSpoolWeights(printer, usageData);
|
|
||||||
|
|
||||||
// Mark printer as seen and idle (reachable = idle, not printing)
|
|
||||||
printer.LastSeenAt = DateTime.UtcNow;
|
|
||||||
printer.Status = PrinterStatus.Idle;
|
|
||||||
|
|
||||||
syncedCount++;
|
|
||||||
_logger.LogInformation(
|
|
||||||
"Successfully synced filament usage from printer {PrinterName}",
|
|
||||||
printer.Name);
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
_logger.LogError(ex,
|
|
||||||
"Error syncing filament usage from printer {PrinterName} ({Host}:{Port})",
|
|
||||||
printer.Name, printer.HostnameOrIp, printer.Port);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
await _dbContext.SaveChangesAsync(cancellationToken);
|
|
||||||
|
|
||||||
_logger.LogInformation(
|
|
||||||
"Filament usage sync cycle complete — {SyncedCount}/{TotalCount} printers synced",
|
|
||||||
syncedCount, printers.Count);
|
|
||||||
|
|
||||||
return syncedCount;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Updates spool remaining weights based on usage data received from Moonraker.
|
|
||||||
/// For printers with AMS units, updates the remaining weight on each slot's spool.
|
|
||||||
/// </summary>
|
|
||||||
private void UpdateSpoolWeights(
|
|
||||||
Domain.Entities.Printer printer,
|
|
||||||
Dictionary<string, decimal> usageData)
|
|
||||||
{
|
|
||||||
// Update AMS slot remaining weights if available
|
|
||||||
foreach (var amsUnit in printer.AmsUnits)
|
|
||||||
{
|
|
||||||
foreach (var slot in amsUnit.Slots)
|
|
||||||
{
|
|
||||||
if (slot.Spool != null && slot.RemainingWeightG.HasValue)
|
|
||||||
{
|
|
||||||
// Sync the AMS-reported remaining weight to the spool
|
|
||||||
slot.Spool.WeightRemainingGrams = slot.RemainingWeightG.Value;
|
|
||||||
|
|
||||||
_logger.LogDebug(
|
|
||||||
"Updated spool {SpoolSerial} remaining weight to {Weight}g",
|
|
||||||
slot.Spool.SpoolSerial, slot.RemainingWeightG.Value);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// If usage data contains extruded mm, log it for observability
|
|
||||||
if (usageData.TryGetValue("mm_extruded", out var mmExtruded) && mmExtruded > 0)
|
|
||||||
{
|
|
||||||
_logger.LogInformation(
|
|
||||||
"Printer {PrinterName} reports {MmExtruded}mm filament extruded in latest job",
|
|
||||||
printer.Name, mmExtruded);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
95
backend/Infrastructure/Services/LowStockDetector.cs
Normal file
95
backend/Infrastructure/Services/LowStockDetector.cs
Normal file
@@ -0,0 +1,95 @@
|
|||||||
|
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,130 +0,0 @@
|
|||||||
using System.Net.Http.Json;
|
|
||||||
using System.Text.Json;
|
|
||||||
using Extrudex.Domain.Interfaces;
|
|
||||||
using Microsoft.Extensions.Logging;
|
|
||||||
using Microsoft.Extensions.Options;
|
|
||||||
|
|
||||||
namespace Extrudex.Infrastructure.Configuration;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// HTTP client for communicating with Moonraker REST API endpoints
|
|
||||||
/// on Klipper-based printers (e.g., Elegoo Centauri Carbon).
|
|
||||||
/// Retrieves filament usage data and printer status information.
|
|
||||||
/// </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<Dictionary<string, decimal>> GetFilamentUsageAsync(
|
|
||||||
string hostnameOrIp,
|
|
||||||
int port,
|
|
||||||
string? apiKey,
|
|
||||||
CancellationToken cancellationToken = default)
|
|
||||||
{
|
|
||||||
var baseUrl = BuildBaseUrl(hostnameOrIp, port);
|
|
||||||
var result = new Dictionary<string, decimal>();
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
// Query Moonraker server info endpoint for filament usage data
|
|
||||||
using var request = new HttpRequestMessage(HttpMethod.Get, $"{baseUrl}/server/history/items?limit=1");
|
|
||||||
if (!string.IsNullOrEmpty(apiKey))
|
|
||||||
{
|
|
||||||
request.Headers.Add("X-Api-Key", apiKey);
|
|
||||||
}
|
|
||||||
|
|
||||||
using var response = await _httpClient.SendAsync(request, cancellationToken);
|
|
||||||
response.EnsureSuccessStatusCode();
|
|
||||||
|
|
||||||
var json = await response.Content.ReadFromJsonAsync<JsonElement>(cancellationToken: cancellationToken);
|
|
||||||
|
|
||||||
// Extract filament usage from the response
|
|
||||||
// Moonraker returns job history with filament_used and similar fields
|
|
||||||
if (json.TryGetProperty("result", out var resultElement))
|
|
||||||
{
|
|
||||||
if (resultElement.TryGetProperty("items", out var items) && items.GetArrayLength() > 0)
|
|
||||||
{
|
|
||||||
var job = items[0];
|
|
||||||
|
|
||||||
// Moonraker tracks filament_used in millimeters
|
|
||||||
if (job.TryGetProperty("filament_used", out var filamentUsed))
|
|
||||||
{
|
|
||||||
result["mm_extruded"] = filamentUsed.GetDecimal();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Total duration in seconds
|
|
||||||
if (job.TryGetProperty("print_duration", out var duration))
|
|
||||||
{
|
|
||||||
result["print_duration_seconds"] = duration.GetDecimal();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
_logger.LogDebug(
|
|
||||||
"Retrieved filament usage from Moonraker at {Host}:{Port}: {MetricCount} metrics",
|
|
||||||
hostnameOrIp, port, result.Count);
|
|
||||||
}
|
|
||||||
catch (HttpRequestException ex)
|
|
||||||
{
|
|
||||||
_logger.LogWarning(ex,
|
|
||||||
"Failed to retrieve filament usage from Moonraker at {Host}:{Port}",
|
|
||||||
hostnameOrIp, port);
|
|
||||||
}
|
|
||||||
catch (JsonException ex)
|
|
||||||
{
|
|
||||||
_logger.LogWarning(ex,
|
|
||||||
"Failed to parse Moonraker response from {Host}:{Port}",
|
|
||||||
hostnameOrIp, port);
|
|
||||||
}
|
|
||||||
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public async Task<bool> IsReachableAsync(
|
|
||||||
string hostnameOrIp,
|
|
||||||
int port,
|
|
||||||
string? apiKey,
|
|
||||||
CancellationToken cancellationToken = default)
|
|
||||||
{
|
|
||||||
var baseUrl = BuildBaseUrl(hostnameOrIp, port);
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
using var request = new HttpRequestMessage(HttpMethod.Get, $"{baseUrl}/server/info");
|
|
||||||
if (!string.IsNullOrEmpty(apiKey))
|
|
||||||
{
|
|
||||||
request.Headers.Add("X-Api-Key", apiKey);
|
|
||||||
}
|
|
||||||
|
|
||||||
using var response = await _httpClient.SendAsync(request, cancellationToken);
|
|
||||||
return response.IsSuccessStatusCode;
|
|
||||||
}
|
|
||||||
catch (HttpRequestException)
|
|
||||||
{
|
|
||||||
_logger.LogDebug("Moonraker at {Host}:{Port} is not reachable", hostnameOrIp, port);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <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}";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,9 +1,7 @@
|
|||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
using Extrudex.API.Filters;
|
using Extrudex.API.Filters;
|
||||||
using Extrudex.API.Hubs;
|
using Extrudex.API.Hubs;
|
||||||
using Extrudex.API.Jobs;
|
|
||||||
using Extrudex.Domain.Interfaces;
|
using Extrudex.Domain.Interfaces;
|
||||||
using Extrudex.Infrastructure.Configuration;
|
|
||||||
using Extrudex.Infrastructure.Data;
|
using Extrudex.Infrastructure.Data;
|
||||||
using Extrudex.Infrastructure.Services;
|
using Extrudex.Infrastructure.Services;
|
||||||
using FluentValidation;
|
using FluentValidation;
|
||||||
@@ -52,8 +50,8 @@ builder.Services.AddSwaggerGen(c =>
|
|||||||
// ── QR Code Generation ──────────────────────────────────────
|
// ── QR Code Generation ──────────────────────────────────────
|
||||||
builder.Services.AddSingleton<IQrCodeService, QrCodeService>();
|
builder.Services.AddSingleton<IQrCodeService, QrCodeService>();
|
||||||
|
|
||||||
// ── Cost Per Print Calculation ─────────────────────────────
|
// ── Low Stock Detection ────────────────────────────────────
|
||||||
builder.Services.AddScoped<ICostPerPrintService, CostPerPrintService>();
|
builder.Services.AddSingleton<ILowStockDetector, LowStockDetector>();
|
||||||
|
|
||||||
// ── FluentValidation ──────────────────────────────────────
|
// ── FluentValidation ──────────────────────────────────────
|
||||||
// Registers all validators from the API assembly into DI.
|
// Registers all validators from the API assembly into DI.
|
||||||
@@ -82,16 +80,6 @@ builder.Services.AddCors(options =>
|
|||||||
// ── SignalR (real-time printer updates) ────────────────────
|
// ── SignalR (real-time printer updates) ────────────────────
|
||||||
builder.Services.AddSignalR();
|
builder.Services.AddSignalR();
|
||||||
|
|
||||||
// ── Filament Usage Sync (Background Job) ──────────────────
|
|
||||||
builder.Services.Configure<FilamentUsageSyncOptions>(
|
|
||||||
builder.Configuration.GetSection(FilamentUsageSyncOptions.SectionName));
|
|
||||||
builder.Services.AddHttpClient<IMoonrakerClient, MoonrakerClient>(client =>
|
|
||||||
{
|
|
||||||
client.DefaultRequestHeaders.Add("User-Agent", "Extrudex/1.0");
|
|
||||||
});
|
|
||||||
builder.Services.AddScoped<IFilamentUsageSyncService, FilamentUsageSyncService>();
|
|
||||||
builder.Services.AddHostedService<FilamentUsageSyncJob>();
|
|
||||||
|
|
||||||
// ── Health Checks ───────────────────────────────────────────
|
// ── Health Checks ───────────────────────────────────────────
|
||||||
builder.Services.AddHealthChecks()
|
builder.Services.AddHealthChecks()
|
||||||
.AddNpgSql(connectionString);
|
.AddNpgSql(connectionString);
|
||||||
|
|||||||
@@ -8,10 +8,5 @@
|
|||||||
},
|
},
|
||||||
"ConnectionStrings": {
|
"ConnectionStrings": {
|
||||||
"ExtrudexDb": "Host=localhost;Port=5432;Database=extrudex_dev;Username=extrudex;Password=changeme"
|
"ExtrudexDb": "Host=localhost;Port=5432;Database=extrudex_dev;Username=extrudex;Password=changeme"
|
||||||
},
|
|
||||||
"FilamentUsageSync": {
|
|
||||||
"PollingInterval": "00:01:00",
|
|
||||||
"RequestTimeout": "00:00:30",
|
|
||||||
"Enabled": true
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -10,9 +10,7 @@
|
|||||||
"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": {
|
"FilamentAlerts": {
|
||||||
"PollingInterval": "00:05:00",
|
"LowStockThresholdPercent": 20
|
||||||
"RequestTimeout": "00:00:30",
|
|
||||||
"Enabled": true
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -18,14 +18,13 @@ echo "📦 Building and starting services..."
|
|||||||
$COMPOSE_CMD -f docker-compose.dev.yml up -d --build
|
$COMPOSE_CMD -f docker-compose.dev.yml up -d --build
|
||||||
|
|
||||||
echo "⏳ Waiting for services to become healthy..."
|
echo "⏳ Waiting for services to become healthy..."
|
||||||
sleep 15
|
sleep 10
|
||||||
|
|
||||||
echo "✅ Deployment complete!"
|
echo "✅ Deployment complete!"
|
||||||
echo ""
|
echo ""
|
||||||
echo "Services running:"
|
echo "Services running:"
|
||||||
echo " • PostgreSQL: localhost:5433"
|
|
||||||
echo " • Extrudex API: http://localhost:5080"
|
echo " • Extrudex API: http://localhost:5080"
|
||||||
echo " • Extrudex Web: http://localhost:5081"
|
echo " • Control Center Web: http://localhost:5081"
|
||||||
echo ""
|
echo ""
|
||||||
echo "To view logs:"
|
echo "To view logs:"
|
||||||
echo " $COMPOSE_CMD -f docker-compose.dev.yml logs -f"
|
echo " $COMPOSE_CMD -f docker-compose.dev.yml logs -f"
|
||||||
|
|||||||
@@ -1,25 +1,6 @@
|
|||||||
services:
|
version: '3.8'
|
||||||
extrudex-db:
|
|
||||||
image: postgres:16-alpine
|
|
||||||
container_name: extrudex-db
|
|
||||||
environment:
|
|
||||||
POSTGRES_USER: extrudex
|
|
||||||
POSTGRES_PASSWORD: changeme
|
|
||||||
POSTGRES_DB: extrudex
|
|
||||||
ports:
|
|
||||||
- "5433:5432"
|
|
||||||
volumes:
|
|
||||||
- extrudex-db-data:/var/lib/postgresql/data
|
|
||||||
healthcheck:
|
|
||||||
test: ["CMD-SHELL", "pg_isready -U extrudex"]
|
|
||||||
interval: 10s
|
|
||||||
timeout: 5s
|
|
||||||
retries: 5
|
|
||||||
start_period: 10s
|
|
||||||
restart: unless-stopped
|
|
||||||
networks:
|
|
||||||
- extrudex-network
|
|
||||||
|
|
||||||
|
services:
|
||||||
extrudex-api:
|
extrudex-api:
|
||||||
build:
|
build:
|
||||||
context: ./backend
|
context: ./backend
|
||||||
@@ -30,14 +11,6 @@ services:
|
|||||||
environment:
|
environment:
|
||||||
- ASPNETCORE_ENVIRONMENT=Development
|
- ASPNETCORE_ENVIRONMENT=Development
|
||||||
- ASPNETCORE_URLS=http://+:8080
|
- ASPNETCORE_URLS=http://+:8080
|
||||||
- EXTRUDEX_DB_HOST=extrudex-db
|
|
||||||
- EXTRUDEX_DB_PORT=5432
|
|
||||||
- EXTRUDEX_DB_NAME=extrudex
|
|
||||||
- EXTRUDEX_DB_USER=extrudex
|
|
||||||
- EXTRUDEX_DB_PASSWORD=changeme
|
|
||||||
depends_on:
|
|
||||||
extrudex-db:
|
|
||||||
condition: service_healthy
|
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD", "curl", "-f", "http://localhost:8080/health"]
|
test: ["CMD", "curl", "-f", "http://localhost:8080/health"]
|
||||||
@@ -48,11 +21,11 @@ services:
|
|||||||
networks:
|
networks:
|
||||||
- extrudex-network
|
- extrudex-network
|
||||||
|
|
||||||
extrudex-web:
|
control-center-web:
|
||||||
build:
|
build:
|
||||||
context: ./frontend
|
context: ../Control-Center/frontend
|
||||||
dockerfile: Dockerfile
|
dockerfile: Dockerfile
|
||||||
container_name: extrudex-web
|
container_name: control-center-web
|
||||||
ports:
|
ports:
|
||||||
- "5081:80"
|
- "5081:80"
|
||||||
depends_on:
|
depends_on:
|
||||||
@@ -62,9 +35,6 @@ services:
|
|||||||
networks:
|
networks:
|
||||||
- extrudex-network
|
- extrudex-network
|
||||||
|
|
||||||
volumes:
|
|
||||||
extrudex-db-data:
|
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
extrudex-network:
|
extrudex-network:
|
||||||
driver: bridge
|
driver: bridge
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
node_modules
|
|
||||||
dist
|
|
||||||
.git
|
|
||||||
.gitignore
|
|
||||||
.angular
|
|
||||||
.vscode
|
|
||||||
*.md
|
|
||||||
.editorconfig
|
|
||||||
.prettierrc
|
|
||||||
src/test.ts
|
|
||||||
**/*.spec.ts
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
# Stage 1: Build the Angular application
|
|
||||||
FROM node:22-alpine AS build
|
|
||||||
|
|
||||||
WORKDIR /app
|
|
||||||
|
|
||||||
# Copy package files first for better layer caching
|
|
||||||
COPY package.json package-lock.json ./
|
|
||||||
RUN npm ci
|
|
||||||
|
|
||||||
# Copy source and build
|
|
||||||
COPY . .
|
|
||||||
RUN npx ng build --configuration production
|
|
||||||
|
|
||||||
# Stage 2: Serve static files with nginx
|
|
||||||
FROM nginx:alpine
|
|
||||||
|
|
||||||
# Remove default nginx config
|
|
||||||
RUN rm /etc/nginx/conf.d/default.conf
|
|
||||||
|
|
||||||
# Copy custom nginx config
|
|
||||||
COPY nginx.conf /etc/nginx/conf.d/default.conf
|
|
||||||
|
|
||||||
# Copy built Angular artifacts from build stage
|
|
||||||
COPY --from=build /app/dist/frontend/browser /usr/share/nginx/html
|
|
||||||
|
|
||||||
EXPOSE 80
|
|
||||||
|
|
||||||
CMD ["nginx", "-g", "daemon off;"]
|
|
||||||
@@ -1,42 +0,0 @@
|
|||||||
server {
|
|
||||||
listen 80;
|
|
||||||
server_name _;
|
|
||||||
root /usr/share/nginx/html;
|
|
||||||
index index.html;
|
|
||||||
|
|
||||||
# Gzip compression
|
|
||||||
gzip on;
|
|
||||||
gzip_types text/plain text/css application/json application/javascript text/xml application/xml text/javascript;
|
|
||||||
gzip_min_length 256;
|
|
||||||
|
|
||||||
# Angular SPA — fallback to index.html for client-side routing
|
|
||||||
location / {
|
|
||||||
try_files $uri $uri/ /index.html;
|
|
||||||
}
|
|
||||||
|
|
||||||
# Cache static assets aggressively
|
|
||||||
location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg|woff2?|ttf|eot)$ {
|
|
||||||
expires 1y;
|
|
||||||
add_header Cache-Control "public, immutable";
|
|
||||||
}
|
|
||||||
|
|
||||||
# Proxy API requests to backend
|
|
||||||
# Uses resolver so nginx doesn't crash if backend isn't available at startup
|
|
||||||
resolver 127.0.0.11 valid=30s ipv6=off;
|
|
||||||
set $backend "extrudex-api:8080";
|
|
||||||
|
|
||||||
location /api/ {
|
|
||||||
proxy_pass http://$backend;
|
|
||||||
proxy_set_header Host $host;
|
|
||||||
proxy_set_header X-Real-IP $remote_addr;
|
|
||||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
|
||||||
proxy_set_header X-Forwarded-Proto $scheme;
|
|
||||||
}
|
|
||||||
|
|
||||||
# Health check endpoint
|
|
||||||
location /health {
|
|
||||||
access_log off;
|
|
||||||
return 200 "ok";
|
|
||||||
add_header Content-Type text/plain;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,76 +0,0 @@
|
|||||||
<!-- Filament Filter Bar — material type, color search, low stock, active-only -->
|
|
||||||
<div class="filament-filter-bar" role="search" aria-label="Filter filament inventory">
|
|
||||||
|
|
||||||
<!-- Material Type Multi-Select -->
|
|
||||||
<mat-form-field appearance="outline" class="filter-field material-filter">
|
|
||||||
<mat-label>Material</mat-label>
|
|
||||||
<mat-select multiple
|
|
||||||
[value]="selectedMaterials()"
|
|
||||||
(selectionChange)="onMaterialChange($event.value)"
|
|
||||||
aria-label="Filter by material type">
|
|
||||||
@for (material of materialOptions(); track material) {
|
|
||||||
<mat-option [value]="material">{{ material }}</mat-option>
|
|
||||||
}
|
|
||||||
</mat-select>
|
|
||||||
@if (selectedMaterials().length > 0) {
|
|
||||||
<mat-chip-set class="selected-chips" matSuffix>
|
|
||||||
@for (mat of selectedMaterials(); track mat) {
|
|
||||||
<mat-chip (removed)="removeMaterial(mat)"
|
|
||||||
class="filter-chip">
|
|
||||||
<span>{{ mat }}</span>
|
|
||||||
<mat-icon matChipRemove>cancel</mat-icon>
|
|
||||||
</mat-chip>
|
|
||||||
}
|
|
||||||
</mat-chip-set>
|
|
||||||
}
|
|
||||||
</mat-form-field>
|
|
||||||
|
|
||||||
<!-- Color Search -->
|
|
||||||
<mat-form-field appearance="outline" class="filter-field color-filter">
|
|
||||||
<mat-label>Color</mat-label>
|
|
||||||
<input matInput
|
|
||||||
type="text"
|
|
||||||
[value]="colorSearch()"
|
|
||||||
(input)="onColorSearchChange($any($event.target).value)"
|
|
||||||
placeholder="Search color..."
|
|
||||||
aria-label="Filter by color name" />
|
|
||||||
@if (colorSearch().trim()) {
|
|
||||||
<mat-icon matSuffix class="filter-active-icon">filter_list</mat-icon>
|
|
||||||
}
|
|
||||||
</mat-form-field>
|
|
||||||
|
|
||||||
<!-- Low Stock Toggle -->
|
|
||||||
<mat-checkbox [checked]="lowStockOnly()"
|
|
||||||
(change)="onLowStockToggle($event.checked)"
|
|
||||||
class="filter-checkbox"
|
|
||||||
aria-label="Show low stock only"
|
|
||||||
matTooltip="Show only spools at 25% or less remaining"
|
|
||||||
matTooltipPosition="below">
|
|
||||||
<mat-icon class="checkbox-icon" [class.active]="lowStockOnly()">warning</mat-icon>
|
|
||||||
Low Stock
|
|
||||||
</mat-checkbox>
|
|
||||||
|
|
||||||
<!-- Active Only Toggle -->
|
|
||||||
<mat-checkbox [checked]="activeOnly()"
|
|
||||||
(change)="onActiveOnlyToggle($event.checked)"
|
|
||||||
class="filter-checkbox"
|
|
||||||
aria-label="Show active spools only"
|
|
||||||
matTooltip="Show only spools currently in use"
|
|
||||||
matTooltipPosition="below">
|
|
||||||
<mat-icon class="checkbox-icon" [class.active]="activeOnly()">check_circle</mat-icon>
|
|
||||||
Active Only
|
|
||||||
</mat-checkbox>
|
|
||||||
|
|
||||||
<!-- Clear All Filters -->
|
|
||||||
@if (hasActiveFilters()) {
|
|
||||||
<button mat-button
|
|
||||||
class="clear-filters-btn"
|
|
||||||
(click)="clearAll()"
|
|
||||||
aria-label="Clear all filters"
|
|
||||||
matTooltip="Remove all filters"
|
|
||||||
matTooltipPosition="below">
|
|
||||||
<mat-icon>filter_alt_off</mat-icon>
|
|
||||||
Clear
|
|
||||||
</button>
|
|
||||||
}
|
|
||||||
</div>
|
|
||||||
@@ -1,134 +0,0 @@
|
|||||||
/**
|
|
||||||
* Filament Filter Bar Styles
|
|
||||||
* Responsive filter layout for kiosk and mobile
|
|
||||||
*/
|
|
||||||
|
|
||||||
$spacing-unit: 8px;
|
|
||||||
|
|
||||||
.filament-filter-bar {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: $spacing-unit * 2;
|
|
||||||
flex-wrap: wrap;
|
|
||||||
padding: $spacing-unit * 2 0;
|
|
||||||
margin-bottom: $spacing-unit * 2;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Form field sizing
|
|
||||||
.filter-field {
|
|
||||||
flex: 0 1 auto;
|
|
||||||
min-width: 160px;
|
|
||||||
|
|
||||||
&.material-filter {
|
|
||||||
min-width: 200px;
|
|
||||||
}
|
|
||||||
|
|
||||||
&.color-filter {
|
|
||||||
min-width: 180px;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Reduce vertical spacing inside filter fields
|
|
||||||
.mat-mdc-form-field-subscript-wrapper {
|
|
||||||
display: none; // No hint/error text needed for filters
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Selected material chips
|
|
||||||
.selected-chips {
|
|
||||||
flex-wrap: wrap;
|
|
||||||
gap: 4px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.filter-chip {
|
|
||||||
font-size: 12px !important;
|
|
||||||
min-height: 24px !important;
|
|
||||||
|
|
||||||
mat-icon {
|
|
||||||
font-size: 14px !important;
|
|
||||||
width: 14px !important;
|
|
||||||
height: 14px !important;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Active filter icon
|
|
||||||
.filter-active-icon {
|
|
||||||
color: var(--mat-sys-primary);
|
|
||||||
font-size: 18px !important;
|
|
||||||
width: 18px !important;
|
|
||||||
height: 18px !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Checkbox styling
|
|
||||||
.filter-checkbox {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 4px;
|
|
||||||
white-space: nowrap;
|
|
||||||
user-select: none;
|
|
||||||
touch-action: manipulation; // Prevent zoom on double-tap
|
|
||||||
|
|
||||||
.checkbox-icon {
|
|
||||||
font-size: 18px !important;
|
|
||||||
width: 18px !important;
|
|
||||||
height: 18px !important;
|
|
||||||
color: var(--mat-sys-on-surface-variant);
|
|
||||||
transition: color 0.2s ease;
|
|
||||||
|
|
||||||
&.active {
|
|
||||||
color: var(--mat-sys-primary);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Clear filters button
|
|
||||||
.clear-filters-btn {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 4px;
|
|
||||||
font-size: 13px;
|
|
||||||
|
|
||||||
mat-icon {
|
|
||||||
font-size: 18px !important;
|
|
||||||
width: 18px !important;
|
|
||||||
height: 18px !important;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Responsive: stack filters vertically on small screens
|
|
||||||
@media (max-width: 768px) {
|
|
||||||
.filament-filter-bar {
|
|
||||||
flex-direction: column;
|
|
||||||
align-items: stretch;
|
|
||||||
gap: $spacing-unit;
|
|
||||||
}
|
|
||||||
|
|
||||||
.filter-field {
|
|
||||||
width: 100%;
|
|
||||||
min-width: unset;
|
|
||||||
|
|
||||||
&.material-filter,
|
|
||||||
&.color-filter {
|
|
||||||
min-width: unset;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.filter-checkbox {
|
|
||||||
padding: $spacing-unit 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.clear-filters-btn {
|
|
||||||
align-self: flex-start;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Extra-small screens (phone portrait)
|
|
||||||
@media (max-width: 480px) {
|
|
||||||
.filament-filter-bar {
|
|
||||||
padding: $spacing-unit 0;
|
|
||||||
margin-bottom: $spacing-unit;
|
|
||||||
}
|
|
||||||
|
|
||||||
.filter-checkbox {
|
|
||||||
font-size: 13px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,158 +0,0 @@
|
|||||||
import {
|
|
||||||
ChangeDetectionStrategy,
|
|
||||||
Component,
|
|
||||||
EventEmitter,
|
|
||||||
Input,
|
|
||||||
Output,
|
|
||||||
computed,
|
|
||||||
signal,
|
|
||||||
} from '@angular/core';
|
|
||||||
import { CommonModule } from '@angular/common';
|
|
||||||
import { FormsModule } from '@angular/forms';
|
|
||||||
import { MatFormFieldModule } from '@angular/material/form-field';
|
|
||||||
import { MatSelectModule } from '@angular/material/select';
|
|
||||||
import { MatInputModule } from '@angular/material/input';
|
|
||||||
import { MatCheckboxModule } from '@angular/material/checkbox';
|
|
||||||
import { MatIconModule } from '@angular/material/icon';
|
|
||||||
import { MatChipsModule } from '@angular/material/chips';
|
|
||||||
import { MatButtonModule } from '@angular/material/button';
|
|
||||||
import { MatTooltipModule } from '@angular/material/tooltip';
|
|
||||||
import {
|
|
||||||
Filament,
|
|
||||||
StockLevel,
|
|
||||||
classifyStockLevel,
|
|
||||||
} from '../../models/filament.model';
|
|
||||||
|
|
||||||
/** Filter state emitted by the filament filter component */
|
|
||||||
export interface FilamentFilterState {
|
|
||||||
/** Selected material base names — empty means all */
|
|
||||||
materialBaseNames: string[];
|
|
||||||
|
|
||||||
/** Color search text — empty string means all */
|
|
||||||
colorSearch: string;
|
|
||||||
|
|
||||||
/** Whether to show only low/critical stock */
|
|
||||||
lowStockOnly: boolean;
|
|
||||||
|
|
||||||
/** Whether to show only active spools */
|
|
||||||
activeOnly: boolean;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* FilamentFilterComponent — Filter bar for the filament inventory list.
|
|
||||||
*
|
|
||||||
* Provides:
|
|
||||||
* - Material type multi-select filter
|
|
||||||
* - Color name text search
|
|
||||||
* - Low stock toggle (shows only critical/low spools)
|
|
||||||
* - Active-only toggle
|
|
||||||
* - Clear all filters action
|
|
||||||
*/
|
|
||||||
@Component({
|
|
||||||
selector: 'app-filament-filter',
|
|
||||||
standalone: true,
|
|
||||||
imports: [
|
|
||||||
CommonModule,
|
|
||||||
FormsModule,
|
|
||||||
MatFormFieldModule,
|
|
||||||
MatSelectModule,
|
|
||||||
MatInputModule,
|
|
||||||
MatCheckboxModule,
|
|
||||||
MatIconModule,
|
|
||||||
MatChipsModule,
|
|
||||||
MatButtonModule,
|
|
||||||
MatTooltipModule,
|
|
||||||
],
|
|
||||||
templateUrl: './filament-filter.component.html',
|
|
||||||
styleUrl: './filament-filter.component.scss',
|
|
||||||
changeDetection: ChangeDetectionStrategy.OnPush,
|
|
||||||
})
|
|
||||||
export class FilamentFilterComponent {
|
|
||||||
/** Filament data input — used to derive material options */
|
|
||||||
@Input() set filaments(value: Filament[]) {
|
|
||||||
this._filaments.set(value);
|
|
||||||
const materials = [...new Set(value.map((f) => f.materialBaseName))].sort();
|
|
||||||
this.materialOptions.set(materials);
|
|
||||||
}
|
|
||||||
get filaments(): Filament[] {
|
|
||||||
return this._filaments();
|
|
||||||
}
|
|
||||||
private readonly _filaments = signal<Filament[]>([]);
|
|
||||||
|
|
||||||
/** Available material base names derived from filament data */
|
|
||||||
readonly materialOptions = signal<string[]>([]);
|
|
||||||
|
|
||||||
/** Selected material base names */
|
|
||||||
readonly selectedMaterials = signal<string[]>([]);
|
|
||||||
|
|
||||||
/** Color search text */
|
|
||||||
readonly colorSearch = signal('');
|
|
||||||
|
|
||||||
/** Low stock only toggle */
|
|
||||||
readonly lowStockOnly = signal(false);
|
|
||||||
|
|
||||||
/** Active only toggle */
|
|
||||||
readonly activeOnly = signal(false);
|
|
||||||
|
|
||||||
/** Computed: whether any filters are active */
|
|
||||||
readonly hasActiveFilters = computed(
|
|
||||||
() =>
|
|
||||||
this.selectedMaterials().length > 0 ||
|
|
||||||
this.colorSearch().trim().length > 0 ||
|
|
||||||
this.lowStockOnly() ||
|
|
||||||
this.activeOnly()
|
|
||||||
);
|
|
||||||
|
|
||||||
/** Emits the current filter state whenever filters change */
|
|
||||||
@Output() readonly filterChange = new EventEmitter<FilamentFilterState>();
|
|
||||||
|
|
||||||
/** Handle material selection change */
|
|
||||||
onMaterialChange(selected: string[]): void {
|
|
||||||
this.selectedMaterials.set(selected);
|
|
||||||
this.emitFilterState();
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Handle color search input */
|
|
||||||
onColorSearchChange(value: string): void {
|
|
||||||
this.colorSearch.set(value);
|
|
||||||
this.emitFilterState();
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Handle low stock toggle */
|
|
||||||
onLowStockToggle(checked: boolean): void {
|
|
||||||
this.lowStockOnly.set(checked);
|
|
||||||
this.emitFilterState();
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Handle active-only toggle */
|
|
||||||
onActiveOnlyToggle(checked: boolean): void {
|
|
||||||
this.activeOnly.set(checked);
|
|
||||||
this.emitFilterState();
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Remove a single material chip */
|
|
||||||
removeMaterial(material: string): void {
|
|
||||||
const updated = this.selectedMaterials().filter((m) => m !== material);
|
|
||||||
this.selectedMaterials.set(updated);
|
|
||||||
this.emitFilterState();
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Clear all filters */
|
|
||||||
clearAll(): void {
|
|
||||||
this.selectedMaterials.set([]);
|
|
||||||
this.colorSearch.set('');
|
|
||||||
this.lowStockOnly.set(false);
|
|
||||||
this.activeOnly.set(false);
|
|
||||||
this.emitFilterState();
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Emit the current filter state */
|
|
||||||
private emitFilterState(): void {
|
|
||||||
this.filterChange.emit({
|
|
||||||
materialBaseNames: this.selectedMaterials(),
|
|
||||||
colorSearch: this.colorSearch().trim().toLowerCase(),
|
|
||||||
lowStockOnly: this.lowStockOnly(),
|
|
||||||
activeOnly: this.activeOnly(),
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,12 +1,6 @@
|
|||||||
<!-- Filament Inventory Table — with filters and low stock indicators -->
|
<!-- Filament Inventory Table — with low stock indicators -->
|
||||||
<div class="filament-table-container" role="region" aria-label="Filament inventory">
|
<div class="filament-table-container" role="region" aria-label="Filament inventory">
|
||||||
|
|
||||||
<!-- Filter Bar -->
|
|
||||||
<app-filament-filter
|
|
||||||
[filaments]="allFilaments()"
|
|
||||||
(filterChange)="onFilterChange($event)"
|
|
||||||
aria-label="Filter filament inventory" />
|
|
||||||
|
|
||||||
<!-- Low Stock Alert Banner — shown when critical or low stock spools exist -->
|
<!-- Low Stock Alert Banner — shown when critical or low stock spools exist -->
|
||||||
@if (criticalCount() > 0) {
|
@if (criticalCount() > 0) {
|
||||||
<div class="alert-banner critical" role="alert">
|
<div class="alert-banner critical" role="alert">
|
||||||
@@ -22,7 +16,7 @@
|
|||||||
|
|
||||||
<!-- Filament Table -->
|
<!-- Filament Table -->
|
||||||
<table mat-table
|
<table mat-table
|
||||||
[dataSource]="filteredFilaments()"
|
[dataSource]="sortedFilaments()"
|
||||||
matSort
|
matSort
|
||||||
(matSortChange)="sortData($event)"
|
(matSortChange)="sortData($event)"
|
||||||
class="filament-table"
|
class="filament-table"
|
||||||
@@ -119,15 +113,7 @@
|
|||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
<!-- Filtered empty state -->
|
<!-- Empty state -->
|
||||||
@if (filteredFilaments().length === 0 && filaments().length > 0) {
|
|
||||||
<div class="empty-state" role="status">
|
|
||||||
<mat-icon aria-hidden="true">filter_alt_off</mat-icon>
|
|
||||||
<p>No filaments match the current filters</p>
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
|
|
||||||
<!-- No data empty state -->
|
|
||||||
@if (filaments().length === 0) {
|
@if (filaments().length === 0) {
|
||||||
<div class="empty-state" role="status">
|
<div class="empty-state" role="status">
|
||||||
<mat-icon aria-hidden="true">inventory_2</mat-icon>
|
<mat-icon aria-hidden="true">inventory_2</mat-icon>
|
||||||
|
|||||||
@@ -12,7 +12,6 @@ import { MatIconModule } from '@angular/material/icon';
|
|||||||
import { MatProgressBarModule } from '@angular/material/progress-bar';
|
import { MatProgressBarModule } from '@angular/material/progress-bar';
|
||||||
import { MatTooltipModule } from '@angular/material/tooltip';
|
import { MatTooltipModule } from '@angular/material/tooltip';
|
||||||
import { MatSortModule, Sort } from '@angular/material/sort';
|
import { MatSortModule, Sort } from '@angular/material/sort';
|
||||||
import { FilamentFilterComponent, FilamentFilterState } from '../filament-filter/filament-filter.component';
|
|
||||||
import {
|
import {
|
||||||
Filament,
|
Filament,
|
||||||
StockLevel,
|
StockLevel,
|
||||||
@@ -41,7 +40,6 @@ export type FilamentColumn =
|
|||||||
MatProgressBarModule,
|
MatProgressBarModule,
|
||||||
MatTooltipModule,
|
MatTooltipModule,
|
||||||
MatSortModule,
|
MatSortModule,
|
||||||
FilamentFilterComponent,
|
|
||||||
],
|
],
|
||||||
templateUrl: './filament-table.component.html',
|
templateUrl: './filament-table.component.html',
|
||||||
styleUrl: './filament-table.component.scss',
|
styleUrl: './filament-table.component.scss',
|
||||||
@@ -72,24 +70,9 @@ export class FilamentTableComponent {
|
|||||||
/** Default columns for template binding */
|
/** Default columns for template binding */
|
||||||
readonly columns = this._displayedColumns;
|
readonly columns = this._displayedColumns;
|
||||||
|
|
||||||
/** Current filter state */
|
|
||||||
readonly filterState = signal<FilamentFilterState>({
|
|
||||||
materialBaseNames: [],
|
|
||||||
colorSearch: '',
|
|
||||||
lowStockOnly: false,
|
|
||||||
activeOnly: false,
|
|
||||||
});
|
|
||||||
|
|
||||||
/** Sorted filament data */
|
/** Sorted filament data */
|
||||||
readonly sortedFilaments = signal<Filament[]>([]);
|
readonly sortedFilaments = signal<Filament[]>([]);
|
||||||
|
|
||||||
/** Computed: filtered + sorted filament data for display */
|
|
||||||
readonly filteredFilaments = computed(() => {
|
|
||||||
const data = this.sortedFilaments();
|
|
||||||
const filters = this.filterState();
|
|
||||||
return data.filter((f) => this.matchesFilter(f, filters));
|
|
||||||
});
|
|
||||||
|
|
||||||
/** Computed: count of low/critical spools */
|
/** Computed: count of low/critical spools */
|
||||||
readonly lowStockCount = computed(() =>
|
readonly lowStockCount = computed(() =>
|
||||||
this.filaments().filter(
|
this.filaments().filter(
|
||||||
@@ -228,9 +211,6 @@ export class FilamentTableComponent {
|
|||||||
this.sortedFilaments.set([...data]);
|
this.sortedFilaments.set([...data]);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** All filament data — for the filter component to derive material options */
|
|
||||||
readonly allFilaments = this.filaments;
|
|
||||||
|
|
||||||
/** Handle sort changes from MatSort */
|
/** Handle sort changes from MatSort */
|
||||||
sortData(sort: Sort): void {
|
sortData(sort: Sort): void {
|
||||||
const data = [...this.filaments()];
|
const data = [...this.filaments()];
|
||||||
@@ -272,46 +252,6 @@ export class FilamentTableComponent {
|
|||||||
this.sortedFilaments.set(sorted);
|
this.sortedFilaments.set(sorted);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Handle filter changes from FilamentFilterComponent */
|
|
||||||
onFilterChange(state: FilamentFilterState): void {
|
|
||||||
this.filterState.set(state);
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Check if a filament matches the current filter state */
|
|
||||||
private matchesFilter(filament: Filament, filters: FilamentFilterState): boolean {
|
|
||||||
// Material filter — empty means all
|
|
||||||
if (
|
|
||||||
filters.materialBaseNames.length > 0 &&
|
|
||||||
!filters.materialBaseNames.includes(filament.materialBaseName)
|
|
||||||
) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Color search — empty means all
|
|
||||||
if (
|
|
||||||
filters.colorSearch &&
|
|
||||||
!filament.colorName.toLowerCase().includes(filters.colorSearch) &&
|
|
||||||
!filament.colorHex.toLowerCase().includes(filters.colorSearch)
|
|
||||||
) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Low stock filter — show only critical/low
|
|
||||||
if (filters.lowStockOnly) {
|
|
||||||
const level = classifyStockLevel(filament);
|
|
||||||
if (level !== 'critical' && level !== 'low') {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Active only filter
|
|
||||||
if (filters.activeOnly && !filament.isActive) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Template helper: get remaining percent */
|
/** Template helper: get remaining percent */
|
||||||
getRemainingPercent = getRemainingPercent;
|
getRemainingPercent = getRemainingPercent;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user