Jul 30 - Allow customer to flag follow-up a inspection

app/models/inspection.py

@@ -81,6 +81,14 @@ class Inspection(db.Model):
     )
     follow_up_required = db.Column(db.Boolean, nullable=False, default=False)
     follow_up_note     = db.Column(db.Text, nullable=True)
+    # Who asked for the follow-up (phase46). NULL for legacy rows flagged before
+    # the column existed. Matters because customers can now raise the request
+    # themselves — staff need to see at a glance that the client is waiting on
+    # this one, not another internal reviewer.
+    follow_up_requested_by = db.Column(
+        db.Integer, db.ForeignKey('users.id', ondelete='SET NULL'), nullable=True
+    )
+    follow_up_requested_at = db.Column(db.DateTime, nullable=True)
 
     results     = db.relationship('InspectionResult', backref='inspection', lazy='dynamic', cascade='all, delete-orphan')
     issues      = db.relationship('Issue', backref='inspection', lazy='dynamic', cascade='all, delete-orphan')
@@ -88,6 +96,10 @@ class Inspection(db.Model):
     # None for ad-hoc/manual inspections or if the schedule was later deleted.
     scheduled_inspection = db.relationship('ScheduledInspection',
                                            foreign_keys=[scheduled_inspection_id])
+    # The user who requested the follow-up (phase46) — a customer or a manager.
+    # Explicit foreign_keys: `inspector_id` also points at users.
+    follow_up_requester = db.relationship('User',
+                                          foreign_keys=[follow_up_requested_by])
     follow_ups  = db.relationship('Inspection', backref=db.backref('parent', remote_side='Inspection.id'),
                                   lazy='dynamic', foreign_keys='Inspection.parent_inspection_id')
 

app/models/notification.py

@@ -33,6 +33,11 @@ EVENT_ADMIN_BROADCAST = 'admin_broadcast'   # bulk messages sent by admin to all
 # overdue to admin/director). Phase 36.
 EVENT_SCHEDULED_INSPECTION = 'scheduled_inspection'
 
+# Fired when someone asks for a follow-up re-inspection of a completed
+# inspection. Raised by admin/director from the inspection page and — since
+# phase46 — by CUSTOMERS for their own facilities. Phase 46.
+EVENT_FOLLOWUP_REQUESTED = 'followup_requested'
+
 ALL_EVENT_TYPES = {
     EVENT_ISSUE_ASSIGNED:  'Issue assigned to me',
     EVENT_ISSUE_STATUS:    'Issue status changed',
@@ -49,6 +54,7 @@ ALL_EVENT_TYPES = {
     EVENT_SCORE_ALERT: 'Facility score trend alert (significant drop detected)',
     # Scheduled inspection reminders (due/advance/overdue)
     EVENT_SCHEDULED_INSPECTION: 'Scheduled inspection reminders (due / overdue)',
+    EVENT_FOLLOWUP_REQUESTED: 'Follow-up re-inspection requested',
 }
 
 

app/models/notification_matrix.py

@@ -31,6 +31,7 @@ issue_flagged            : admin ✓  director  ✓  inspector ✗  pm ✗  cust
 issue_created            : admin ✗  director  ✗  inspector ✗  pm ✗  customer ✓  (assignee implicit)
 issue_updated_customer   : admin ✗  director  ✗  inspector ✗  pm ✗  customer ✓
 verification_requested   : admin ✓  director  ✓  inspector ✗  pm ✗  customer ✗
+followup_requested       : admin ✓  director  ✓  inspector ✗  pm ✓  customer ✗  (inspection's own inspector implicit)
 sla_alert                : admin ✓  director  ✗  inspector ✗  pm ✗  customer ✗  (assignee + followers implicit)
 score_alert              : admin ✓  director  ✓  inspector ✗  pm ✗  customer ✗  (facility score drop cron)
 """
@@ -63,6 +64,7 @@ MATRIX_EVENTS = {
     'issue_created':          'Issue created (standalone)',
     'issue_updated_customer': 'Issue updated (customer)',
     'verification_requested': 'Verification requested',
+    'followup_requested':     'Follow-up requested (incl. by customer)',
     'sla_alert':              'SLA at-risk / breached',
     'score_alert':            'Facility score trend alert (significant drop)',
 }
@@ -147,6 +149,16 @@ MATRIX_DEFAULTS = {
     ('verification_requested', 'project_manager'): False,
     ('verification_requested', 'customer'):        False,
     ('verification_requested', 'custom'):          False,
+    # followup_requested — a customer (or manager) asks for a re-inspection.
+    # On for the roles who action it; the inspection's own inspector is
+    # notified directly by the route, so the inspector column stays off to
+    # avoid alerting the whole inspector pool.
+    ('followup_requested',     'admin'):           True,
+    ('followup_requested',     'director'):        True,
+    ('followup_requested',     'inspector'):       False,
+    ('followup_requested',     'project_manager'): True,
+    ('followup_requested',     'customer'):        False,
+    ('followup_requested',     'custom'):          False,
     # sla_alert (assignee + followers always notified implicitly)
     ('sla_alert',              'admin'):           True,
     ('sla_alert',              'director'):      False,

app/models/user.py

@@ -34,7 +34,12 @@ class User(UserMixin, db.Model):
     set_password_token_expires  = db.Column(db.DateTime, nullable=True)
 
     # Relationships
-    inspections = db.relationship('Inspection', backref='inspector', lazy='dynamic')
+    # Explicit foreign_keys: inspections now has a SECOND FK to users
+    # (follow_up_requested_by, phase46), so the join is otherwise ambiguous.
+    # This relationship means "inspections I performed" — inspector_id only.
+    inspections = db.relationship('Inspection', backref='inspector',
+                                  lazy='dynamic',
+                                  foreign_keys='Inspection.inspector_id')
 
     # ── Flask-Login integration ────────────────────────────────────────────
     # Override UserMixin.is_active so that disabled accounts are rejected