From a6e036737fd1bea385d866b16ba54e2c8a163c52 Mon Sep 17 00:00:00 2001 From: Martin Burchell Date: Sat, 12 Oct 2024 07:13:44 +0100 Subject: [PATCH] Remove unnecessary __init__ to UserGroupMembership and factory workaround --- .../cc_modules/cc_membership.py | 4 - .../cc_modules/cc_testfactories.py | 112 ------------------ 2 files changed, 116 deletions(-) diff --git a/server/camcops_server/cc_modules/cc_membership.py b/server/camcops_server/cc_modules/cc_membership.py index b05e879d4..3d6de0f16 100644 --- a/server/camcops_server/cc_modules/cc_membership.py +++ b/server/camcops_server/cc_modules/cc_membership.py @@ -156,10 +156,6 @@ class UserGroupMembership(Base): group = relationship("Group", back_populates="user_group_memberships") user = relationship("User", back_populates="user_group_memberships") - def __init__(self, user_id: int, group_id: int): - self.user_id = user_id - self.group_id = group_id - @classmethod def get_ugm_by_id( cls, dbsession: SqlASession, ugm_id: Optional[int] diff --git a/server/camcops_server/cc_modules/cc_testfactories.py b/server/camcops_server/cc_modules/cc_testfactories.py index 2d82e08ed..13cb78a1b 100644 --- a/server/camcops_server/cc_modules/cc_testfactories.py +++ b/server/camcops_server/cc_modules/cc_testfactories.py @@ -391,118 +391,6 @@ class UserGroupMembershipFactory(BaseFactory): class Meta: model = UserGroupMembership - # TODO: This seems to be necessary because UserGroupMembership - # __init__() does not accept arbitrary keyword args. - @factory.post_generation - def may_run_reports( - obj: "Resolver", create: bool, may_run_reports: bool, **kwargs - ) -> None: - if not create: - return - - obj.may_run_reports = may_run_reports - - @factory.post_generation - def groupadmin( - obj: "Resolver", create: bool, groupadmin: bool, **kwargs - ) -> None: - if not create: - return - - obj.groupadmin = groupadmin - - @factory.post_generation - def may_manage_patients( - obj: "Resolver", create: bool, may_manage_patients: bool, **kwargs - ) -> None: - if not create: - return - - obj.may_manage_patients = may_manage_patients - - @factory.post_generation - def may_use_webviewer( - obj: "Resolver", create: bool, may_use_webviewer: bool, **kwargs - ) -> None: - if not create: - return - - obj.may_use_webviewer = may_use_webviewer - - @factory.post_generation - def view_all_patients_when_unfiltered( - obj: "Resolver", - create: bool, - view_all_patients_when_unfiltered: bool, - **kwargs, - ) -> None: - if not create: - return - - obj.view_all_patients_when_unfiltered = ( - view_all_patients_when_unfiltered - ) - - @factory.post_generation - def may_add_notes( - obj: "Resolver", - create: bool, - may_add_notes: bool, - **kwargs, - ) -> None: - if not create: - return - - obj.may_add_notes = may_add_notes - - @factory.post_generation - def may_dump_data( - obj: "Resolver", - create: bool, - may_dump_data: bool, - **kwargs, - ) -> None: - if not create: - return - - obj.may_dump_data = may_dump_data - - @factory.post_generation - def may_email_patients( - obj: "Resolver", - create: bool, - may_email_patients: bool, - **kwargs, - ) -> None: - if not create: - return - - obj.may_email_patients = may_email_patients - - @factory.post_generation - def may_upload( - obj: "Resolver", - create: bool, - may_upload: bool, - **kwargs, - ) -> None: - if not create: - return - - obj.may_upload = may_upload - - @factory.post_generation - def may_register_devices( - obj: "Resolver", - create: bool, - may_register_devices: bool, - **kwargs, - ) -> None: - if not create: - return - - obj.may_register_devices = may_register_devices - class BlobFactory(GenericTabletRecordFactory): class Meta: