zou 0.20.74__py3-none-any.whl → 0.20.75__py3-none-any.whl

zou/__init__.py

@@ -1 +1 @@
-__version__ = "0.20.74"
+__version__ = "0.20.75"

zou/app/blueprints/projects/resources.py

@@ -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(

zou/app/models/day_off.py

@@ -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)

zou/app/models/person.py

@@ -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(

zou/app/services/time_spents_service.py

@@ -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)

{zou-0.20.74.dist-info → zou-0.20.75.dist-info}/METADATA

@@ -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

{zou-0.20.74.dist-info → zou-0.20.75.dist-info}/RECORD

@@ -1,4 +1,4 @@
-zou/__init__.py,sha256=XfPpnxKnarguaQf3OrkgE_t9bFlmoaJ40CFc2Edn8bo,24
+zou/__init__.py,sha256=WaRGkUs0CThomz5212CALhrybWnq3dLxxUd7Txzzgiw,24
 zou/cli.py,sha256=N9FyrL4TDgIiCUa-I3xIzOgiVLM14kz8_QLQ48y51oE,22767
 zou/debug.py,sha256=1fawPbkD4wn0Y9Gk0BiBFSa-CQe5agFi8R9uJYl2Uyk,520
 zou/event_stream.py,sha256=9O1PE_vDW8p3yfHJNSZ8w0ybD-660x8oGN0izgJdTjM,8575
@@ -101,7 +101,7 @@ zou/app/blueprints/playlists/resources.py,sha256=dD50WpKkIyaDar4nfYS2GfC_5e8mncV
 zou/app/blueprints/previews/__init__.py,sha256=ihC6OQ9AUjnZ2JeMnjRh_tKGO0UmAjOwhZnOivc3BnQ,4460
 zou/app/blueprints/previews/resources.py,sha256=mRFVMl4fi4mptE1qMG68GAIg868HMiE7AFnQYnszSAU,53345
 zou/app/blueprints/projects/__init__.py,sha256=ZX59ZmMIAI11zNy_RjLacOQnEcSJdwRIr68KwOYiB2k,5918
-zou/app/blueprints/projects/resources.py,sha256=BrPwUtiMAsk8Lozph5gNHV42mj3_RIN-1iG20bp2P88,64602
+zou/app/blueprints/projects/resources.py,sha256=a3Il_DHOEx9zauUf-ifvnJADC1-KRllHvFIP5RILurM,64933
 zou/app/blueprints/search/__init__.py,sha256=QCjQIY_85l_orhdEiqav_GifjReuwsjZggN3V0GeUVY,356
 zou/app/blueprints/search/resources.py,sha256=XhNewgF4y0Tj9TIZt-2b0c5Whu43YsoeLuNZG2EHFg4,4797
 zou/app/blueprints/shots/__init__.py,sha256=EcG9qmAchlucqg1M6-RqWGfuKpa5Kq6RgyLZNSsjUr4,4225
@@ -154,7 +154,7 @@ zou/app/models/chat_message.py,sha256=8w7xtoqCW_CRoGKrF4ba5w-oyAHIRh-2ms3p5sQQor
 zou/app/models/comment.py,sha256=aDi64Yny5RvlSDace5ydUqxI7_hhugBVnO6EvR19tAE,6040
 zou/app/models/custom_action.py,sha256=wx5ASKJ2oG-ivASZbVf1nLiL7zELgQBJ8U1jDdvGkuU,578
 zou/app/models/data_import_error.py,sha256=dCyzaX0KATa0F8h5V3sTPlXz-XNl1VNkflRfJuaCmsg,425
-zou/app/models/day_off.py,sha256=WMZs7oMhUBpMnNyvhgpl1j6egZ5J0drnrF1dH3N5cII,691
+zou/app/models/day_off.py,sha256=pG5EKnohhdTkYgSQl4h1CrGQ6Woa8b-DGmS-DL5q7pw,803
 zou/app/models/department.py,sha256=j8nxMJRE6wvqlDY68uPRephQTSny4sr06qs0wbzlkzc,2095
 zou/app/models/desktop_login_log.py,sha256=fdgqEXAQkHw6CtRU_Y-CuboaZA9QWJc9OzklvbdPBJY,546
 zou/app/models/entity.py,sha256=-pW30_KWeKll5fTrLBAQ_O24KxUL6G5E8cj6xUAY8M8,8569
@@ -170,7 +170,7 @@ zou/app/models/notification.py,sha256=1ODOymGPeB4oxgX_3WhOgIL_Lsz-JR7miDkBS6W8t_
 zou/app/models/organisation.py,sha256=R69AR1JDZSs6YeXDalmz3ewmrSMDv9Mr8AZAHn09Iu0,1365
 zou/app/models/output_file.py,sha256=hyLGrpsgrk0aisDXppRQrB7ItCwyuyw-X0ZwVAHabsA,2569
 zou/app/models/output_type.py,sha256=us_lCUCEvuP4vi_XmmOcEl1J2MtZhMX5ZheBqEFCgWA,381
-zou/app/models/person.py,sha256=EiyzAQAZ3jypRXBIAIYCexv7AacqA9JUe5rODsLUxPo,8114
+zou/app/models/person.py,sha256=EnndhMwVArOM1ZJqazX5q_LL-aq-JPeKtm_goy2y_Og,8089
 zou/app/models/playlist.py,sha256=YGgAk84u0_fdIEY02Dal4kfk8APVZvWFwWYV74qvrio,1503
 zou/app/models/plugin.py,sha256=zNs9Qi1h_v_6edZs5GHRSKItaAG4Gnlk1FQKumiiv68,766
 zou/app/models/preview_background_file.py,sha256=j8LgRmY7INnlB07hFwwB-8ssQrRC8vsb8VcpsTbt6tA,559
@@ -229,7 +229,7 @@ zou/app/services/status_automations_service.py,sha256=tVio7Sj7inhvKS4UOyRhcdpwr_
 zou/app/services/sync_service.py,sha256=iWxx1kOGEXympHmSBBQWtDZWNtumdxp8kppee0OefMo,41811
 zou/app/services/tasks_service.py,sha256=ZLUi6_XhLU_SLwERFHx4QwcXdS-ncrVH_rIl-Lt-9yE,69993
 zou/app/services/telemetry_services.py,sha256=xQm1h1t_JxSFW59zQGf4NuNdUi1UfMa_6pQ-ytRbmGA,1029
-zou/app/services/time_spents_service.py,sha256=h3YlhAAhfAxijmQe-32p2qZNu4h5J3lIh8fOjV0uy4Y,18394
+zou/app/services/time_spents_service.py,sha256=E0RU5dcoME1MZrxohKWmRMDTD_irwT8HUUhXHeR7kng,18635
 zou/app/services/user_service.py,sha256=inFNPsAb11odskiidXAOzNGlY5S2DvFYuYCeGGN_1lc,52990
 zou/app/stores/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zou/app/stores/auth_tokens_store.py,sha256=-qOJPybLHvnMOq3PWk073OW9HJwOHGhFLZeOIlX1UVw,1290
@@ -469,9 +469,9 @@ zou/remote/normalize_movie.py,sha256=zNfEY3N1UbAHZfddGONTg2Sff3ieLVWd4dfZa1dpnes
 zou/remote/playlist.py,sha256=AsDo0bgYhDcd6DfNRV6r6Jj3URWwavE2ZN3VkKRPbLU,3293
 zou/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zou/utils/movie.py,sha256=d67fIL9dVBKt-E_qCGXRbNNdbJaJR5sHvZeX3hf8ldE,16559
-zou-0.20.74.dist-info/licenses/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
-zou-0.20.74.dist-info/METADATA,sha256=JHbyHNZzhvDcMKA0cso9abXsl70PRr8G5WD9mdd-IPc,6698
-zou-0.20.74.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-zou-0.20.74.dist-info/entry_points.txt,sha256=PelQoIx3qhQ_Tmne7wrLY-1m2izuzgpwokoURwSohy4,130
-zou-0.20.74.dist-info/top_level.txt,sha256=4S7G_jk4MzpToeDItHGjPhHx_fRdX52zJZWTD4SL54g,4
-zou-0.20.74.dist-info/RECORD,,
+zou-0.20.75.dist-info/licenses/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
+zou-0.20.75.dist-info/METADATA,sha256=IRv9nsvhgVz_XrDixkS0PTUVzMBk4vXuvaZueB8de4k,6698
+zou-0.20.75.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+zou-0.20.75.dist-info/entry_points.txt,sha256=PelQoIx3qhQ_Tmne7wrLY-1m2izuzgpwokoURwSohy4,130
+zou-0.20.75.dist-info/top_level.txt,sha256=4S7G_jk4MzpToeDItHGjPhHx_fRdX52zJZWTD4SL54g,4
+zou-0.20.75.dist-info/RECORD,,