feat: Add speaker custom form logic and validation (#7107)

Author: iamareebjamal

app/api/attendees.py

@@ -6,7 +6,7 @@
 
 from app.api.bootstrap import api
 from app.api.helpers.custom_forms import validate_custom_form_constraints_request
-from app.api.helpers.db import safe_query, safe_query_kwargs, safe_query_by_id
+from app.api.helpers.db import safe_query, safe_query_by_id, safe_query_kwargs
 from app.api.helpers.errors import ForbiddenError, UnprocessableEntityError
 from app.api.helpers.permission_manager import has_access
 from app.api.helpers.permissions import jwt_required

app/api/helpers/speaker.py

@@ -10,7 +10,9 @@ def can_edit_after_cfs_ends(event_id):
     Method to check that user has permission to edit the speaker or session
     after the CFS ends
     """
-    speakers_call = SpeakersCall.query.filter_by(event_id=event_id, deleted_at=None).one()
+    speakers_call = SpeakersCall.query.filter_by(
+        event_id=event_id, deleted_at=None
+    ).one_or_none()
     if speakers_call:
         speakers_call_tz = speakers_call.ends_at.tzinfo
         return not (

app/api/speakers.py

@@ -1,12 +1,14 @@
 from flask import request
-from flask_login import current_user
+from flask_jwt_extended import current_user
 from flask_rest_jsonapi import ResourceDetail, ResourceList, ResourceRelationship
 from flask_rest_jsonapi.exceptions import ObjectNotFound
 
 from app.api.bootstrap import api
+from app.api.helpers.custom_forms import validate_custom_form_constraints_request
 from app.api.helpers.db import get_count, safe_query_kwargs, save_to_db
 from app.api.helpers.errors import ForbiddenError
 from app.api.helpers.permission_manager import has_access
+from app.api.helpers.permissions import jwt_required
 from app.api.helpers.query import event_query
 from app.api.helpers.speaker import can_edit_after_cfs_ends
 from app.api.helpers.utilities import require_relationship
@@ -32,14 +34,15 @@ def before_post(self, args, kwargs, data=None):
         :param data:
         :return:
         """
+        data['user'] = current_user.id
         require_relationship(['event', 'user'], data)
 
         if not has_access('is_coorganizer', event_id=data['event']):
             event = db.session.query(Event).filter_by(id=data['event']).one()
             if event.state == "draft":
                 raise ObjectNotFound(
                     {'parameter': 'event_id'},
-                    "Event: {} not found".format(data['event_id']),
+                    "Event: {} not found".format(data['event']),
                 )
 
         if (
@@ -88,6 +91,10 @@ def before_post(self, args, kwargs, data=None):
                         "Session: {} not found".format(session_id),
                     )
 
+        data['complex_field_values'] = validate_custom_form_constraints_request(
+            'speaker', SpeakerSchema, Speaker(event_id=data['event']), data
+        )
+
     def after_create_object(self, speaker, data, view_kwargs):
         """
         after create method to save resized images for speaker
@@ -101,6 +108,7 @@ def after_create_object(self, speaker, data, view_kwargs):
             start_image_resizing_tasks(speaker, data['photo_url'])
 
     schema = SpeakerSchema
+    decorators = (jwt_required,)
     methods = [
         'POST',
     ]
@@ -186,6 +194,10 @@ def before_update_object(self, speaker, data, view_kwargs):
         ):
             data['email'] = current_user.email
 
+        data['complex_field_values'] = validate_custom_form_constraints_request(
+            'speaker', self.resource.schema, speaker, data
+        )
+
     def after_patch(self, result):
         """
         method to create session speaker link

app/models/custom_form.py

@@ -162,7 +162,7 @@ def identifier(self):
         return to_snake_case(self.field_identifier)
 
     def __repr__(self):
-        return '<CustomForm %r>' % self.id
+        return '<CustomForm %r %r>' % (self.id, self.identifier)
 
 
 def get_set_field_name(target: CustomForms) -> str: