Add scope-aware subscriptions using existing registrations
This commit is contained in:
@@ -484,7 +484,7 @@ def catalogue_create_page(request: Request):
|
||||
|
||||
|
||||
@router.post('/catalogue/new')
|
||||
def catalogue_create_submit(request: Request, service_code: str = Form(...), service_name: str = Form(...), category_id: str = Form(''), recurrence_type: str = Form(''), engagement_type: str = Form('non_assurance'), sort_order: int = Form(100), description: str = Form(''), applicable_individual: str | None = Form(None), applicable_proprietorship: str | None = Form(None), applicable_partnership: str | None = Form(None), applicable_llp: str | None = Form(None), applicable_company: str | None = Form(None), applicable_trust: str | None = Form(None), applicable_society: str | None = Form(None), is_active: str | None = Form(None), is_client_requestable: str | None = Form(None), is_consultant_requestable: str | None = Form(None), csrf_token: str = Form(...)):
|
||||
def catalogue_create_submit(request: Request, service_code: str = Form(...), service_name: str = Form(...), category_id: str = Form(''), recurrence_type: str = Form(''), engagement_type: str = Form('non_assurance'), service_scope_type: str = Form('client'), required_registration_type: str = Form(''), sort_order: int = Form(100), description: str = Form(''), applicable_individual: str | None = Form(None), applicable_proprietorship: str | None = Form(None), applicable_partnership: str | None = Form(None), applicable_llp: str | None = Form(None), applicable_company: str | None = Form(None), applicable_trust: str | None = Form(None), applicable_society: str | None = Form(None), is_active: str | None = Form(None), is_client_requestable: str | None = Form(None), is_consultant_requestable: str | None = Form(None), csrf_token: str = Form(...)):
|
||||
validate_csrf(request, csrf_token)
|
||||
db = CommonSessionLocal()
|
||||
try:
|
||||
@@ -502,6 +502,8 @@ def catalogue_create_submit(request: Request, service_code: str = Form(...), ser
|
||||
category=selected_category.name if selected_category else None,
|
||||
recurrence_type=recurrence_type.strip() or None,
|
||||
engagement_type=normalize_engagement_type(engagement_type),
|
||||
service_scope_type=(service_scope_type or 'client').strip().lower(),
|
||||
required_registration_type=(required_registration_type or '').strip().upper() or None,
|
||||
sort_order=sort_order,
|
||||
description=description.strip() or None,
|
||||
applicable_individual=applicable_individual is not None,
|
||||
@@ -812,7 +814,7 @@ def catalogue_edit_page(request: Request, catalogue_id: int):
|
||||
|
||||
|
||||
@router.post('/catalogue/{catalogue_id}/edit')
|
||||
def catalogue_edit_submit(request: Request, catalogue_id: int, service_name: str = Form(...), category_id: str = Form(''), recurrence_type: str = Form(''), engagement_type: str = Form('non_assurance'), sort_order: int = Form(100), description: str = Form(''), applicable_individual: str | None = Form(None), applicable_proprietorship: str | None = Form(None), applicable_partnership: str | None = Form(None), applicable_llp: str | None = Form(None), applicable_company: str | None = Form(None), applicable_trust: str | None = Form(None), applicable_society: str | None = Form(None), is_active: str | None = Form(None), is_client_requestable: str | None = Form(None), is_consultant_requestable: str | None = Form(None), csrf_token: str = Form(...)):
|
||||
def catalogue_edit_submit(request: Request, catalogue_id: int, service_name: str = Form(...), category_id: str = Form(''), recurrence_type: str = Form(''), engagement_type: str = Form('non_assurance'), service_scope_type: str = Form('client'), required_registration_type: str = Form(''), sort_order: int = Form(100), description: str = Form(''), applicable_individual: str | None = Form(None), applicable_proprietorship: str | None = Form(None), applicable_partnership: str | None = Form(None), applicable_llp: str | None = Form(None), applicable_company: str | None = Form(None), applicable_trust: str | None = Form(None), applicable_society: str | None = Form(None), is_active: str | None = Form(None), is_client_requestable: str | None = Form(None), is_consultant_requestable: str | None = Form(None), csrf_token: str = Form(...)):
|
||||
validate_csrf(request, csrf_token)
|
||||
db = CommonSessionLocal()
|
||||
try:
|
||||
@@ -831,6 +833,8 @@ def catalogue_edit_submit(request: Request, catalogue_id: int, service_name: str
|
||||
row.category = selected_category.name if selected_category else None
|
||||
row.recurrence_type = recurrence_type.strip() or None
|
||||
row.engagement_type = normalize_engagement_type(engagement_type)
|
||||
row.service_scope_type = (service_scope_type or 'client').strip().lower()
|
||||
row.required_registration_type = (required_registration_type or '').strip().upper() or None
|
||||
row.sort_order = sort_order
|
||||
row.applicable_individual = applicable_individual is not None
|
||||
row.applicable_proprietorship = applicable_proprietorship is not None
|
||||
|
||||
Reference in New Issue
Block a user