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>
94 lines
2.7 KiB
Python
94 lines
2.7 KiB
Python
"""Communication/network interface models."""
|
|
|
|
from shopdb.extensions import db
|
|
from .base import BaseModel
|
|
|
|
|
|
class CommunicationType(BaseModel):
|
|
"""Types of communication interfaces."""
|
|
__tablename__ = 'communicationtypes'
|
|
|
|
comtypeid = db.Column(db.Integer, primary_key=True)
|
|
comtype = db.Column(db.String(50), unique=True, nullable=False)
|
|
description = db.Column(db.Text)
|
|
|
|
# Types: IP, Serial, USB, VNC, FTP, DNC, Parallel, Network Interface
|
|
|
|
def __repr__(self):
|
|
return f"<CommunicationType {self.comtype}>"
|
|
|
|
|
|
class Communication(BaseModel):
|
|
"""
|
|
Communication interface for an asset (or legacy machine).
|
|
Stores network config, serial settings, etc.
|
|
"""
|
|
__tablename__ = 'communications'
|
|
|
|
communicationid = db.Column(db.Integer, primary_key=True)
|
|
|
|
# New asset-based FK (preferred)
|
|
assetid = db.Column(
|
|
db.Integer,
|
|
db.ForeignKey('assets.assetid'),
|
|
nullable=True,
|
|
comment='FK to assets table (new architecture)'
|
|
)
|
|
|
|
comtypeid = db.Column(
|
|
db.Integer,
|
|
db.ForeignKey('communicationtypes.comtypeid'),
|
|
nullable=False
|
|
)
|
|
|
|
# Network configuration (for IP type)
|
|
ipaddress = db.Column(db.String(50))
|
|
subnetmask = db.Column(db.String(50))
|
|
gateway = db.Column(db.String(50))
|
|
dns1 = db.Column(db.String(50))
|
|
dns2 = db.Column(db.String(50))
|
|
macaddress = db.Column(db.String(50))
|
|
isdhcp = db.Column(db.Boolean, default=False)
|
|
|
|
# Serial configuration (for Serial type)
|
|
comport = db.Column(db.String(20))
|
|
baudrate = db.Column(db.Integer)
|
|
databits = db.Column(db.Integer)
|
|
stopbits = db.Column(db.String(10))
|
|
parity = db.Column(db.String(20))
|
|
flowcontrol = db.Column(db.String(20))
|
|
|
|
# VNC/FTP configuration
|
|
port = db.Column(db.Integer)
|
|
username = db.Column(db.String(100))
|
|
# Note: passwords should not be stored here - use secure vault
|
|
|
|
# DNC configuration
|
|
pathname = db.Column(db.String(255))
|
|
pathname2 = db.Column(db.String(255), comment='Secondary path for dualpath')
|
|
|
|
# Flags
|
|
isprimary = db.Column(
|
|
db.Boolean,
|
|
default=False,
|
|
comment='Primary communication method'
|
|
)
|
|
ismachinenetwork = db.Column(
|
|
db.Boolean,
|
|
default=False,
|
|
comment='On machine network vs office network'
|
|
)
|
|
|
|
notes = db.Column(db.Text)
|
|
|
|
# Relationships
|
|
comtype = db.relationship('CommunicationType', backref='communications')
|
|
|
|
__table_args__ = (
|
|
db.Index('idx_comm_asset', 'assetid'),
|
|
db.Index('idx_comm_ip', 'ipaddress'),
|
|
)
|
|
|
|
def __repr__(self):
|
|
return f"<Communication {self.assetid}:{self.comtype.comtype if self.comtype else 'Unknown'}>"
|