feature-8866: Rename form with meaningful name in order form (#8950)

* fix-8788: Rename form with meaningful name in order form

* feature-8866: Merge code development

Author: Hieu Lam - TMA

app/api/schema/attendees.py

@@ -74,10 +74,10 @@ def validate_json(self, data, original_data):
     complex_field_values = CustomFormValueField(allow_none=True)
     is_consent_form_field = fields.Boolean(allow_none=True)
     is_consent_of_refund_policy = fields.Boolean()
+    native_language = fields.Str(allow_none=True)
+    fluent_language = fields.Str(allow_none=True)
     is_consent_form_field_photo = fields.Boolean(allow_none=True)
     is_consent_form_field_email = fields.Boolean(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/models/custom_form.py

@@ -114,8 +114,8 @@
     "wiki_scholarship": {"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},
+    "native_language": {"include": 0, "require": 0},
+    "fluent_language": {"include": 0, "require": 0},
     "is_consent_form_field": {"include": 0, "require": 0},
     "is_consent_form_field_photo": {"include": 0, "require": 0},
     "is_consent_form_field_email": {"include": 0, "require": 0},
@@ -154,8 +154,8 @@
     "is_consent_form_field_photo": "Wikimania photo consent",
     "is_consent_form_field_email": "Wikimania email updates",
     "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?",
+    "native_language": "What is your native language, or what language are you most fluent in?",
+    "fluent_language": "Are you fluent in any other of the following languages?",
     "home_wiki": "What is your home wiki",
     "wiki_scholarship": "Have you received a Wikimania scholarship?",
 }

app/models/ticket_holder.py

@@ -67,8 +67,8 @@ class TicketHolder(SoftDeletionModel):
     )
     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)
+    native_language: str = db.Column(db.JSON)
+    fluent_language: str = db.Column(db.JSON)
     user = db.relationship(
         'User',
         foreign_keys=[email],

migrations/versions/rev-2023-06-29-15:22:56-f508644acbd3_.py

@@ -0,0 +1,27 @@
+"""empty message
+
+Revision ID: f508644acbd3
+Revises: 05b1aab46b66
+Create Date: 2023-06-29 15:22:56.735800
+
+"""
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = 'f508644acbd3'
+down_revision = '05b1aab46b66'
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.alter_column('ticket_holders', 'language_form_1', new_column_name='native_language')
+    op.alter_column('ticket_holders', 'language_form_2', new_column_name='fluent_language')
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.alter_column('ticket_holders', 'native_language', new_column_name='language_form_1')
+    op.alter_column('ticket_holders', 'fluent_language', new_column_name='language_form_2')
+    # ### end Alembic commands ###