Compare commits
20 Commits
e9e856a012
...
agent/rex/
| Author | SHA1 | Date | |
|---|---|---|---|
| 9112f78641 | |||
| 57157ad947 | |||
| a2707e02ee | |||
| 9192ece040 | |||
| fa4a4c21b3 | |||
| f2d9b7f455 | |||
| 808d5f909d | |||
| b7e61fab8a | |||
| 5ede6a8eb6 | |||
| e56aa3ba39 | |||
| f70495a85c | |||
| bb35ed1eab | |||
| 1f03606468 | |||
| 1b4fc22f59 | |||
| b86dda97a3 | |||
| 8b2a29881d | |||
| 90a89eecf3 | |||
| 215033f3e5 | |||
| a28d032b16 | |||
| a90627de28 |
@@ -20,12 +20,15 @@ jobs:
|
||||
|
||||
- name: Restore backend
|
||||
run: dotnet restore
|
||||
working-directory: ./backend
|
||||
|
||||
- name: Build backend
|
||||
run: dotnet build --no-restore --configuration Release
|
||||
working-directory: ./backend
|
||||
|
||||
- name: Test backend
|
||||
run: dotnet test --no-build --configuration Release
|
||||
working-directory: ./backend
|
||||
|
||||
- name: Setup Node
|
||||
uses: actions/setup-node@v4
|
||||
@@ -39,39 +42,3 @@ jobs:
|
||||
- name: Build frontend
|
||||
run: npm run build
|
||||
working-directory: ./frontend
|
||||
|
||||
deploy-dev:
|
||||
needs: build-test
|
||||
if: gitea.event_name == 'push'
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- name: Deploy dev
|
||||
run: |
|
||||
echo "${{ secrets.DEV_DEPLOY_SSH_KEY }}" > /tmp/dev_key
|
||||
chmod 600 /tmp/dev_key
|
||||
ssh -i /tmp/dev_key -o StrictHostKeyChecking=no \
|
||||
${{ secrets.DEV_DEPLOY_USER }}@${{ secrets.DEV_DEPLOY_HOST }} \
|
||||
"${{ secrets.DEV_DEPLOY_PATH }}/deploy.sh"
|
||||
|
||||
notify-success:
|
||||
needs: [build-test, deploy-dev]
|
||||
if: success() && gitea.event_name == 'push'
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Notify Slack success
|
||||
run: |
|
||||
curl -X POST -H 'Content-type: application/json' \
|
||||
--data "{\"text\":\"✅ Extrudex dev deployed successfully from dev branch.\"}" \
|
||||
"${{ secrets.SLACK_WEBHOOK_URL }}"
|
||||
|
||||
notify-failure:
|
||||
needs: [build-test, deploy-dev]
|
||||
if: failure()
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Notify Slack failure
|
||||
run: |
|
||||
curl -X POST -H 'Content-type: application/json' \
|
||||
--data "{\"text\":\"🚨 Extrudex dev pipeline failed. Check Gitea Actions for details.\"}" \
|
||||
"${{ secrets.SLACK_WEBHOOK_URL }}"
|
||||
@@ -1,6 +1,7 @@
|
||||
using Extrudex.API.DTOs;
|
||||
using Extrudex.API.DTOs.Filaments;
|
||||
using Extrudex.Domain.Entities;
|
||||
using Extrudex.Domain.Interfaces;
|
||||
using Extrudex.Infrastructure.Data;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
@@ -17,16 +18,22 @@ namespace Extrudex.API.Controllers;
|
||||
public class FilamentsController : ControllerBase
|
||||
{
|
||||
private readonly ExtrudexDbContext _dbContext;
|
||||
private readonly ILowStockDetector _lowStockDetector;
|
||||
private readonly ILogger<FilamentsController> _logger;
|
||||
|
||||
/// <summary>
|
||||
/// Initializes a new instance of the <see cref="FilamentsController"/> class.
|
||||
/// </summary>
|
||||
/// <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>
|
||||
public FilamentsController(ExtrudexDbContext dbContext, ILogger<FilamentsController> logger)
|
||||
public FilamentsController(
|
||||
ExtrudexDbContext dbContext,
|
||||
ILowStockDetector lowStockDetector,
|
||||
ILogger<FilamentsController> logger)
|
||||
{
|
||||
_dbContext = dbContext;
|
||||
_lowStockDetector = lowStockDetector;
|
||||
_logger = logger;
|
||||
}
|
||||
|
||||
@@ -95,7 +102,7 @@ public class FilamentsController : ControllerBase
|
||||
.OrderByDescending(s => s.CreatedAt)
|
||||
.Skip((pageNumber - 1) * pageSize)
|
||||
.Take(pageSize)
|
||||
.Select(s => MapToFilamentResponse(s))
|
||||
.Select(s => MapToFilamentResponse(s, _lowStockDetector))
|
||||
.ToListAsync();
|
||||
|
||||
var response = new PagedResponse<FilamentResponse>
|
||||
@@ -136,7 +143,7 @@ public class FilamentsController : ControllerBase
|
||||
return NotFound(new { error = $"Filament with ID '{id}' not found." });
|
||||
}
|
||||
|
||||
return Ok(MapToFilamentResponse(spool));
|
||||
return Ok(MapToFilamentResponse(spool, _lowStockDetector));
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -211,7 +218,7 @@ public class FilamentsController : ControllerBase
|
||||
if (entity.MaterialModifierId.HasValue)
|
||||
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);
|
||||
}
|
||||
|
||||
@@ -292,7 +299,97 @@ public class FilamentsController : ControllerBase
|
||||
if (entity.MaterialModifierId.HasValue)
|
||||
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);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Deletes a filament spool by its unique identifier.
|
||||
/// If the spool has associated print jobs, the deletion is rejected with a 409 Conflict
|
||||
/// to preserve COGS and print history — the caller should archive the spool instead.
|
||||
/// Associated filament usage records are removed before the spool is deleted.
|
||||
/// AMS slots referencing this spool will have their SpoolId set to null by the database.
|
||||
/// </summary>
|
||||
/// <param name="id">The unique identifier of the filament spool to delete.</param>
|
||||
/// <returns>No content on successful deletion.</returns>
|
||||
/// <response code="204">The filament spool was successfully deleted.</response>
|
||||
/// <response code="404">If the filament spool with the given ID is not found.</response>
|
||||
/// <response code="409">If the spool has associated print jobs and cannot be deleted.</response>
|
||||
[HttpDelete("{id:guid}")]
|
||||
[ProducesResponseType(StatusCodes.Status204NoContent)]
|
||||
[ProducesResponseType(StatusCodes.Status404NotFound)]
|
||||
[ProducesResponseType(StatusCodes.Status409Conflict)]
|
||||
public async Task<IActionResult> DeleteFilament(Guid id)
|
||||
{
|
||||
_logger.LogInformation("Deleting filament {Id}", id);
|
||||
|
||||
var entity = await _dbContext.Spools.FindAsync(id);
|
||||
if (entity is null)
|
||||
{
|
||||
_logger.LogWarning("Filament {Id} not found for deletion", id);
|
||||
return NotFound(new { error = $"Filament with ID '{id}' not found." });
|
||||
}
|
||||
|
||||
// Check for associated print jobs — these cannot be orphaned
|
||||
var hasPrintJobs = await _dbContext.PrintJobs.AnyAsync(pj => pj.SpoolId == id);
|
||||
if (hasPrintJobs)
|
||||
{
|
||||
_logger.LogWarning(
|
||||
"Cannot delete filament {Id}: associated print jobs exist. Suggest archiving instead.", id);
|
||||
return Conflict(new
|
||||
{
|
||||
error = $"Cannot delete filament '{id}' because it has associated print jobs. " +
|
||||
"Archive the filament instead to preserve print history and COGS data."
|
||||
});
|
||||
}
|
||||
|
||||
// Remove associated filament usage records (usage tracking data for this spool)
|
||||
var usageRecords = await _dbContext.FilamentUsages
|
||||
.Where(fu => fu.SpoolId == id)
|
||||
.ToListAsync();
|
||||
|
||||
if (usageRecords.Count > 0)
|
||||
{
|
||||
_logger.LogInformation(
|
||||
"Removing {Count} filament usage records for spool {Id}",
|
||||
usageRecords.Count, id);
|
||||
_dbContext.FilamentUsages.RemoveRange(usageRecords);
|
||||
}
|
||||
|
||||
_dbContext.Spools.Remove(entity);
|
||||
await _dbContext.SaveChangesAsync();
|
||||
|
||||
_logger.LogInformation("Filament {Id} deleted successfully", id);
|
||||
return NoContent();
|
||||
}
|
||||
|
||||
// ── Mapping helper ─────────────────────────────────────────
|
||||
@@ -301,10 +398,12 @@ public class FilamentsController : ControllerBase
|
||||
/// Maps a Spool domain entity to a FilamentResponse DTO.
|
||||
/// Denormalizes material names for display convenience.
|
||||
/// Populates the QrCodeUrl for easy frontend access to the spool's QR code.
|
||||
/// Calculates low-stock status and remaining weight percentage.
|
||||
/// </summary>
|
||||
/// <param name="s">The spool entity to map.</param>
|
||||
/// <returns>A FilamentResponse DTO with denormalized material names and QR code URL.</returns>
|
||||
private static FilamentResponse MapToFilamentResponse(Spool s) => new()
|
||||
/// <param name="lowStockDetector">The low-stock detection service for computing alert flags.</param>
|
||||
/// <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,
|
||||
MaterialBaseId = s.MaterialBaseId,
|
||||
@@ -327,6 +426,8 @@ public class FilamentsController : ControllerBase
|
||||
StorageLocation = s.StorageLocation,
|
||||
CreatedAt = s.CreatedAt,
|
||||
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)
|
||||
};
|
||||
}
|
||||
117
backend/API/Controllers/UsageLogsController.cs
Normal file
117
backend/API/Controllers/UsageLogsController.cs
Normal file
@@ -0,0 +1,117 @@
|
||||
using Extrudex.API.DTOs.UsageLogs;
|
||||
using Extrudex.Domain.Enums;
|
||||
using Extrudex.Domain.Interfaces;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
|
||||
namespace Extrudex.API.Controllers;
|
||||
|
||||
/// <summary>
|
||||
/// API controller for recording and querying filament usage logs.
|
||||
/// Usage logs provide a fine-grained audit trail of filament consumption
|
||||
/// from printer integrations or manual input.
|
||||
/// </summary>
|
||||
[ApiController]
|
||||
[Route("api/[controller]")]
|
||||
[Produces("application/json")]
|
||||
public class UsageLogsController : ControllerBase
|
||||
{
|
||||
private readonly IUsageLogService _usageLogService;
|
||||
|
||||
/// <summary>
|
||||
/// Initializes a new instance of the <see cref="UsageLogsController"/> class.
|
||||
/// </summary>
|
||||
/// <param name="usageLogService">The usage log service for recording and querying usage.</param>
|
||||
public UsageLogsController(IUsageLogService usageLogService)
|
||||
{
|
||||
_usageLogService = usageLogService;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Records a new filament usage entry.
|
||||
/// </summary>
|
||||
/// <param name="request">The usage entry details.</param>
|
||||
/// <returns>The created usage log entry.</returns>
|
||||
[HttpPost]
|
||||
[ProducesResponseType(typeof(UsageLogResponse), StatusCodes.Status201Created)]
|
||||
[ProducesResponseType(StatusCodes.Status400BadRequest)]
|
||||
public async Task<ActionResult<UsageLogResponse>> Create([FromBody] CreateUsageLogRequest request)
|
||||
{
|
||||
if (!Enum.TryParse<DataSource>(request.DataSource, ignoreCase: true, out var dataSource))
|
||||
{
|
||||
return BadRequest($"Invalid data source: '{request.DataSource}'. Valid values: Mqtt, Moonraker, Manual.");
|
||||
}
|
||||
|
||||
var entry = await _usageLogService.RecordUsageAsync(
|
||||
spoolId: request.SpoolId,
|
||||
gramsUsed: request.GramsUsed,
|
||||
dataSource: dataSource,
|
||||
printerId: request.PrinterId,
|
||||
printJobId: request.PrintJobId,
|
||||
mmExtruded: request.MmExtruded,
|
||||
usageTimestamp: request.UsageTimestamp,
|
||||
notes: request.Notes
|
||||
);
|
||||
|
||||
return CreatedAtAction(
|
||||
nameof(GetBySpool),
|
||||
new { spoolId = entry.SpoolId },
|
||||
MapToResponse(entry));
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gets usage logs for a specific spool, ordered by most recent first.
|
||||
/// </summary>
|
||||
/// <param name="spoolId">The spool ID to filter by.</param>
|
||||
/// <returns>A collection of usage log entries for the spool.</returns>
|
||||
[HttpGet("spool/{spoolId:guid}")]
|
||||
[ProducesResponseType(typeof(IEnumerable<UsageLogResponse>), StatusCodes.Status200OK)]
|
||||
public async Task<ActionResult<IEnumerable<UsageLogResponse>>> GetBySpool(Guid spoolId)
|
||||
{
|
||||
var logs = await _usageLogService.GetBySpoolAsync(spoolId);
|
||||
return Ok(logs.Select(MapToResponse));
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gets usage logs for a specific printer, ordered by most recent first.
|
||||
/// </summary>
|
||||
/// <param name="printerId">The printer ID to filter by.</param>
|
||||
/// <returns>A collection of usage log entries for the printer.</returns>
|
||||
[HttpGet("printer/{printerId:guid}")]
|
||||
[ProducesResponseType(typeof(IEnumerable<UsageLogResponse>), StatusCodes.Status200OK)]
|
||||
public async Task<ActionResult<IEnumerable<UsageLogResponse>>> GetByPrinter(Guid printerId)
|
||||
{
|
||||
var logs = await _usageLogService.GetByPrinterAsync(printerId);
|
||||
return Ok(logs.Select(MapToResponse));
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gets usage logs for a specific print job, ordered by most recent first.
|
||||
/// </summary>
|
||||
/// <param name="printJobId">The print job ID to filter by.</param>
|
||||
/// <returns>A collection of usage log entries for the print job.</returns>
|
||||
[HttpGet("print-job/{printJobId:guid}")]
|
||||
[ProducesResponseType(typeof(IEnumerable<UsageLogResponse>), StatusCodes.Status200OK)]
|
||||
public async Task<ActionResult<IEnumerable<UsageLogResponse>>> GetByPrintJob(Guid printJobId)
|
||||
{
|
||||
var logs = await _usageLogService.GetByPrintJobAsync(printJobId);
|
||||
return Ok(logs.Select(MapToResponse));
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Maps a UsageLog domain entity to a UsageLogResponse DTO.
|
||||
/// </summary>
|
||||
private static UsageLogResponse MapToResponse(Domain.Entities.UsageLog log) => new()
|
||||
{
|
||||
Id = log.Id,
|
||||
SpoolId = log.SpoolId,
|
||||
PrinterId = log.PrinterId,
|
||||
PrintJobId = log.PrintJobId,
|
||||
GramsUsed = log.GramsUsed,
|
||||
MmExtruded = log.MmExtruded,
|
||||
UsageTimestamp = log.UsageTimestamp,
|
||||
DataSource = log.DataSource.ToString(),
|
||||
Notes = log.Notes,
|
||||
CreatedAt = log.CreatedAt,
|
||||
UpdatedAt = log.UpdatedAt
|
||||
};
|
||||
}
|
||||
@@ -76,6 +76,19 @@ public class FilamentResponse
|
||||
/// Encodes a deep link to the spool's detail page.
|
||||
/// </summary>
|
||||
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>
|
||||
|
||||
115
backend/API/DTOs/UsageLogs/UsageLogDtos.cs
Normal file
115
backend/API/DTOs/UsageLogs/UsageLogDtos.cs
Normal file
@@ -0,0 +1,115 @@
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
|
||||
namespace Extrudex.API.DTOs.UsageLogs;
|
||||
|
||||
/// <summary>
|
||||
/// Request DTO for recording a filament usage entry.
|
||||
/// </summary>
|
||||
public class CreateUsageLogRequest
|
||||
{
|
||||
/// <summary>
|
||||
/// The ID of the spool that provided the filament.
|
||||
/// </summary>
|
||||
[Required]
|
||||
public Guid SpoolId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// The number of grams of filament consumed.
|
||||
/// </summary>
|
||||
[Required]
|
||||
[Range(0.01, double.MaxValue, ErrorMessage = "GramsUsed must be a positive value.")]
|
||||
public decimal GramsUsed { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// The source of the usage data (Mqtt, Moonraker, Manual).
|
||||
/// </summary>
|
||||
[Required]
|
||||
public string DataSource { get; set; } = string.Empty;
|
||||
|
||||
/// <summary>
|
||||
/// The ID of the printer that consumed the filament. Optional.
|
||||
/// </summary>
|
||||
public Guid? PrinterId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// The ID of the print job associated with this usage. Optional.
|
||||
/// </summary>
|
||||
public Guid? PrintJobId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// The number of millimeters of filament extruded. Optional.
|
||||
/// </summary>
|
||||
public decimal? MmExtruded { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// When the usage occurred (UTC). Defaults to now if not specified.
|
||||
/// </summary>
|
||||
public DateTime? UsageTimestamp { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Optional notes about this usage entry.
|
||||
/// </summary>
|
||||
[MaxLength(2000)]
|
||||
public string? Notes { get; set; }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Response DTO for a usage log entry.
|
||||
/// </summary>
|
||||
public class UsageLogResponse
|
||||
{
|
||||
/// <summary>
|
||||
/// Unique identifier for the usage log entry.
|
||||
/// </summary>
|
||||
public Guid Id { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// The spool that provided the filament.
|
||||
/// </summary>
|
||||
public Guid SpoolId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// The printer that consumed the filament, if applicable.
|
||||
/// </summary>
|
||||
public Guid? PrinterId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// The print job associated with this usage, if applicable.
|
||||
/// </summary>
|
||||
public Guid? PrintJobId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Grams of filament consumed.
|
||||
/// </summary>
|
||||
public decimal GramsUsed { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Millimeters of filament extruded, if available.
|
||||
/// </summary>
|
||||
public decimal? MmExtruded { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// When the usage occurred (UTC).
|
||||
/// </summary>
|
||||
public DateTime UsageTimestamp { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Source of the usage data (Mqtt, Moonraker, Manual).
|
||||
/// </summary>
|
||||
public string DataSource { get; set; } = string.Empty;
|
||||
|
||||
/// <summary>
|
||||
/// Optional notes about this usage entry.
|
||||
/// </summary>
|
||||
public string? Notes { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// When the record was created (UTC).
|
||||
/// </summary>
|
||||
public DateTime CreatedAt { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// When the record was last updated (UTC).
|
||||
/// </summary>
|
||||
public DateTime UpdatedAt { get; set; }
|
||||
}
|
||||
80
backend/API/Jobs/MoonrakerPrinterSyncJob.cs
Normal file
80
backend/API/Jobs/MoonrakerPrinterSyncJob.cs
Normal file
@@ -0,0 +1,80 @@
|
||||
using Extrudex.Domain.Interfaces;
|
||||
using Extrudex.Infrastructure.Configuration;
|
||||
using Microsoft.Extensions.Hosting;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using Microsoft.Extensions.Options;
|
||||
|
||||
namespace Extrudex.API.Jobs;
|
||||
|
||||
/// <summary>
|
||||
/// Background service that periodically syncs Moonraker printer status
|
||||
/// and print job history into the Extrudex database. Runs as a hosted
|
||||
/// service and polls all active Moonraker printers on a configurable
|
||||
/// interval to update printer state and map completed print jobs
|
||||
/// to PrintJob and FilamentUsage entities.
|
||||
///
|
||||
/// Configuration is bound from the "MoonrakerPrinterSync" section in
|
||||
/// appsettings.json. Set Enabled=false to disable without removing
|
||||
/// the service registration.
|
||||
/// </summary>
|
||||
public class MoonrakerPrinterSyncJob : BackgroundService
|
||||
{
|
||||
private readonly IMoonrakerPrinterSyncService _syncService;
|
||||
private readonly MoonrakerPrinterSyncOptions _options;
|
||||
private readonly ILogger<MoonrakerPrinterSyncJob> _logger;
|
||||
|
||||
/// <summary>
|
||||
/// Creates a new MoonrakerPrinterSyncJob.
|
||||
/// </summary>
|
||||
/// <param name="syncService">The service that performs the actual sync logic.</param>
|
||||
/// <param name="options">Configuration options for polling interval and timeouts.</param>
|
||||
/// <param name="logger">Logger for diagnostic output.</param>
|
||||
public MoonrakerPrinterSyncJob(
|
||||
IMoonrakerPrinterSyncService syncService,
|
||||
IOptions<MoonrakerPrinterSyncOptions> options,
|
||||
ILogger<MoonrakerPrinterSyncJob> logger)
|
||||
{
|
||||
_syncService = syncService;
|
||||
_options = options.Value;
|
||||
_logger = logger;
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
protected override async Task ExecuteAsync(CancellationToken stoppingToken)
|
||||
{
|
||||
if (!_options.Enabled)
|
||||
{
|
||||
_logger.LogInformation("Moonraker printer sync job is disabled via configuration — exiting");
|
||||
return;
|
||||
}
|
||||
|
||||
_logger.LogInformation(
|
||||
"Moonraker printer sync job starting — polling every {Interval}",
|
||||
_options.PollingInterval);
|
||||
|
||||
// Delay briefly on startup to allow the web host to fully initialize
|
||||
await Task.Delay(TimeSpan.FromSeconds(15), stoppingToken);
|
||||
|
||||
while (!stoppingToken.IsCancellationRequested)
|
||||
{
|
||||
try
|
||||
{
|
||||
var syncedCount = await _syncService.SyncAllAsync(stoppingToken);
|
||||
|
||||
_logger.LogInformation(
|
||||
"Moonraker printer sync completed — {SyncedCount} printer(s) synced. Next sync in {Interval}",
|
||||
syncedCount, _options.PollingInterval);
|
||||
}
|
||||
catch (Exception ex) when (ex is not OperationCanceledException)
|
||||
{
|
||||
_logger.LogError(ex,
|
||||
"Error during Moonraker printer sync cycle — will retry in {Interval}",
|
||||
_options.PollingInterval);
|
||||
}
|
||||
|
||||
await Task.Delay(_options.PollingInterval, stoppingToken);
|
||||
}
|
||||
|
||||
_logger.LogInformation("Moonraker printer sync job shutting down");
|
||||
}
|
||||
}
|
||||
72
backend/Domain/Entities/UsageLog.cs
Normal file
72
backend/Domain/Entities/UsageLog.cs
Normal file
@@ -0,0 +1,72 @@
|
||||
using Extrudex.Domain.Base;
|
||||
using Extrudex.Domain.Enums;
|
||||
|
||||
namespace Extrudex.Domain.Entities;
|
||||
|
||||
/// <summary>
|
||||
/// Represents a single filament usage log entry. Records how much filament
|
||||
/// was consumed, by which printer, at what time, and optionally linked to
|
||||
/// a print job. This provides a fine-grained audit trail of filament consumption
|
||||
/// independent of print job lifecycle.
|
||||
/// </summary>
|
||||
public class UsageLog : AuditableEntity
|
||||
{
|
||||
/// <summary>
|
||||
/// Foreign key to the spool that provided the filament.
|
||||
/// </summary>
|
||||
public Guid SpoolId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Navigation to the spool that provided the filament.
|
||||
/// </summary>
|
||||
public Spool Spool { get; set; } = null!;
|
||||
|
||||
/// <summary>
|
||||
/// Foreign key to the printer that consumed the filament.
|
||||
/// Nullable to support manual entries without a specific printer.
|
||||
/// </summary>
|
||||
public Guid? PrinterId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Navigation to the printer that consumed the filament.
|
||||
/// </summary>
|
||||
public Printer? Printer { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Foreign key to the print job associated with this usage entry.
|
||||
/// Nullable because usage can be logged before or without a print job.
|
||||
/// </summary>
|
||||
public Guid? PrintJobId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Navigation to the print job associated with this usage entry.
|
||||
/// </summary>
|
||||
public PrintJob? PrintJob { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// The number of grams of filament consumed in this usage event.
|
||||
/// </summary>
|
||||
public decimal GramsUsed { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// The number of millimeters of filament extruded in this usage event.
|
||||
/// Optional — may not be available for all data sources.
|
||||
/// </summary>
|
||||
public decimal? MmExtruded { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Timestamp when the usage occurred (UTC). This is the actual time of
|
||||
/// consumption, which may differ from CreatedAt if the entry was recorded later.
|
||||
/// </summary>
|
||||
public DateTime UsageTimestamp { get; set; } = DateTime.UtcNow;
|
||||
|
||||
/// <summary>
|
||||
/// The source of the usage data (which integration path provided it).
|
||||
/// </summary>
|
||||
public DataSource DataSource { get; set; } = DataSource.Manual;
|
||||
|
||||
/// <summary>
|
||||
/// Optional notes about this usage entry.
|
||||
/// </summary>
|
||||
public string? Notes { get; set; }
|
||||
}
|
||||
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; }
|
||||
}
|
||||
20
backend/Domain/Interfaces/IMoonrakerPrinterSyncService.cs
Normal file
20
backend/Domain/Interfaces/IMoonrakerPrinterSyncService.cs
Normal file
@@ -0,0 +1,20 @@
|
||||
using Extrudex.Domain.DTOs.Moonraker;
|
||||
|
||||
namespace Extrudex.Domain.Interfaces;
|
||||
|
||||
/// <summary>
|
||||
/// Service interface for syncing Moonraker printer data into the Extrudex database.
|
||||
/// Handles periodic polling of printer status and mapping print job history
|
||||
/// to PrintJob and FilamentUsage entities.
|
||||
/// </summary>
|
||||
public interface IMoonrakerPrinterSyncService
|
||||
{
|
||||
/// <summary>
|
||||
/// Performs a single sync cycle: queries all active Moonraker printers,
|
||||
/// fetches their current status and print job history, and persists
|
||||
/// updates to the database.
|
||||
/// </summary>
|
||||
/// <param name="cancellationToken">Cancellation token for graceful shutdown.</param>
|
||||
/// <returns>The number of printers successfully synced.</returns>
|
||||
Task<int> SyncAllAsync(CancellationToken cancellationToken = default);
|
||||
}
|
||||
57
backend/Domain/Interfaces/IUsageLogService.cs
Normal file
57
backend/Domain/Interfaces/IUsageLogService.cs
Normal file
@@ -0,0 +1,57 @@
|
||||
using Extrudex.Domain.Entities;
|
||||
using Extrudex.Domain.Enums;
|
||||
|
||||
namespace Extrudex.Domain.Interfaces;
|
||||
|
||||
/// <summary>
|
||||
/// Service for recording filament usage entries. Writes to the usage_logs table
|
||||
/// and provides query capabilities for usage history.
|
||||
/// </summary>
|
||||
public interface IUsageLogService
|
||||
{
|
||||
/// <summary>
|
||||
/// Records a filament usage entry.
|
||||
/// </summary>
|
||||
/// <param name="spoolId">The spool that provided the filament.</param>
|
||||
/// <param name="gramsUsed">Grams of filament consumed.</param>
|
||||
/// <param name="dataSource">Where the data came from.</param>
|
||||
/// <param name="printerId">Optional printer ID.</param>
|
||||
/// <param name="printJobId">Optional print job ID.</param>
|
||||
/// <param name="mmExtruded">Optional mm extruded.</param>
|
||||
/// <param name="usageTimestamp">When the usage occurred (defaults to UTC now).</param>
|
||||
/// <param name="notes">Optional notes.</param>
|
||||
/// <returns>The created UsageLog entity.</returns>
|
||||
Task<UsageLog> RecordUsageAsync(
|
||||
Guid spoolId,
|
||||
decimal gramsUsed,
|
||||
DataSource dataSource,
|
||||
Guid? printerId = null,
|
||||
Guid? printJobId = null,
|
||||
decimal? mmExtruded = null,
|
||||
DateTime? usageTimestamp = null,
|
||||
string? notes = null);
|
||||
|
||||
/// <summary>
|
||||
/// Retrieves usage logs for a specific spool, ordered by usage timestamp descending.
|
||||
/// </summary>
|
||||
/// <param name="spoolId">The spool ID to filter by.</param>
|
||||
/// <param name="cancellationToken">Cancellation token.</param>
|
||||
/// <returns>A collection of usage logs for the spool.</returns>
|
||||
Task<IEnumerable<UsageLog>> GetBySpoolAsync(Guid spoolId, CancellationToken cancellationToken = default);
|
||||
|
||||
/// <summary>
|
||||
/// Retrieves usage logs for a specific printer, ordered by usage timestamp descending.
|
||||
/// </summary>
|
||||
/// <param name="printerId">The printer ID to filter by.</param>
|
||||
/// <param name="cancellationToken">Cancellation token.</param>
|
||||
/// <returns>A collection of usage logs for the printer.</returns>
|
||||
Task<IEnumerable<UsageLog>> GetByPrinterAsync(Guid printerId, CancellationToken cancellationToken = default);
|
||||
|
||||
/// <summary>
|
||||
/// Retrieves usage logs for a specific print job, ordered by usage timestamp descending.
|
||||
/// </summary>
|
||||
/// <param name="printJobId">The print job ID to filter by.</param>
|
||||
/// <param name="cancellationToken">Cancellation token.</param>
|
||||
/// <returns>A collection of usage logs for the print job.</returns>
|
||||
Task<IEnumerable<UsageLog>> GetByPrintJobAsync(Guid printJobId, CancellationToken cancellationToken = default);
|
||||
}
|
||||
@@ -0,0 +1,41 @@
|
||||
namespace Extrudex.Infrastructure.Configuration;
|
||||
|
||||
/// <summary>
|
||||
/// Configuration options for the MoonrakerPrinterSync background service.
|
||||
/// Bound from appsettings.json under the "MoonrakerPrinterSync" section.
|
||||
/// Controls polling interval, timeouts, and feature toggles for the
|
||||
/// printer status and print job mapping service.
|
||||
/// </summary>
|
||||
public class MoonrakerPrinterSyncOptions
|
||||
{
|
||||
/// <summary>
|
||||
/// The section name in appsettings.json where these options are bound.
|
||||
/// </summary>
|
||||
public const string SectionName = "MoonrakerPrinterSync";
|
||||
|
||||
/// <summary>
|
||||
/// How often the background service polls Moonraker printers for status
|
||||
/// and print job data. Default: 1 minute.
|
||||
/// </summary>
|
||||
public TimeSpan PollingInterval { get; set; } = TimeSpan.FromMinutes(1);
|
||||
|
||||
/// <summary>
|
||||
/// Timeout for individual HTTP requests to a Moonraker printer.
|
||||
/// Default: 15 seconds.
|
||||
/// </summary>
|
||||
public TimeSpan RequestTimeout { get; set; } = TimeSpan.FromSeconds(15);
|
||||
|
||||
/// <summary>
|
||||
/// Whether the Moonraker printer sync service is enabled.
|
||||
/// Set to false to disable without removing the service registration.
|
||||
/// Default: true.
|
||||
/// </summary>
|
||||
public bool Enabled { get; set; } = true;
|
||||
|
||||
/// <summary>
|
||||
/// Maximum number of print history items to fetch per printer per sync cycle.
|
||||
/// Controls the batch size when syncing print jobs from Moonraker.
|
||||
/// Default: 25.
|
||||
/// </summary>
|
||||
public int HistoryBatchSize { get; set; } = 25;
|
||||
}
|
||||
@@ -0,0 +1,91 @@
|
||||
using Extrudex.Domain.Entities;
|
||||
using Extrudex.Domain.Enums;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.EntityFrameworkCore.Metadata.Builders;
|
||||
|
||||
namespace Extrudex.Infrastructure.Data.Configurations;
|
||||
|
||||
/// <summary>
|
||||
/// EF Core configuration for the UsageLog entity.
|
||||
/// Maps to the usage_logs table with snake_case columns and appropriate indexes.
|
||||
/// </summary>
|
||||
public class UsageLogConfiguration : BaseEntityConfiguration<UsageLog>
|
||||
{
|
||||
/// <inheritdoc/>
|
||||
public override void Configure(EntityTypeBuilder<UsageLog> builder)
|
||||
{
|
||||
base.Configure(builder);
|
||||
|
||||
builder.Property(e => e.SpoolId)
|
||||
.HasColumnName("spool_id")
|
||||
.IsRequired();
|
||||
|
||||
builder.Property(e => e.PrinterId)
|
||||
.HasColumnName("printer_id");
|
||||
|
||||
builder.Property(e => e.PrintJobId)
|
||||
.HasColumnName("print_job_id");
|
||||
|
||||
builder.Property(e => e.GramsUsed)
|
||||
.HasColumnName("grams_used")
|
||||
.HasPrecision(10, 2)
|
||||
.IsRequired();
|
||||
|
||||
builder.Property(e => e.MmExtruded)
|
||||
.HasColumnName("mm_extruded")
|
||||
.HasPrecision(12, 2);
|
||||
|
||||
builder.Property(e => e.UsageTimestamp)
|
||||
.HasColumnName("usage_timestamp")
|
||||
.IsRequired();
|
||||
|
||||
builder.Property(e => e.DataSource)
|
||||
.HasColumnName("data_source")
|
||||
.HasConversion<string>()
|
||||
.HasMaxLength(50)
|
||||
.IsRequired();
|
||||
|
||||
builder.Property(e => e.Notes)
|
||||
.HasColumnName("notes")
|
||||
.HasMaxLength(2000);
|
||||
|
||||
// Index on spool_id for querying usage by spool
|
||||
builder.HasIndex(e => e.SpoolId)
|
||||
.HasDatabaseName("ix_usage_logs_spool_id");
|
||||
|
||||
// Index on printer_id for querying usage by printer
|
||||
builder.HasIndex(e => e.PrinterId)
|
||||
.HasDatabaseName("ix_usage_logs_printer_id");
|
||||
|
||||
// Index on print_job_id for querying usage by print job
|
||||
builder.HasIndex(e => e.PrintJobId)
|
||||
.HasDatabaseName("ix_usage_logs_print_job_id");
|
||||
|
||||
// Index on usage_timestamp for chronological queries
|
||||
builder.HasIndex(e => e.UsageTimestamp)
|
||||
.HasDatabaseName("ix_usage_logs_usage_timestamp");
|
||||
|
||||
// Index on data_source for filtering by integration path
|
||||
builder.HasIndex(e => e.DataSource)
|
||||
.HasDatabaseName("ix_usage_logs_data_source");
|
||||
|
||||
// Relationships
|
||||
builder.HasOne(e => e.Spool)
|
||||
.WithMany()
|
||||
.HasForeignKey(e => e.SpoolId)
|
||||
.HasConstraintName("fk_usage_logs_spool")
|
||||
.OnDelete(DeleteBehavior.Restrict);
|
||||
|
||||
builder.HasOne(e => e.Printer)
|
||||
.WithMany()
|
||||
.HasForeignKey(e => e.PrinterId)
|
||||
.HasConstraintName("fk_usage_logs_printer")
|
||||
.OnDelete(DeleteBehavior.SetNull);
|
||||
|
||||
builder.HasOne(e => e.PrintJob)
|
||||
.WithMany()
|
||||
.HasForeignKey(e => e.PrintJobId)
|
||||
.HasConstraintName("fk_usage_logs_print_job")
|
||||
.OnDelete(DeleteBehavior.SetNull);
|
||||
}
|
||||
}
|
||||
@@ -24,6 +24,7 @@ public class ExtrudexDbContext : DbContext
|
||||
public DbSet<AmsSlot> AmsSlots => Set<AmsSlot>();
|
||||
public DbSet<PrintJob> PrintJobs => Set<PrintJob>();
|
||||
public DbSet<FilamentUsage> FilamentUsages => Set<FilamentUsage>();
|
||||
public DbSet<UsageLog> UsageLogs => Set<UsageLog>();
|
||||
|
||||
protected override void OnModelCreating(ModelBuilder modelBuilder)
|
||||
{
|
||||
|
||||
1061
backend/Infrastructure/Data/Migrations/20260426184329_AddUsageLogTable.Designer.cs
generated
Normal file
1061
backend/Infrastructure/Data/Migrations/20260426184329_AddUsageLogTable.Designer.cs
generated
Normal file
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,534 @@
|
||||
using System;
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
|
||||
#nullable disable
|
||||
|
||||
namespace Extrudex.Infrastructure.Data.Migrations
|
||||
{
|
||||
/// <inheritdoc />
|
||||
public partial class AddUsageLogTable : Migration
|
||||
{
|
||||
/// <inheritdoc />
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.CreateTable(
|
||||
name: "usage_logs",
|
||||
columns: table => new
|
||||
{
|
||||
id = table.Column<Guid>(type: "uuid", nullable: false),
|
||||
spool_id = table.Column<Guid>(type: "uuid", nullable: false),
|
||||
printer_id = table.Column<Guid>(type: "uuid", nullable: true),
|
||||
print_job_id = table.Column<Guid>(type: "uuid", nullable: true),
|
||||
grams_used = table.Column<decimal>(type: "numeric(10,2)", precision: 10, scale: 2, nullable: false),
|
||||
mm_extruded = table.Column<decimal>(type: "numeric(12,2)", precision: 12, scale: 2, nullable: true),
|
||||
usage_timestamp = table.Column<DateTime>(type: "timestamp with time zone", nullable: false),
|
||||
data_source = table.Column<string>(type: "character varying(50)", maxLength: 50, nullable: false),
|
||||
notes = table.Column<string>(type: "character varying(2000)", maxLength: 2000, nullable: true),
|
||||
created_at = table.Column<DateTime>(type: "timestamp with time zone", nullable: false, defaultValueSql: "now() at time zone 'utc'"),
|
||||
updated_at = table.Column<DateTime>(type: "timestamp with time zone", nullable: false, defaultValueSql: "now() at time zone 'utc'")
|
||||
},
|
||||
constraints: table =>
|
||||
{
|
||||
table.PrimaryKey("PK_usage_logs", x => x.id);
|
||||
table.ForeignKey(
|
||||
name: "fk_usage_logs_print_job",
|
||||
column: x => x.print_job_id,
|
||||
principalTable: "print_jobs",
|
||||
principalColumn: "id",
|
||||
onDelete: ReferentialAction.SetNull);
|
||||
table.ForeignKey(
|
||||
name: "fk_usage_logs_printer",
|
||||
column: x => x.printer_id,
|
||||
principalTable: "printers",
|
||||
principalColumn: "id",
|
||||
onDelete: ReferentialAction.SetNull);
|
||||
table.ForeignKey(
|
||||
name: "fk_usage_logs_spool",
|
||||
column: x => x.spool_id,
|
||||
principalTable: "spools",
|
||||
principalColumn: "id",
|
||||
onDelete: ReferentialAction.Restrict);
|
||||
});
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_bases",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("10000000-0000-0000-0000-000000000001"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(6535), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(6535) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_bases",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("10000000-0000-0000-0000-000000000002"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7016), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7016) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_bases",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("10000000-0000-0000-0000-000000000003"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7027), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7028) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_bases",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("10000000-0000-0000-0000-000000000004"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7034), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7035) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_bases",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("10000000-0000-0000-0000-000000000005"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7042), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7042) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_bases",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("10000000-0000-0000-0000-000000000006"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7049), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7049) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_finishes",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("20000000-0000-0000-0000-000000000001"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7291), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7292) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_finishes",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("20000000-0000-0000-0000-000000000002"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7453), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7453) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_finishes",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("20000000-0000-0000-0000-000000000003"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7461), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7461) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_finishes",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("20000000-0000-0000-0000-000000000004"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7468), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7468) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_finishes",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("20000000-0000-0000-0000-000000000005"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7474), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7474) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_finishes",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("20000000-0000-0000-0000-000000000006"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7480), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7481) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_finishes",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("20000000-0000-0000-0000-000000000007"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7487), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7487) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_finishes",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("20000000-0000-0000-0000-000000000008"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7493), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7493) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_finishes",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("20000000-0000-0000-0000-000000000009"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7500), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7500) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_finishes",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("20000000-0000-0000-0000-000000000010"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7507), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7507) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_finishes",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("20000000-0000-0000-0000-000000000011"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7513), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7513) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_finishes",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("20000000-0000-0000-0000-000000000012"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7519), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7520) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_finishes",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("20000000-0000-0000-0000-000000000013"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7526), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7526) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_finishes",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("20000000-0000-0000-0000-000000000014"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7532), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7532) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_finishes",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("20000000-0000-0000-0000-000000000015"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7538), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7539) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_modifiers",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("30000000-0000-0000-0000-000000000001"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7690), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7690) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_modifiers",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("30000000-0000-0000-0000-000000000002"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7838), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7838) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_modifiers",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("30000000-0000-0000-0000-000000000003"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7846), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7846) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_modifiers",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("30000000-0000-0000-0000-000000000004"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7853), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7853) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_modifiers",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("30000000-0000-0000-0000-000000000005"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7859), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7859) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_modifiers",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("30000000-0000-0000-0000-000000000006"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7865), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7866) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_modifiers",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("30000000-0000-0000-0000-000000000007"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7872), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7872) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_modifiers",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("30000000-0000-0000-0000-000000000008"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7878), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7879) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_modifiers",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("30000000-0000-0000-0000-000000000009"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7885), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7885) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_modifiers",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("30000000-0000-0000-0000-000000000010"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7891), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7891) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_modifiers",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("30000000-0000-0000-0000-000000000011"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7898), new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7898) });
|
||||
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "ix_usage_logs_data_source",
|
||||
table: "usage_logs",
|
||||
column: "data_source");
|
||||
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "ix_usage_logs_print_job_id",
|
||||
table: "usage_logs",
|
||||
column: "print_job_id");
|
||||
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "ix_usage_logs_printer_id",
|
||||
table: "usage_logs",
|
||||
column: "printer_id");
|
||||
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "ix_usage_logs_spool_id",
|
||||
table: "usage_logs",
|
||||
column: "spool_id");
|
||||
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "ix_usage_logs_usage_timestamp",
|
||||
table: "usage_logs",
|
||||
column: "usage_timestamp");
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropTable(
|
||||
name: "usage_logs");
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_bases",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("10000000-0000-0000-0000-000000000001"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1096), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1096) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_bases",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("10000000-0000-0000-0000-000000000002"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1620), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1620) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_bases",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("10000000-0000-0000-0000-000000000003"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1630), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1630) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_bases",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("10000000-0000-0000-0000-000000000004"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1638), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1638) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_bases",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("10000000-0000-0000-0000-000000000005"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1645), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1645) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_bases",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("10000000-0000-0000-0000-000000000006"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1651), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1652) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_finishes",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("20000000-0000-0000-0000-000000000001"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1850), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(1850) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_finishes",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("20000000-0000-0000-0000-000000000002"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2041), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2041) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_finishes",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("20000000-0000-0000-0000-000000000003"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2049), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2049) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_finishes",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("20000000-0000-0000-0000-000000000004"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2055), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2056) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_finishes",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("20000000-0000-0000-0000-000000000005"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2062), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2062) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_finishes",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("20000000-0000-0000-0000-000000000006"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2068), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2068) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_finishes",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("20000000-0000-0000-0000-000000000007"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2075), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2075) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_finishes",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("20000000-0000-0000-0000-000000000008"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2081), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2081) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_finishes",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("20000000-0000-0000-0000-000000000009"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2100), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2100) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_finishes",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("20000000-0000-0000-0000-000000000010"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2107), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2107) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_finishes",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("20000000-0000-0000-0000-000000000011"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2113), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2113) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_finishes",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("20000000-0000-0000-0000-000000000012"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2120), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2120) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_finishes",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("20000000-0000-0000-0000-000000000013"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2126), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2126) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_finishes",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("20000000-0000-0000-0000-000000000014"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2132), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2133) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_finishes",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("20000000-0000-0000-0000-000000000015"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2139), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2139) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_modifiers",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("30000000-0000-0000-0000-000000000001"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2304), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2304) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_modifiers",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("30000000-0000-0000-0000-000000000002"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2463), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2463) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_modifiers",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("30000000-0000-0000-0000-000000000003"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2471), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2471) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_modifiers",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("30000000-0000-0000-0000-000000000004"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2477), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2478) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_modifiers",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("30000000-0000-0000-0000-000000000005"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2484), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2484) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_modifiers",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("30000000-0000-0000-0000-000000000006"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2490), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2491) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_modifiers",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("30000000-0000-0000-0000-000000000007"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2497), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2497) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_modifiers",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("30000000-0000-0000-0000-000000000008"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2503), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2503) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_modifiers",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("30000000-0000-0000-0000-000000000009"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2510), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2510) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_modifiers",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("30000000-0000-0000-0000-000000000010"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2516), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2516) });
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "material_modifiers",
|
||||
keyColumn: "id",
|
||||
keyValue: new Guid("30000000-0000-0000-0000-000000000011"),
|
||||
columns: new[] { "created_at", "updated_at" },
|
||||
values: new object[] { new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2522), new DateTime(2026, 4, 26, 13, 14, 18, 745, DateTimeKind.Utc).AddTicks(2523) });
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -104,77 +104,6 @@ namespace Extrudex.Infrastructure.Data.Migrations
|
||||
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 =>
|
||||
{
|
||||
b.Property<Guid>("Id")
|
||||
@@ -216,50 +145,50 @@ namespace Extrudex.Infrastructure.Data.Migrations
|
||||
new
|
||||
{
|
||||
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, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(6535),
|
||||
DensityGperCm3 = 1.24m,
|
||||
Name = "PLA",
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 291, DateTimeKind.Utc).AddTicks(9388)
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(6535)
|
||||
},
|
||||
new
|
||||
{
|
||||
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, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7016),
|
||||
DensityGperCm3 = 1.27m,
|
||||
Name = "PETG",
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 291, DateTimeKind.Utc).AddTicks(9871)
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7016)
|
||||
},
|
||||
new
|
||||
{
|
||||
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, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7027),
|
||||
DensityGperCm3 = 1.04m,
|
||||
Name = "ABS",
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 291, DateTimeKind.Utc).AddTicks(9881)
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7028)
|
||||
},
|
||||
new
|
||||
{
|
||||
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, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7034),
|
||||
DensityGperCm3 = 1.07m,
|
||||
Name = "ASA",
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 291, DateTimeKind.Utc).AddTicks(9888)
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7035)
|
||||
},
|
||||
new
|
||||
{
|
||||
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, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7042),
|
||||
DensityGperCm3 = 1.21m,
|
||||
Name = "TPU",
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 291, DateTimeKind.Utc).AddTicks(9895)
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7042)
|
||||
},
|
||||
new
|
||||
{
|
||||
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, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7049),
|
||||
DensityGperCm3 = 1.14m,
|
||||
Name = "Nylon",
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 291, DateTimeKind.Utc).AddTicks(9902)
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7049)
|
||||
});
|
||||
});
|
||||
|
||||
@@ -303,122 +232,122 @@ namespace Extrudex.Infrastructure.Data.Migrations
|
||||
new
|
||||
{
|
||||
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, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7291),
|
||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000001"),
|
||||
Name = "Basic",
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(90)
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7292)
|
||||
},
|
||||
new
|
||||
{
|
||||
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, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7453),
|
||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000001"),
|
||||
Name = "Matte",
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(251)
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7453)
|
||||
},
|
||||
new
|
||||
{
|
||||
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, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7461),
|
||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000001"),
|
||||
Name = "Silk",
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(259)
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7461)
|
||||
},
|
||||
new
|
||||
{
|
||||
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, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7468),
|
||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000001"),
|
||||
Name = "Glitter",
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(266)
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7468)
|
||||
},
|
||||
new
|
||||
{
|
||||
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, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7474),
|
||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000001"),
|
||||
Name = "Marble",
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(272)
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7474)
|
||||
},
|
||||
new
|
||||
{
|
||||
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, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7480),
|
||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000001"),
|
||||
Name = "Sparkle",
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(278)
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7481)
|
||||
},
|
||||
new
|
||||
{
|
||||
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, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7487),
|
||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000002"),
|
||||
Name = "Basic",
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(285)
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7487)
|
||||
},
|
||||
new
|
||||
{
|
||||
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, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7493),
|
||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000002"),
|
||||
Name = "Matte",
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(291)
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7493)
|
||||
},
|
||||
new
|
||||
{
|
||||
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, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7500),
|
||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000002"),
|
||||
Name = "Silk",
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(298)
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7500)
|
||||
},
|
||||
new
|
||||
{
|
||||
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, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7507),
|
||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000003"),
|
||||
Name = "Basic",
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(304)
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7507)
|
||||
},
|
||||
new
|
||||
{
|
||||
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, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7513),
|
||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000003"),
|
||||
Name = "Matte",
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(310)
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7513)
|
||||
},
|
||||
new
|
||||
{
|
||||
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, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7519),
|
||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000004"),
|
||||
Name = "Basic",
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(317)
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7520)
|
||||
},
|
||||
new
|
||||
{
|
||||
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, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7526),
|
||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000004"),
|
||||
Name = "Matte",
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(323)
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7526)
|
||||
},
|
||||
new
|
||||
{
|
||||
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, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7532),
|
||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000005"),
|
||||
Name = "Basic",
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(329)
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7532)
|
||||
},
|
||||
new
|
||||
{
|
||||
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, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7538),
|
||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000006"),
|
||||
Name = "Basic",
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(336)
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7539)
|
||||
});
|
||||
});
|
||||
|
||||
@@ -462,90 +391,90 @@ namespace Extrudex.Infrastructure.Data.Migrations
|
||||
new
|
||||
{
|
||||
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, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7690),
|
||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000001"),
|
||||
Name = "Carbon Fiber",
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(482)
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7690)
|
||||
},
|
||||
new
|
||||
{
|
||||
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, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7838),
|
||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000001"),
|
||||
Name = "Glass Fiber",
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(806)
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7838)
|
||||
},
|
||||
new
|
||||
{
|
||||
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, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7846),
|
||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000001"),
|
||||
Name = "Wood Fill",
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(815)
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7846)
|
||||
},
|
||||
new
|
||||
{
|
||||
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, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7853),
|
||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000001"),
|
||||
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, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7853)
|
||||
},
|
||||
new
|
||||
{
|
||||
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, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7859),
|
||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000002"),
|
||||
Name = "Carbon Fiber",
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(828)
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7859)
|
||||
},
|
||||
new
|
||||
{
|
||||
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, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7865),
|
||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000002"),
|
||||
Name = "Glass Fiber",
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(834)
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7866)
|
||||
},
|
||||
new
|
||||
{
|
||||
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, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7872),
|
||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000003"),
|
||||
Name = "Carbon Fiber",
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(840)
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7872)
|
||||
},
|
||||
new
|
||||
{
|
||||
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, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7878),
|
||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000003"),
|
||||
Name = "Glass Fiber",
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(847)
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7879)
|
||||
},
|
||||
new
|
||||
{
|
||||
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, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7885),
|
||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000004"),
|
||||
Name = "Carbon Fiber",
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(853)
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7885)
|
||||
},
|
||||
new
|
||||
{
|
||||
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, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7891),
|
||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000006"),
|
||||
Name = "Carbon Fiber",
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(860)
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7891)
|
||||
},
|
||||
new
|
||||
{
|
||||
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, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7898),
|
||||
MaterialBaseId = new Guid("10000000-0000-0000-0000-000000000006"),
|
||||
Name = "Glass Fiber",
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 34, 33, 292, DateTimeKind.Utc).AddTicks(866)
|
||||
UpdatedAt = new DateTime(2026, 4, 26, 18, 43, 28, 895, DateTimeKind.Utc).AddTicks(7898)
|
||||
});
|
||||
});
|
||||
|
||||
@@ -877,6 +806,81 @@ namespace Extrudex.Infrastructure.Data.Migrations
|
||||
b.ToTable("spools", (string)null);
|
||||
});
|
||||
|
||||
modelBuilder.Entity("Extrudex.Domain.Entities.UsageLog", b =>
|
||||
{
|
||||
b.Property<Guid>("Id")
|
||||
.HasColumnType("uuid")
|
||||
.HasColumnName("id");
|
||||
|
||||
b.Property<DateTime>("CreatedAt")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("timestamp with time zone")
|
||||
.HasColumnName("created_at")
|
||||
.HasDefaultValueSql("now() at time zone 'utc'");
|
||||
|
||||
b.Property<string>("DataSource")
|
||||
.IsRequired()
|
||||
.HasMaxLength(50)
|
||||
.HasColumnType("character varying(50)")
|
||||
.HasColumnName("data_source");
|
||||
|
||||
b.Property<decimal>("GramsUsed")
|
||||
.HasPrecision(10, 2)
|
||||
.HasColumnType("numeric(10,2)")
|
||||
.HasColumnName("grams_used");
|
||||
|
||||
b.Property<decimal?>("MmExtruded")
|
||||
.HasPrecision(12, 2)
|
||||
.HasColumnType("numeric(12,2)")
|
||||
.HasColumnName("mm_extruded");
|
||||
|
||||
b.Property<string>("Notes")
|
||||
.HasMaxLength(2000)
|
||||
.HasColumnType("character varying(2000)")
|
||||
.HasColumnName("notes");
|
||||
|
||||
b.Property<Guid?>("PrintJobId")
|
||||
.HasColumnType("uuid")
|
||||
.HasColumnName("print_job_id");
|
||||
|
||||
b.Property<Guid?>("PrinterId")
|
||||
.HasColumnType("uuid")
|
||||
.HasColumnName("printer_id");
|
||||
|
||||
b.Property<Guid>("SpoolId")
|
||||
.HasColumnType("uuid")
|
||||
.HasColumnName("spool_id");
|
||||
|
||||
b.Property<DateTime>("UpdatedAt")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("timestamp with time zone")
|
||||
.HasColumnName("updated_at")
|
||||
.HasDefaultValueSql("now() at time zone 'utc'");
|
||||
|
||||
b.Property<DateTime>("UsageTimestamp")
|
||||
.HasColumnType("timestamp with time zone")
|
||||
.HasColumnName("usage_timestamp");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.HasIndex("DataSource")
|
||||
.HasDatabaseName("ix_usage_logs_data_source");
|
||||
|
||||
b.HasIndex("PrintJobId")
|
||||
.HasDatabaseName("ix_usage_logs_print_job_id");
|
||||
|
||||
b.HasIndex("PrinterId")
|
||||
.HasDatabaseName("ix_usage_logs_printer_id");
|
||||
|
||||
b.HasIndex("SpoolId")
|
||||
.HasDatabaseName("ix_usage_logs_spool_id");
|
||||
|
||||
b.HasIndex("UsageTimestamp")
|
||||
.HasDatabaseName("ix_usage_logs_usage_timestamp");
|
||||
|
||||
b.ToTable("usage_logs", (string)null);
|
||||
});
|
||||
|
||||
modelBuilder.Entity("Extrudex.Domain.Entities.AmsSlot", b =>
|
||||
{
|
||||
b.HasOne("Extrudex.Domain.Entities.AmsUnit", "AmsUnit")
|
||||
@@ -909,36 +913,6 @@ namespace Extrudex.Infrastructure.Data.Migrations
|
||||
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 =>
|
||||
{
|
||||
b.HasOne("Extrudex.Domain.Entities.MaterialBase", "MaterialBase")
|
||||
@@ -1013,6 +987,34 @@ namespace Extrudex.Infrastructure.Data.Migrations
|
||||
b.Navigation("MaterialModifier");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("Extrudex.Domain.Entities.UsageLog", b =>
|
||||
{
|
||||
b.HasOne("Extrudex.Domain.Entities.PrintJob", "PrintJob")
|
||||
.WithMany()
|
||||
.HasForeignKey("PrintJobId")
|
||||
.OnDelete(DeleteBehavior.SetNull)
|
||||
.HasConstraintName("fk_usage_logs_print_job");
|
||||
|
||||
b.HasOne("Extrudex.Domain.Entities.Printer", "Printer")
|
||||
.WithMany()
|
||||
.HasForeignKey("PrinterId")
|
||||
.OnDelete(DeleteBehavior.SetNull)
|
||||
.HasConstraintName("fk_usage_logs_printer");
|
||||
|
||||
b.HasOne("Extrudex.Domain.Entities.Spool", "Spool")
|
||||
.WithMany()
|
||||
.HasForeignKey("SpoolId")
|
||||
.OnDelete(DeleteBehavior.Restrict)
|
||||
.IsRequired()
|
||||
.HasConstraintName("fk_usage_logs_spool");
|
||||
|
||||
b.Navigation("PrintJob");
|
||||
|
||||
b.Navigation("Printer");
|
||||
|
||||
b.Navigation("Spool");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("Extrudex.Domain.Entities.AmsUnit", b =>
|
||||
{
|
||||
b.Navigation("Slots");
|
||||
@@ -1037,17 +1039,10 @@ namespace Extrudex.Infrastructure.Data.Migrations
|
||||
b.Navigation("Spools");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("Extrudex.Domain.Entities.PrintJob", b =>
|
||||
{
|
||||
b.Navigation("FilamentUsages");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("Extrudex.Domain.Entities.Printer", b =>
|
||||
{
|
||||
b.Navigation("AmsUnits");
|
||||
|
||||
b.Navigation("FilamentUsages");
|
||||
|
||||
b.Navigation("PrintJobs");
|
||||
});
|
||||
|
||||
@@ -1055,8 +1050,6 @@ namespace Extrudex.Infrastructure.Data.Migrations
|
||||
{
|
||||
b.Navigation("AmsSlots");
|
||||
|
||||
b.Navigation("FilamentUsages");
|
||||
|
||||
b.Navigation("PrintJobs");
|
||||
});
|
||||
#pragma warning restore 612, 618
|
||||
|
||||
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);
|
||||
}
|
||||
}
|
||||
@@ -4,7 +4,7 @@ using Extrudex.Domain.DTOs.Moonraker;
|
||||
using Extrudex.Domain.Interfaces;
|
||||
using Microsoft.Extensions.Logging;
|
||||
|
||||
namespace Extrudex.Infrastructure.Configuration;
|
||||
namespace Extrudex.Infrastructure.Services;
|
||||
|
||||
/// <summary>
|
||||
/// HTTP client for communicating with Moonraker REST API endpoints
|
||||
|
||||
320
backend/Infrastructure/Services/MoonrakerPrinterSyncService.cs
Normal file
320
backend/Infrastructure/Services/MoonrakerPrinterSyncService.cs
Normal file
@@ -0,0 +1,320 @@
|
||||
using Extrudex.Domain.DTOs.Moonraker;
|
||||
using Extrudex.Domain.Entities;
|
||||
using Extrudex.Domain.Enums;
|
||||
using Extrudex.Domain.Interfaces;
|
||||
using Extrudex.Infrastructure.Configuration;
|
||||
using Extrudex.Infrastructure.Data;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.Extensions.Logging;
|
||||
|
||||
namespace Extrudex.Infrastructure.Services;
|
||||
|
||||
/// <summary>
|
||||
/// Service that syncs Moonraker printer status and print job history into the
|
||||
/// Extrudex database. Queries all active Moonraker printers, fetches their
|
||||
/// current operational state, and maps completed print jobs to PrintJob and
|
||||
/// FilamentUsage entities with derived gram calculations.
|
||||
/// </summary>
|
||||
public class MoonrakerPrinterSyncService : IMoonrakerPrinterSyncService
|
||||
{
|
||||
private readonly ExtrudexDbContext _dbContext;
|
||||
private readonly IMoonrakerClient _moonrakerClient;
|
||||
private readonly ILogger<MoonrakerPrinterSyncService> _logger;
|
||||
|
||||
/// <summary>
|
||||
/// Creates a new MoonrakerPrinterSyncService.
|
||||
/// </summary>
|
||||
/// <param name="dbContext">The EF Core database context for persisting updates.</param>
|
||||
/// <param name="moonrakerClient">The Moonraker HTTP client for fetching printer data.</param>
|
||||
/// <param name="logger">Logger for diagnostic output.</param>
|
||||
public MoonrakerPrinterSyncService(
|
||||
ExtrudexDbContext dbContext,
|
||||
IMoonrakerClient moonrakerClient,
|
||||
ILogger<MoonrakerPrinterSyncService> logger)
|
||||
{
|
||||
_dbContext = dbContext;
|
||||
_moonrakerClient = moonrakerClient;
|
||||
_logger = logger;
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
public async Task<int> SyncAllAsync(CancellationToken cancellationToken = default)
|
||||
{
|
||||
_logger.LogInformation("Starting Moonraker printer sync cycle");
|
||||
|
||||
var printers = await _dbContext.Printers
|
||||
.Where(p => p.IsActive && p.ConnectionType == ConnectionType.Moonraker)
|
||||
.Include(p => p.AmsUnits)
|
||||
.ThenInclude(u => u.Slots)
|
||||
.ThenInclude(s => s.Spool)
|
||||
.ThenInclude(s => s.MaterialBase)
|
||||
.Include(p => p.PrintJobs)
|
||||
.ToListAsync(cancellationToken);
|
||||
|
||||
if (printers.Count == 0)
|
||||
{
|
||||
_logger.LogInformation("No active Moonraker printers found — skipping sync");
|
||||
return 0;
|
||||
}
|
||||
|
||||
_logger.LogInformation("Found {PrinterCount} active Moonraker printer(s) to sync", printers.Count);
|
||||
|
||||
var syncedCount = 0;
|
||||
|
||||
foreach (var printer in printers)
|
||||
{
|
||||
try
|
||||
{
|
||||
await SyncPrinterAsync(printer, cancellationToken);
|
||||
syncedCount++;
|
||||
}
|
||||
catch (Exception ex) when (ex is not OperationCanceledException)
|
||||
{
|
||||
_logger.LogError(ex,
|
||||
"Error syncing printer {PrinterName} ({Host}:{Port})",
|
||||
printer.Name, printer.HostnameOrIp, printer.Port);
|
||||
|
||||
// Mark printer as offline if we can't reach it
|
||||
printer.Status = PrinterStatus.Offline;
|
||||
}
|
||||
}
|
||||
|
||||
await _dbContext.SaveChangesAsync(cancellationToken);
|
||||
|
||||
_logger.LogInformation(
|
||||
"Moonraker printer sync cycle complete — {SyncedCount}/{TotalCount} printers synced",
|
||||
syncedCount, printers.Count);
|
||||
|
||||
return syncedCount;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Syncs a single Moonraker printer: updates its status, fetches print history,
|
||||
/// and maps new print jobs to database entities.
|
||||
/// </summary>
|
||||
private async Task SyncPrinterAsync(Printer printer, CancellationToken cancellationToken)
|
||||
{
|
||||
// Step 1: Fetch printer status
|
||||
var printerInfo = await _moonrakerClient.GetPrinterInfoAsync(
|
||||
printer.HostnameOrIp, printer.Port, printer.ApiKey, cancellationToken);
|
||||
|
||||
var printStats = await _moonrakerClient.GetPrintStatsAsync(
|
||||
printer.HostnameOrIp, printer.Port, printer.ApiKey, cancellationToken);
|
||||
|
||||
// Step 2: Update printer status
|
||||
UpdatePrinterStatus(printer, printerInfo, printStats);
|
||||
printer.LastSeenAt = DateTime.UtcNow;
|
||||
|
||||
_logger.LogDebug(
|
||||
"Printer {PrinterName} status updated to {Status}",
|
||||
printer.Name, printer.Status);
|
||||
|
||||
// Step 3: Fetch and map print job history
|
||||
var history = await _moonrakerClient.GetPrintHistoryAsync(
|
||||
printer.HostnameOrIp, printer.Port, printer.ApiKey,
|
||||
limit: 25,
|
||||
cancellationToken);
|
||||
|
||||
if (history.Items.Count == 0)
|
||||
{
|
||||
_logger.LogDebug("No print history returned for printer {PrinterName}", printer.Name);
|
||||
return;
|
||||
}
|
||||
|
||||
var newJobsCount = await MapPrintJobsAsync(printer, history.Items, cancellationToken);
|
||||
|
||||
if (newJobsCount > 0)
|
||||
{
|
||||
_logger.LogInformation(
|
||||
"Mapped {NewJobsCount} new print job(s) from printer {PrinterName}",
|
||||
newJobsCount, printer.Name);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Updates the printer's operational status based on Moonraker telemetry.
|
||||
/// Maps Klipper/Moonraker state strings to the PrinterStatus enum.
|
||||
/// </summary>
|
||||
private void UpdatePrinterStatus(
|
||||
Printer printer,
|
||||
MoonrakerPrinterInfo? printerInfo,
|
||||
MoonrakerPrintStats? printStats)
|
||||
{
|
||||
// Prefer print_stats state — it's the most authoritative
|
||||
if (printStats != null)
|
||||
{
|
||||
printer.Status = printStats.State.ToLowerInvariant() switch
|
||||
{
|
||||
"printing" => PrinterStatus.Printing,
|
||||
"paused" => PrinterStatus.Paused,
|
||||
"complete" => PrinterStatus.Idle,
|
||||
"standby" => PrinterStatus.Idle,
|
||||
"cancelled" => PrinterStatus.Idle,
|
||||
"error" => PrinterStatus.Error,
|
||||
_ => PrinterStatus.Idle
|
||||
};
|
||||
return;
|
||||
}
|
||||
|
||||
// Fall back to printer_info state
|
||||
if (printerInfo != null)
|
||||
{
|
||||
printer.Status = printerInfo.State.ToLowerInvariant() switch
|
||||
{
|
||||
"ready" => PrinterStatus.Idle,
|
||||
"startup" => PrinterStatus.Idle,
|
||||
"shutdown" => PrinterStatus.Offline,
|
||||
"error" => PrinterStatus.Error,
|
||||
"cancelled" => PrinterStatus.Idle,
|
||||
_ => printer.Status // Preserve existing status if unknown
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Maps Moonraker print job history items to Extrudex PrintJob and FilamentUsage entities.
|
||||
/// Only creates records for jobs not already tracked (by Moonraker JobId stored in GcodeFilePath).
|
||||
/// </summary>
|
||||
private async Task<int> MapPrintJobsAsync(
|
||||
Printer printer,
|
||||
List<MoonrakerPrintJob> historyItems,
|
||||
CancellationToken cancellationToken)
|
||||
{
|
||||
// Build a set of already-tracked Moonraker JobIds for this printer
|
||||
// We store the Moonraker JobId in the GcodeFilePath field with a "moonraker:" prefix
|
||||
var trackedJobIds = await _dbContext.PrintJobs
|
||||
.Where(pj => pj.PrinterId == printer.Id && pj.GcodeFilePath != null && pj.GcodeFilePath.StartsWith("moonraker:"))
|
||||
.Select(pj => pj.GcodeFilePath!)
|
||||
.ToListAsync(cancellationToken);
|
||||
|
||||
var trackedIdSet = new HashSet<string>(trackedJobIds);
|
||||
var newJobsCount = 0;
|
||||
|
||||
// Find the default spool for this printer (first active spool in AMS, or first active spool overall)
|
||||
var defaultSpool = FindDefaultSpool(printer);
|
||||
|
||||
foreach (var moonrakerJob in historyItems)
|
||||
{
|
||||
var jobIdKey = $"moonraker:{moonrakerJob.JobId}";
|
||||
|
||||
if (trackedIdSet.Contains(jobIdKey))
|
||||
{
|
||||
continue; // Already tracked — skip
|
||||
}
|
||||
|
||||
// Only map completed, cancelled, or errored jobs (not in_progress)
|
||||
// In-progress jobs will be captured on the next cycle once they finish
|
||||
if (moonrakerJob.Status == "in_progress")
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
// Map Moonraker job status to JobStatus enum
|
||||
var jobStatus = moonrakerJob.Status.ToLowerInvariant() switch
|
||||
{
|
||||
"completed" => JobStatus.Completed,
|
||||
"cancelled" => JobStatus.Cancelled,
|
||||
"error" => JobStatus.Failed,
|
||||
_ => JobStatus.Completed
|
||||
};
|
||||
|
||||
// Calculate derived grams if we have a spool and filament data
|
||||
decimal gramsDerived = 0m;
|
||||
decimal filamentDiameterMm = 1.75m;
|
||||
decimal materialDensity = 1.24m; // PLA default
|
||||
|
||||
if (defaultSpool != null)
|
||||
{
|
||||
filamentDiameterMm = defaultSpool.FilamentDiameterMm;
|
||||
materialDensity = defaultSpool.MaterialBase.DensityGperCm3;
|
||||
gramsDerived = CalculateGrams(moonrakerJob.FilamentUsedMm, filamentDiameterMm, materialDensity);
|
||||
}
|
||||
else if (moonrakerJob.FilamentUsedMm > 0)
|
||||
{
|
||||
gramsDerived = CalculateGrams(moonrakerJob.FilamentUsedMm, 1.75m, 1.24m);
|
||||
_logger.LogWarning(
|
||||
"No default spool found for printer {PrinterName} — using PLA defaults for grams derivation on job {JobId}",
|
||||
printer.Name, moonrakerJob.JobId);
|
||||
}
|
||||
|
||||
var printJob = new PrintJob
|
||||
{
|
||||
PrinterId = printer.Id,
|
||||
SpoolId = defaultSpool?.Id ?? Guid.Empty,
|
||||
PrintName = moonrakerJob.Filename,
|
||||
GcodeFilePath = jobIdKey,
|
||||
MmExtruded = moonrakerJob.FilamentUsedMm,
|
||||
GramsDerived = gramsDerived,
|
||||
StartedAt = moonrakerJob.StartTime,
|
||||
CompletedAt = moonrakerJob.EndTime,
|
||||
Status = jobStatus,
|
||||
DataSource = DataSource.Moonraker,
|
||||
FilamentDiameterAtPrintMm = filamentDiameterMm,
|
||||
MaterialDensityAtPrint = materialDensity,
|
||||
Notes = $"Auto-imported from Moonraker (JobId: {moonrakerJob.JobId})"
|
||||
};
|
||||
|
||||
_dbContext.PrintJobs.Add(printJob);
|
||||
|
||||
// Create a FilamentUsage record if filament was consumed
|
||||
if (moonrakerJob.FilamentUsedMm > 0 && defaultSpool != null)
|
||||
{
|
||||
var usage = new FilamentUsage
|
||||
{
|
||||
PrintJob = printJob,
|
||||
SpoolId = defaultSpool.Id,
|
||||
PrinterId = printer.Id,
|
||||
GramsUsed = gramsDerived,
|
||||
MmExtruded = moonrakerJob.FilamentUsedMm,
|
||||
RecordedAt = DateTime.UtcNow,
|
||||
Notes = $"Auto-imported from Moonraker history (JobId: {moonrakerJob.JobId})"
|
||||
};
|
||||
|
||||
_dbContext.FilamentUsages.Add(usage);
|
||||
}
|
||||
|
||||
newJobsCount++;
|
||||
trackedIdSet.Add(jobIdKey); // Prevent duplicates within this batch
|
||||
}
|
||||
|
||||
return newJobsCount;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Finds the default spool for a printer. Returns the first spool loaded
|
||||
/// in an AMS slot, or null if no spool is available.
|
||||
/// </summary>
|
||||
private static Spool? FindDefaultSpool(Printer printer)
|
||||
{
|
||||
// Prefer the first active spool in an AMS slot
|
||||
foreach (var amsUnit in printer.AmsUnits)
|
||||
{
|
||||
foreach (var slot in amsUnit.Slots)
|
||||
{
|
||||
if (slot.Spool != null && slot.Spool.IsActive && !slot.Spool.IsArchived)
|
||||
{
|
||||
return slot.Spool;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Calculates derived grams from millimeters extruded using the standard formula:
|
||||
/// grams = mm_extruded × cross_section_area × material_density
|
||||
/// where cross_section_area = π × (diameter / 2)²
|
||||
/// </summary>
|
||||
private static decimal CalculateGrams(decimal mmExtruded, decimal diameterMm, decimal densityGperCm3)
|
||||
{
|
||||
if (mmExtruded <= 0) return 0m;
|
||||
|
||||
var radiusCm = (double)diameterMm / 2.0 / 10.0; // mm to cm
|
||||
var crossSectionAreaCm2 = Math.PI * radiusCm * radiusCm;
|
||||
var mmToCm = (double)mmExtruded / 10.0;
|
||||
|
||||
var grams = mmToCm * crossSectionAreaCm2 * (double)densityGperCm3;
|
||||
return (decimal)grams;
|
||||
}
|
||||
}
|
||||
81
backend/Infrastructure/Services/UsageLogService.cs
Normal file
81
backend/Infrastructure/Services/UsageLogService.cs
Normal file
@@ -0,0 +1,81 @@
|
||||
using Extrudex.Domain.Entities;
|
||||
using Extrudex.Domain.Enums;
|
||||
using Extrudex.Domain.Interfaces;
|
||||
using Extrudex.Infrastructure.Data;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
|
||||
namespace Extrudex.Infrastructure.Services;
|
||||
|
||||
/// <summary>
|
||||
/// Implementation of <see cref="IUsageLogService"/> that persists usage entries
|
||||
/// to the usage_logs table via EF Core.
|
||||
/// </summary>
|
||||
public class UsageLogService : IUsageLogService
|
||||
{
|
||||
private readonly ExtrudexDbContext _dbContext;
|
||||
|
||||
/// <summary>
|
||||
/// Initializes a new instance of the <see cref="UsageLogService"/> class.
|
||||
/// </summary>
|
||||
/// <param name="dbContext">The EF Core database context for data persistence.</param>
|
||||
public UsageLogService(ExtrudexDbContext dbContext)
|
||||
{
|
||||
_dbContext = dbContext;
|
||||
}
|
||||
|
||||
/// <inheritdoc/>
|
||||
public async Task<UsageLog> RecordUsageAsync(
|
||||
Guid spoolId,
|
||||
decimal gramsUsed,
|
||||
DataSource dataSource,
|
||||
Guid? printerId = null,
|
||||
Guid? printJobId = null,
|
||||
decimal? mmExtruded = null,
|
||||
DateTime? usageTimestamp = null,
|
||||
string? notes = null)
|
||||
{
|
||||
var entry = new UsageLog
|
||||
{
|
||||
SpoolId = spoolId,
|
||||
GramsUsed = gramsUsed,
|
||||
DataSource = dataSource,
|
||||
PrinterId = printerId,
|
||||
PrintJobId = printJobId,
|
||||
MmExtruded = mmExtruded,
|
||||
UsageTimestamp = usageTimestamp ?? DateTime.UtcNow,
|
||||
Notes = notes
|
||||
};
|
||||
|
||||
_dbContext.UsageLogs.Add(entry);
|
||||
await _dbContext.SaveChangesAsync();
|
||||
|
||||
return entry;
|
||||
}
|
||||
|
||||
/// <inheritdoc/>
|
||||
public async Task<IEnumerable<UsageLog>> GetBySpoolAsync(Guid spoolId, CancellationToken cancellationToken = default)
|
||||
{
|
||||
return await _dbContext.UsageLogs
|
||||
.Where(u => u.SpoolId == spoolId)
|
||||
.OrderByDescending(u => u.UsageTimestamp)
|
||||
.ToListAsync(cancellationToken);
|
||||
}
|
||||
|
||||
/// <inheritdoc/>
|
||||
public async Task<IEnumerable<UsageLog>> GetByPrinterAsync(Guid printerId, CancellationToken cancellationToken = default)
|
||||
{
|
||||
return await _dbContext.UsageLogs
|
||||
.Where(u => u.PrinterId == printerId)
|
||||
.OrderByDescending(u => u.UsageTimestamp)
|
||||
.ToListAsync(cancellationToken);
|
||||
}
|
||||
|
||||
/// <inheritdoc/>
|
||||
public async Task<IEnumerable<UsageLog>> GetByPrintJobAsync(Guid printJobId, CancellationToken cancellationToken = default)
|
||||
{
|
||||
return await _dbContext.UsageLogs
|
||||
.Where(u => u.PrintJobId == printJobId)
|
||||
.OrderByDescending(u => u.UsageTimestamp)
|
||||
.ToListAsync(cancellationToken);
|
||||
}
|
||||
}
|
||||
@@ -55,6 +55,12 @@ builder.Services.AddSingleton<IQrCodeService, QrCodeService>();
|
||||
// ── Cost Per Print Calculation ─────────────────────────────
|
||||
builder.Services.AddScoped<ICostPerPrintService, CostPerPrintService>();
|
||||
|
||||
// ── Low Stock Detection ────────────────────────────────────
|
||||
builder.Services.AddSingleton<ILowStockDetector, LowStockDetector>();
|
||||
|
||||
// ── Usage Logging ───────────────────────────────────────────
|
||||
builder.Services.AddScoped<IUsageLogService, UsageLogService>();
|
||||
|
||||
// ── FluentValidation ──────────────────────────────────────
|
||||
// Registers all validators from the API assembly into DI.
|
||||
builder.Services.AddValidatorsFromAssembly(Assembly.GetExecutingAssembly());
|
||||
@@ -92,6 +98,12 @@ builder.Services.AddHttpClient<IMoonrakerClient, MoonrakerClient>(client =>
|
||||
builder.Services.AddScoped<IFilamentUsageSyncService, FilamentUsageSyncService>();
|
||||
builder.Services.AddHostedService<FilamentUsageSyncJob>();
|
||||
|
||||
// ── Moonraker Printer Sync (Background Service) ──────────
|
||||
builder.Services.Configure<MoonrakerPrinterSyncOptions>(
|
||||
builder.Configuration.GetSection(MoonrakerPrinterSyncOptions.SectionName));
|
||||
builder.Services.AddScoped<IMoonrakerPrinterSyncService, MoonrakerPrinterSyncService>();
|
||||
builder.Services.AddHostedService<MoonrakerPrinterSyncJob>();
|
||||
|
||||
// ── Health Checks ───────────────────────────────────────────
|
||||
builder.Services.AddHealthChecks()
|
||||
.AddNpgSql(connectionString);
|
||||
|
||||
@@ -14,5 +14,14 @@
|
||||
"PollingInterval": "00:05:00",
|
||||
"RequestTimeout": "00:00:30",
|
||||
"Enabled": true
|
||||
},
|
||||
"MoonrakerPrinterSync": {
|
||||
"PollingInterval": "00:01:00",
|
||||
"RequestTimeout": "00:00:15",
|
||||
"Enabled": true,
|
||||
"HistoryBatchSize": 25
|
||||
},
|
||||
"FilamentAlerts": {
|
||||
"LowStockThresholdPercent": 20
|
||||
}
|
||||
}
|
||||
@@ -1,11 +1,13 @@
|
||||
import { ApplicationConfig, provideBrowserGlobalErrorListeners } from '@angular/core';
|
||||
import { provideRouter } from '@angular/router';
|
||||
import { provideHttpClient } from '@angular/common/http';
|
||||
|
||||
import { routes } from './app.routes';
|
||||
|
||||
export const appConfig: ApplicationConfig = {
|
||||
providers: [
|
||||
provideBrowserGlobalErrorListeners(),
|
||||
provideRouter(routes)
|
||||
provideRouter(routes),
|
||||
provideHttpClient(),
|
||||
]
|
||||
};
|
||||
|
||||
@@ -5,6 +5,9 @@
|
||||
<!-- Status Summary Bar — fleet-wide health at a glance -->
|
||||
<app-dashboard-summary></app-dashboard-summary>
|
||||
|
||||
<!-- Inventory Summary — filament metrics at a glance -->
|
||||
<app-inventory-summary></app-inventory-summary>
|
||||
|
||||
<!-- Filament Inventory — routed view -->
|
||||
<router-outlet />
|
||||
</main>
|
||||
@@ -1,11 +1,12 @@
|
||||
import { Component, ViewChild } from '@angular/core';
|
||||
import { RouterOutlet } from '@angular/router';
|
||||
import { DashboardSummaryComponent } from './components/dashboard-summary/dashboard-summary.component';
|
||||
import { InventorySummaryComponent } from './components/inventory-summary/inventory-summary.component';
|
||||
import { AgentSummary, SystemHealth } from './models/agent.model';
|
||||
|
||||
@Component({
|
||||
selector: 'app-root',
|
||||
imports: [RouterOutlet, DashboardSummaryComponent],
|
||||
imports: [RouterOutlet, DashboardSummaryComponent, InventorySummaryComponent],
|
||||
templateUrl: './app.html',
|
||||
styleUrl: './app.scss'
|
||||
})
|
||||
|
||||
@@ -83,6 +83,35 @@
|
||||
</td>
|
||||
</ng-container>
|
||||
|
||||
<!-- Cost Column -->
|
||||
<ng-container matColumnDef="cost">
|
||||
<th mat-header-cell *matHeaderCellDef mat-sort-header="cost">Cost</th>
|
||||
<td mat-cell *matCellDef="let filament">
|
||||
<div class="cost-cell">
|
||||
@if (filament.purchasePrice !== null) {
|
||||
<span class="cost-price">{{ formatCurrency(filament.purchasePrice) }}</span>
|
||||
@let cpg = getCostPerGram(filament);
|
||||
@if (cpg !== null) {
|
||||
<span class="cost-per-gram">${{ cpg.toFixed(2) }}/g</span>
|
||||
}
|
||||
} @else {
|
||||
<span class="cost-unknown">—</span>
|
||||
}
|
||||
</div>
|
||||
</td>
|
||||
</ng-container>
|
||||
|
||||
<!-- Usage Column -->
|
||||
<ng-container matColumnDef="usage">
|
||||
<th mat-header-cell *matHeaderCellDef mat-sort-header="usage">Usage</th>
|
||||
<td mat-cell *matCellDef="let filament">
|
||||
<div class="usage-cell">
|
||||
<span class="usage-grams">{{ formatWeight(getGramsUsed(filament)) }} used</span>
|
||||
<span class="usage-remaining">{{ formatWeight(filament.weightRemainingGrams) }} left</span>
|
||||
</div>
|
||||
</td>
|
||||
</ng-container>
|
||||
|
||||
<!-- Stock Level Indicator Column -->
|
||||
<ng-container matColumnDef="stockLevel">
|
||||
<th mat-header-cell *matHeaderCellDef mat-sort-header="stockLevel">Stock</th>
|
||||
|
||||
@@ -55,7 +55,7 @@ $color-inactive: #94a3b8; // Gray — inactive spool
|
||||
// Table styling
|
||||
.filament-table {
|
||||
width: 100%;
|
||||
min-width: 700px;
|
||||
min-width: 900px;
|
||||
|
||||
th {
|
||||
font-weight: 600;
|
||||
@@ -132,6 +132,48 @@ $color-inactive: #94a3b8; // Gray — inactive spool
|
||||
letter-spacing: 0.02em;
|
||||
}
|
||||
|
||||
// Cost cell
|
||||
.cost-cell {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 2px;
|
||||
min-width: 80px;
|
||||
|
||||
.cost-price {
|
||||
font-weight: 600;
|
||||
color: var(--mat-sys-on-surface);
|
||||
}
|
||||
|
||||
.cost-per-gram {
|
||||
font-size: 11px;
|
||||
color: var(--mat-sys-on-surface-variant);
|
||||
letter-spacing: 0.02em;
|
||||
}
|
||||
|
||||
.cost-unknown {
|
||||
color: var(--mat-sys-on-surface-variant);
|
||||
font-style: italic;
|
||||
}
|
||||
}
|
||||
|
||||
// Usage cell
|
||||
.usage-cell {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 2px;
|
||||
min-width: 100px;
|
||||
|
||||
.usage-grams {
|
||||
font-weight: 500;
|
||||
color: var(--mat-sys-on-surface);
|
||||
}
|
||||
|
||||
.usage-remaining {
|
||||
font-size: 12px;
|
||||
color: var(--mat-sys-on-surface-variant);
|
||||
}
|
||||
}
|
||||
|
||||
// Remaining weight cell
|
||||
.remaining-cell {
|
||||
display: flex;
|
||||
|
||||
@@ -2,9 +2,12 @@ import {
|
||||
ChangeDetectionStrategy,
|
||||
Component,
|
||||
Input,
|
||||
OnInit,
|
||||
computed,
|
||||
inject,
|
||||
signal,
|
||||
} from '@angular/core';
|
||||
import { FilamentService } from '../../services/filament.service';
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { MatTableModule } from '@angular/material/table';
|
||||
import { MatChipsModule } from '@angular/material/chips';
|
||||
@@ -27,6 +30,8 @@ export type FilamentColumn =
|
||||
| 'brand'
|
||||
| 'serial'
|
||||
| 'remaining'
|
||||
| 'cost'
|
||||
| 'usage'
|
||||
| 'stockLevel'
|
||||
| 'status';
|
||||
|
||||
@@ -47,9 +52,11 @@ export type FilamentColumn =
|
||||
styleUrl: './filament-table.component.scss',
|
||||
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||
})
|
||||
export class FilamentTableComponent {
|
||||
/** Filament data input — reactive signal for live updates */
|
||||
readonly filaments = signal<Filament[]>([]);
|
||||
export class FilamentTableComponent implements OnInit {
|
||||
private readonly filamentService = inject(FilamentService);
|
||||
|
||||
/** Filament data — reactive signal driven by FilamentService */
|
||||
readonly filaments = this.filamentService.filaments;
|
||||
|
||||
/** Columns to display — defaults to all columns */
|
||||
@Input()
|
||||
@@ -65,6 +72,8 @@ export class FilamentTableComponent {
|
||||
'brand',
|
||||
'serial',
|
||||
'remaining',
|
||||
'cost',
|
||||
'usage',
|
||||
'stockLevel',
|
||||
'status',
|
||||
]);
|
||||
@@ -102,129 +111,14 @@ export class FilamentTableComponent {
|
||||
this.filaments().filter((f) => classifyStockLevel(f) === 'critical').length
|
||||
);
|
||||
|
||||
constructor() {
|
||||
// Initialize sorted data from filaments
|
||||
// (MatSort handles sorting via sortChange; we start unsorted)
|
||||
|
||||
// Development: seed with sample data for visual testing
|
||||
// TODO: Replace with service data from FilamentService / SignalR
|
||||
this.updateFilaments([
|
||||
{
|
||||
id: '1',
|
||||
materialBaseId: 'm1',
|
||||
materialBaseName: 'PLA',
|
||||
materialFinishId: 'f1',
|
||||
materialFinishName: 'Basic',
|
||||
materialModifierId: null,
|
||||
materialModifierName: null,
|
||||
brand: 'Bambu Lab',
|
||||
colorName: 'White',
|
||||
colorHex: '#F5F5F5',
|
||||
weightTotalGrams: 1000,
|
||||
weightRemainingGrams: 850,
|
||||
filamentDiameterMm: 1.75,
|
||||
spoolSerial: 'SN-001',
|
||||
purchasePrice: 25.00,
|
||||
purchaseDate: '2026-01-15T00:00:00Z',
|
||||
isActive: true,
|
||||
createdAt: '2026-01-15T00:00:00Z',
|
||||
updatedAt: '2026-04-20T00:00:00Z',
|
||||
qrCodeUrl: '',
|
||||
},
|
||||
{
|
||||
id: '2',
|
||||
materialBaseId: 'm2',
|
||||
materialBaseName: 'PETG',
|
||||
materialFinishId: 'f2',
|
||||
materialFinishName: 'Matte',
|
||||
materialModifierId: 'mod1',
|
||||
materialModifierName: 'Carbon Fiber',
|
||||
brand: 'Polymaker',
|
||||
colorName: 'Fire Engine Red',
|
||||
colorHex: '#FF0000',
|
||||
weightTotalGrams: 1000,
|
||||
weightRemainingGrams: 80,
|
||||
filamentDiameterMm: 1.75,
|
||||
spoolSerial: 'SN-002',
|
||||
purchasePrice: 35.00,
|
||||
purchaseDate: '2026-02-01T00:00:00Z',
|
||||
isActive: true,
|
||||
createdAt: '2026-02-01T00:00:00Z',
|
||||
updatedAt: '2026-04-25T00:00:00Z',
|
||||
qrCodeUrl: '',
|
||||
},
|
||||
{
|
||||
id: '3',
|
||||
materialBaseId: 'm1',
|
||||
materialBaseName: 'PLA',
|
||||
materialFinishId: 'f1',
|
||||
materialFinishName: 'Basic',
|
||||
materialModifierId: null,
|
||||
materialModifierName: null,
|
||||
brand: 'eSun',
|
||||
colorName: 'Sky Blue',
|
||||
colorHex: '#87CEEB',
|
||||
weightTotalGrams: 1000,
|
||||
weightRemainingGrams: 200,
|
||||
filamentDiameterMm: 1.75,
|
||||
spoolSerial: 'SN-003',
|
||||
purchasePrice: 20.00,
|
||||
purchaseDate: '2026-03-10T00:00:00Z',
|
||||
isActive: true,
|
||||
createdAt: '2026-03-10T00:00:00Z',
|
||||
updatedAt: '2026-04-26T00:00:00Z',
|
||||
qrCodeUrl: '',
|
||||
},
|
||||
{
|
||||
id: '4',
|
||||
materialBaseId: 'm3',
|
||||
materialBaseName: 'ABS',
|
||||
materialFinishId: 'f1',
|
||||
materialFinishName: 'Basic',
|
||||
materialModifierId: null,
|
||||
materialModifierName: null,
|
||||
brand: 'Hatchbox',
|
||||
colorName: 'Black',
|
||||
colorHex: '#1A1A1A',
|
||||
weightTotalGrams: 1000,
|
||||
weightRemainingGrams: 450,
|
||||
filamentDiameterMm: 1.75,
|
||||
spoolSerial: 'SN-004',
|
||||
purchasePrice: 22.00,
|
||||
purchaseDate: null,
|
||||
isActive: true,
|
||||
createdAt: '2026-01-20T00:00:00Z',
|
||||
updatedAt: '2026-04-18T00:00:00Z',
|
||||
qrCodeUrl: '',
|
||||
},
|
||||
{
|
||||
id: '5',
|
||||
materialBaseId: 'm1',
|
||||
materialBaseName: 'PLA',
|
||||
materialFinishId: 'f3',
|
||||
materialFinishName: 'Silk',
|
||||
materialModifierId: null,
|
||||
materialModifierName: null,
|
||||
brand: 'Overturn',
|
||||
colorName: 'Gold',
|
||||
colorHex: '#FFD700',
|
||||
weightTotalGrams: 500,
|
||||
weightRemainingGrams: 15,
|
||||
filamentDiameterMm: 1.75,
|
||||
spoolSerial: 'SN-005',
|
||||
purchasePrice: 28.00,
|
||||
purchaseDate: null,
|
||||
isActive: false,
|
||||
createdAt: '2025-12-01T00:00:00Z',
|
||||
updatedAt: '2026-04-01T00:00:00Z',
|
||||
qrCodeUrl: '',
|
||||
},
|
||||
]);
|
||||
ngOnInit(): void {
|
||||
// Initialize sorted data from FilamentService
|
||||
this.sortedFilaments.set([...this.filaments()]);
|
||||
}
|
||||
|
||||
/** Update filament data — called by parent or service */
|
||||
/** Update filament data — called externally or from a SignalR handler */
|
||||
updateFilaments(data: Filament[]): void {
|
||||
this.filaments.set(data);
|
||||
this.filamentService.setFilaments(data);
|
||||
this.sortedFilaments.set([...data]);
|
||||
}
|
||||
|
||||
@@ -253,6 +147,18 @@ export class FilamentTableComponent {
|
||||
getRemainingPercent(b),
|
||||
isAsc
|
||||
);
|
||||
case 'cost':
|
||||
return compare(
|
||||
a.purchasePrice ?? 0,
|
||||
b.purchasePrice ?? 0,
|
||||
isAsc
|
||||
);
|
||||
case 'usage':
|
||||
return compare(
|
||||
a.weightTotalGrams - a.weightRemainingGrams,
|
||||
b.weightTotalGrams - b.weightRemainingGrams,
|
||||
isAsc
|
||||
);
|
||||
case 'stockLevel':
|
||||
return compare(
|
||||
stockLevelOrder(classifyStockLevel(a)),
|
||||
@@ -353,6 +259,29 @@ export class FilamentTableComponent {
|
||||
}
|
||||
return `${Math.round(grams)}g`;
|
||||
}
|
||||
|
||||
/** Template helper: format currency */
|
||||
formatCurrency(value: number): string {
|
||||
return new Intl.NumberFormat('en-US', {
|
||||
style: 'currency',
|
||||
currency: 'USD',
|
||||
minimumFractionDigits: 2,
|
||||
maximumFractionDigits: 2,
|
||||
}).format(value);
|
||||
}
|
||||
|
||||
/** Template helper: compute cost per gram for a filament */
|
||||
getCostPerGram(filament: Filament): number | null {
|
||||
if (filament.purchasePrice === null || filament.purchasePrice === 0 || filament.weightTotalGrams <= 0) {
|
||||
return null;
|
||||
}
|
||||
return filament.purchasePrice / filament.weightTotalGrams;
|
||||
}
|
||||
|
||||
/** Template helper: compute grams used for a filament */
|
||||
getGramsUsed(filament: Filament): number {
|
||||
return filament.weightTotalGrams - filament.weightRemainingGrams;
|
||||
}
|
||||
}
|
||||
|
||||
/** Compare helper for sorting */
|
||||
|
||||
@@ -0,0 +1,145 @@
|
||||
<!-- Inventory Dashboard Summary — filament metrics at a glance -->
|
||||
<section class="inventory-summary" role="region" aria-label="Inventory summary">
|
||||
|
||||
<!-- Loading State -->
|
||||
@if (loading()) {
|
||||
<div class="summary-loading" role="status" aria-live="polite">
|
||||
<mat-icon aria-hidden="true" class="spin">sync</mat-icon>
|
||||
<span>Loading inventory...</span>
|
||||
</div>
|
||||
}
|
||||
|
||||
<!-- Error State -->
|
||||
@else if (error()) {
|
||||
<div class="summary-error" role="alert" aria-live="assertive">
|
||||
<mat-icon aria-hidden="true">error_outline</mat-icon>
|
||||
<span>{{ error() }}</span>
|
||||
<button class="retry-btn" (click)="refresh()" aria-label="Retry loading inventory">
|
||||
<mat-icon aria-hidden="true">refresh</mat-icon>
|
||||
Retry
|
||||
</button>
|
||||
</div>
|
||||
}
|
||||
|
||||
<!-- Loaded State -->
|
||||
@else {
|
||||
<!-- Health Status Indicator -->
|
||||
<div class="summary-item health-status"
|
||||
[class]="healthClass()"
|
||||
[matTooltip]="healthLabel()"
|
||||
matTooltipPosition="below">
|
||||
<mat-icon aria-hidden="true">
|
||||
@switch (healthClass()) {
|
||||
@case ('critical') { error }
|
||||
@case ('low') { warning }
|
||||
@default { check_circle }
|
||||
}
|
||||
</mat-icon>
|
||||
<span class="health-text">{{ healthLabel() }}</span>
|
||||
</div>
|
||||
|
||||
<!-- Total Spool Count -->
|
||||
<div class="summary-item metric-card"
|
||||
matTooltip="Total filament spools in inventory"
|
||||
matTooltipPosition="below">
|
||||
<mat-icon aria-hidden="true" class="metric-icon">inventory_2</mat-icon>
|
||||
<div class="metric-content">
|
||||
<span class="metric-value">{{ totalCount() }}</span>
|
||||
<span class="metric-label">Total Spools</span>
|
||||
</div>
|
||||
@if (activeCount() < totalCount()) {
|
||||
<span class="metric-detail">{{ activeCount() }} active</span>
|
||||
}
|
||||
</div>
|
||||
|
||||
<!-- Low Stock Count -->
|
||||
<div class="summary-item metric-card"
|
||||
[class.has-alert]="hasLowStock()"
|
||||
[class.has-critical]="hasCritical()"
|
||||
[matTooltip]="hasCritical()
|
||||
? criticalCount() + ' critical, ' + (lowStockCount() - criticalCount()) + ' low'
|
||||
: hasLowStock()
|
||||
? lowStockCount() + ' spools at or below 25% remaining'
|
||||
: 'All spools above 25% remaining'"
|
||||
matTooltipPosition="below">
|
||||
<mat-icon aria-hidden="true" class="metric-icon">
|
||||
@if (hasCritical()) { error }
|
||||
@else if (hasLowStock()) { warning }
|
||||
@else { check_circle }
|
||||
</mat-icon>
|
||||
<div class="metric-content">
|
||||
<span class="metric-value">{{ lowStockCount() }}</span>
|
||||
<span class="metric-label">Low Stock</span>
|
||||
</div>
|
||||
@if (hasCritical()) {
|
||||
<span class="metric-detail critical-detail">{{ criticalCount() }} critical</span>
|
||||
}
|
||||
</div>
|
||||
|
||||
<!-- Estimated Total Value -->
|
||||
<div class="summary-item metric-card"
|
||||
matTooltip="Estimated total value of active spools"
|
||||
matTooltipPosition="below">
|
||||
<mat-icon aria-hidden="true" class="metric-icon">payments</mat-icon>
|
||||
<div class="metric-content">
|
||||
<span class="metric-value">{{ formatCurrency(totalValue()) }}</span>
|
||||
<span class="metric-label">Est. Value</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Average Cost per Gram -->
|
||||
@if (avgCostPerGram() !== null) {
|
||||
<div class="summary-item metric-card"
|
||||
matTooltip="Average cost per gram across priced, active spools"
|
||||
matTooltipPosition="below">
|
||||
<mat-icon aria-hidden="true" class="metric-icon">scale</mat-icon>
|
||||
<div class="metric-content">
|
||||
<span class="metric-value">${{ avgCostPerGram()!.toFixed(2) }}/g</span>
|
||||
<span class="metric-label">Avg Cost/g</span>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
|
||||
<!-- Total Usage -->
|
||||
<div class="summary-item metric-card"
|
||||
matTooltip="Total filament used across all spools"
|
||||
matTooltipPosition="below">
|
||||
<mat-icon aria-hidden="true" class="metric-icon">trending_down</mat-icon>
|
||||
<div class="metric-content">
|
||||
<span class="metric-value">{{ formatWeight(totalGramsUsed()) }}</span>
|
||||
<span class="metric-label">Total Used</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Estimated Used Value -->
|
||||
@if (estimatedUsedValue() !== null) {
|
||||
<div class="summary-item metric-card"
|
||||
matTooltip="Estimated value of filament consumed"
|
||||
matTooltipPosition="below">
|
||||
<mat-icon aria-hidden="true" class="metric-icon">receipt_long</mat-icon>
|
||||
<div class="metric-content">
|
||||
<span class="metric-value">{{ formatCurrency(estimatedUsedValue()!) }}</span>
|
||||
<span class="metric-label">Used Value</span>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
|
||||
<!-- Overall Remaining Stock Bar -->
|
||||
<div class="summary-item metric-card stock-bar-card"
|
||||
matTooltip="{{ formatWeight(totalRemainingGrams()) }} of {{ formatWeight(totalCapacityGrams()) }} remaining"
|
||||
matTooltipPosition="below">
|
||||
<mat-icon aria-hidden="true" class="metric-icon">line_weight</mat-icon>
|
||||
<div class="metric-content stock-bar-content">
|
||||
<div class="stock-bar-header">
|
||||
<span class="metric-value">{{ overallRemainingPercent() }}%</span>
|
||||
<span class="metric-label">Remaining</span>
|
||||
</div>
|
||||
<mat-progress-bar
|
||||
mode="determinate"
|
||||
[value]="overallRemainingPercent()"
|
||||
[ngClass]="healthClass()">
|
||||
</mat-progress-bar>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
</section>
|
||||
@@ -0,0 +1,257 @@
|
||||
/**
|
||||
* Inventory Summary Component Styles
|
||||
* Touch-optimized for kiosk (Raspberry Pi 5) and mobile PWA
|
||||
* Matches the existing dark theme from app.scss
|
||||
*/
|
||||
|
||||
// Touch-optimized sizing
|
||||
$touch-target-min: 48px;
|
||||
$kiosk-font-primary: 24px;
|
||||
$mobile-font-primary: 18px;
|
||||
$spacing-unit: 8px;
|
||||
|
||||
// Status colors — high contrast for workshop/bright environments
|
||||
$color-healthy: #4ade70; // Green
|
||||
$color-low: #fbbf24; // Amber/Yellow
|
||||
$color-critical: #f87171; // Red
|
||||
$color-bg: #1a1a2e; // Matches app.scss
|
||||
$color-text: #e0e0e0;
|
||||
$color-text-muted: rgba(255, 255, 255, 0.7);
|
||||
$color-card-bg: rgba(255, 255, 255, 0.05);
|
||||
$color-card-border: rgba(255, 255, 255, 0.1);
|
||||
|
||||
.inventory-summary {
|
||||
display: flex;
|
||||
align-items: stretch;
|
||||
gap: $spacing-unit * 2;
|
||||
padding: $spacing-unit * 2;
|
||||
overflow-x: auto;
|
||||
-webkit-overflow-scrolling: touch;
|
||||
scrollbar-width: thin;
|
||||
|
||||
@media (max-width: 600px) {
|
||||
flex-wrap: wrap;
|
||||
padding: $spacing-unit;
|
||||
gap: $spacing-unit;
|
||||
}
|
||||
}
|
||||
|
||||
// Health status indicator
|
||||
.health-status {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: $spacing-unit;
|
||||
padding: $spacing-unit $spacing-unit * 2;
|
||||
border-radius: 24px;
|
||||
min-height: $touch-target-min;
|
||||
white-space: nowrap;
|
||||
transition: background-color 0.3s ease;
|
||||
|
||||
&.healthy {
|
||||
background-color: rgba($color-healthy, 0.15);
|
||||
color: $color-healthy;
|
||||
}
|
||||
|
||||
&.low {
|
||||
background-color: rgba($color-low, 0.15);
|
||||
color: $color-low;
|
||||
}
|
||||
|
||||
&.critical {
|
||||
background-color: rgba($color-critical, 0.15);
|
||||
color: $color-critical;
|
||||
}
|
||||
|
||||
.health-text {
|
||||
font-size: 14px;
|
||||
font-weight: 600;
|
||||
letter-spacing: 0.02em;
|
||||
|
||||
@media (max-width: 480px) {
|
||||
font-size: 12px;
|
||||
}
|
||||
}
|
||||
|
||||
mat-icon {
|
||||
font-size: 20px !important;
|
||||
width: 20px !important;
|
||||
height: 20px !important;
|
||||
}
|
||||
}
|
||||
|
||||
// Metric card
|
||||
.metric-card {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: $spacing-unit;
|
||||
padding: $spacing-unit $spacing-unit * 2;
|
||||
background-color: $color-card-bg;
|
||||
border: 1px solid $color-card-border;
|
||||
border-radius: 12px;
|
||||
min-height: $touch-target-min;
|
||||
white-space: nowrap;
|
||||
transition: border-color 0.2s ease, background-color 0.2s ease;
|
||||
|
||||
&:hover {
|
||||
border-color: rgba(255, 255, 255, 0.2);
|
||||
background-color: rgba(255, 255, 255, 0.08);
|
||||
}
|
||||
|
||||
@media (max-width: 480px) {
|
||||
padding: $spacing-unit;
|
||||
}
|
||||
|
||||
&.has-alert {
|
||||
border-color: rgba($color-low, 0.4);
|
||||
}
|
||||
|
||||
&.has-critical {
|
||||
border-color: rgba($color-critical, 0.5);
|
||||
background-color: rgba($color-critical, 0.08);
|
||||
}
|
||||
}
|
||||
|
||||
.metric-icon {
|
||||
color: $color-text-muted;
|
||||
font-size: 22px !important;
|
||||
width: 22px !important;
|
||||
height: 22px !important;
|
||||
|
||||
.has-alert & {
|
||||
color: $color-low;
|
||||
}
|
||||
|
||||
.has-critical & {
|
||||
color: $color-critical;
|
||||
}
|
||||
}
|
||||
|
||||
.metric-content {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 2px;
|
||||
}
|
||||
|
||||
.metric-value {
|
||||
font-size: $kiosk-font-primary;
|
||||
font-weight: 700;
|
||||
line-height: 1.2;
|
||||
color: $color-text;
|
||||
|
||||
@media (max-width: 480px) {
|
||||
font-size: $mobile-font-primary;
|
||||
}
|
||||
}
|
||||
|
||||
.metric-label {
|
||||
font-size: 11px;
|
||||
color: $color-text-muted;
|
||||
text-transform: uppercase;
|
||||
letter-spacing: 0.08em;
|
||||
}
|
||||
|
||||
.metric-detail {
|
||||
font-size: 11px;
|
||||
color: $color-text-muted;
|
||||
margin-left: $spacing-unit;
|
||||
|
||||
&.critical-detail {
|
||||
color: $color-critical;
|
||||
font-weight: 600;
|
||||
}
|
||||
}
|
||||
|
||||
// Stock bar card
|
||||
.stock-bar-card {
|
||||
flex: 1 1 200px;
|
||||
min-width: 180px;
|
||||
}
|
||||
|
||||
.stock-bar-content {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.stock-bar-header {
|
||||
display: flex;
|
||||
align-items: baseline;
|
||||
gap: $spacing-unit;
|
||||
margin-bottom: 4px;
|
||||
}
|
||||
|
||||
// Progress bar color classes
|
||||
::ng-deep .mat-mdc-progress-bar {
|
||||
&.healthy .mdc-linear-progress__bar-inner {
|
||||
background-color: $color-healthy !important;
|
||||
}
|
||||
|
||||
&.low .mdc-linear-progress__bar-inner {
|
||||
background-color: $color-low !important;
|
||||
}
|
||||
|
||||
&.critical .mdc-linear-progress__bar-inner {
|
||||
background-color: $color-critical !important;
|
||||
}
|
||||
}
|
||||
|
||||
// Loading state
|
||||
.summary-loading {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: $spacing-unit;
|
||||
padding: $spacing-unit * 2;
|
||||
color: $color-text-muted;
|
||||
font-size: 14px;
|
||||
|
||||
.spin {
|
||||
animation: spin 1s linear infinite;
|
||||
}
|
||||
}
|
||||
|
||||
@keyframes spin {
|
||||
0% { transform: rotate(0deg); }
|
||||
100% { transform: rotate(360deg); }
|
||||
}
|
||||
|
||||
// Error state
|
||||
.summary-error {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: $spacing-unit;
|
||||
padding: $spacing-unit * 2;
|
||||
background-color: rgba($color-critical, 0.1);
|
||||
border: 1px solid rgba($color-critical, 0.3);
|
||||
border-radius: 12px;
|
||||
color: $color-critical;
|
||||
font-size: 14px;
|
||||
|
||||
.retry-btn {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 4px;
|
||||
background: transparent;
|
||||
border: 1px solid rgba($color-critical, 0.4);
|
||||
color: $color-critical;
|
||||
padding: 4px 12px;
|
||||
border-radius: 8px;
|
||||
cursor: pointer;
|
||||
font-size: 13px;
|
||||
min-height: $touch-target-min - 8px;
|
||||
transition: background-color 0.2s ease;
|
||||
|
||||
&:hover {
|
||||
background-color: rgba($color-critical, 0.15);
|
||||
}
|
||||
|
||||
mat-icon {
|
||||
font-size: 16px !important;
|
||||
width: 16px !important;
|
||||
height: 16px !important;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Summary item base
|
||||
.summary-item {
|
||||
flex-shrink: 0;
|
||||
}
|
||||
@@ -0,0 +1,207 @@
|
||||
import {
|
||||
ChangeDetectionStrategy,
|
||||
Component,
|
||||
OnDestroy,
|
||||
OnInit,
|
||||
computed,
|
||||
inject,
|
||||
signal,
|
||||
} from '@angular/core';
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { MatIconModule } from '@angular/material/icon';
|
||||
import { MatChipsModule } from '@angular/material/chips';
|
||||
import { MatTooltipModule } from '@angular/material/tooltip';
|
||||
import { MatProgressBarModule } from '@angular/material/progress-bar';
|
||||
import { FilamentService } from '../../services/filament.service';
|
||||
import {
|
||||
classifyStockLevel,
|
||||
} from '../../models/filament.model';
|
||||
import { Subscription } from 'rxjs';
|
||||
|
||||
/**
|
||||
* Inventory Dashboard Summary — shows filament inventory at a glance.
|
||||
*
|
||||
* Displays:
|
||||
* - Total filament spool count
|
||||
* - Low stock count (spools ≤25% remaining, i.e. "low" or "critical")
|
||||
* - Estimated total filament value (sum of purchase prices for active spools)
|
||||
*
|
||||
* Data is sourced from the shared FilamentService signal,
|
||||
* which is loaded on init and can be refreshed via refresh().
|
||||
*/
|
||||
@Component({
|
||||
selector: 'app-inventory-summary',
|
||||
standalone: true,
|
||||
imports: [
|
||||
CommonModule,
|
||||
MatIconModule,
|
||||
MatChipsModule,
|
||||
MatTooltipModule,
|
||||
MatProgressBarModule,
|
||||
],
|
||||
templateUrl: './inventory-summary.component.html',
|
||||
styleUrls: ['./inventory-summary.component.scss'],
|
||||
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||
})
|
||||
export class InventorySummaryComponent implements OnInit, OnDestroy {
|
||||
private readonly filamentService = inject(FilamentService);
|
||||
private subscription: Subscription | null = null;
|
||||
|
||||
/** All filament data — reactive signal from shared service */
|
||||
readonly filaments = this.filamentService.filaments;
|
||||
|
||||
/** Loading state */
|
||||
readonly loading = signal<boolean>(true);
|
||||
|
||||
/** Error state */
|
||||
readonly error = signal<string | null>(null);
|
||||
|
||||
/** Computed: total number of filament spools */
|
||||
readonly totalCount = computed(() => this.filaments().length);
|
||||
|
||||
/** Computed: count of active spools */
|
||||
readonly activeCount = computed(
|
||||
() => this.filaments().filter((f) => f.isActive).length
|
||||
);
|
||||
|
||||
/** Computed: count of low/critical stock spools (≤25% remaining) */
|
||||
readonly lowStockCount = computed(
|
||||
() =>
|
||||
this.filaments().filter(
|
||||
(f) =>
|
||||
classifyStockLevel(f) === 'low' ||
|
||||
classifyStockLevel(f) === 'critical'
|
||||
).length
|
||||
);
|
||||
|
||||
/** Computed: count of critically low spools (≤10% remaining) */
|
||||
readonly criticalCount = computed(
|
||||
() =>
|
||||
this.filaments().filter((f) => classifyStockLevel(f) === 'critical')
|
||||
.length
|
||||
);
|
||||
|
||||
/** Computed: estimated total value of active spools */
|
||||
readonly totalValue = computed(() =>
|
||||
this.filaments()
|
||||
.filter((f) => f.isActive && f.purchasePrice !== null)
|
||||
.reduce((sum, f) => sum + (f.purchasePrice ?? 0), 0)
|
||||
);
|
||||
|
||||
/** Computed: average cost per gram across active spools with a price */
|
||||
readonly avgCostPerGram = computed(() => {
|
||||
const priced = this.filaments().filter(
|
||||
(f) => f.isActive && f.purchasePrice !== null && f.purchasePrice! > 0 && f.weightTotalGrams > 0
|
||||
);
|
||||
if (priced.length === 0) return null;
|
||||
const totalCost = priced.reduce((sum, f) => sum + f.purchasePrice!, 0);
|
||||
const totalWeight = priced.reduce((sum, f) => sum + f.weightTotalGrams, 0);
|
||||
return totalWeight > 0 ? totalCost / totalWeight : null;
|
||||
});
|
||||
|
||||
/** Computed: total grams used across all spools */
|
||||
readonly totalGramsUsed = computed(() =>
|
||||
this.filaments().reduce(
|
||||
(sum, f) => sum + (f.weightTotalGrams - f.weightRemainingGrams),
|
||||
0
|
||||
)
|
||||
);
|
||||
|
||||
/** Computed: total estimated value of used filament */
|
||||
readonly estimatedUsedValue = computed(() => {
|
||||
const priced = this.filaments().filter(
|
||||
(f) => f.isActive && f.purchasePrice !== null && f.purchasePrice! > 0 && f.weightTotalGrams > 0
|
||||
);
|
||||
if (priced.length === 0) return null;
|
||||
return priced.reduce((sum, f) => {
|
||||
const usedFraction = (f.weightTotalGrams - f.weightRemainingGrams) / f.weightTotalGrams;
|
||||
return sum + f.purchasePrice! * usedFraction;
|
||||
}, 0);
|
||||
});
|
||||
|
||||
/** Computed: total remaining weight across all spools in grams */
|
||||
readonly totalRemainingGrams = computed(() =>
|
||||
this.filaments().reduce((sum, f) => sum + f.weightRemainingGrams, 0)
|
||||
);
|
||||
|
||||
/** Computed: total capacity weight across all spools in grams */
|
||||
readonly totalCapacityGrams = computed(() =>
|
||||
this.filaments().reduce((sum, f) => sum + f.weightTotalGrams, 0)
|
||||
);
|
||||
|
||||
/** Computed: overall remaining percentage */
|
||||
readonly overallRemainingPercent = computed(() => {
|
||||
const capacity = this.totalCapacityGrams();
|
||||
if (capacity <= 0) return 0;
|
||||
return Math.round(
|
||||
(this.totalRemainingGrams() / capacity) * 100
|
||||
);
|
||||
});
|
||||
|
||||
/** Computed: whether to show a low-stock alert */
|
||||
readonly hasLowStock = computed(() => this.lowStockCount() > 0);
|
||||
|
||||
/** Computed: whether to show a critical-stock alert */
|
||||
readonly hasCritical = computed(() => this.criticalCount() > 0);
|
||||
|
||||
/** Computed: status label for the inventory health */
|
||||
readonly healthLabel = computed(() => {
|
||||
if (this.hasCritical()) return 'Critical Stock';
|
||||
if (this.hasLowStock()) return 'Low Stock Alert';
|
||||
return 'Stock Healthy';
|
||||
});
|
||||
|
||||
/** Computed: health status color class */
|
||||
readonly healthClass = computed(() => {
|
||||
if (this.hasCritical()) return 'critical';
|
||||
if (this.hasLowStock()) return 'low';
|
||||
return 'healthy';
|
||||
});
|
||||
|
||||
ngOnInit(): void {
|
||||
this.loadFilaments();
|
||||
}
|
||||
|
||||
ngOnDestroy(): void {
|
||||
this.subscription?.unsubscribe();
|
||||
}
|
||||
|
||||
/** Load filament data from the API via FilamentService */
|
||||
loadFilaments(): void {
|
||||
this.loading.set(true);
|
||||
this.error.set(null);
|
||||
this.subscription = this.filamentService.getFilaments().subscribe({
|
||||
next: () => {
|
||||
this.loading.set(false);
|
||||
},
|
||||
error: (err) => {
|
||||
console.error('Failed to load filaments:', err);
|
||||
this.error.set('Failed to load inventory data');
|
||||
this.loading.set(false);
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
/** Refresh data — called externally when data changes (e.g., SignalR notification) */
|
||||
refresh(): void {
|
||||
this.loadFilaments();
|
||||
}
|
||||
|
||||
/** Format weight for display */
|
||||
formatWeight(grams: number): string {
|
||||
if (grams >= 1000) {
|
||||
return `${(grams / 1000).toFixed(1)}kg`;
|
||||
}
|
||||
return `${Math.round(grams)}g`;
|
||||
}
|
||||
|
||||
/** Format currency for display */
|
||||
formatCurrency(value: number): string {
|
||||
return new Intl.NumberFormat('en-US', {
|
||||
style: 'currency',
|
||||
currency: 'USD',
|
||||
minimumFractionDigits: 2,
|
||||
maximumFractionDigits: 2,
|
||||
}).format(value);
|
||||
}
|
||||
}
|
||||
52
frontend/src/app/services/filament.service.ts
Normal file
52
frontend/src/app/services/filament.service.ts
Normal file
@@ -0,0 +1,52 @@
|
||||
import { Injectable, inject } from '@angular/core';
|
||||
import { HttpClient } from '@angular/common/http';
|
||||
import { Observable, Subscription } from 'rxjs';
|
||||
import { signal } from '@angular/core';
|
||||
import { Filament } from '../models/filament.model';
|
||||
|
||||
/**
|
||||
* API base URL — matches the Extrudex backend.
|
||||
* TODO: Move to environment config when environments are set up.
|
||||
*/
|
||||
const API_BASE_URL = '/api/filaments';
|
||||
|
||||
/**
|
||||
* Service for managing filament inventory data.
|
||||
*
|
||||
* Provides:
|
||||
* - A reactive `filaments` signal for components to bind to
|
||||
* - REST methods for GET, POST, DELETE endpoints
|
||||
* - Real-time updates via SignalR should be layered on top when the hub is ready
|
||||
*/
|
||||
@Injectable({ providedIn: 'root' })
|
||||
export class FilamentService {
|
||||
private readonly http = inject(HttpClient);
|
||||
|
||||
/** Reactive filament data — components read from this signal */
|
||||
readonly filaments = signal<Filament[]>([]);
|
||||
|
||||
/** Fetch all filament spools and update the signal */
|
||||
getFilaments(): Observable<Filament[]> {
|
||||
const req = this.http.get<Filament[]>(API_BASE_URL);
|
||||
req.subscribe({
|
||||
next: (data) => this.filaments.set(data),
|
||||
error: (err) => console.error('Failed to load filaments:', err),
|
||||
});
|
||||
return req;
|
||||
}
|
||||
|
||||
/** Fetch a single filament by ID */
|
||||
getFilament(id: string): Observable<Filament> {
|
||||
return this.http.get<Filament>(`${API_BASE_URL}/${id}`);
|
||||
}
|
||||
|
||||
/** Set filament data directly — used by components or SignalR handlers */
|
||||
setFilaments(data: Filament[]): void {
|
||||
this.filaments.set(data);
|
||||
}
|
||||
|
||||
/** Delete a filament spool by ID */
|
||||
deleteFilament(id: string): Observable<void> {
|
||||
return this.http.delete<void>(`${API_BASE_URL}/${id}`);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user