Merge pull request #8914 from norbusan/development

Merge development to master

Author: norbusan

.gitignore

@@ -62,3 +62,4 @@ celerybeat-schedule*
 .pytype
 .tool-versions
 *.mo
+.python-version

app/api/schema/attendees.py

@@ -71,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)
+    is_consent_form_field = fields.Boolean(allow_none=True)
+    is_consent_of_refund_policy = fields.Boolean()
     language_form_1 = fields.Str(allow_none=True)
     language_form_2 = fields.Str(allow_none=True)
     event = Relationship(

app/api/schema/orders.py

@@ -5,7 +5,6 @@
 
 from app.api.helpers.utilities import dasherize
 from app.api.schema.base import GetterRelationship
-from app.models import db
 from utils.common import use_defaults
 
 
@@ -53,7 +52,7 @@ def initial_values(self, data):
     amount = fields.Float(validate=lambda n: n >= 0, allow_none=False, default=0)
     address = fields.Str(allow_none=True)
     city = fields.Str(allow_none=True)
-    state = fields.Str(db.String, allow_none=True)
+    state = fields.Str(allow_none=True)
     country = fields.Str(allow_none=True)
     zipcode = fields.Str(allow_none=True)
     company = fields.Str(allow_none=True)

app/models/custom_form.py

@@ -63,8 +63,10 @@
     "age_group": {"include": 0, "require": 0},
     "home_wiki": {"include": 0, "require": 0},
     "accept_video_recording": {"include": 0, "require": 0},
+    "is_consent_of_refund_policy" : {"include": 0, "require": 0},
     "language_form_1": {"include": 0, "require": 0},
     "language_form_2": {"include": 0, "require": 0},
+    "is_consent_form_field": {"include": 0, "require": 0},
 }
 
 session_form_str = json.dumps(SESSION_FORM, separators=(',', ':'))
@@ -149,6 +151,8 @@
         "acceptVideoRecording": "Photo & video & text consent",
         "acceptShareDetails": "Partner contact consent",
         "acceptReceiveEmails": "Email consent",
+        "is_consent_form_field": "Consent form field",
+        "is_consent_of_refund_policy": "Consent of refund policy",
         "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"

app/models/ticket_holder.py

@@ -65,6 +65,7 @@ class TicketHolder(SoftDeletionModel):
         db.DateTime(timezone=True), default=datetime.utcnow, onupdate=datetime.utcnow
     )
     complex_field_values: str = db.Column(db.JSON)
+    is_consent_of_refund_policy: bool = db.Column(db.Boolean, default=False)
     language_form_1: str = db.Column(db.JSON)
     language_form_2: str = db.Column(db.JSON)
     user = db.relationship(
@@ -77,6 +78,7 @@ class TicketHolder(SoftDeletionModel):
     )
     order = db.relationship('Order', backref='ticket_holders')
     ticket = db.relationship('Ticket', backref='ticket_holders')
+    is_consent_form_field: bool = db.Column(db.Boolean, default=False)
 
     @property
     def name(self):

migrations/versions/rev-2023-06-22-10:02:35-8cf2327b952b_.py

@@ -0,0 +1,27 @@
+"""empty message
+
+Revision ID: 8cf2327b952b
+Revises: 9b6873db28df
+Create Date: 2023-06-22 10:02:35.198498
+
+"""
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '8cf2327b952b'
+down_revision = '9b6873db28df'
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('ticket_holders', sa.Column('is_consent_of_refund_policy', sa.Boolean(), nullable=True))
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('ticket_holders', 'is_consent_of_refund_policy')
+    # ### end Alembic commands ###

migrations/versions/rev-2023-06-22-11:53:16-a15294581397_.py

@@ -0,0 +1,27 @@
+"""empty message
+
+Revision ID: a15294581397
+Revises: 8cf2327b952b
+Create Date: 2023-06-22 11:53:16.566102
+
+"""
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'a15294581397'
+down_revision = '8cf2327b952b'
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('ticket_holders', sa.Column('is_consent_form_field', sa.Boolean(), nullable=True))
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('ticket_holders', 'is_consent_form_field')
+    # ### end Alembic commands ###

pyproject.toml

@@ -21,6 +21,20 @@ exclude = '''
 )
 '''
 
+[tool.pylint.MAIN]
+load-plugins = [ "pylint_flask_sqlalchemy", "pylint_flask" ]
+
+[tool.pylint."MESSAGES CONTROL"]
+disable = [
+    "missing-function-docstring",
+    "missing-module-docstring",
+    "missing-class-docstring",
+    "invalid-name",
+]
+
+[tool.pylint.CODE_STYLE]
+max-line-length = 90
+
 [tool.isort]
 profile = "black"
 line_length = 90
@@ -146,6 +160,8 @@ dredd_hooks = "0.2"
 pytest = "7.1.2"
 pytest-cov = "4.1.0"
 objproxies = "0.9.4"
+pylint-flask-sqlalchemy = "^0.2.0"
+pylint-flask = "^0.6"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]