Bump pytest-codecov from 0.6.1 to 0.7.0

etc/ipython/profile_default/ipython_config.py

@@ -5,11 +5,13 @@
 import pathlib as pl
 import sys
 
+
 def is_venv():
     # Get base/real prefix, or sys.prefix if there is none.
     base_prefix = getattr(sys, "base_prefix", None) or getattr(sys, "real_prefix", None) or sys.prefix
     return sys.prefix != base_prefix
 
+
 if is_venv():
     # use a cache-folder inside the virtualenv-project.
     prefix = pl.Path(sys.prefix)

etc/ipython/profile_default/startup/10-logging.py

@@ -14,6 +14,7 @@
 return-statements are not allowed.
 
 """
+
 print(f"\nRunning {__file__}")
 
 import logging

etc/ipython/profile_default/startup/20-django.py

@@ -14,6 +14,7 @@
 return-statements are not allowed.
 
 """
+
 print(f"\nRunning {__file__}")
 
 

pyproject.toml

@@ -50,7 +50,8 @@ packages = [
 ]
 
 [tool.poetry.dependencies]
-python = ">=3.9,<3.10"
+# python = ">=3.9,<3.10"
+python = ">=3.9,!=3.9.0,!=3.9.1,<3.10"
 boto3 = ">=1.30"
 django = ">=4.2,<5.0"
 dj-email-url = ">=1.0"
@@ -71,7 +72,7 @@ psycopg2-binary = ">=2.9"
 pyjwt = ">=2.3"
 PyYAML = ">=6.0"
 # scouts-auth = {git = "ssh://git@gitlab.inuits.io:2224/boro/scouts_auth.git", rev = "master"}  # @TODO
-urllib3= "1.26.19"
+urllib3= "1.26.20"
 
 
 [tool.poetry.group.dev.dependencies]
@@ -120,4 +121,7 @@ DJANGO_SETTINGS_MODULE = "verzekeringen_api.settings"
 # https://docs.astral.sh/ruff/configuration
 cache-dir = "var/cache/ruff"
 exclude = ["**/migrations/*.py"]
-line-length = 120
+line-length = 120
+
+[tool.ruff.format]
+preview = true

tests/test_settings.py

@@ -9,4 +9,3 @@ def test_settings():
     from django.conf import settings
 
     assert settings.DEBUG is True
-

verzekeringen_api/apps/equipment/services/inuits_equipment_service.py

@@ -23,7 +23,7 @@ class InuitsEquipmentService:
 
     @transaction.atomic
     def inuits_equipment_create(
-            self, inuits_equipment: InuitsEquipment, created_by: settings.AUTH_USER_MODEL
+        self, inuits_equipment: InuitsEquipment, created_by: settings.AUTH_USER_MODEL
     ) -> InuitsEquipment:
         # Check if the instance already exists
         create = True
@@ -52,9 +52,7 @@ def inuits_equipment_create(
             )
 
         if create:
-            logger.debug(
-                "INUITS EQUIPMENT WILL BE CREATED: %s (%s)", inuits_equipment, type(inuits_equipment).__name__
-            )
+            logger.debug("INUITS EQUIPMENT WILL BE CREATED: %s (%s)", inuits_equipment, type(inuits_equipment).__name__)
             inuits_equipment = InuitsEquipment(
                 nature=inuits_equipment.nature,
                 description=inuits_equipment.description,
@@ -72,7 +70,7 @@ def inuits_equipment_create(
 
     @transaction.atomic
     def linked_equipment_create(
-            self, insurance: EquipmentInsurance, inuits_equipment: InuitsEquipment, created_by: settings.AUTH_USER_MODEL
+        self, insurance: EquipmentInsurance, inuits_equipment: InuitsEquipment, created_by: settings.AUTH_USER_MODEL
     ) -> Equipment:
         """
         Creates an Equipment instance.
@@ -91,9 +89,9 @@ def linked_equipment_create(
 
     @transaction.atomic
     def equipment_create(
-            self,
-            insurance: EquipmentInsurance,
-            inuits_equipment: InuitsEquipment,
+        self,
+        insurance: EquipmentInsurance,
+        inuits_equipment: InuitsEquipment,
     ) -> Equipment:
         equipment = Equipment(
             inuits_id=inuits_equipment.id,
@@ -112,7 +110,7 @@ def equipment_create(
                 birth_date=inuits_equipment.owner_member.birth_date,
                 email=inuits_equipment.owner_member.email,
                 membership_number=inuits_equipment.owner_member.membership_number,
-                group_admin_id=inuits_equipment.owner_member.group_admin_id
+                group_admin_id=inuits_equipment.owner_member.group_admin_id,
             )
         equipment.full_clean()
         equipment.save()
@@ -121,11 +119,11 @@ def equipment_create(
 
     @transaction.atomic
     def inuits_equipment_update(
-            self,
-            *,
-            inuits_equipment: InuitsEquipment,
-            updated_inuits_equipment: InuitsEquipment,
-            updated_by: settings.AUTH_USER_MODEL,
+        self,
+        *,
+        inuits_equipment: InuitsEquipment,
+        updated_inuits_equipment: InuitsEquipment,
+        updated_by: settings.AUTH_USER_MODEL,
     ) -> InuitsEquipment:
         # logger.debug("UPDATED EQUIPMENT: %s", updated_inuits_equipment)
         if inuits_equipment.equals(updated_inuits_equipment):
@@ -146,14 +144,10 @@ def inuits_equipment_update(
             else inuits_equipment.total_value
         )
         inuits_equipment.owner_non_member = (
-            updated_inuits_equipment.owner_non_member
-            if updated_inuits_equipment.owner_non_member
-            else None
+            updated_inuits_equipment.owner_non_member if updated_inuits_equipment.owner_non_member else None
         )
         inuits_equipment.owner_member = (
-            updated_inuits_equipment.owner_member.group_admin_id
-            if updated_inuits_equipment.owner_member
-            else None
+            updated_inuits_equipment.owner_member.group_admin_id if updated_inuits_equipment.owner_member else None
         )
         if updated_inuits_equipment.owner_group:
             if isinstance(updated_inuits_equipment.owner_group, AbstractScoutsGroup):
@@ -180,26 +174,34 @@ def inuits_equipment_update(
 
     @transaction.atomic
     def equipment_update(
-            self,
-            *,
-            equipment: Equipment,
-            updated_equipment: InuitsEquipment,
+        self,
+        *,
+        equipment: Equipment,
+        updated_equipment: InuitsEquipment,
     ) -> Equipment:
         # equipment.insurance = insurance
-        equipment.nature = (
-            updated_equipment.nature if updated_equipment.nature else equipment.nature
-        )
+        equipment.nature = updated_equipment.nature if updated_equipment.nature else equipment.nature
         equipment.description = (
             updated_equipment.description if updated_equipment.description else equipment.description
         )
         equipment.total_value = (
             updated_equipment.total_value if updated_equipment.total_value else equipment.total_value
         )
-        owner_non_member = NonMember.objects.all().filter(inuits_id=updated_equipment.owner_non_member.id).last() if updated_equipment.owner_non_member else None
-        equipment.owner_non_member = (
-            owner_non_member
+        owner_non_member = (
+            NonMember.objects.all().filter(inuits_id=updated_equipment.owner_non_member.id).last()
+            if updated_equipment.owner_non_member
+            else None
+        )
+        equipment.owner_non_member = owner_non_member
+        owner_member = (
+            Member.objects.filter(
+                group_admin_id=updated_equipment.owner_member
+                if isinstance(updated_equipment.owner_member, str)
+                else updated_equipment.owner_member.group_admin_id
+            ).last()
+            if updated_equipment.owner_member
+            else None
         )
-        owner_member = Member.objects.filter(group_admin_id=updated_equipment.owner_member if isinstance(updated_equipment.owner_member, str) else updated_equipment.owner_member.group_admin_id).last() if updated_equipment.owner_member else None
         equipment.owner_member = owner_member
 
         equipment.owner_group = (

verzekeringen_api/apps/insurances/managers/insurance_draft_manager.py

@@ -3,13 +3,13 @@
 
 class InsuranceDraftQuerySet(models.QuerySet):
     def allowed(self, user):
-
         user_groups: str = []
         for scouts_group in user.scouts_groups:
             user_groups.append(scouts_group.number)
 
         return self.filter(data__scouts_group__group_admin_id__in=user_groups)
 
+
 class InsuranceDraftManager(models.Manager):
     def get_queryset(self):
         return InsuranceDraftQuerySet(self.model, using=self._db)

verzekeringen_api/apps/insurances/permissions/insurance_claims_permission.py

@@ -7,10 +7,7 @@
 
 
 class InsuranceClaimsPermission(permissions.BasePermission):
-
     def has_object_permission(self, request, view, obj):
         if request.user.has_role_administrator():
             return True
-        raise PermissionDenied({"message":"You don't have permission to access",
-                                "object_id": obj.id})
-
+        raise PermissionDenied({"message": "You don't have permission to access", "object_id": obj.id})

verzekeringen_api/apps/insurances/serializers/insurance_claim_serializers.py

@@ -88,7 +88,7 @@ def create(self, validated_data: dict) -> InsuranceClaim:
         if "attachments" in self.context:  # checking if key is in context
             files: MultiValueDict = self.context["attachments"]
             for file in files.getlist("file"):
-                print('@@@@@FILE@@@@@: ', file)
+                print("@@@@@FILE@@@@@: ", file)
                 InsuranceClaimAttachment.objects.create(insurance_claim=insurance_claim, file=file)
 
         return insurance_claim

verzekeringen_api/apps/insurances/serializers/inuits_event_insurance_serializer.py

@@ -16,7 +16,6 @@
 
 
 class InuitsEventInsuranceSerializer(EventInsuranceSerializer):
-
     participant_list_file = serializers.SerializerMethodField(required=False, allow_null=True)
 
     class Meta:

verzekeringen_api/apps/insurances/services/activity_insurance_attachment_service.py

@@ -12,7 +12,6 @@
 
 
 class ActivityInsuranceAttachmentService:
-
     file_service: StorageService = default_storage
 
     def store_attachment(

verzekeringen_api/apps/insurances/services/event_insurance_attachment_service.py

@@ -12,12 +12,9 @@
 
 
 class EventInsuranceAttachmentService:
-
     file_service: StorageService = default_storage
 
-    def store_attachment(
-        self, *, uploaded_file: File, insurance: EventInsuranceAttachment
-    ) -> EventInsuranceAttachment:
+    def store_attachment(self, *, uploaded_file: File, insurance: EventInsuranceAttachment) -> EventInsuranceAttachment:
         """Stores the uploaded attachment as a file."""
 
         name, extension = os.path.splitext(uploaded_file.name)

verzekeringen_api/apps/insurances/services/insurance_claim_service.py

@@ -18,40 +18,38 @@
 
 
 class InsuranceClaimService:
-
     report_service = InsuranceClaimReportService()
     attachment_service = InsuranceClaimAttachmentService()
     mail_service = InuitsInsuranceMailService()
 
     @transaction.atomic
     def create(
-            self,
-            *,
-            group_group_admin_id: str,
-            created_by: settings.AUTH_USER_MODEL,
-            date_of_accident: datetime = None,
-            declarant_city: str = "",
-            file=None,
-            bank_account: str = "",
-            activity: str = "",
-            activity_type: str = "",
-            used_transport: str = "",
-            damage_type: str = "",
-            description: str = "",
-            involved_party_description: str = "",
-            involved_party_name: str = "",
-            involved_party_birthdate: date = None,
-            official_report_description: str = "",
-            pv_number: str = "",
-            witness_name: str = "",
-            witness_description: str = "",
-            leadership_description: str = "",
-            victim: InuitsClaimVictim,
-            witness: bool = None,
-            involved_party: bool = None,
-            official_report: bool = None,
-            leadership: bool = None
-
+        self,
+        *,
+        group_group_admin_id: str,
+        created_by: settings.AUTH_USER_MODEL,
+        date_of_accident: datetime = None,
+        declarant_city: str = "",
+        file=None,
+        bank_account: str = "",
+        activity: str = "",
+        activity_type: str = "",
+        used_transport: str = "",
+        damage_type: str = "",
+        description: str = "",
+        involved_party_description: str = "",
+        involved_party_name: str = "",
+        involved_party_birthdate: date = None,
+        official_report_description: str = "",
+        pv_number: str = "",
+        witness_name: str = "",
+        witness_description: str = "",
+        leadership_description: str = "",
+        victim: InuitsClaimVictim,
+        witness: bool = None,
+        involved_party: bool = None,
+        official_report: bool = None,
+        leadership: bool = None,
     ) -> InsuranceClaim:
         # validate if person has rights to create claim for this group
         if group_group_admin_id not in (group.group_admin_id for group in created_by.scouts_groups):
@@ -83,7 +81,7 @@ def create(
             involved_party=involved_party,
             official_report=official_report,
             leadership=leadership,
-            attachment_name=file.get("file").name if file.get("file", None) else None
+            attachment_name=file.get("file").name if file.get("file", None) else None,
         )
 
         claim.full_clean()

verzekeringen_api/apps/insurances/services/inuits_equipment_insurance_service.py

@@ -48,7 +48,9 @@ def inuits_equipment_insurance_create(
         insurance.total_cost = self._calculate_total_cost(insurance)
         insurance.full_clean()
         insurance.save()
-        self.base_insurance_service.handle_insurance_created(insurance, created_by=base_insurance_fields.get("created_by"))
+        self.base_insurance_service.handle_insurance_created(
+            insurance, created_by=base_insurance_fields.get("created_by")
+        )
 
         return insurance
 
@@ -59,7 +61,12 @@ def inuits_equipment_insurance_update(self, *, insurance: EquipmentInsurance, **
         insurance.nature = fields.get("nature", insurance.nature)
         insurance.postal_code = fields.get("postal_code", None)
         insurance.city = fields.get("city", None)
-        insurance.country = fields.get("country", insurance.country if insurance.country and insurance.city is None and insurance.postal_code is None else None)
+        insurance.country = fields.get(
+            "country",
+            insurance.country
+            if insurance.country and insurance.city is None and insurance.postal_code is None
+            else None,
+        )
 
         insurance.full_clean()
         insurance.save()
@@ -100,9 +107,7 @@ def _update_equipment(
                     insurance=insurance, inuits_equipment=inuits_equipment, created_by=created_by
                 )
 
-            equipment = self.equipment_service.equipment_update(
-                equipment=equipment, updated_equipment=inuits_equipment
-            )
+            equipment = self.equipment_service.equipment_update(equipment=equipment, updated_equipment=inuits_equipment)
 
             updated_insurance_equipment_list.append(equipment)
 

verzekeringen_api/apps/insurances/services/inuits_temporary_insurance_service.py

@@ -57,7 +57,9 @@ def inuits_temporary_insurance_create(
         insurance.full_clean()
         insurance.save()
 
-        self.base_insurance_service.handle_insurance_created(insurance, created_by=base_insurance_fields.get("responsible_member"))
+        self.base_insurance_service.handle_insurance_created(
+            insurance, created_by=base_insurance_fields.get("responsible_member")
+        )
 
         return insurance