Merge pull request #8909 from norbusan/merge-to-master

Merge to master

Author: mariobehling

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/helpers/static.py

@@ -549,7 +549,8 @@
     'USD',
 ]
 
-AGE_GROUP_CHOICES = ['19 or less', '20 to 29', '30 to 39', '40 to 49', '50 or above']
+AGE_GROUP_CHOICES = ['Under 18', '18-24', '25-34', '35-44', '45-54', '55-64', '65-74', '75-84', '85+', 'I prefer not '
+                                                                                                       'to say']
 
 GENDER_CHOICES = [
     'Male',

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/attendees.py

@@ -59,6 +59,7 @@ def validate_json(self, data, original_data):
     age_group = fields.Str(
         validate=validate.OneOf(choices=AGE_GROUP_CHOICES), allow_none=True
     )
+    home_wiki = fields.Str(allow_none=True)
     birth_date = fields.DateTime(allow_none=True)
 
     ticket_id = fields.Str(allow_none=True)
@@ -70,6 +71,8 @@ def validate_json(self, data, original_data):
     is_checked_out = fields.Boolean()
     pdf_url = fields.Url(dump_only=True)
     complex_field_values = CustomFormValueField(allow_none=True)
+    language_form_1 = fields.Str(allow_none=True)
+    language_form_2 = fields.Str(allow_none=True)
     event = Relationship(
         self_view='v1.attendee_event',
         self_view_kwargs={'id': '<id>'},

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,3 +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

@@ -61,7 +61,10 @@
     "github": {"include": 1, "require": 0},
     "gender": {"include": 0, "require": 0},
     "age_group": {"include": 0, "require": 0},
+    "home_wiki": {"include": 0, "require": 0},
     "accept_video_recording": {"include": 0, "require": 0},
+    "language_form_1": {"include": 0, "require": 0},
+    "language_form_2": {"include": 0, "require": 0},
 }
 
 session_form_str = json.dumps(SESSION_FORM, separators=(',', ':'))
@@ -146,6 +149,9 @@
         "acceptVideoRecording": "Photo & video & text consent",
         "acceptShareDetails": "Partner contact consent",
         "acceptReceiveEmails": "Email consent",
+        "language_form_1": "What is your native language, or what language are you most fluent in?",
+        "language_form_2": "Are you fluent in any other of the following languages?",
+        "home_wiki": "What is your home wiki"
     },
 }
 
@@ -161,7 +167,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 +184,9 @@ 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)
 
     @property
     def identifier(self):

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.

app/models/ticket_holder.py

@@ -44,6 +44,7 @@ class TicketHolder(SoftDeletionModel):
     accept_share_details: bool = db.Column(db.Boolean)
     accept_receive_emails: bool = db.Column(db.Boolean)
     age_group: str = db.Column(db.String)
+    home_wiki: str = db.Column(db.String)
     birth_date: datetime = db.Column(db.DateTime(timezone=True))
     pdf_url: str = db.Column(db.String)
     ticket_id: int = db.Column(
@@ -64,6 +65,8 @@ class TicketHolder(SoftDeletionModel):
         db.DateTime(timezone=True), default=datetime.utcnow, onupdate=datetime.utcnow
     )
     complex_field_values: str = db.Column(db.JSON)
+    language_form_1: str = db.Column(db.JSON)
+    language_form_2: str = db.Column(db.JSON)
     user = db.relationship(
         'User',
         foreign_keys=[email],