fix(config): align Configuration pages with platform logic
Audit of the admin Configuration section (FAQ Manager, Notification Rules,
Approval Config) surfaced three contract mismatches and one missing schema.
FAQ
* Backend `encoach.faq.category.audience` / `encoach.faq.item.audience`
rejected the `both` and `entity` values emitted by the FAQ Manager
UI. Widened the Selection so the UI's full vocabulary round-trips.
* FAQ item `video_url` was already accepted by the UI but silently
dropped by the controller; now persisted via a new `video_url`
field on `encoach.faq.item` and serialized on list/get responses.
Notification Rules
* Added `days_before`, `frequency`, `channel`, `entity_id` to
`encoach.notification.rule`. These are the exact fields the admin
form collects; prior to this change they were serialized into the
JSON body, ignored by the controller, and omitted from responses,
leaving the Active switch permanently off and the table columns
blank.
* Controller now translates `active` <-> `is_active` both ways so the
new frontend contract and legacy callers coexist. Missing required
fields return HTTP 400 instead of 500.
Approval Workflows
* The controller had been hand-rolling raw SQL against three tables
(`encoach_approval_workflow`, `_stage`, `_request`) that no Odoo
model declared, so the tables never existed. List() was guarded and
returned empty; create() would 500 with "relation does not exist".
* Introduced real ORM models in `encoach_exam_template/models/approval.py`
plus access rights, which auto-provision the tables on -u.
* Rewrote the controller to use ORM, added PATCH, and emitted both
`items` and `results` in the list envelope so the frontend's
PaginatedResponse reader and legacy callers both work. Step
payloads now carry `max_days`, `auto_escalate`, and
`notification_email` end to end.
* Frontend `approvalsService` and `ApprovalWorkflowConfig` updated to
send the full stage shape + `allow_bypass`, tolerate both envelope
keys, and validate at least one approver before submit.
Schema delta applied via `./run.sh -u encoach_exam_template,encoach_lms_api`.
Verified with new `test_config_flows.py`: 24/24 passing. Regression runs
on `test_support_flows.py` (29/29) and `test_training_flows.py` (26/26)
remain green.
Made-with: Cursor
This commit is contained in:
@@ -1,4 +1,14 @@
|
||||
from odoo import models, fields
|
||||
from odoo import api, models, fields
|
||||
|
||||
|
||||
FAQ_AUDIENCE = [
|
||||
('all', 'All'),
|
||||
('both', 'Both (Student + Entity)'),
|
||||
('student', 'Students'),
|
||||
('teacher', 'Teachers'),
|
||||
('admin', 'Admins'),
|
||||
('entity', 'Entity Users'),
|
||||
]
|
||||
|
||||
|
||||
class EncoachFaqCategory(models.Model):
|
||||
@@ -8,16 +18,12 @@ class EncoachFaqCategory(models.Model):
|
||||
|
||||
name = fields.Char(required=True)
|
||||
sequence = fields.Integer(default=10)
|
||||
audience = fields.Selection([
|
||||
('all', 'All'),
|
||||
('student', 'Students'),
|
||||
('teacher', 'Teachers'),
|
||||
('admin', 'Admins'),
|
||||
], default='all')
|
||||
audience = fields.Selection(FAQ_AUDIENCE, default='all')
|
||||
is_published = fields.Boolean(default=True)
|
||||
item_ids = fields.One2many('encoach.faq.item', 'category_id')
|
||||
item_count = fields.Integer(compute='_compute_item_count', store=True)
|
||||
|
||||
@api.depends('item_ids')
|
||||
def _compute_item_count(self):
|
||||
for rec in self:
|
||||
rec.item_count = len(rec.item_ids)
|
||||
@@ -32,10 +38,6 @@ class EncoachFaqItem(models.Model):
|
||||
question = fields.Char(required=True)
|
||||
answer = fields.Text(required=True)
|
||||
sequence = fields.Integer(default=10)
|
||||
audience = fields.Selection([
|
||||
('all', 'All'),
|
||||
('student', 'Students'),
|
||||
('teacher', 'Teachers'),
|
||||
('admin', 'Admins'),
|
||||
], default='all')
|
||||
audience = fields.Selection(FAQ_AUDIENCE, default='all')
|
||||
is_published = fields.Boolean(default=True)
|
||||
video_url = fields.Char(help='Optional walkthrough video URL.')
|
||||
|
||||
@@ -26,7 +26,8 @@ class EncoachNotificationRule(models.Model):
|
||||
_description = 'Notification Rule'
|
||||
|
||||
name = fields.Char(required=True)
|
||||
event_type = fields.Char(required=True)
|
||||
event_type = fields.Char(required=True, help='e.g. deadline, chapter_unlock, '
|
||||
'result_release, assignment, exam')
|
||||
template = fields.Text()
|
||||
is_active = fields.Boolean(default=True)
|
||||
recipients = fields.Selection([
|
||||
@@ -35,7 +36,23 @@ class EncoachNotificationRule(models.Model):
|
||||
('teachers', 'Teachers Only'),
|
||||
('admins', 'Admins Only'),
|
||||
], default='all')
|
||||
channels = fields.Char(help='Comma-separated: email,push,in_app')
|
||||
channels = fields.Char(help='Legacy: comma-separated email,push,in_app. '
|
||||
'New code should use `channel` instead.')
|
||||
|
||||
# New fields aligned with the admin Configuration UI (NotificationRules page)
|
||||
days_before = fields.Integer(default=1,
|
||||
help='Lead time in days before the event fires.')
|
||||
frequency = fields.Selection([
|
||||
('once', 'Once'),
|
||||
('daily', 'Daily'),
|
||||
('custom', 'Custom schedule'),
|
||||
], default='once')
|
||||
channel = fields.Selection([
|
||||
('in_app', 'In-App'),
|
||||
('email', 'Email'),
|
||||
('both', 'Both'),
|
||||
], default='in_app')
|
||||
entity_id = fields.Many2one('encoach.entity', ondelete='set null')
|
||||
|
||||
|
||||
class EncoachNotificationPreference(models.Model):
|
||||
|
||||
Reference in New Issue
Block a user