b8c22244a1
Make the app distributable to other GE Aerospace sites (one self-hosted
instance per site, ADR-004). GE values remain the shipped defaults; every
site-specific behavior is now a Setting an admin can change in the UI.
Settings-driven site config:
- Branding: site/QR/badge logos, favicon, primary color (upload endpoints
mirror the map-blueprint pattern; new Settings > Branding section).
- ServiceNow: search/incident/change URL templates ({ticket}), ticket
prefixes, enable toggle. Defaults point at the current
geaerospaceqa.service-now.com global search. Disabled = plain-text tickets.
- Employee-id regex (employeeid_pattern), printer hostname template,
QR label targets (qr_target_printer / qr_target_usb, blank = asset page,
else URL template with placeholders), usb_label_style (barcode|qr).
- West Jefferson floor-plan PNGs removed from the tree; generic placeholder
ships as the map default and sites upload their own blueprint.
Security closeout:
- dashboarddefaults writes now require admin.
- Collector: generic error messages (no str(exc) leak); API key accepted
via X-API-Key header only (BREAKING: querystring api_key removed).
- IP-based login rate limiting (AUTH_RATELIMIT_* knobs) atop account lockout.
- Setting.set() creation race fixed (IntegrityError retry).
Release engineering and docs:
- __version__ 0.5.0 (distinct from __contract_version__, ADR-007),
CHANGELOG.md, Gitea Actions CI config, frontend version aligned.
- One wizard-first install story across README/DEPLOY; new CONFIG.md,
UPGRADE.md, BACKUP-RESTORE.md; CLAUDE.md and ROADMAP de-staled.
- Dockerfile multi-stage build now bundles the frontend; compose binds
MySQL to 127.0.0.1; stale database/schema.sql and one-off SQL removed.
Debt and fixes:
- .query.get() -> db.session.get() sweep; datetime.utcnow() removed
(naive-UTC via timezone-aware now); users.py on authz decorators.
- Fixed 4 stale tests (slides feed shape, shopfloor splitperemployee,
plugin contract purity) and the USB label page field mapping (both usb
modes emit the cmmc shape: device_id/device_desc).
- Health endpoint reports the real version.
248 tests pass; naming/style check green; frontend builds; fresh-DB
flask db upgrade + seeds verified; QR targets verified by decoding
rendered codes.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
72 lines
1.9 KiB
Python
72 lines
1.9 KiB
Python
"""Base model class with common fields."""
|
|
|
|
from datetime import datetime, timezone
|
|
from shopdb.extensions import db
|
|
|
|
|
|
def _utcnow():
|
|
# naive UTC for DB columns (stored without tzinfo)
|
|
return datetime.now(timezone.utc).replace(tzinfo=None)
|
|
|
|
|
|
class BaseModel(db.Model):
|
|
"""
|
|
Abstract base model with common fields.
|
|
All models should inherit from this.
|
|
"""
|
|
__abstract__ = True
|
|
|
|
createddate = db.Column(
|
|
db.DateTime,
|
|
default=_utcnow,
|
|
nullable=False
|
|
)
|
|
modifieddate = db.Column(
|
|
db.DateTime,
|
|
default=_utcnow,
|
|
onupdate=_utcnow,
|
|
nullable=False
|
|
)
|
|
isactive = db.Column(db.Boolean, default=True, nullable=False)
|
|
|
|
def to_dict(self):
|
|
"""Convert model to dictionary."""
|
|
result = {}
|
|
for c in self.__table__.columns:
|
|
value = getattr(self, c.name)
|
|
if isinstance(value, datetime):
|
|
value = value.isoformat() + 'Z'
|
|
result[c.name] = value
|
|
return result
|
|
|
|
def update(self, **kwargs):
|
|
"""Update model attributes."""
|
|
for key, value in kwargs.items():
|
|
if hasattr(self, key):
|
|
setattr(self, key, value)
|
|
|
|
@classmethod
|
|
def get_active(cls):
|
|
"""Return query for active records only."""
|
|
return cls.query.filter_by(isactive=True)
|
|
|
|
|
|
class SoftDeleteMixin:
|
|
"""Mixin for soft delete functionality."""
|
|
|
|
deleteddate = db.Column(db.DateTime, nullable=True)
|
|
deletedby = db.Column(db.String(100), nullable=True)
|
|
|
|
def soft_delete(self, deleted_by: str = None):
|
|
"""Mark record as deleted."""
|
|
self.isactive = False
|
|
self.deleteddate = datetime.now(timezone.utc).replace(tzinfo=None)
|
|
self.deletedby = deleted_by
|
|
|
|
|
|
class AuditMixin:
|
|
"""Mixin for audit fields."""
|
|
|
|
createdby = db.Column(db.String(100), nullable=True)
|
|
modifiedby = db.Column(db.String(100), nullable=True)
|