wbcrm 1.55.8__tar.gz → 1.55.10rc0__tar.gz

{wbcrm-1.55.8 → wbcrm-1.55.10rc0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wbcrm
-Version: 1.55.8
+Version: 1.55.10rc0
 Summary: A workbench module that contains all the functionality related to a customer relationship management.
 Author-email: Christopher Wittlinger <c.wittlinger@stainly.com>
 Requires-Dist: django-eventtools==1.*

{wbcrm-1.55.8 → wbcrm-1.55.10rc0}/wbcrm/factories/activities.py

@@ -105,8 +105,6 @@ class ActivityCompanyFactory(ActivityFactory):
         company = CompanyFactory()
         # Set global config main_company=company.id
         global_preferences_registry.manager()["directory__main_company"] = company.id
-        global_preferences = global_preferences_registry.manager()
-        assert global_preferences
         self.companies.add(company)
 
 

{wbcrm-1.55.8 → wbcrm-1.55.10rc0}/wbcrm/factories/groups.py

@@ -20,5 +20,5 @@ class GroupFactory(factory.django.DjangoModelFactory):
             for member in extracted:
                 self.members.add(member)
         else:
-            for i in range(1, random.randrange(2, 10)):
+            for _ in range(1, random.randrange(2, 10)):
                 self.members.add(EntryFactory())

{wbcrm-1.55.8 → wbcrm-1.55.10rc0}/wbcrm/models/accounts.py

@@ -480,7 +480,7 @@ class AccountRoleManager(models.Manager):
         return self.get_queryset().filter_for_user(user, validity_date=validity_date, strict=strict)
 
 
-class AccountRole(ComplexToStringMixin, models.Model):
+class AccountRole(ComplexToStringMixin):
     """Model for Account Roles"""
 
     class Meta:

{wbcrm-1.55.8 → wbcrm-1.55.10rc0}/wbcrm/models/activities.py

@@ -179,7 +179,7 @@ class Activity(Recurrence):
                 WBColor.BLUE_LIGHT.value,
                 WBColor.GREEN_LIGHT.value,
             ]
-            return [choice for choice in zip(cls, colors)]
+            return [choice for choice in zip(cls, colors, strict=False)]
 
     class Importance(models.TextChoices):
         LOW = "LOW", _("Low")
@@ -1036,6 +1036,9 @@ class ActivityCompanyThroughModel(ComplexToStringMixin, models.Model):
         blank=True,
     )
 
+    def __str__(self) -> str:
+        return f"{self.activity} - {self.company} ({self.customer_status})"
+
     def save(self, *args, **kwargs):
         self.customer_status = self.company.customer_status
         super().save(*args, **kwargs)

{wbcrm-1.55.8 → wbcrm-1.55.10rc0}/wbcrm/models/events.py

@@ -10,3 +10,6 @@ class Event(models.Model):
     result = models.JSONField(default=dict, blank=True)
     created = models.DateTimeField(auto_now_add=True)
     updated = models.DateTimeField(auto_now=True)
+
+    def __str__(self) -> str:
+        return str(self.id)

{wbcrm-1.55.8 → wbcrm-1.55.10rc0}/wbcrm/models/products.py

@@ -26,6 +26,9 @@ class ProductCompanyRelationship(models.Model):
         verbose_name = _("Company-Product Relationship")
         verbose_name_plural = _("Company-Product Relationships")
 
+    def __str__(self) -> str:
+        return f"{self.product} - {self.company}"
+
 
 class Product(ComplexToStringMixin, WBModel):
     title = models.CharField(

{wbcrm-1.55.8 → wbcrm-1.55.10rc0}/wbcrm/models/recurrence.py

@@ -220,7 +220,7 @@ class Recurrence(CalendarItem):
     def forward_change(
         self,
         allow_reclaiming_root: bool = True,
-        fields_to_forward: list = [
+        fields_to_forward: tuple[str, ...] = (
             "online_meeting",
             "visibility",
             "conference_room",
@@ -233,7 +233,7 @@ class Recurrence(CalendarItem):
             "location_longitude",
             "location_latitude",
             "assigned_to",
-        ],
+        ),
         period_time_changed: bool = False,
     ):
         """
@@ -261,7 +261,7 @@ class Recurrence(CalendarItem):
                     self._handle_recurrence_m2m_forwarding(child)
             self._meta.model.objects.filter(id=self.id).update(propagate_for_all_children=False)
 
-    def forward_deletion(self, child_ids: list["str"] = []):
+    def forward_deletion(self, child_ids: tuple["str", ...] = ()):
         if self.is_recurrent:
             if self.is_root:
                 occurrences = self.get_recurrent_valid_children()

{wbcrm-1.55.8 → wbcrm-1.55.10rc0}/wbcrm/synchronization/activity/backend.py

@@ -83,7 +83,7 @@ class SyncBackend:
         activity_dto: ActivityDTO,
         activity_dict: dict[str, Any],
         only_participants_changed: bool = False,
-        external_participants: list = [],
+        external_participants: list | None = None,
         keep_external_description: bool = False,
     ) -> tuple[ActivityDTO, dict[str, Any]]:
         """

{wbcrm-1.55.8 → wbcrm-1.55.10rc0}/wbcrm/synchronization/activity/backends/google/google_calendar_backend.py

@@ -103,7 +103,9 @@ class GoogleCalendarBackend:
             credentials = Credentials.from_service_account_info(serivce_account_file, scopes=cls.SCOPES)
             return build(cls.API_SERVICE_NAME, cls.API_VERSION, credentials=credentials.with_subject(user_email))
         except Exception as e:
-            raise ValueError("{msg}{exception}".format(msg=cls.error_messages["service_build_error"], exception=e))
+            raise ValueError(
+                "{msg}{exception}".format(msg=cls.error_messages["service_build_error"], exception=e)
+            ) from e
 
     @classmethod
     def create_external_activity(cls, activity: Activity) -> None:
@@ -127,7 +129,7 @@ class GoogleCalendarBackend:
                 GoogleSyncUtils.add_instance_metadata(activity, google_event_items, metadata, True)
 
         except Exception as e:
-            raise ValueError("{msg}{exception}".format(msg=cls.error_messages["create_error"], exception=e))
+            raise ValueError("{msg}{exception}".format(msg=cls.error_messages["create_error"], exception=e)) from e
 
     @classmethod
     def delete_external_activity(cls, activity: Activity) -> None:
@@ -153,7 +155,7 @@ class GoogleCalendarBackend:
                 external_id = google_backend.get("instance", {}).get("id")
             service.events().delete(calendarId=service_user_mail, eventId=external_id).execute()
         except Exception as e:
-            warnings.warn("{msg}{exception}".format(msg=cls.error_messages["delete_error"], exception=e))
+            warnings.warn("{msg}{exception}".format(msg=cls.error_messages["delete_error"], exception=e), stacklevel=2)
 
     @classmethod
     def update_external_activity(cls, activity: Activity) -> None:
@@ -186,7 +188,7 @@ class GoogleCalendarBackend:
             else:
                 update_single_event(service_user_mail, service, activity, updated_event_body)
         except Exception as e:
-            raise ValueError("{msg}{exception}".format(msg=cls.error_messages["update_error"], exception=e))
+            raise ValueError("{msg}{exception}".format(msg=cls.error_messages["update_error"], exception=e)) from e
 
     @classmethod
     def send_participant_response_external_activity(
@@ -228,7 +230,7 @@ class GoogleCalendarBackend:
         except Exception as e:
             raise ValueError(
                 "{msg}{exception}".format(msg=cls.error_messages["send_participant_response_error"], exception=e)
-            )
+            ) from e
 
     @classmethod
     def sync_with_external_calendar(cls, request: HttpRequest) -> HttpResponse:
@@ -293,7 +295,9 @@ class GoogleCalendarBackend:
             try:
                 events: Dict = request.execute()
             except Exception as e:
-                warnings.warn("{msg}{exception}".format(msg=cls.error_messages["could_not_sync"], exception=e))
+                warnings.warn(
+                    "{msg}{exception}".format(msg=cls.error_messages["could_not_sync"], exception=e), stacklevel=2
+                )
             external_event_list += events.get("items", [])
             page_token = events.get("nextPageToken")
             if not page_token:
@@ -370,7 +374,7 @@ class GoogleCalendarBackend:
                         user=user.profile.computed_str,
                         exception=e,  # type: ignore
                     )
-                )
+                ) from e
 
     @classmethod
     def stop_web_hook(cls, user: User) -> None:
@@ -391,7 +395,9 @@ class GoogleCalendarBackend:
         user_google_backend: Dict = user.metadata.get("google_backend", {})
         expiration: str | None = user_google_backend.get("watch", {}).get("expiration")
         if expiration and datetime.fromtimestamp(int(expiration) / 1000) > now:
-            warnings.warn(_("Timestamp valid until:") + str(datetime.fromtimestamp(int(expiration) / 1000)))
+            warnings.warn(
+                _("Timestamp valid until:") + str(datetime.fromtimestamp(int(expiration) / 1000)), stacklevel=2
+            )
         else:
             raise Exception(_("No valid web hook found"))
 

{wbcrm-1.55.8 → wbcrm-1.55.10rc0}/wbcrm/synchronization/activity/backends/google/request_utils/internal_to_external/update.py

@@ -112,7 +112,8 @@ def update_all_recurring_events_from_new_parent(
         ).first()
     ):
         return warnings.warn(
-            "Could not update the recurring events on google, because the old parent activity was already deleted."
+            "Could not update the recurring events on google, because the old parent activity was already deleted.",
+            stacklevel=2,
         )
 
     # Get the current parent event from google

{wbcrm-1.55.8 → wbcrm-1.55.10rc0}/wbcrm/synchronization/activity/backends/google/tests/test_data.py

@@ -33,38 +33,38 @@ event_list = [
 ]
 
 
-class event_service:
-    def insert(calendarId, body):
-        return execute_service(calendarId, body)
+class EventService:
+    def insert(self, calendarId, body):
+        return ExecuteService(calendarId, body)
 
-    def instances(calendarId, eventId):
-        return execute_service(calendarId, eventId)
+    def instances(self, calendarId, eventId):
+        return ExecuteService(calendarId, eventId)
 
-    def delete(calendarId, eventId):
-        return execute_service(calendarId, eventId)
+    def delete(self, calendarId, eventId):
+        return ExecuteService(calendarId, eventId)
 
-    def update(calendarId, eventId, body=event):
-        return execute_service(calendarId, eventId)
+    def update(self, calendarId, eventId, body=event):
+        return ExecuteService(calendarId, eventId)
 
-    def patch(calendarId, eventId, body=event):
-        return execute_service(calendarId, eventId)
+    def patch(self, calendarId, eventId, body=event):
+        return ExecuteService(calendarId, eventId)
 
-    def get(calendarId, eventId, body=event):
-        return execute_service(calendarId, eventId)
+    def get(self, calendarId, eventId, body=event):
+        return ExecuteService(calendarId, eventId)
 
-    def list(calendarId, pageToken, syncToken):
-        return execute_service(calendarId, pageToken)
+    def list(self, calendarId, pageToken, syncToken):
+        return ExecuteService(calendarId, pageToken)
 
-    def watch(calendarId, body=event):
-        return execute_service(calendarId, event)
+    def watch(self, calendarId, body=event):
+        return ExecuteService(calendarId, event)
 
 
-class channels_service:
-    def stop(body):
-        return execute_service("", body)
+class ChannelsService:
+    def stop(self, body):
+        return ExecuteService("", body)
 
 
-class execute_service:
+class ExecuteService:
     def __init__(self, calendarId, body):
         self.calendarId = calendarId
         self.body = body
@@ -73,9 +73,9 @@ class execute_service:
         return event_data
 
 
-class service_data:
+class ServiceData:
     def events(self):
-        return event_service
+        return EventService
 
     def channels(self):
-        return channels_service
+        return ChannelsService

{wbcrm-1.55.8 → wbcrm-1.55.10rc0}/wbcrm/synchronization/activity/backends/google/tests/test_google_backend.py

@@ -10,7 +10,7 @@
 # from wbcrm.models import ActivityParticipant
 
 # from ..google_calendar_backend import GoogleCalendarBackend
-# from .test_data import credentials, event_data, execute_service, service_data
+# from .test_data import credentials, event_data, ExecuteService, ServiceData
 
 
 # class TestInitialisationGoogleCalendarBackend:
@@ -128,7 +128,7 @@
 #         )
 
 #         mock_service.return_value = service_data()
-#         with patch.object(execute_service, "execute", return_value=event):
+#         with patch.object(ExecuteService, "execute", return_value=event):
 
 #             backend = GoogleCalendarBackend()
 #             if event:
@@ -186,7 +186,7 @@
 #         )
 
 #         mock_service.return_value = service_data()
-#         with patch.object(execute_service, "execute", return_value=None):
+#         with patch.object(ExecuteService, "execute", return_value=None):
 
 #             backend = GoogleCalendarBackend()
 #             backend.delete_external_activity(activity_passed)
@@ -220,7 +220,7 @@
 #         )
 
 #         mock_service.return_value = service_data()
-#         with patch.object(execute_service, "execute", return_value=event if event else {"id": None}):
+#         with patch.object(ExecuteService, "execute", return_value=event if event else {"id": None}):
 #             backend = GoogleCalendarBackend()
 #             backend.update_external_activity(activity_no_metadata)
 #             backend.update_external_activity(activity_passed)
@@ -253,7 +253,7 @@
 #             activity=activity, participant=activity.creator
 #         ).first()
 #         mock_service.return_value = service_data()
-#         with patch.object(execute_service, "execute", return_value=event if event else {"id": None}) as mock_execute:
+#         with patch.object(ExecuteService, "execute", return_value=event if event else {"id": None}) as mock_execute:
 #             backend = GoogleCalendarBackend()
 #             activityparticipant = activity.activity_participants.filter(participant=person).first()
 #             backend.send_participant_response_external_activity(activityparticipant, response_status)
@@ -295,7 +295,7 @@
 #         user = get_or_create_superuser()
 #         watch = {"id": "fake_id"}
 #         mock_service.return_value = service_data()
-#         with patch.object(execute_service, "execute", return_value=watch):
+#         with patch.object(ExecuteService, "execute", return_value=watch):
 #             GoogleCalendarBackend().set_web_hook(user)
 #         assert user.metadata["google_backend"]["watch"] == watch
 
@@ -305,7 +305,7 @@
 #         user.save()
 #         watch = {"id": "fake_id"}
 #         mock_service.return_value = service_data()
-#         with patch.object(execute_service, "execute", return_value=watch):
+#         with patch.object(ExecuteService, "execute", return_value=watch):
 #             GoogleCalendarBackend().stop_web_hook(user)
 #         assert user.metadata["google_backend"] == {}
 

{wbcrm-1.55.8 → wbcrm-1.55.10rc0}/wbcrm/synchronization/activity/backends/outlook/backend.py

@@ -239,9 +239,11 @@ class OutlookSyncBackend(SyncBackend):
         activity_dto: ActivityDTO,
         activity_dict: dict[str, Any] | None = None,
         only_participants_changed: bool = False,
-        external_participants: list = [],
+        external_participants: list | None = None,
         keep_external_description: bool = False,
     ) -> tuple[ActivityDTO, dict[str, Any]]:
+        if external_participants is None:
+            external_participants = []
         if old_event := self.get_external_event(activity_dto):
             if tenant_id := self.msgraph.get_tenant_id(activity_dto.creator.email):
                 activity_dict = activity_dict or old_event
@@ -521,7 +523,9 @@ class OutlookSyncBackend(SyncBackend):
         except Exception:
             return False
 
-    def _generate_event_metadata(self, tenant_id: str, master_event: dict, occurrence_event: dict = {}):
+    def _generate_event_metadata(self, tenant_id: str, master_event: dict, occurrence_event: dict | None = None):
+        if occurrence_event is None:
+            occurrence_event = {}
         resource = f"Users/{tenant_id}/Events/{master_event['id']}"
         metadata = {
             self.METADATA_KEY: {

{wbcrm-1.55.8 → wbcrm-1.55.10rc0}/wbcrm/synchronization/activity/backends/outlook/msgraph.py

@@ -210,11 +210,9 @@ class MicrosoftGraphAPI:
         return data
 
     def get_tenant_id(self, email: str) -> str | None:
-        try:
+        with suppress(Exception):
             if msuser := self.user(email):
                 return msuser.get("id", None)
-        except Exception:
-            pass
         return None
 
     def delta_changes_events(self, tenant_id: str, minutes: int) -> list:
@@ -428,11 +426,11 @@ class MicrosoftGraphAPI:
             global_preferences = global_preferences_registry.manager()
             headers["Authorization"] = f'Bearer {global_preferences["wbactivity_sync__outlook_sync_access_token"]}'
         if method == "POST":
-            response = requests.post(url, data=data, headers=headers)
+            response = requests.post(url, data=data, headers=headers, timeout=10)
         elif method == "DELETE":
-            response = requests.delete(url, headers=headers)
+            response = requests.delete(url, headers=headers, timeout=10)
         elif method == "PATCH":
-            response = requests.patch(url, data=data, headers=headers)
+            response = requests.patch(url, data=data, headers=headers, timeout=10)
         else:
-            response = requests.get(url, headers=headers, params=params)
+            response = requests.get(url, headers=headers, params=params, timeout=10)
         return response

{wbcrm-1.55.8 → wbcrm-1.55.10rc0}/wbcrm/synchronization/activity/backends/outlook/tests/fixtures.py

@@ -5,7 +5,7 @@ from django.contrib.messages import storage
 from rest_framework.test import APIRequestFactory
 
 
-class msgraph_fixture:
+class MSGraphFixture:
     token = None
     _subscriptions = []
     _subscription = None

{wbcrm-1.55.8 → wbcrm-1.55.10rc0}/wbcrm/synchronization/activity/backends/outlook/tests/test_admin.py

@@ -10,7 +10,7 @@ from wbcore.contrib.authentication.factories import UserFactory
 
 from wbcrm.synchronization.activity.admin import UserSyncAdmin
 
-from .fixtures import TestOutlookSyncFixture, msgraph_fixture
+from .fixtures import MSGraphFixture, TestOutlookSyncFixture
 
 
 @pytest.mark.parametrize(
@@ -36,11 +36,11 @@ class TestAdminUserWebhook(TestOutlookSyncFixture):
                 "wbcrm.synchronization.activity.backends.outlook.backend.OutlookSyncBackend"
             )
         mock_msgraph.return_value.status_code = status.HTTP_200_OK
-        mock_msgraph.return_value = msgraph_fixture()
+        mock_msgraph.return_value = MSGraphFixture()
         if credentials:
             preferences["wbactivity_sync__outlook_sync_credentials"] = credentials_fixture
-            msgraph_fixture._subscription = subscription
-            msgraph_fixture.tenant_id = tenant_id
+            MSGraphFixture._subscription = subscription
+            MSGraphFixture.tenant_id = tenant_id
         else:
             mock_msgraph.side_effect = AssertionError("Invalid URL")
         user = UserFactory(is_superuser=True)

{wbcrm-1.55.8 → wbcrm-1.55.10rc0}/wbcrm/synchronization/activity/backends/outlook/tests/test_backend.py

@@ -9,7 +9,7 @@ from wbcore.contrib.authentication.factories import UserFactory
 from wbcrm.models.activities import Activity
 from wbcrm.synchronization.activity.backends.outlook.backend import OutlookSyncBackend
 
-from .fixtures import TestOutlookSyncFixture, msgraph_fixture
+from .fixtures import MSGraphFixture, TestOutlookSyncFixture
 
 
 @pytest.mark.django_db
@@ -73,14 +73,14 @@ class TestOutlookSyncBackend(TestOutlookSyncFixture):
             "", data=json.dumps({"value": [notification_created_fixture]}), content_type="application/json"
         )
         self.backend.open()
-        self.backend.msgraph = msgraph_fixture()
+        self.backend.msgraph = MSGraphFixture()
         if event_found:
             if is_organizer:
-                msgraph_fixture.event = organizer_event_fixture_parsed
-                msgraph_fixture.tenant_id = "fake_tenant_id"
+                MSGraphFixture.event = organizer_event_fixture_parsed
+                MSGraphFixture.tenant_id = "fake_tenant_id"
             else:
-                msgraph_fixture.event = invitation_event_fixture_parsed
-                msgraph_fixture.event_by_uid = organizer_event_fixture_parsed
+                MSGraphFixture.event = invitation_event_fixture_parsed
+                MSGraphFixture.event_by_uid = organizer_event_fixture_parsed
         events = self.backend._get_events_from_request(request1)
         self.backend.close()
         assert len(events) == 1
@@ -166,9 +166,9 @@ class TestOutlookSyncBackend(TestOutlookSyncFixture):
         activity_dto = activity_factory(preceded_by=None)._build_dto()
         activity_dto2 = activity_factory(preceded_by=None, metadata={self.backend.METADATA_KEY: metadata})._build_dto()
         self.backend.open()
-        self.backend.msgraph = msgraph_fixture()
-        msgraph_fixture.tenant_id = "fake_tenant_id"
-        msgraph_fixture.event_by_uid = msgraph_fixture.event = {"id": "event_id"}
+        self.backend.msgraph = MSGraphFixture()
+        MSGraphFixture.tenant_id = "fake_tenant_id"
+        MSGraphFixture.event_by_uid = MSGraphFixture.event = {"id": "event_id"}
         assert (
             self.backend.get_external_event(activity_dto, master_event)
             == self.backend.get_external_event(activity_dto, master_event)
@@ -198,9 +198,9 @@ class TestOutlookSyncBackend(TestOutlookSyncFixture):
             metadata={self.backend.METADATA_KEY: {"organizer_resource": "fake_resource"}},
         )._build_dto()
         self.backend.open()
-        self.backend.msgraph = msgraph_fixture()
-        msgraph_fixture.tenant_id = "fake_tenant_id"
-        msgraph_fixture.event_by_uid = msgraph_fixture.event = {
+        self.backend.msgraph = MSGraphFixture()
+        MSGraphFixture.tenant_id = "fake_tenant_id"
+        MSGraphFixture.event_by_uid = MSGraphFixture.event = {
             "id": "event_id",
             "attendees": [{"emailAddress": {"address": person._build_dto().email}}],
         }
@@ -214,8 +214,8 @@ class TestOutlookSyncBackend(TestOutlookSyncFixture):
         user2 = UserFactory(is_superuser=True)
         user2.metadata = {self.backend.METADATA_KEY: {"subscription": {"id": "fake_subscription_id"}}}
         user2.save()
-        msgraph_fixture._subscription = {"id": "fake_subscription_id"}
-        mock_msgraph.return_value = msgraph_fixture()
+        MSGraphFixture._subscription = {"id": "fake_subscription_id"}
+        mock_msgraph.return_value = MSGraphFixture()
         assert self.backend._is_participant_valid(user2) is True
         assert self.backend._is_participant_valid(user) is False
 
@@ -240,8 +240,8 @@ class TestOutlookSyncBackend(TestOutlookSyncFixture):
         self, activity_factory, organizer_event_fixture_parsed, organizer_master_event_fixture_parsed
     ):
         self.backend.open()
-        self.backend.msgraph = msgraph_fixture()
-        msgraph_fixture.tenant_id = "fake_tenant_id"
+        self.backend.msgraph = MSGraphFixture()
+        MSGraphFixture.tenant_id = "fake_tenant_id"
         activity_dto = activity_factory(preceded_by=None)._build_dto()
         metadata_list = self.backend._get_metadata_from_event(activity_dto, organizer_event_fixture_parsed)
         # self.backend._get_metadata_from_event()
@@ -259,8 +259,8 @@ class TestOutlookSyncBackend(TestOutlookSyncFixture):
 
     @patch("wbcrm.synchronization.activity.backends.outlook.backend.MicrosoftGraphAPI")
     def test_renew_web_hooks(self, mock_msgraph):
-        msgraph_fixture._subscription = {"id": "fake_id_new"}
-        mock_msgraph.return_value = msgraph_fixture()
+        MSGraphFixture._subscription = {"id": "fake_id_new"}
+        mock_msgraph.return_value = MSGraphFixture()
 
         user1 = UserFactory(is_superuser=True)
         user2 = UserFactory(is_superuser=True)

{wbcrm-1.55.8 → wbcrm-1.55.10rc0}/wbcrm/synchronization/activity/backends/outlook/tests/test_controller.py

@@ -15,7 +15,7 @@ from wbcrm.models import Activity, ActivityParticipant
 from wbcrm.synchronization.activity.shortcuts import get_backend
 from wbcrm.typings import User as UserDTO
 
-from .fixtures import TestOutlookSyncFixture, msgraph_fixture
+from .fixtures import MSGraphFixture, TestOutlookSyncFixture
 
 User = get_user_model()
 
@@ -46,7 +46,7 @@ class TestController(TestOutlookSyncFixture):
     def controller(self, mock_msgraph):
         controller = get_backend()
         controller.backend.open()
-        controller.backend.msgraph = msgraph_fixture()
+        controller.backend.msgraph = MSGraphFixture()
         return controller
 
     @pytest.mark.parametrize("type_request", [None, "validationToken", "admin_consent"])

{wbcrm-1.55.8 → wbcrm-1.55.10rc0}/wbcrm/synchronization/activity/controller.py

@@ -241,8 +241,8 @@ class ActivityController:
         self,
         activity_dto: ActivityDTO,
         old_activity_dto: ActivityDTO,
-        update_fields: list = [],
-        exclude_fields: list = [],
+        update_fields: list | None = None,
+        exclude_fields: list | None = None,
     ) -> bool:
         """
         Comparison of 2 activities, returns false if they are identical
@@ -252,6 +252,8 @@ class ActivityController:
 
         :param exclude_fields: allows you to exclude fields from the comparison list
         """
+        if exclude_fields is None:
+            exclude_fields = []
         if not can_synchronize_activity_description():
             exclude_fields.append("description")
         update_fields = (

{wbcrm-1.55.8 → wbcrm-1.55.10rc0}/wbcrm/synchronization/activity/utils.py

@@ -20,7 +20,7 @@ def merge_nested_dict(dct: dict, nested_to_merge: dict):
     """
     allows to merge 2 nested dictionaries
     """
-    for k, v in nested_to_merge.items():
+    for k in nested_to_merge.keys():
         if k in dct:
             if isinstance(dct[k], dict) and isinstance(nested_to_merge[k], dict):  # noqa
                 merge_nested_dict(dct[k], nested_to_merge[k])

{wbcrm-1.55.8 → wbcrm-1.55.10rc0}/wbcrm/tasks.py

@@ -144,7 +144,7 @@ def yesterdays_activity_summary(yesterday: date | None = None, report_receiver_u
     # Create the notification for each person with the right permission
     for user in User.objects.filter(id__in=report_receiver_user_ids).distinct():
         context = {
-            "map_activities": zip(employee_names, activity_lists),
+            "map_activities": zip(employee_names, activity_lists, strict=False),
             "activities_count": internal_activities.count(),
             "report_date": yesterday.strftime("%d.%m.%Y"),
         }

{wbcrm-1.55.8 → wbcrm-1.55.10rc0}/wbcrm/tests/disable_signals.py

@@ -2,7 +2,17 @@ import inspect
 import re
 from collections import defaultdict
 
-from django.db.models.signals import *
+from django.db.models.signals import (
+    ModelSignal,
+    post_delete,
+    post_init,
+    post_migrate,
+    post_save,
+    pre_delete,
+    pre_init,
+    pre_migrate,
+    pre_save,
+)
 
 
 class DisableSignals(object):

{wbcrm-1.55.8 → wbcrm-1.55.10rc0}/wbcrm/tests/e2e/test_e2e.py

@@ -24,7 +24,7 @@ from wbcore.contrib.directory.tests.e2e import (
     set_up_companies,
     set_up_persons,
 )
-from wbcore.contrib.directory.viewsets.display import CMR_Color
+from wbcore.contrib.directory.viewsets.display import ClientManagerRelationshipColor
 from wbcore.test import (
     click_button_by_label,
     click_close_all_widgets,
@@ -64,7 +64,7 @@ class TestCRMFilters:
         """
 
         # Creating a test user
-        user: User = SuperUserFactory(plaintext_password=USER_PASSWORD)
+        user: User = SuperUserFactory(plaintext_password=USER_PASSWORD)  # noqa
         # Creating three test companies with different last activities.
         companies = set_up_companies()
         now = timezone.now()
@@ -349,7 +349,7 @@ class TestCRMRelationShipManagement:
         assert is_counter_as_expected(selenium, 1)
         assert is_text_visible(selenium, cmr.client.computed_str)
         assert is_text_visible(selenium, cmr.relationship_manager.computed_str)
-        assert does_background_color_match(cmr_element, CMR_Color.DRAFT.value)
+        assert does_background_color_match(cmr_element, ClientManagerRelationshipColor.DRAFT.value)
 
         # # -----> Edit <----- #
 

{wbcrm-1.55.8 → wbcrm-1.55.10rc0}/wbcrm/tests/test_recurrence.py

@@ -125,7 +125,7 @@ class TestRecurrenceModel(RecurrenceFixture):
         else:
             assert Activity.objects.count() == 3
             next_occ.refresh_from_db()
-            next_occ.is_root == was_root
+            assert next_occ.is_root == was_root
 
     @pytest.mark.parametrize("include_self", [False, True])
     def test_get_occurrence_start_datetimes(self, occurrences_fixture, include_self, activity_factory):

{wbcrm-1.55.8 → wbcrm-1.55.10rc0}/wbcrm/tests/test_viewsets.py

@@ -388,7 +388,6 @@ class TestActivityModelViewSet:
     @pytest.mark.parametrize("mvs", [ActivityViewSet])
     def test_partial_update_activity_instance(self, mvs, activity_factory):
         activity = activity_factory()
-        activity.title
         user = InternalUserFactory(is_active=True, is_superuser=True)
         request = self.api_factory.patch("", data={"title": "New Title"})
         request.user = user