chore: improve csv import inclduing serialized equipment that has content

Author: TobiasGleiter

cmd/web/handlers:equipment.go

@@ -514,13 +514,17 @@ func (app *application) postEquipmentUpdateUnit(w http.ResponseWriter, r *http.R
 
 	if err := app.services.equipment.UpdateUnit(ctx, equipment.UpdateUnit{
 		ID:                       unitID,
+		SerialNumber:             form.SerialNumber,
 		StatusID:                 form.StatusID,
 		ManufacturerSerialNumber: form.ManufacturerSerialNumber,
-		Notes:                    form.Notes,
+		Remark:                   form.Remark,
 		PurchasePrice:            form.PurchasePrice,
 		PurchasedAt:              form.PurchasedAt,
 		NextInspectionAt:         form.NextInspectionAt,
 	}); err != nil {
+		if errors.Is(err, database.ErrUniqueConstraint) {
+			return app.renderEquipmentUnits(w, r, orgID, itemID)
+		}
 		return &httperr.Error{Error: err, Message: "Failed to update unit.", Code: http.StatusInternalServerError}
 	}
 

cmd/web/handlers:equipment:export.go

@@ -3,16 +3,16 @@ package main
 import (
 	"encoding/csv"
 	"net/http"
-	"strconv"
 
+	"github.com/bit8bytes/gearberg/internal/equipment"
 	"github.com/bit8bytes/gearberg/internal/equipment/imports"
 	"github.com/bit8bytes/gearberg/internal/httperr"
 )
 
 // exportColumnCount must equal len(imports.ExpectedHeaders). This line fails to
-// compile if the export cw.Write call is updated without updating ExpectedHeaders
-// (or vice versa), catching column-count drift at build time.
-const exportColumnCount = 18
+// compile if RowsForItem is updated without updating ExpectedHeaders (or vice
+// versa), catching column-count drift at build time.
+const exportColumnCount = 26
 
 var _ = [1]struct{}{}[exportColumnCount-len(imports.ExpectedHeaders)]
 
@@ -46,26 +46,18 @@ func (app *application) getEquipmentExport(w http.ResponseWriter, r *http.Reques
 		if item.IsArchived || item.TotalStock == 0 {
 			continue
 		}
-		_ = cw.Write([]string{
-			item.Name,
-			item.Type.Label(),
-			item.UsageType.Label(),
-			item.CategoryName,
-			mfrByID[item.ManufacturerID],
-			item.LocationName,
-			item.Pricing.RentalPrice.ToDecimal(),
-			item.Pricing.PurchasePrice.ToDecimal(),
-			item.Notes,
-			item.Properties.Weight.ToKG(),
-			item.Properties.Width.ToCM(),
-			item.Properties.Height.ToCM(),
-			item.Properties.Depth.ToCM(),
-			item.Properties.Voltage.ToV(),
-			item.Properties.Current.ToA(),
-			item.Properties.Power.ToW(),
-			item.Properties.WireGauge.String(),
-			strconv.FormatInt(item.TotalStock, 10),
-		})
+
+		var units []equipment.Unit
+		if item.Type == equipment.Serialized {
+			units, err = app.services.equipment.ListUnits(ctx, item.ID)
+			if err != nil {
+				return &httperr.Error{Error: err, Message: "Failed to retrieve units.", Code: http.StatusInternalServerError}
+			}
+		}
+
+		for _, row := range imports.RowsForItem(item, mfrByID[item.ManufacturerID], units) {
+			_ = cw.Write(row)
+		}
 	}
 	cw.Flush()
 	return nil

cmd/web/handlers:equipment:import.go

@@ -1,8 +1,10 @@
 package main
 
 import (
+	"fmt"
 	"net/http"
 	"net/url"
+	"strings"
 
 	"github.com/bit8bytes/gearberg/internal/equipment/imports"
 	"github.com/bit8bytes/gearberg/internal/httperr"
@@ -14,14 +16,91 @@ type equipmentImportData struct {
 	Error string
 }
 
+// importPreviewRow is a display-oriented view of a staged import row.
+// Serialized rows with the same name are collapsed into a single entry;
+// Stock holds the unit count for serialized items and quantity for bulk.
+type importPreviewRow struct {
+	RowNumber    int64
+	Name         string
+	TypeLabel    string
+	CategoryName string
+	Stock        string
+	Status       string
+	ErrorMessage string
+}
+
 type equipmentImportPreviewData struct {
 	OrgID      string
 	ImportID   string
-	Rows       []imports.Row
+	Rows       []importPreviewRow
 	CountNew   int
 	CountError int
 }
 
+// groupImportRows collapses serialized staging rows that share a name into one
+// preview row and returns per-item counts for new and error items.
+func groupImportRows(staged []imports.Row) (rows []importPreviewRow, cntNew, cntError int) {
+	type group struct {
+		row    importPreviewRow
+		total  int
+		hasErr bool
+	}
+	seen := make(map[string]*group)
+	var order []string
+
+	for _, r := range staged {
+		if !strings.EqualFold(r.TypeLabel, "serialized") {
+			pr := importPreviewRow{
+				RowNumber:    r.RowNumber,
+				Name:         r.Name,
+				TypeLabel:    r.TypeLabel,
+				CategoryName: r.CategoryName,
+				Stock:        r.Quantity,
+				Status:       r.Status,
+				ErrorMessage: r.ErrorMessage,
+			}
+			rows = append(rows, pr)
+			if r.Status == imports.StatusNew {
+				cntNew++
+			} else {
+				cntError++
+			}
+			continue
+		}
+
+		key := strings.ToLower(r.Name)
+		if _, ok := seen[key]; !ok {
+			seen[key] = &group{row: importPreviewRow{
+				RowNumber:    r.RowNumber,
+				Name:         r.Name,
+				TypeLabel:    r.TypeLabel,
+				CategoryName: r.CategoryName,
+				Status:       imports.StatusNew,
+			}}
+			order = append(order, key)
+		}
+		g := seen[key]
+		g.total++
+		if r.Status == imports.StatusError && !g.hasErr {
+			g.hasErr = true
+			g.row.Status = imports.StatusError
+			g.row.ErrorMessage = r.ErrorMessage
+		}
+	}
+
+	for _, key := range order {
+		g := seen[key]
+		g.row.Stock = fmt.Sprintf("%d", g.total)
+		rows = append(rows, g.row)
+		if g.hasErr {
+			cntError++
+		} else {
+			cntNew++
+		}
+	}
+	return
+}
+
 // getEquipmentImport serves the upload form when no ?id= param is present,
 // or the staging preview when ?id= is set (after a successful upload).
 func (app *application) getEquipmentImport(w http.ResponseWriter, r *http.Request) *httperr.Error {
@@ -77,26 +156,18 @@ func (app *application) postEquipmentImport(w http.ResponseWriter, r *http.Reque
 func (app *application) renderImportPreview(w http.ResponseWriter, r *http.Request, orgID, importID string) *httperr.Error {
 	ctx := r.Context()
 
-	rows, err := app.services.equipmentImports.ListStaged(ctx, importID)
+	staged, err := app.services.equipmentImports.ListStaged(ctx, importID)
 	if err != nil {
 		return &httperr.Error{Error: err, Message: "Failed to load import preview.", Code: http.StatusInternalServerError}
 	}
 
-	var cntNew, cntError int
-	for _, row := range rows {
-		switch row.Status {
-		case imports.StatusNew:
-			cntNew++
-		case imports.StatusError:
-			cntError++
-		}
-	}
+	previewRows, cntNew, cntError := groupImportRows(staged)
 
 	data := app.html.TemplateData(r)
 	data.Data = equipmentImportPreviewData{
 		OrgID:      orgID,
 		ImportID:   importID,
-		Rows:       rows,
+		Rows:       previewRows,
 		CountNew:   cntNew,
 		CountError: cntError,
 	}

internal/database/migrations/sqlite/20260606133519_equipment_imports.sql

@@ -13,30 +13,37 @@ CREATE TABLE equipment_imports (
   created_at INTEGER NOT NULL DEFAULT (unixepoch()),
   -- raw CSV columns; all TEXT to preserve input before validation
   name TEXT NOT NULL DEFAULT '',
-  type_label TEXT NOT NULL DEFAULT '',
-  tracking_label TEXT NOT NULL DEFAULT '',
-  usage_type_label TEXT NOT NULL DEFAULT '',
+  -- Labels are defined by Gearberg and should match the seeded once
+  type_label TEXT NOT NULL DEFAULT '', -- Bulk/Serialized
+  tracking_label TEXT NOT NULL DEFAULT '', -- Physical/Virtual
+  usage_type_label TEXT NOT NULL DEFAULT '', -- Rental/Resale
+  -- User provided fields:
   category_name TEXT NOT NULL DEFAULT '',
   manufacturer_name TEXT NOT NULL DEFAULT '',
   location_name TEXT NOT NULL DEFAULT '',
+  purchase_price TEXT NOT NULL DEFAULT '',
   rental_price TEXT NOT NULL DEFAULT '',
   resale_price TEXT NOT NULL DEFAULT '',
   notes TEXT NOT NULL DEFAULT '',
   weight_g TEXT NOT NULL DEFAULT '',
   width_mm TEXT NOT NULL DEFAULT '',
   height_mm TEXT NOT NULL DEFAULT '',
   depth_mm TEXT NOT NULL DEFAULT '',
-  voltage_v TEXT NOT NULL DEFAULT '',
+  voltage_mv TEXT NOT NULL DEFAULT '',
   current_ma TEXT NOT NULL DEFAULT '',
   power_mw TEXT NOT NULL DEFAULT '',
   wire_gauge_mm2_x100 TEXT NOT NULL DEFAULT '',
   quantity TEXT NOT NULL DEFAULT '1',
-  purchase_price TEXT NOT NULL DEFAULT '',
-  purchased_at TEXT NOT NULL DEFAULT '',
-  manufacturer_serial TEXT NOT NULL DEFAULT '',
+  -- Has content tab for serialized items
+  has_content TEXT NOT NULL DEFAULT '0',
+  -- Units for serialized equipment items
+  unit_serial_number TEXT NOT NULL DEFAULT '',
+  unit_manufacturer_serial TEXT NOT NULL DEFAULT '',
+  unit_purchase_price TEXT NOT NULL DEFAULT '',
+  unit_purchased_at TEXT NOT NULL DEFAULT '',
   next_inspection_at TEXT NOT NULL DEFAULT '',
-  is_active TEXT NOT NULL DEFAULT '1',
-  remark TEXT NOT NULL DEFAULT ''
+  unit_is_active TEXT NOT NULL DEFAULT '1',
+  unit_remark TEXT NOT NULL DEFAULT ''
 ) STRICT;
 -- +goose StatementEnd