refactor: Remove useless __init__ from models

app/api/event_locations.py

@@ -30,7 +30,7 @@ def get(self, *args, **kwargs):
         locations = []
         for location, _ in popular_locations:
             if location is not None:
-                new_location = EventLocation(location)
+                new_location = EventLocation(name=location)
                 new_location.id = len(locations)
                 locations.append(new_location)
         schema = EventLocationSchema()

app/api/events.py

@@ -378,14 +378,13 @@ def after_create_object(self, event, data, view_kwargs):
         """
         user = User.query.filter_by(id=view_kwargs['user_id']).first()
         role = Role.query.filter_by(name=OWNER).first()
-        uer = UsersEventsRoles(user, event, role)
+        uer = UsersEventsRoles(user=user, event=event, role=role)
         save_to_db(uer, 'Event Saved')
         role_invite = RoleInvite(
-            user.email,
-            role.title_name,
-            event.id,
-            role.id,
-            datetime.now(pytz.utc),
+            email=user.email,
+            role_name=role.title_name,
+            event=event,
+            role=role,
             status='accepted',
         )
         save_to_db(role_invite, 'Owner Role Invite Added')

app/api/helpers/files.py

@@ -140,7 +140,7 @@ def create_save_image_sizes(image_file, image_sizes_type, unique_identifier=None
         image_sizes = ImageSizes.query.filter_by(type=image_sizes_type).one()
     except NoResultFound:
         image_sizes = ImageSizes(
-            image_sizes_type,
+            type=image_sizes_type,
             full_width=1300,
             full_height=500,
             full_aspect=True,

app/api/role_invites.py

@@ -223,7 +223,7 @@ def accept_invite():
                     delete_previous_uer(past_owner)
             role_invite.status = "accepted"
             save_to_db(role_invite, 'Role Invite Accepted')
-            uer = UsersEventsRoles(user, event, role)
+            uer = UsersEventsRoles(user=user, event=event, role=role)
             save_to_db(uer, 'User Event Role Created')
             if not user.is_verified:
                 user.is_verified = True

app/models/access_code.py

@@ -4,11 +4,8 @@
 from app.models import db
 from app.models.base import SoftDeletionModel
 
-TICKET = 'ticket'
-EVENT = 'event'
 
-
-@dataclass(init=True, repr=True, unsafe_hash=True)
+@dataclass(init=False, unsafe_hash=True)
 class AccessCode(SoftDeletionModel):
     __tablename__ = "access_codes"
 
@@ -41,20 +38,3 @@ class AccessCode(SoftDeletionModel):
     @staticmethod
     def get_service_name():
         return 'access_code'
-
-    @property
-    def serialize(self):
-        """Return object data in easily serializable format"""
-        return {
-            'id': self.id,
-            'code': self.code,
-            'access_url': self.access_url,
-            'tickets_number': self.tickets_number,
-            'min_quantity': self.min_quantity,
-            'max_quantity': self.max_quantity,
-            'used_for': self.used_for,
-            'valid_from': self.valid_from,
-            'valid_till': self.valid_till,
-            'event_id': self.event_id,
-            'is_active': self.is_active,
-        }

app/models/activity.py

@@ -1,6 +1,4 @@
-from datetime import datetime
-
-import pytz
+from sqlalchemy.sql import func
 
 from app.models import db
 
@@ -40,18 +38,8 @@ class Activity(db.Model):
     __tablename__ = 'activities'
     id = db.Column(db.Integer, primary_key=True)
     actor = db.Column(db.String)  # user email + id
-    time = db.Column(db.DateTime(timezone=True))
+    time = db.Column(db.DateTime(timezone=True), default=func.now())
     action = db.Column(db.String)
 
-    def __init__(self, actor=None, time=None, action=None):
-        self.actor = actor
-        self.time = time
-        if self.time is None:
-            self.time = datetime.now(pytz.utc)
-        self.action = action
-
     def __repr__(self):
         return '<Activity by %s>' % self.actor
-
-    def __str__(self):
-        return self.__repr__()

app/models/custom_form.py

@@ -88,48 +88,5 @@ class CustomForms(SoftDeletionModel):
     event_id = db.Column(db.Integer, db.ForeignKey('events.id', ondelete='CASCADE'))
     custom_form_options = db.relationship('CustomFormOptions', backref="custom_form")
 
-    def __init__(
-        self,
-        event_id=None,
-        field_identifier=None,
-        form=None,
-        type=None,
-        description=None,
-        is_required=False,
-        is_included=False,
-        is_fixed=False,
-        is_complex=False,
-        deleted_at=None,
-    ):
-        self.event_id = event_id
-        self.field_identifier = field_identifier
-        self.form = form
-        self.type = type
-        self.description = description
-        self.is_required = is_required
-        self.is_included = is_included
-        self.is_fixed = is_fixed
-        self.is_complex = is_complex
-        self.deleted_at = deleted_at
-
     def __repr__(self):
         return '<CustomForm %r>' % self.id
-
-    def __str__(self):
-        return self.__repr__()
-
-    @property
-    def serialize(self):
-        """Return object data in easily serializable format"""
-
-        return {
-            'id': self.id,
-            'field_identifier': self.field_identifier,
-            'form': self.form,
-            'type': self.type,
-            'description': self.description,
-            'is_required': self.is_required,
-            'is_included': self.is_included,
-            'is_fixed': self.is_fixed,
-            'is_complex': self.is_complex,
-        }

app/models/custom_form_option.py

@@ -3,20 +3,11 @@
 
 
 class CustomFormOptions(SoftDeletionModel):
-    __tablename__ = 'custom_form_options'
     id = db.Column(db.Integer, primary_key=True)
     value = db.Column(db.String, nullable=False)
     custom_form_id = db.Column(
         db.Integer, db.ForeignKey('custom_forms.id', ondelete='CASCADE')
     )
 
-    def __init__(self, custom_form_id=None, deleted_at=None, value=None):
-        self.custom_form_id = custom_form_id
-        self.value = value
-        self.deleted_at = deleted_at
-
     def __repr__(self):
         return '<CustomFormOption %r>' % self.id
-
-    def __str__(self):
-        return self.__repr__()

app/models/custom_placeholder.py

@@ -27,37 +27,5 @@ class CustomPlaceholder(db.Model):
         'EventSubTopic', backref=backref('custom_placeholder', uselist=False)
     )
 
-    def __init__(
-        self,
-        name=None,
-        original_image_url=None,
-        thumbnail_image_url=None,
-        large_image_url=None,
-        icon_image_url=None,
-        copyright=None,
-        origin=None,
-        event_sub_topic_id=None,
-    ):
-        self.name = name
-        self.original_image_url = original_image_url
-        self.thumbnail_image_url = thumbnail_image_url
-        self.large_image_url = large_image_url
-        self.icon_image_url = icon_image_url
-        self.copyright = copyright
-        self.origin = origin
-        self.event_sub_topic_id = event_sub_topic_id
-
-    def __str__(self):
+    def __repr__(self):
         return 'Name: ' + self.name
-
-    @property
-    def serialize(self):
-        """Return object data in easily serializable format"""
-        return {
-            'id': self.id,
-            'name': self.name,
-            'url': self.url,
-            'thumbnail': self.thumbnail,
-            'copyright': self.copyright,
-            'origin': self.origin,
-        }

app/models/custom_system_role.py

@@ -11,9 +11,6 @@ class CustomSysRole(db.Model):
     id = db.Column(db.Integer, primary_key=True)
     name = db.Column(db.String, unique=True)
 
-    def __init__(self, name):
-        self.name = name
-
     def can_access(self, panel_name):
         panel = PanelPermission.query.filter_by(panel_name=panel_name).first()
         for role in panel.custom_system_roles:
@@ -24,9 +21,6 @@ def can_access(self, panel_name):
     def __repr__(self):
         return '<CustomSysRole %r>' % self.name
 
-    def __str__(self):
-        return self.__repr__()
-
 
 class UserSystemRole(db.Model):
     """User Custom System Role
@@ -46,21 +40,5 @@ class UserSystemRole(db.Model):
     )
     role = db.relationship('CustomSysRole')
 
-    def __init__(
-        self, user=None, event=None, role=None, user_id=None, role_id=None, event_id=None
-    ):
-        if user:
-            self.user = user
-        if event:
-            self.event = event
-        if role:
-            self.role = role
-        if user_id:
-            self.user_id = user_id
-        if role_id:
-            self.role_id = role_id
-        if event_id:
-            self.event_id = event_id
-
-    def __str__(self):
+    def __repr__(self):
         return '%r as %r' % (self.user, self.role, self.event)

app/models/discount_code.py

@@ -1,14 +1,11 @@
-from datetime import datetime
 from sqlalchemy.sql import func
+
 from app.api.helpers.db import get_count
 from app.models import db
 from app.models.base import SoftDeletionModel
 from app.models.order import Order
 from app.models.ticket_holder import TicketHolder
 
-TICKET = 'ticket'
-EVENT = 'event'
-
 
 class DiscountCode(SoftDeletionModel):
     __tablename__ = "discount_codes"
@@ -32,52 +29,13 @@ class DiscountCode(SoftDeletionModel):
 
     used_for = db.Column(db.String, nullable=False)
 
-    def __init__(
-        self,
-        code=None,
-        discount_url=None,
-        value=None,
-        type=None,
-        tickets_number=None,
-        min_quantity=None,
-        max_quantity=None,
-        valid_from=None,
-        valid_till=None,
-        is_active=True,
-        created_at=None,
-        used_for=None,
-        event_id=None,
-        user_id=None,
-        marketer_id=None,
-        deleted_at=None,
-    ):
-        self.code = code
-        self.discount_url = discount_url
-        self.type = type
-        self.value = value
-        self.tickets_number = tickets_number
-        self.min_quantity = min_quantity
-        self.max_quantity = max_quantity
-        self.valid_from = valid_from
-        self.valid_till = valid_till
-        self.event_id = event_id
-        self.is_active = is_active
-        self.created_at = datetime.utcnow()
-        self.used_for = used_for
-        self.marketer_id = user_id
-        self.marketer_id = marketer_id
-        self.deleted_at = deleted_at
-
     @staticmethod
-    def get_service_name():
+    def get_service_name() -> str:
         return 'discount_code'
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return '<DiscountCode %r>' % self.id
 
-    def __str__(self):
-        return self.__repr__()
-
     def get_confirmed_attendees_query(self):
         return (
             TicketHolder.query.filter_by(deleted_at=None)
@@ -91,24 +49,5 @@ def confirmed_attendees(self):
         return self.get_confirmed_attendees_query().all()
 
     @property
-    def confirmed_attendees_count(self):
+    def confirmed_attendees_count(self) -> int:
         return get_count(self.get_confirmed_attendees_query())
-
-    @property
-    def serialize(self):
-        """Return object data in easily serializable format"""
-        return {
-            'id': self.id,
-            'code': self.code,
-            'discount_url': self.discount_url,
-            'value': self.value,
-            'type': self.type,
-            'tickets_number': self.tickets_number,
-            'min_quantity': self.min_quantity,
-            'max_quantity': self.max_quantity,
-            'used_for': self.used_for,
-            'valid_from': self.valid_from,
-            'valid_till': self.valid_till,
-            'event_id': self.event_id,
-            'is_active': self.is_active,
-        }

app/models/email_notification.py

@@ -17,25 +17,5 @@ class EmailNotification(SoftDeletionModel):
     event = db.relationship("Event")
     user = db.relationship("User", backref="email_notifications")
 
-    def __init__(
-        self,
-        next_event=False,
-        new_paper=False,
-        session_accept_reject=False,
-        session_schedule=False,
-        after_ticket_purchase=True,
-        user_id=None,
-        event_id=None,
-        deleted_at=None,
-    ):
-        self.next_event = next_event
-        self.new_paper = new_paper
-        self.session_accept_reject = session_accept_reject
-        self.session_schedule = session_schedule
-        self.user_id = user_id
-        self.event_id = event_id
-        self.after_ticket_purchase = after_ticket_purchase
-        self.deleted_at = deleted_at
-
     def __str__(self):
         return 'User:' + self.user_id + ' Event: ' + self.event_id