1c6c7ba14b
From the database review (verdict: sound-with-minor-issues). Applies the actionable findings. Redundant indexes: five non-unique secondary indexes duplicated a named idx_* or a unique index on the same column - ix_communications_assetid, ix_computers_hostname, ix_networkdevices_hostname, ix_printers_hostname (each shadowing an idx_*), and idx_usb_serial (shadowing the serialnumber unique index). Removed the redundant index source from the models (column index=True / the extra db.Index) and added core migration 7d25 dropping the live duplicates. The unique ix_*_assetid indexes are kept (they enforce assetid uniqueness). Dead column: usbcheckouts.machineid was a NOT NULL soft-ref to the retired machines table storing sentinel 0 (ADR-001). Dropped from the model + the machineid=0 literal in selfhosted checkout; usb plugin migration 0002 drops it live (downgrade restores it default 0). Index: notifications.businessunitid (filtered by the shopfloor feed) was unindexed; added index=True + notifications migration 0002. CI: new migrations-mysql job proves the real multi-site deploy path - fresh `flask db upgrade` + per-plugin install on utf8mb4 MySQL from empty, asserting table count + charset and a clean second-run no-op. The pytest suite only exercises SQLite create_all(), so a regression in the Alembic chain on MySQL would otherwise ship undetected. Verified: fresh core upgrade on a scratch utf8mb4 MySQL builds clean + no-op on rerun (redundant indexes absent, unique assetid kept); plugin migrations applied + verified on the dev DB (machineid gone, bu index present). 953 backend tests pass; naming + pyflakes green. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
124 lines
3.5 KiB
Python
124 lines
3.5 KiB
Python
"""Printer plugin models - new Asset-based architecture."""
|
|
|
|
from shopdb.api import db, BaseModel
|
|
|
|
|
|
class PrinterType(BaseModel):
|
|
"""
|
|
Printer type classification.
|
|
|
|
Examples: Laser, Inkjet, Label, MFP, Plotter, etc.
|
|
"""
|
|
__tablename__ = 'printertypes'
|
|
|
|
printertypeid = db.Column(db.Integer, primary_key=True)
|
|
printertype = db.Column(db.String(100), unique=True, nullable=False)
|
|
description = db.Column(db.Text)
|
|
icon = db.Column(db.String(50), comment='Icon name for UI')
|
|
color = db.Column(db.String(20), comment='CSS color for UI/map markers')
|
|
|
|
def __repr__(self):
|
|
return f"<PrinterType {self.printertype}>"
|
|
|
|
|
|
class Printer(BaseModel):
|
|
"""
|
|
Printer-specific extension data (new Asset architecture).
|
|
|
|
Links to core Asset table via assetid.
|
|
Stores printer-specific fields like type, Windows name, share name, etc.
|
|
"""
|
|
__tablename__ = 'printers'
|
|
|
|
printerid = db.Column(db.Integer, primary_key=True)
|
|
|
|
# Link to core asset
|
|
assetid = db.Column(
|
|
db.Integer,
|
|
db.ForeignKey('assets.assetid', ondelete='CASCADE'),
|
|
unique=True,
|
|
nullable=False,
|
|
index=True
|
|
)
|
|
|
|
# Printer classification
|
|
printertypeid = db.Column(
|
|
db.Integer,
|
|
db.ForeignKey('printertypes.printertypeid'),
|
|
nullable=True
|
|
)
|
|
|
|
# Vendor
|
|
vendorid = db.Column(
|
|
db.Integer,
|
|
db.ForeignKey('vendors.vendorid'),
|
|
nullable=True
|
|
)
|
|
modelnumberid = db.Column(
|
|
db.Integer,
|
|
db.ForeignKey('models.modelnumberid'),
|
|
nullable=True
|
|
)
|
|
|
|
# Network identity
|
|
hostname = db.Column(
|
|
db.String(100),
|
|
comment='Network hostname'
|
|
)
|
|
|
|
# Windows/Network naming
|
|
windowsname = db.Column(
|
|
db.String(255),
|
|
comment='Windows printer name (e.g., \\\\server\\printer)'
|
|
)
|
|
sharename = db.Column(
|
|
db.String(100),
|
|
comment='CSF/share name'
|
|
)
|
|
|
|
# Installation
|
|
iscsf = db.Column(db.Boolean, default=False, comment='Is CSF printer')
|
|
installpath = db.Column(db.String(255), comment='Driver install path')
|
|
|
|
# Printer PIN (for secure print)
|
|
pin = db.Column(db.String(20))
|
|
|
|
# Features
|
|
iscolor = db.Column(db.Boolean, default=False, comment='Color capable')
|
|
isduplex = db.Column(db.Boolean, default=False, comment='Duplex capable')
|
|
isnetwork = db.Column(db.Boolean, default=True, comment='Network connected')
|
|
|
|
# Relationships
|
|
asset = db.relationship(
|
|
'Asset',
|
|
backref=db.backref('printer', uselist=False, lazy='joined')
|
|
)
|
|
printertype = db.relationship('PrinterType', backref='printers')
|
|
vendor = db.relationship('Vendor', backref='printer_items')
|
|
model = db.relationship('Model', backref='printer_items')
|
|
|
|
__table_args__ = (
|
|
db.Index('idx_printer_type', 'printertypeid'),
|
|
db.Index('idx_printer_hostname', 'hostname'),
|
|
db.Index('idx_printer_windowsname', 'windowsname'),
|
|
)
|
|
|
|
def __repr__(self):
|
|
return f"<Printer {self.hostname or self.assetid}>"
|
|
|
|
def to_dict(self):
|
|
"""Convert to dictionary with related names."""
|
|
result = super().to_dict()
|
|
|
|
# Add related object names
|
|
if self.printertype:
|
|
result['printertypename'] = self.printertype.printertype
|
|
if self.vendor:
|
|
result['vendorname'] = self.vendor.vendor
|
|
if self.model:
|
|
result['modelname'] = self.model.modelnumber
|
|
if self.model.imageurl:
|
|
result['imageurl'] = self.model.imageurl
|
|
|
|
return result
|