PyPI - zou - Versions diffs - 0.20.74__tar.gz → 0.20.75__tar.gz - Mend

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zou
-Version: 0.20.74
+Version: 0.20.75
 Summary: API to store and manage the data of your animation production
 Home-page: https://zou.cg-wire.com
 Author: CG Wire

@@ -2159,12 +2159,21 @@ class ProductionDayOffsResource(Resource, ArgsMixin):
           '400':
             description: Invalid date range parameters
         """
-        user_service.check_manager_project_access(project_id)
+        user_service.check_project_access(project_id)
+        if (
+            permissions.has_client_permissions()
+            or permissions.has_vendor_permissions()
+        ):
+            raise permissions.PermissionDenied
         arguments = self.get_args(["start_date", "end_date"])
         start_date, end_date = arguments["start_date"], arguments["end_date"]
         try:
             return time_spents_service.get_day_offs_between_for_project(
-                project_id, start_date, end_date
+                project_id,
+                start_date,
+                end_date,
+                safe=permissions.has_manager_permissions(),
+                current_user_id=persons_service.get_current_user()["id"],
             )
         except WrongDateFormatException:
             abort(

@@ -19,3 +19,6 @@ class DayOff(db.Model, BaseMixin, SerializerMixin):
         db.UniqueConstraint("person_id", "date", name="day_off_uc"),
         db.CheckConstraint("date <= end_date", name="day_off_date_check"),
     )
+    def serialize_safe(self, **kwargs):
+        return self.serialize(ignored_attrs=["description"], **kwargs)

@@ -192,15 +192,18 @@ class Person(db.Model, BaseMixin, SerializerMixin):
         data["fido_devices"] = self.fido_devices()
         return data
-    def serialize_safe(self, relations=False, milliseconds=False):
-        data = self.serialize(relations=relations, milliseconds=milliseconds)
-        del data["password"]
-        del data["totp_secret"]
-        del data["email_otp_secret"]
-        del data["otp_recovery_codes"]
-        del data["fido_credentials"]
-        del data["jti"]
-        return data
+    def serialize_safe(self, **kwargs):
+        return self.serialize(
+            ignored_attrs=[
+                "password",
+                "totp_secret",
+                "email_otp_secret",
+                "otp_recovery_codes",
+                "fido_credentials",
+                "jti",
+            ],
+            **kwargs,
+        )
     def present_minimal(self, relations=False, milliseconds=False):
         data = SerializerMixin.serialize(

@@ -606,7 +606,11 @@ def get_project_task_type_time_spents(
 def get_day_offs_between_for_project(
-    project_id, start_date=None, end_date=None
+    project_id,
+    start_date=None,
+    end_date=None,
+    safe=False,
+    current_user_id=None,
 ):
     """
     Get all day off entries for project, start and end date.
@@ -627,8 +631,12 @@ def get_day_offs_between_for_project(
         result = defaultdict(list)
         for day_off in days_offs:
-            result[str(day_off.person_id)].append(day_off.serialize())
+            day_off_person_id = str(day_off.person_id)
+            result[day_off_person_id].append(
+                day_off.serialize_safe()
+                if safe and current_user_id != day_off_person_id
+                else day_off.serialize()
+            )
     except DataError:
         raise WrongDateFormatException
     return dict(result)

	@@ -0,0 +1 @@
1	+ __version__ = "0.20.75"

	@@ -1 +0,0 @@
1	- __version__ = "0.20.74"

zou 0.20.74__tar.gz → 0.20.75__tar.gz