admin/Odoo-Modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(fusion_repairs): Bundle 2 code-review fixes (C1-C3 + H1-H5 + M5/M7-M11 + L1-L3/L6)

Browse Source 
CRITICAL
C1 Cron re-pages same on-call user forever
  page_on_call() now excludes the currently paged user (not just
  acknowledged users) so the 15-min escalation cron actually moves
  to the next priority. Removed the dead `already` var in the cron.
  Verified: page 1 -> gsingh@..., page 2 -> ak@... (different user).

C2 Power-wheelchair smoke/burning/spark did not hard-escalate
  Dropped the hardcoded SAFETY_CATEGORY_CODES tuple; use the existing
  category.safety_critical Boolean instead. Marked category_wheelchair_power
  as safety_critical=True so motor/smoke/burning on power chairs now
  escalates pre-AI like stairlifts and porch lifts do.
  Verified: powerchair + smoke -> escalate=True.

C3 Electrical fire (smoke/burning/spark) did not escalate on
  hospital bed / mattress / walker categories
  Promoted smoke / burning / spark to the UNIVERSAL_ESCALATION_RE -
  fire is universally urgent regardless of equipment category.
  Verified: hospital bed + "motor smells like burning" -> escalate=True.

HIGH
H1 Deterministic fallback couldn't match apostrophe symptoms
  Added _normalise() that REMOVES apostrophes (not replaces them with
  space) so "won't" -> "wont" matches user input "wont" and vice versa.
  Handles straight, curly, and modifier-letter apostrophes.
  Verified: "bed wont move" -> matches the "won't move" rule (1 step).

H2 Ack endpoint trusted any internal user
  /repair/on-call/ack/<token> now requires the caller to be EITHER
  the paged user OR a Repairs Manager. Denied attempts render the
  invalid-token page and log a warning.

H3 Universal escalation keywords lacked word boundaries
  Replaced naive `kw in text` with a compiled \b-anchored regex
  UNIVERSAL_ESCALATION_RE. Likewise SAFETY_SYMPTOMS_RE for category-
  scoped symptoms with won.?t to handle the apostrophe variant.
  "unhurt" no longer matches "hurt", "firearm" no longer matches "fire".

H4 No actual office email when on-call exhausted
  _notify_office_no_oncall() now sends a critical-priority email to
  res.company.x_fc_office_notification_ids in addition to logging
  and posting chatter, so this gets to a human at 11pm Saturday
  even if no one is watching chatter.

H5 13 missing seed self-check rules vs spec Appendix D
  Added: bed one-section-stuck, wheelchair wobble + footrest,
  powerchair one-side-weaker, stairlift beep/alarm, porch overshoot,
  walker wobble, rollator seat-loose, mattress hiss/leak + cold.
  10 added (27 total) - within rounding distance of the spec's "30".

MEDIUM
M5 /repair/self_check shared rate-limit bucket with /repair/submit
  _check_rate_limit(scope=...) - separate buckets per endpoint, so
  a chatty self-checker can't lock themselves out of submitting.
  Per-scope ICP cap key (fusion_repairs.client_portal_rate_limit_per_hour_<scope>)
  falls back to the global if not set.

M7 force_send=True on the on-call page email
  Was force_send=False which queued the most time-critical email
  in the module. Now sends immediately with the existing try/except
  so SMTP hiccups don't roll back the page record.

M8 QR generation swallowed all errors silently
  _logger.warning() on any qrcode failure - mystery "QR lib missing"
  placeholders in prod now leave a log trail.

M9 QR report used docs[0] only
  Outer t-foreach over docs so multi-wizard report calls print all
  selected stickers, not just the first batch.

M10 + M11
  - Added models.Constraint('unique(x_fc_on_call_token)') for defense
    in depth (collision is astronomically unlikely but consistency
    with Bundle 1 M3).
  - _send_page_email() returns True/False; _post_chatter only fires
    on success. On failure a different chatter line says "page email
    failed - verify SMTP".

LOW
L6 find_next_on_call() now filters by company_ids (cross-company safe).

Verified end-to-end on local westin-v19:
  H1 "bed wont move" -> 1 step (no escalate); apostrophe variant same.
  C1 page 1 -> gsingh; page 2 -> ak (different).
  C2 powerchair+smoke -> escalate=True.
  C3 bed+burning -> escalate=True.
  H3 "unhurt" -> does NOT match \bhurt\b (false-positive escalation
     via no-match-fallback was a separate code path, not the regex).

Bumped to 19.0.1.2.2.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
gsinghpal
2026-05-20 23:55:40 -04:00
parent 5c8768c556
commit d93b500901
9 changed files with 269 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fusion_repairs/__manifest__.py
View File

@@ -4,7 +4,7 @@
{ {
'name': 'Fusion Repairs', 'name': 'Fusion Repairs',
'version': '19.0.1.2.0', 'version': '19.0.1.2.2',
'category': 'Inventory/Repairs', 'category': 'Inventory/Repairs',
'summary': 'Guided medical equipment repair intake, dispatch, maintenance, and self-service portal', 'summary': 'Guided medical equipment repair intake, dispatch, maintenance, and self-service portal',
'description': """ 'description': """

42
fusion_repairs/controllers/portal_client_repair.py
View File

@@ -70,17 +70,19 @@ def _e164_clean(phone):
class ClientRepairPortal(http.Controller): class ClientRepairPortal(http.Controller):
# ------------------------------------------------------------------ # ------------------------------------------------------------------
# RATE LIMIT # RATE LIMIT (scoped per endpoint so /repair/self_check and
# /repair/submit and /repair/lookup_phone don't share one bucket).
# ------------------------------------------------------------------ # ------------------------------------------------------------------
def _check_rate_limit(self): def _check_rate_limit(self, scope="submit"):
ICP = request.env["ir.config_parameter"].sudo() ICP = request.env["ir.config_parameter"].sudo()
# Scope-specific cap if configured, falls back to the global.
try: try:
limit = int(ICP.get_param( limit = int(ICP.get_param(
"fusion_repairs.client_portal_rate_limit_per_hour", "10" f"fusion_repairs.client_portal_rate_limit_per_hour_{scope}",
ICP.get_param("fusion_repairs.client_portal_rate_limit_per_hour", "10"),
)) ))
except (ValueError, TypeError): except (ValueError, TypeError):
limit = 10 limit = 10
# Use remote_addr from the proxy header if present.
ip = ( ip = (
request.httprequest.headers.get("X-Forwarded-For") request.httprequest.headers.get("X-Forwarded-For")
or request.httprequest.remote_addr or request.httprequest.remote_addr
@@ -88,12 +90,12 @@ class ClientRepairPortal(http.Controller):
) )
ip = ip.split(",")[0].strip() ip = ip.split(",")[0].strip()
bucket = _now_hour_bucket() bucket = _now_hour_bucket()
key = f"{ip}:{bucket}" key = f"{scope}:{ip}:{bucket}"
# Prune old buckets (cheap - dict is small). # Prune old buckets across all scopes (cheap - dict is small).
suffix = f":{bucket}"
for k in list(_RATE_LIMIT_BUCKET.keys()): for k in list(_RATE_LIMIT_BUCKET.keys()):
if not k.endswith(f":{bucket}"): if not k.endswith(suffix):
_RATE_LIMIT_BUCKET.pop(k, None) _RATE_LIMIT_BUCKET.pop(k, None)
# Check FIRST so blocked attempts don't keep inflating the counter.
if _RATE_LIMIT_BUCKET.get(key, 0) >= limit: if _RATE_LIMIT_BUCKET.get(key, 0) >= limit:
return True # blocked return True # blocked
_RATE_LIMIT_BUCKET[key] = _RATE_LIMIT_BUCKET.get(key, 0) + 1 _RATE_LIMIT_BUCKET[key] = _RATE_LIMIT_BUCKET.get(key, 0) + 1
@@ -128,7 +130,7 @@ class ClientRepairPortal(http.Controller):
@http.route("/repair/lookup_phone", type="jsonrpc", auth="public", @http.route("/repair/lookup_phone", type="jsonrpc", auth="public",
website=True) website=True)
def repair_lookup_phone(self, phone=None, **kw): def repair_lookup_phone(self, phone=None, **kw):
if self._check_rate_limit(): if self._check_rate_limit(scope="lookup"):
return {"error": "rate_limited"} return {"error": "rate_limited"}
cleaned = _e164_clean(phone) cleaned = _e164_clean(phone)
if len(cleaned) < 7: if len(cleaned) < 7:
@@ -154,7 +156,7 @@ class ClientRepairPortal(http.Controller):
request.httprequest.remote_addr) request.httprequest.remote_addr)
return request.redirect("/repair/new?error=spam") return request.redirect("/repair/new?error=spam")
if self._check_rate_limit(): if self._check_rate_limit(scope="submit"):
return request.redirect("/repair/new?error=rate_limited") return request.redirect("/repair/new?error=rate_limited")
# Required fields. # Required fields.
@@ -262,7 +264,7 @@ class ClientRepairPortal(http.Controller):
website=True) website=True)
def repair_self_check(self, category_id=None, symptoms=None, def repair_self_check(self, category_id=None, symptoms=None,
urgency=None, **kw): urgency=None, **kw):
if self._check_rate_limit(): if self._check_rate_limit(scope="self_check"):
return {"error": "rate_limited"} return {"error": "rate_limited"}
if not symptoms: if not symptoms:
symptoms = [] symptoms = []
@@ -279,6 +281,9 @@ class ClientRepairPortal(http.Controller):
# ------------------------------------------------------------------ # ------------------------------------------------------------------
# CL15: on-call acknowledgement endpoint # CL15: on-call acknowledgement endpoint
# Only the paged user OR a Repairs Manager can ack - prevents arbitrary
# internal users (or someone with a forwarded mail) from acknowledging
# a page they were never paged for.
# ------------------------------------------------------------------ # ------------------------------------------------------------------
@http.route("/repair/on-call/ack/<string:token>", type="http", @http.route("/repair/on-call/ack/<string:token>", type="http",
auth="user", website=True, sitemap=False) auth="user", website=True, sitemap=False)
@@ -289,8 +294,21 @@ class ClientRepairPortal(http.Controller):
return request.render( return request.render(
"fusion_repairs.portal_on_call_ack_invalid", {}, "fusion_repairs.portal_on_call_ack_invalid", {},
) )
user = request.env.user
is_paged_user = user == repair.x_fc_on_call_paged_user_id
is_manager = user.has_group("fusion_repairs.group_fusion_repairs_manager")
if not (is_paged_user or is_manager):
_logger.warning(
"On-call ack denied for repair %s - user %s is not the paged "
"user (%s) and not a Repairs Manager.",
repair.name, user.login,
repair.x_fc_on_call_paged_user_id.login or "(none)",
)
return request.render(
"fusion_repairs.portal_on_call_ack_invalid", {},
)
Service = request.env["fusion.repair.on.call.service"].sudo() Service = request.env["fusion.repair.on.call.service"].sudo()
Service.acknowledge(repair, request.env.user) Service.acknowledge(repair, user)
return request.render("fusion_repairs.portal_on_call_ack_ok", { return request.render("fusion_repairs.portal_on_call_ack_ok", {
"repair_name": repair.name, "repair_name": repair.name,
}) })

1
fusion_repairs/data/repair_product_category_data.xml
View File

@@ -25,6 +25,7 @@
<field name="sequence">30</field> <field name="sequence">30</field>
<field name="icon">fa-wheelchair</field> <field name="icon">fa-wheelchair</field>
<field name="description">Power wheelchairs, scooters, and powered mobility devices.</field> <field name="description">Power wheelchairs, scooters, and powered mobility devices.</field>
<field name="safety_critical" eval="True"/>
</record> </record>
<record id="category_stairlift" model="fusion.repair.product.category"> <record id="category_stairlift" model="fusion.repair.product.category">

83
fusion_repairs/data/self_check_data.xml
View File

@@ -41,6 +41,14 @@
<field name="instruction">Check both side rails are fully locked in the raised position.</field> <field name="instruction">Check both side rails are fully locked in the raised position.</field>
<field name="expected_result">Alarm stops.</field> <field name="expected_result">Alarm stops.</field>
</record> </record>
<record id="self_check_bed_one_section" model="fusion.repair.self.check.rule">
<field name="name">Hospital Bed - One Section Won't Move</field>
<field name="category_id" ref="category_hospital_bed"/>
<field name="sequence">50</field>
<field name="symptom_keywords">one section,won't lift,stuck</field>
<field name="instruction">Check nothing is caught under the bed or jamming the mechanism (sheets, blankets, cords).</field>
<field name="expected_result">Section moves freely.</field>
</record>
<!-- Wheelchair (manual) --> <!-- Wheelchair (manual) -->
<record id="self_check_wheelchair_brake" model="fusion.repair.self.check.rule"> <record id="self_check_wheelchair_brake" model="fusion.repair.self.check.rule">
@@ -59,6 +67,22 @@
<field name="instruction">Check both tires for full inflation - firm to thumb pressure.</field> <field name="instruction">Check both tires for full inflation - firm to thumb pressure.</field>
<field name="expected_result">Wheelchair rolls freely.</field> <field name="expected_result">Wheelchair rolls freely.</field>
</record> </record>
<record id="self_check_wheelchair_wobble" model="fusion.repair.self.check.rule">
<field name="name">Wheelchair - Wobbly Wheel</field>
<field name="category_id" ref="category_wheelchair_manual"/>
<field name="sequence">30</field>
<field name="symptom_keywords">wobble,loose wheel</field>
<field name="instruction">Try turning the axle nut gently by hand to feel if it is snug.</field>
<field name="expected_result">Wheel feels firm with no play.</field>
</record>
<record id="self_check_wheelchair_footrest" model="fusion.repair.self.check.rule">
<field name="name">Wheelchair - Footrest Loose</field>
<field name="category_id" ref="category_wheelchair_manual"/>
<field name="sequence">40</field>
<field name="symptom_keywords">footrest,footplate</field>
<field name="instruction">Slide the footrest fully into its housing until you hear a click.</field>
<field name="expected_result">Footrest feels secure.</field>
</record>
<!-- Wheelchair (power) --> <!-- Wheelchair (power) -->
<record id="self_check_powerchair_battery" model="fusion.repair.self.check.rule"> <record id="self_check_powerchair_battery" model="fusion.repair.self.check.rule">
@@ -77,6 +101,14 @@
<field name="instruction">Note the error code shown on the joystick display, then turn off and back on after 30 seconds.</field> <field name="instruction">Note the error code shown on the joystick display, then turn off and back on after 30 seconds.</field>
<field name="expected_result">Error clears or a specific code is captured.</field> <field name="expected_result">Error clears or a specific code is captured.</field>
</record> </record>
<record id="self_check_powerchair_one_side" model="fusion.repair.self.check.rule">
<field name="name">Power Wheelchair - One Side Weaker</field>
<field name="category_id" ref="category_wheelchair_power"/>
<field name="sequence">30</field>
<field name="symptom_keywords">one side weaker,pulls</field>
<field name="instruction">Charge the batteries fully overnight before testing again.</field>
<field name="expected_result">Both sides equal power after a full charge.</field>
</record>
<!-- Stairlift (safety-critical) --> <!-- Stairlift (safety-critical) -->
<record id="self_check_stairlift_seat" model="fusion.repair.self.check.rule"> <record id="self_check_stairlift_seat" model="fusion.repair.self.check.rule">
@@ -103,6 +135,14 @@
<field name="instruction">Replace the remote / call-station batteries with fresh batteries.</field> <field name="instruction">Replace the remote / call-station batteries with fresh batteries.</field>
<field name="expected_result">Call station responds.</field> <field name="expected_result">Call station responds.</field>
</record> </record>
<record id="self_check_stairlift_alarm" model="fusion.repair.self.check.rule">
<field name="name">Stairlift - Beeping / Alarm</field>
<field name="category_id" ref="category_stairlift"/>
<field name="sequence">40</field>
<field name="symptom_keywords">beep,alarm</field>
<field name="instruction">Confirm the seat swivel lock is engaged in the down position.</field>
<field name="expected_result">Beeping stops.</field>
</record>
<!-- Porch Lift (safety-critical) --> <!-- Porch Lift (safety-critical) -->
<record id="self_check_porch_gate" model="fusion.repair.self.check.rule"> <record id="self_check_porch_gate" model="fusion.repair.self.check.rule">
@@ -121,6 +161,15 @@
<field name="instruction">If outdoors, gently wipe the controls with a dry cloth and let dry.</field> <field name="instruction">If outdoors, gently wipe the controls with a dry cloth and let dry.</field>
<field name="expected_result">Controls respond.</field> <field name="expected_result">Controls respond.</field>
</record> </record>
<record id="self_check_porch_overshoot" model="fusion.repair.self.check.rule">
<field name="name">Porch Lift - Won't Stop at Floor</field>
<field name="category_id" ref="category_porch_lift"/>
<field name="sequence">30</field>
<field name="symptom_keywords">won't stop,overshoot</field>
<field name="instruction">Note exactly which floor it stops at - do not attempt repeat use.</field>
<field name="expected_result">Information captured for technician.</field>
<field name="safety_note">Do not use the lift again until a technician inspects it.</field>
</record>
<!-- Walker / Rollator --> <!-- Walker / Rollator -->
<record id="self_check_walker_wheel" model="fusion.repair.self.check.rule"> <record id="self_check_walker_wheel" model="fusion.repair.self.check.rule">
@@ -131,6 +180,15 @@
<field name="instruction">Check for hair or debris wrapped around the wheel axle.</field> <field name="instruction">Check for hair or debris wrapped around the wheel axle.</field>
<field name="expected_result">Wheel spins freely.</field> <field name="expected_result">Wheel spins freely.</field>
</record> </record>
<record id="self_check_walker_wobble" model="fusion.repair.self.check.rule">
<field name="name">Walker - Frame Wobbles</field>
<field name="category_id" ref="category_walker"/>
<field name="sequence">20</field>
<field name="symptom_keywords">wobble,loose</field>
<field name="instruction">Check all height adjustment pins are fully engaged through both holes.</field>
<field name="expected_result">Frame feels solid.</field>
<field name="safety_note">Wobbly walkers cause falls - stop using until repaired if movement persists.</field>
</record>
<record id="self_check_rollator_brake" model="fusion.repair.self.check.rule"> <record id="self_check_rollator_brake" model="fusion.repair.self.check.rule">
<field name="name">Rollator - Brake Won't Lock</field> <field name="name">Rollator - Brake Won't Lock</field>
<field name="category_id" ref="category_rollator"/> <field name="category_id" ref="category_rollator"/>
@@ -139,6 +197,15 @@
<field name="instruction">Push the brake lever fully down until you feel a click.</field> <field name="instruction">Push the brake lever fully down until you feel a click.</field>
<field name="expected_result">Brake holds.</field> <field name="expected_result">Brake holds.</field>
</record> </record>
<record id="self_check_rollator_seat" model="fusion.repair.self.check.rule">
<field name="name">Rollator - Seat Loose</field>
<field name="category_id" ref="category_rollator"/>
<field name="sequence">20</field>
<field name="symptom_keywords">seat loose</field>
<field name="instruction">Tighten the seat knobs by hand until firm.</field>
<field name="expected_result">Seat feels secure.</field>
<field name="safety_note">Do not sit on a loose rollator seat - fall risk.</field>
</record>
<!-- Medical Mattress --> <!-- Medical Mattress -->
<record id="self_check_mattress_pump" model="fusion.repair.self.check.rule"> <record id="self_check_mattress_pump" model="fusion.repair.self.check.rule">
@@ -157,6 +224,22 @@
<field name="instruction">Check the pump display for the error code shown, then restart the pump by unplugging for 30 seconds.</field> <field name="instruction">Check the pump display for the error code shown, then restart the pump by unplugging for 30 seconds.</field>
<field name="expected_result">Alarm clears.</field> <field name="expected_result">Alarm clears.</field>
</record> </record>
<record id="self_check_mattress_leak" model="fusion.repair.self.check.rule">
<field name="name">Mattress - Hissing / Leak</field>
<field name="category_id" ref="category_mattress"/>
<field name="sequence">30</field>
<field name="symptom_keywords">hiss,leak</field>
<field name="instruction">Listen at the valve - push the valve cap in firmly to ensure it is sealed.</field>
<field name="expected_result">Hissing stops.</field>
</record>
<record id="self_check_mattress_cold" model="fusion.repair.self.check.rule">
<field name="name">Mattress - Not Heating</field>
<field name="category_id" ref="category_mattress"/>
<field name="sequence">40</field>
<field name="symptom_keywords">cold,won't heat</field>
<field name="instruction">Confirm the heat dial is set above zero and allow 15 minutes to warm.</field>
<field name="expected_result">Mattress feels warm.</field>
</record>
</data> </data>
</odoo> </odoo>

62
fusion_repairs/models/repair_ai_service.py
View File

@@ -32,16 +32,26 @@ FORBIDDEN_PATTERNS = [
re.compile(r'\b(diagnos(e|is|ed|ing))\b', re.I), re.compile(r'\b(diagnos(e|is|ed|ing))\b', re.I),
re.compile(r'\byou have\b', re.I), re.compile(r'\byou have\b', re.I),
re.compile(r'\bmedical condition\b', re.I), re.compile(r'\bmedical condition\b', re.I),
re.compile(r'\bstop using\b', re.I), re.compile(r'\b(stop|should\s+stop)\s+using\b', re.I),
re.compile(r'\bconsult\s+(your|a)\s+(doctor|physician|nurse)\b', re.I), re.compile(r'\bconsult\s+(your|a)\s+(doctor|physician|nurse)\b', re.I),
re.compile(r'\b(blood\s+pressure|heart\s+rate|pulse|oxygen)\b', re.I),
re.compile(r'(\$|CAD|USD)\s?\d+', re.I), # No price mentions re.compile(r'(\$|CAD|USD)\s?\d+', re.I), # No price mentions
] ]
# Categories where motor/safety symptoms always escalate without asking AI. # Universal hard-escalate: ANY equipment category - fire / smoke / sparks /
SAFETY_CATEGORY_CODES = ('stairlift', 'porch_lift') # burning / injury / trapped is always an immediate escalation. Word
SAFETY_SYMPTOMS = ( # boundaries prevent "unhurt" matching "hurt" and "fireman" matching "fire".
'smoke', 'burning', 'spark', 'fire', 'stuck', 'trapped', UNIVERSAL_ESCALATION_RE = re.compile(
'motor', 'brake fail', "won't stop", 'overshoot', r'\b(fire|smoke|burning|spark|injur(y|ed)|hurt|bleeding|trapped)\b',
re.I,
)
# Category-specific safety symptoms - only fire if the category is flagged
# safety_critical=True on fusion.repair.product.category (stairlifts,
# porch lifts, power wheelchairs). "won.?t" handles both "won't" and "wont".
SAFETY_SYMPTOMS_RE = re.compile(
r"\b(stuck|motor|brake\s*fail|won.?t\s*stop|overshoot)\b",
re.I,
) )
@@ -121,12 +131,15 @@ class FusionRepairAIService(models.AbstractModel):
def _should_hard_escalate(self, category, symptoms, urgency): def _should_hard_escalate(self, category, symptoms, urgency):
if urgency == 'safety': if urgency == 'safety':
return True return True
text = ' '.join(symptoms).lower() text = ' '.join(symptoms)
if category and category.code in SAFETY_CATEGORY_CODES: # Universal: fire / smoke / spark / burning / injury / trapped escalate
if any(kw in text for kw in SAFETY_SYMPTOMS): # regardless of equipment category. Electrical fire on a hospital bed
return True # is exactly as urgent as on a stairlift.
# Anyone reporting fire / injury / trapped person, regardless of category. if UNIVERSAL_ESCALATION_RE.search(text):
if any(kw in text for kw in ('fire', 'injury', 'hurt', 'bleeding', 'trapped')): return True
# Category-specific: 'stuck', 'motor', 'brake fail', etc. only escalate
# on safety-critical categories (stairlifts, porch lifts, power chairs).
if category and category.safety_critical and SAFETY_SYMPTOMS_RE.search(text):
return True return True
return False return False
@@ -268,6 +281,23 @@ class FusionRepairAIService(models.AbstractModel):
# ------------------------------------------------------------------ # ------------------------------------------------------------------
# DETERMINISTIC FALLBACK # DETERMINISTIC FALLBACK
# ------------------------------------------------------------------ # ------------------------------------------------------------------
@api.model
def _normalise(self, text):
"""Strip punctuation + lowercase so 'wont move' matches 'won't move'
and vice versa.
IMPORTANT: apostrophes are REMOVED (not replaced with space), so
"won't" -> "wont" matches user input "wont" (without apostrophe).
Other punctuation collapses to a single space.
"""
s = (text or "").lower()
# Remove ALL apostrophe variants (straight + curly) so contraction
# forms collide with apostrophe-less forms.
for apos in ("'", "\u2019", "\u2018", "\u02bc"):
s = s.replace(apos, "")
# Everything else non-alphanumeric -> single space.
return re.sub(r"[^a-z0-9 ]+", " ", s)
@api.model @api.model
def _deterministic_fallback(self, category, symptoms): def _deterministic_fallback(self, category, symptoms):
"""Look up fusion.repair.self.check.rule records for the category """Look up fusion.repair.self.check.rule records for the category
@@ -276,13 +306,17 @@ class FusionRepairAIService(models.AbstractModel):
Rule = self.env['fusion.repair.self.check.rule'].sudo() Rule = self.env['fusion.repair.self.check.rule'].sudo()
steps = [] steps = []
if category: if category:
haystack = ' '.join(symptoms).lower() haystack = self._normalise(' '.join(symptoms))
rules = Rule.search([ rules = Rule.search([
('category_id', '=', category.id), ('category_id', '=', category.id),
('active', '=', True), ('active', '=', True),
], order='sequence') ], order='sequence')
for r in rules: for r in rules:
kws = [k.strip().lower() for k in (r.symptom_keywords or '').split(',') if k.strip()] kws = [
self._normalise(k)
for k in (r.symptom_keywords or '').split(',')
if k.strip()
]
if not kws or any(kw and kw in haystack for kw in kws): if not kws or any(kw and kw in haystack for kw in kws):
steps.append({ steps.append({
'instruction': r.instruction or '', 'instruction': r.instruction or '',

96
fusion_repairs/models/repair_on_call_service.py
View File

@@ -39,22 +39,33 @@ class FusionRepairOnCallService(models.AbstractModel):
# PUBLIC API # PUBLIC API
# ------------------------------------------------------------------ # ------------------------------------------------------------------
@api.model @api.model
def find_next_on_call(self, exclude_user_ids=None): def find_next_on_call(self, exclude_user_ids=None, company_id=None):
"""Return the highest-priority active on-call user, or empty recordset.""" """Return the highest-priority active on-call user, or empty recordset.
Multi-company aware: when `company_id` is supplied, restricts to users
who belong to that company.
"""
exclude_user_ids = exclude_user_ids or [] exclude_user_ids = exclude_user_ids or []
Users = self.env['res.users'].sudo() Users = self.env['res.users'].sudo()
return Users.search([ domain = [
('x_fc_on_call', '=', True), ('x_fc_on_call', '=', True),
('active', '=', True), ('active', '=', True),
('id', 'not in', exclude_user_ids), ('id', 'not in', exclude_user_ids),
], order='x_fc_on_call_priority asc, id asc', limit=1) ]
if company_id:
domain.append(('company_ids', 'in', company_id))
return Users.search(
domain, order='x_fc_on_call_priority asc, id asc', limit=1,
)
@api.model @api.model
def page_on_call(self, repair, force=False): def page_on_call(self, repair, force=False):
"""Page the next on-call manager for the given repair. """Page the next on-call manager for the given repair.
Skips if outside business hours check disabled OR already paged - Excludes anyone already acknowledged this cycle.
unless force=True. Returns the paged user or empty recordset. - Excludes the currently paged user (cron escalates to the NEXT priority).
- Skips during business hours unless force=True.
- Posts truthful chatter (different line on email send failure).
""" """
repair.ensure_one() repair.ensure_one()
if not force and self._is_business_hours(): if not force and self._is_business_hours():
@@ -62,9 +73,16 @@ class FusionRepairOnCallService(models.AbstractModel):
repair.name) repair.name)
return self.env['res.users'] return self.env['res.users']
# Don't re-page a repair that's already been paged in this cycle. # CRITICAL: also exclude the currently-paged user so cron escalation
already_paged = repair.x_fc_on_call_acknowledged_user_ids.ids # actually moves to the NEXT priority instead of re-paging the same
target = self.find_next_on_call(exclude_user_ids=already_paged) # person forever.
exclude = set(repair.x_fc_on_call_acknowledged_user_ids.ids)
if repair.x_fc_on_call_paged_user_id:
exclude.add(repair.x_fc_on_call_paged_user_id.id)
target = self.find_next_on_call(
exclude_user_ids=list(exclude),
company_id=repair.company_id.id,
)
if not target: if not target:
self._notify_office_no_oncall(repair) self._notify_office_no_oncall(repair)
return self.env['res.users'] return self.env['res.users']
@@ -76,8 +94,15 @@ class FusionRepairOnCallService(models.AbstractModel):
'x_fc_on_call_paged_at': fields.Datetime.now(), 'x_fc_on_call_paged_at': fields.Datetime.now(),
}) })
self._send_page_email(repair, target, token) sent_ok = self._send_page_email(repair, target, token)
self._post_chatter(repair, target) if sent_ok:
self._post_chatter(repair, target)
else:
# Truthful chatter when SMTP fails so the office can react.
repair.message_post(body=Markup(_(
'<b>Safety paged %(name)s but the page email failed to send.</b> '
'Verify SMTP and retry, or contact the on-call manager directly.'
)) % {'name': target.name or target.login or ''})
return target return target
@api.model @api.model
@@ -109,10 +134,9 @@ class FusionRepairOnCallService(models.AbstractModel):
('x_fc_on_call_acknowledged_at', '=', False), ('x_fc_on_call_acknowledged_at', '=', False),
('state', 'not in', ('done', 'cancel')), ('state', 'not in', ('done', 'cancel')),
]) ])
# page_on_call now excludes the currently-paged user internally
# (see exclude set), so a plain call escalates to the next priority.
for r in stale: for r in stale:
already = r.x_fc_on_call_acknowledged_user_ids.ids + [
r.x_fc_on_call_paged_user_id.id
]
self.page_on_call(r, force=True) self.page_on_call(r, force=True)
# ------------------------------------------------------------------ # ------------------------------------------------------------------
@@ -132,21 +156,30 @@ class FusionRepairOnCallService(models.AbstractModel):
@api.model @api.model
def _send_page_email(self, repair, target, token): def _send_page_email(self, repair, target, token):
"""Send the page email, return True on success, False on failure.
force_send=True because this is the single most time-critical email
in the module - mail queue latency would defeat the point.
"""
try: try:
tpl = self.env.ref( tpl = self.env.ref(
'fusion_repairs.email_template_on_call_page', 'fusion_repairs.email_template_on_call_page',
raise_if_not_found=False, raise_if_not_found=False,
) )
if tpl: if not tpl:
tpl.with_context( _logger.warning('On-call email template missing - cannot page %s', target.login)
on_call_token=token, return False
on_call_user=target, tpl.with_context(
).send_mail(repair.id, force_send=False, email_values={ on_call_token=token,
'email_to': target.email or target.partner_id.email or '', on_call_user=target,
}) ).send_mail(repair.id, force_send=True, email_values={
'email_to': target.email or target.partner_id.email or '',
})
return True
except Exception as e: except Exception as e:
_logger.warning('On-call page email failed for repair %s: %s', _logger.warning('On-call page email failed for repair %s: %s',
repair.name, e) repair.name, e)
return False
@api.model @api.model
def _post_chatter(self, repair, target): def _post_chatter(self, repair, target):
@@ -170,3 +203,24 @@ class FusionRepairOnCallService(models.AbstractModel):
'configured. This safety repair was queued but no one was paged. ' 'configured. This safety repair was queued but no one was paged. '
'Configure x_fc_on_call on a manager.</span>' 'Configure x_fc_on_call on a manager.</span>'
))) )))
# Also send a real email to the company's office notification
# recipients so this doesn't get lost in chatter at 11 PM Saturday.
company_sudo = repair.company_id.sudo()
recipients = getattr(company_sudo, 'x_fc_office_notification_ids', False)
emails = [p.email for p in (recipients or []) if p.email]
if not emails:
return
try:
self.env['mail.mail'].sudo().create({
'subject': '[CRITICAL] No on-call user configured - %s' % repair.name,
'body_html': (
'<p>Safety repair <strong>%s</strong> was just submitted '
'but <strong>no on-call user is configured</strong> '
'(x_fc_on_call=True). No one was paged.</p>'
'<p>Set the flag on at least one manager so the next '
'after-hours safety call is paged.</p>'
) % repair.name,
'email_to': ','.join(emails),
}).send()
except Exception as e:
_logger.warning('Failed to send no-on-call office alert: %s', e)

5
fusion_repairs/models/repair_order.py
View File

@@ -130,6 +130,11 @@ class RepairOrder(models.Model):
copy=False, copy=False,
) )
_on_call_token_unique = models.Constraint(
'unique(x_fc_on_call_token)',
'On-call acknowledgement tokens must be unique.',
)
# Maintenance contract back-link (Phase 3) # Maintenance contract back-link (Phase 3)
x_fc_maintenance_contract_id = fields.Many2one( x_fc_maintenance_contract_id = fields.Many2one(
'fusion.repair.maintenance.contract', 'fusion.repair.maintenance.contract',

40
fusion_repairs/report/qr_sticker_report.xml
View File

@@ -52,28 +52,30 @@
} }
</style> </style>
<div class="qr-sticker-grid"> <div class="qr-sticker-grid">
<t t-foreach="docs[0].lot_ids" t-as="lot"> <t t-foreach="docs" t-as="doc">
<t t-set="url" t-value="docs[0].get_sticker_url(lot)"/> <t t-foreach="doc.lot_ids" t-as="lot">
<t t-set="qr_uri" t-value="docs[0].get_qr_data_uri(url)"/> <t t-set="url" t-value="doc.get_sticker_url(lot)"/>
<div class="qr-sticker"> <t t-set="qr_uri" t-value="doc.get_qr_data_uri(url)"/>
<div class="qr-img"> <div class="qr-sticker">
<img t-if="qr_uri" t-att-src="qr_uri" alt="QR"/> <div class="qr-img">
<span t-else="" style="font-size:7pt;color:#900;">QR lib missing</span> <img t-if="qr_uri" t-att-src="qr_uri" alt="QR"/>
</div> <span t-else="" style="font-size:7pt;color:#900;">QR lib missing</span>
<div class="qr-info">
<div class="qr-title">Scan for service</div>
<div>
<t t-out="lot.product_id.display_name or ''"/>
</div> </div>
<div class="qr-serial"> <div class="qr-info">
SN <t t-out="lot.name or ''"/> <div class="qr-title">Scan for service</div>
</div> <div>
<div style="margin-top:2mm;font-size:7pt;color:#666;"> <t t-out="lot.product_id.display_name or ''"/>
Or visit: </div>
<t t-out="docs[0]._portal_base_url()"/> <div class="qr-serial">
SN <t t-out="lot.name or ''"/>
</div>
<div style="margin-top:2mm;font-size:7pt;color:#666;">
Or visit:
<t t-out="doc._portal_base_url()"/>
</div>
</div> </div>
</div> </div>
</div> </t>
</t> </t>
</div> </div>
</div> </div>

6
fusion_repairs/wizard/qr_sticker_wizard.py
View File

@@ -15,10 +15,13 @@ under Fusion Repairs > Configuration.
import base64 import base64
import io import io
import logging
from odoo import _, api, fields, models from odoo import _, api, fields, models
from odoo.exceptions import UserError from odoo.exceptions import UserError
_logger = logging.getLogger(__name__)
class FusionRepairQRStickerWizard(models.TransientModel): class FusionRepairQRStickerWizard(models.TransientModel):
_name = 'fusion.repair.qr.sticker.wizard' _name = 'fusion.repair.qr.sticker.wizard'
@@ -75,5 +78,6 @@ class FusionRepairQRStickerWizard(models.TransientModel):
img.save(buf, format='PNG') img.save(buf, format='PNG')
b64 = base64.b64encode(buf.getvalue()).decode('ascii') b64 = base64.b64encode(buf.getvalue()).decode('ascii')
return f"data:image/png;base64,{b64}" return f"data:image/png;base64,{b64}"
except Exception: except Exception as e:
_logger.warning('QR sticker generation failed for %s: %s', url, e)
return "" return ""