Feature-8470: Make attendee form ticket specific (#8891)

* fix-8740: Create migration Custom Form Ticket and update Custom Form

* fix-8740: Create migration Custom Form Ticket and update Custom Form

* feature-8740: Make attendee form ticket specific

* feature-8470: Make attendee form ticket specific

* feature-8470: Make attendee form ticket specific

* feature-8470: Make attendee form ticket specific

* feature-8470: Make attendee form ticket specific

* feature-8470: Make attendee form ticket specific

* feature-8470: Make attendee form ticket specific

* feature-8470: Make attendee form ticket specific

* feature-8470: Make attendee form ticket specific

* feature-8470: Make attendee form ticket specific

* feature-8470: Make attendee form ticket specific

* feature-8470: Merge code development

* feature-8470: Make attendee form ticket specific

* feature-8470: Make attendee form ticket specific

* feature-8470: Make attendee form ticket specific

* Fix comment: Input parameters as **agrs. Format by Black Formater

* Fix comment: Add dump only back

* Fix trailing-whitespace

Author: Hieu Lam - TMA

app/api/custom_forms.py

@@ -57,7 +57,12 @@ def query(self, view_kwargs):
         :return:
         """
         query_ = self.session.query(CustomForms)
-        query_ = event_query(query_, view_kwargs)
+        if view_kwargs.get('form_id'):
+            events = safe_query_kwargs(Event, view_kwargs, 'event_id')
+            query_ = self.session.query(CustomForms).filter_by(event_id=events.id)
+            query_ = query_.filter_by(form_id=view_kwargs.get('form_id'))
+        else:
+            query_ = event_query(query_, view_kwargs)
         return query_
 
     view_kwargs = True

app/api/helpers/custom_forms.py

@@ -5,6 +5,7 @@
 from app.api.helpers.errors import UnprocessableEntityError
 from app.api.schema.base import TrimmedEmail
 from app.models.custom_form import CustomForms
+from app.models.ticket import Ticket
 
 
 def object_as_dict(obj):
@@ -33,11 +34,18 @@ def get_schema(form_fields):
 
 
 def validate_custom_form_constraints(form, obj, excluded):
-    form_fields = CustomForms.query.filter_by(
-        form=form,
-        event_id=obj.event_id,
-        is_included=True,
-    ).all()
+    """
+    The validate custom form constraints.
+    """
+    conditions = {
+        'form': form,
+        'event_id': obj.event_id,
+        'is_included': True,
+    }
+    if hasattr(obj, 'ticket_id'):
+        ticket = Ticket.query.filter_by(id=obj.ticket_id).first()
+        conditions.update({'form_id': ticket.form_id})
+    form_fields = CustomForms.query.filter_by(**conditions).all()
     required_form_fields = filter(lambda field: field.is_required, form_fields)
     missing_required_fields = []
     for field in required_form_fields:
@@ -72,7 +80,12 @@ def validate_custom_form_constraints(form, obj, excluded):
         return data if data else None
 
 
-def validate_custom_form_constraints_request(form, schema, obj, data, excluded=[]):
+def validate_custom_form_constraints_request(form, schema, obj, data, excluded=None):
+    """
+    The validate custom form constraints request.
+    """
+    if excluded is None:
+        excluded = []
     new_obj = type(obj)(**object_as_dict(obj))
     relationship_fields = get_relationships(schema)
     for key, value in data.items():

app/api/routes.py

@@ -1657,6 +1657,8 @@
     'custom_form_list',
     '/events/<int:event_id>/custom-forms',
     '/events/<event_identifier>/custom-forms',
+    '/events/<int:event_id>/custom-forms/<string:form_id>',
+    '/events/<event_identifier>/custom-forms/<string:form_id>',
 )
 api.route(
     CustomFormDetail,

app/api/schema/custom_forms.py

@@ -52,7 +52,7 @@ class Meta:
     is_included = fields.Boolean(default=False)
     is_public = fields.Boolean(default=False)
     position = fields.Integer(allow_none=True, default=0)
-    is_complex = fields.Boolean(dump_only=True)
+    is_complex = fields.Boolean(dump_only=True, default=False)
     is_fixed = fields.Boolean(default=False)
     event = Relationship(
         self_view='v1.custom_form_event',
@@ -62,5 +62,6 @@ class Meta:
         schema='EventSchemaPublic',
         type_='event',
     )
+    form_id = fields.Str(allow_none=True)
     min = fields.Integer(allow_none=True, default=0)
     max = fields.Integer(allow_none=True, default=10)

app/api/schema/tickets.py

@@ -127,6 +127,7 @@ def validate_discount_code(self, data, original_data):
     max_order = fields.Integer(validate=lambda n: n >= 0, allow_none=True)
     is_checkin_restricted = fields.Boolean(default=True)
     auto_checkin_enabled = fields.Boolean(default=False)
+    form_id = fields.Str(allow_none=True)
     event = Relationship(
         self_view='v1.ticket_event',
         self_view_kwargs={'id': '<id>'},

app/models/custom_form.py

@@ -161,7 +161,7 @@ class TYPE:
     __tablename__ = 'custom_forms'
     __table_args__ = (
         UniqueConstraint(
-            'event_id', 'field_identifier', 'form', name='custom_form_identifier'
+            'event_id', 'field_identifier', 'form', 'form_id', name='custom_form_identifier'
         ),
     )
     id = db.Column(db.Integer, primary_key=True)
@@ -178,6 +178,7 @@ class TYPE:
     is_complex = db.Column(db.Boolean, nullable=False, default=False)
     event_id = db.Column(db.Integer, db.ForeignKey('events.id', ondelete='CASCADE'))
     custom_form_options = db.relationship('CustomFormOptions', backref="custom_form")
+    form_id = db.Column(db.String)
     min = db.Column(db.Integer, default=0, nullable=True)
     max = db.Column(db.Integer, default=10, nullable=True)
 

app/models/ticket.py

@@ -76,6 +76,7 @@ class Ticket(SoftDeletionModel):
     discount_codes = db.relationship(
         'DiscountCode', secondary=discount_codes_tickets, backref="tickets"
     )
+    form_id = db.Column(db.String)
 
     def has_order_tickets(self):
         """Returns True if ticket has already placed orders.

migrations/versions/rev-2023-06-15-08:53:12-d3c32d203ef1_.py

@@ -0,0 +1,35 @@
+"""empty message
+Revision ID: d3c32d203ef1
+Revises: 410e54b84481
+Create Date: 2023-06-15 08:53:12.741108
+"""
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'd3c32d203ef1'
+down_revision = '410e54b84481'
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('custom_forms', sa.Column('form_id', sa.String(), nullable=True))
+    op.add_column('custom_forms', sa.Column('min', sa.Integer(), nullable=True))
+    op.add_column('custom_forms', sa.Column('max', sa.Integer(), nullable=True))
+    op.add_column('tickets', sa.Column('form_id', sa.String(), nullable=True))
+    op.drop_constraint('custom_form_identifier', 'custom_forms', type_='unique')
+    op.create_unique_constraint('custom_form_identifier', 'custom_forms', ['event_id', 'field_identifier', 'form', 'form_id'])
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('tickets', 'form_id')
+    op.drop_column('custom_forms', 'form_id')
+    op.drop_column('custom_forms', 'max')
+    op.drop_column('custom_forms', 'min')
+    op.drop_constraint('custom_form_identifier', 'custom_forms', type_='unique')
+    op.create_unique_constraint('custom_form_identifier', 'custom_forms', ['event_id', 'field_identifier', 'form'])
+    # ### end Alembic commands ###

tests/all/integration/api/custom_forms/test_custom_forms_api.py

@@ -19,7 +19,7 @@ def test_custom_form_create(db, client, user, jwt):
                     "field-identifier": "email",
                     "is-included": True,
                     "is-required": True,
-                    "is-complex": True,
+                    "is-complex": False,
                 },
                 "relationships": {
                     "event": {"data": {"id": str(event.id), "type": "event"}}
@@ -56,6 +56,7 @@ def test_custom_form_create(db, client, user, jwt):
                     "name": "Vortex Tensor",
                     "is-included": True,
                     "is-required": True,
+                    "is-complex": True,
                 },
                 "relationships": {
                     "event": {"data": {"id": str(event.id), "type": "event"}}

tests/all/integration/api/speaker/test_speaker_api.py

@@ -239,6 +239,7 @@ def get_complex_custom_form_speaker(db, user=None):
         type='text',
         is_included=True,
         is_required=True,
+        is_complex=False
     )
     CustomForms(
         event=speaker.event,