Merge remote-tracking branch 'origin/dev' into fix-pr-14

# Conflicts:
#	frontend/.dockerignore
#	frontend/Dockerfile
#	frontend/nginx.conf

backend/API/Controllers/PrintJobsController.cs

@@ -413,6 +413,92 @@ public class PrintJobsController : ControllerBase
         return NoContent();
     }
 
+    // ── GET /api/printjobs/{id}/cost-summary ──────────────────────────
+
+    /// <summary>
+    /// Gets the material cost summary for a specific print job.
+    /// Calculates total material cost from filament usage (grams derived)
+    /// and the spool's purchase price. Returns warnings instead of errors
+    /// when cost data is unavailable.
+    /// </summary>
+    /// <param name="id">The unique identifier of the print job.</param>
+    /// <returns>A cost summary with breakdown and any warnings about missing data.</returns>
+    /// <response code="200">Returns the cost summary. Warnings field lists any missing data.</response>
+    /// <response code="404">If the print job with the given ID is not found.</response>
+    [HttpGet("{id:guid}/cost-summary")]
+    [ProducesResponseType(typeof(CostSummaryResponse), StatusCodes.Status200OK)]
+    [ProducesResponseType(StatusCodes.Status404NotFound)]
+    public async Task<ActionResult<CostSummaryResponse>> GetCostSummary(Guid id)
+    {
+        _logger.LogDebug("Getting cost summary for print job {Id}", id);
+
+        var job = await _dbContext.PrintJobs
+            .Include(j => j.Spool)
+                .ThenInclude(s => s!.MaterialBase)
+            .FirstOrDefaultAsync(j => j.Id == id);
+
+        if (job is null)
+        {
+            _logger.LogWarning("Print job {Id} not found for cost summary", id);
+            return NotFound(new { error = $"Print job with ID '{id}' not found." });
+        }
+
+        var warnings = new List<string>();
+        var spool = job.Spool;
+
+        // Build response with what we have
+        var response = new CostSummaryResponse
+        {
+            PrintJobId = job.Id,
+            PrintName = job.PrintName,
+            SpoolId = job.SpoolId,
+            SpoolSerial = spool?.SpoolSerial ?? string.Empty,
+            SpoolBrand = spool?.Brand ?? string.Empty,
+            SpoolColorName = spool?.ColorName ?? string.Empty,
+            MmExtruded = job.MmExtruded,
+            GramsDerived = job.GramsDerived,
+            SpoolPurchasePrice = spool?.PurchasePrice,
+            SpoolWeightTotalGrams = spool?.WeightTotalGrams,
+            StoredCostPerPrint = job.CostPerPrint
+        };
+
+        // Validate spool data availability
+        if (spool is null)
+        {
+            warnings.Add("Spool data is not available for this print job. Cost cannot be calculated.");
+            response.Warnings = warnings;
+            return Ok(response);
+        }
+
+        // Check if we can calculate cost
+        if (!spool.PurchasePrice.HasValue)
+        {
+            warnings.Add("Spool purchase price is not set. Cost per gram and total material cost cannot be calculated.");
+        }
+
+        if (spool.WeightTotalGrams <= 0)
+        {
+            warnings.Add("Spool total weight is zero or invalid. Cost per gram and total material cost cannot be calculated.");
+        }
+
+        // If we have enough data, calculate the cost
+        if (spool.PurchasePrice.HasValue && spool.WeightTotalGrams > 0)
+        {
+            var pricePerGram = spool.PurchasePrice.Value / spool.WeightTotalGrams;
+            response.PricePerGram = Math.Round(pricePerGram, 4);
+            response.TotalMaterialCost = Math.Round(job.GramsDerived * pricePerGram, 4);
+        }
+
+        // Warn if grams derived is zero but mm extruded is non-zero
+        if (job.GramsDerived == 0 && job.MmExtruded > 0)
+        {
+            warnings.Add("GramsDerived is zero despite MmExtruded being non-zero. Cost may be inaccurate. Consider re-deriving grams from filament parameters.");
+        }
+
+        response.Warnings = warnings;
+        return Ok(response);
+    }
+
     // ── Gram Derivation Formula ────────────────────────────────────
 
     /// <summary>

backend/API/DTOs/PrintJobs/CostSummaryResponse.cs

@@ -0,0 +1,55 @@
+namespace Extrudex.API.DTOs.PrintJobs;
+
+/// <summary>
+/// Response DTO for the cost summary of a print job.
+/// Provides a breakdown of material cost based on filament usage
+/// and spool pricing data. If cost data is incomplete, warnings
+/// are returned instead of throwing an error.
+/// </summary>
+public class CostSummaryResponse
+{
+    /// <summary>Unique identifier of the print job.</summary>
+    public Guid PrintJobId { get; set; }
+
+    /// <summary>Human-readable name of the print job.</summary>
+    public string PrintName { get; set; } = string.Empty;
+
+    /// <summary>Foreign key to the spool used for this print job.</summary>
+    public Guid SpoolId { get; set; }
+
+    /// <summary>Serial number of the spool.</summary>
+    public string SpoolSerial { get; set; } = string.Empty;
+
+    /// <summary>Brand of the spool.</summary>
+    public string SpoolBrand { get; set; } = string.Empty;
+
+    /// <summary>Color name of the spool.</summary>
+    public string SpoolColorName { get; set; } = string.Empty;
+
+    /// <summary>Total millimeters of filament extruded during this print.</summary>
+    public decimal MmExtruded { get; set; }
+
+    /// <summary>Derived grams consumed for this print job.</summary>
+    public decimal GramsDerived { get; set; }
+
+    /// <summary>Purchase price of the full spool, if available.</summary>
+    public decimal? SpoolPurchasePrice { get; set; }
+
+    /// <summary>Total weight of the spool in grams when full.</summary>
+    public decimal? SpoolWeightTotalGrams { get; set; }
+
+    /// <summary>Calculated price per gram (purchase price / total weight), if available.</summary>
+    public decimal? PricePerGram { get; set; }
+
+    /// <summary>Calculated total material cost for this print job, if available.</summary>
+    public decimal? TotalMaterialCost { get; set; }
+
+    /// <summary>The CostPerPrint stored on the print job entity, if set.</summary>
+    public decimal? StoredCostPerPrint { get; set; }
+
+    /// <summary>
+    /// Warnings about missing data that prevent cost calculation.
+    /// Empty if all data is available and cost was calculated successfully.
+    /// </summary>
+    public List<string> Warnings { get; set; } = new();
+}

backend/Dockerfile

@@ -17,6 +17,9 @@ RUN dotnet publish Extrudex.csproj \
 FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS runtime
 WORKDIR /app
 
+# Install curl for health check (not included in aspnet base image)
+RUN apt-get update && apt-get install -y --no-install-recommends curl && rm -rf /var/lib/apt/lists/*
+
 # Non-root user for security
 RUN adduser --disabled-password --gecos "" appuser
 USER appuser

deploy.sh

@@ -18,13 +18,14 @@ echo "📦 Building and starting services..."
 $COMPOSE_CMD -f docker-compose.dev.yml up -d --build
 
 echo "⏳ Waiting for services to become healthy..."
-sleep 10
+sleep 15
 
 echo "✅ Deployment complete!"
 echo ""
 echo "Services running:"
+echo "  • PostgreSQL:    localhost:5433"
 echo "  • Extrudex API: http://localhost:5080"
-echo "  • Control Center Web: http://localhost:5081"
+echo "  • Extrudex Web: http://localhost:5081"
 echo ""
 echo "To view logs:"
 echo "  $COMPOSE_CMD -f docker-compose.dev.yml logs -f"

docker-compose.dev.yml

@@ -1,6 +1,25 @@
-version: '3.8'
-
 services:
+  extrudex-db:
+    image: postgres:16-alpine
+    container_name: extrudex-db
+    environment:
+      POSTGRES_USER: extrudex
+      POSTGRES_PASSWORD: changeme
+      POSTGRES_DB: extrudex
+    ports:
+      - "5433:5432"
+    volumes:
+      - extrudex-db-data:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U extrudex"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 10s
+    restart: unless-stopped
+    networks:
+      - extrudex-network
+
   extrudex-api:
     build:
       context: ./backend
@@ -11,6 +30,14 @@ services:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
       - ASPNETCORE_URLS=http://+:8080
+      - EXTRUDEX_DB_HOST=extrudex-db
+      - EXTRUDEX_DB_PORT=5432
+      - EXTRUDEX_DB_NAME=extrudex
+      - EXTRUDEX_DB_USER=extrudex
+      - EXTRUDEX_DB_PASSWORD=changeme
+    depends_on:
+      extrudex-db:
+        condition: service_healthy
     restart: unless-stopped
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:8080/health"]
@@ -21,11 +48,11 @@ services:
     networks:
       - extrudex-network
 
-  control-center-web:
+  extrudex-web:
     build:
-      context: ../Control-Center/frontend
+      context: ./frontend
       dockerfile: Dockerfile
-    container_name: control-center-web
+    container_name: extrudex-web
     ports:
       - "5081:80"
     depends_on:
@@ -35,6 +62,9 @@ services:
     networks:
       - extrudex-network
 
+volumes:
+  extrudex-db-data:
+
 networks:
   extrudex-network:
     driver: bridge

frontend/.dockerignore

@@ -0,0 +1,11 @@
+node_modules
+dist
+.git
+.gitignore
+.angular
+.vscode
+*.md
+.editorconfig
+.prettierrc
+src/test.ts
+**/*.spec.ts

frontend/Dockerfile

@@ -0,0 +1,28 @@
+# Stage 1: Build the Angular application
+FROM node:22-alpine AS build
+
+WORKDIR /app
+
+# Copy package files first for better layer caching
+COPY package.json package-lock.json ./
+RUN npm ci
+
+# Copy source and build
+COPY . .
+RUN npx ng build --configuration production
+
+# Stage 2: Serve static files with nginx
+FROM nginx:alpine
+
+# Remove default nginx config
+RUN rm /etc/nginx/conf.d/default.conf
+
+# Copy custom nginx config
+COPY nginx.conf /etc/nginx/conf.d/default.conf
+
+# Copy built Angular artifacts from build stage
+COPY --from=build /app/dist/frontend/browser /usr/share/nginx/html
+
+EXPOSE 80
+
+CMD ["nginx", "-g", "daemon off;"]

frontend/nginx.conf

@@ -0,0 +1,42 @@
+server {
+    listen 80;
+    server_name _;
+    root /usr/share/nginx/html;
+    index index.html;
+
+    # Gzip compression
+    gzip on;
+    gzip_types text/plain text/css application/json application/javascript text/xml application/xml text/javascript;
+    gzip_min_length 256;
+
+    # Angular SPA — fallback to index.html for client-side routing
+    location / {
+        try_files $uri $uri/ /index.html;
+    }
+
+    # Cache static assets aggressively
+    location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg|woff2?|ttf|eot)$ {
+        expires 1y;
+        add_header Cache-Control "public, immutable";
+    }
+
+    # Proxy API requests to backend
+    # Uses resolver so nginx doesn't crash if backend isn't available at startup
+    resolver 127.0.0.11 valid=30s ipv6=off;
+    set $backend "extrudex-api:8080";
+
+    location /api/ {
+        proxy_pass http://$backend;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+    }
+
+    # Health check endpoint
+    location /health {
+        access_log off;
+        return 200 "ok";
+        add_header Content-Type text/plain;
+    }
+}