zou 0.20.19__tar.gz → 0.20.21__tar.gz

{zou-0.20.19/zou.egg-info → zou-0.20.21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: zou
-Version: 0.20.19
+Version: 0.20.21
 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.21/zou/__init__.py

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

{zou-0.20.19 → zou-0.20.21}/zou/app/blueprints/assets/resources.py

@@ -355,7 +355,7 @@ class AssetAssetsResource(Resource):
         return breakdown_service.get_entity_casting(asset_id)
 
 
-class AssetTasksResource(Resource):
+class AssetTasksResource(Resource, ArgsMixin):
     @jwt_required()
     def get(self, asset_id):
         """
@@ -376,7 +376,9 @@ class AssetTasksResource(Resource):
         """
         asset = assets_service.get_asset(asset_id)
         user_service.check_project_access(asset["project_id"])
-        return tasks_service.get_tasks_for_asset(asset_id)
+        return tasks_service.get_tasks_for_asset(
+            asset_id, relations=self.get_relations()
+        )
 
 
 class AssetTaskTypesResource(Resource):

{zou-0.20.19 → zou-0.20.21}/zou/app/blueprints/comments/resources.py

@@ -190,7 +190,7 @@ class CommentTaskResource(Resource):
             links,
         ) = self.get_arguments()
 
-        user_service.check_task_access(task_id)
+        user_service.check_task_action_access(task_id)
         user_service.check_task_status_access(task_status_id)
         files = request.files
 
@@ -491,7 +491,7 @@ class ReplyCommentResource(Resource, ArgsMixin):
             ]
         )
 
-        user_service.check_task_access(task_id)
+        user_service.check_task_action_access(task_id)
         return comments_service.reply_comment(comment_id, args["text"])
 
 
@@ -530,7 +530,6 @@ class DeleteReplyCommentResource(Resource):
             200:
                 description: Given comment reply deleted
         """
-        user_service.check_task_access(task_id)
         reply = comments_service.get_reply(comment_id, reply_id)
         current_user = persons_service.get_current_user()
         if reply["person_id"] != current_user["id"]:

{zou-0.20.19 → zou-0.20.21}/zou/app/blueprints/crud/comments.py

@@ -189,6 +189,11 @@ class CommentResource(BaseModelResource):
             )
         return comment
 
+    def update_data(self, data, instance_id):
+        data = super().update_data(data, instance_id)
+        data["updated_by"] = persons_service.get_current_user_raw().id
+        return data
+
     @jwt_required()
     def delete(self, instance_id):
         """

{zou-0.20.19 → zou-0.20.21}/zou/app/blueprints/crud/working_file.py

@@ -51,7 +51,7 @@ class WorkingFileResource(BaseModelResource):
 
     def check_update_permissions(self, instance, data):
         working_file = files_service.get_working_file(instance["id"])
-        user_service.check_task_access(working_file["task_id"])
+        user_service.check_task_action_access(working_file["task_id"])
         return True
 
     @jwt_required()

{zou-0.20.19 → zou-0.20.21}/zou/app/blueprints/files/resources.py

@@ -768,7 +768,7 @@ class ModifiedFileResource(Resource):
               description: Working file modification date updated
         """
         working_file = files_service.get_working_file(working_file_id)
-        user_service.check_task_access(working_file["task_id"])
+        user_service.check_task_action_access(working_file["task_id"])
         working_file = files_service.update_working_file(
             working_file_id,
             {"updated_at": date_helpers.get_utc_now_datetime()},
@@ -819,7 +819,7 @@ class CommentWorkingFileResource(Resource, ArgsMixin):
         )
 
         working_file = files_service.get_working_file(working_file_id)
-        user_service.check_task_access(working_file["task_id"])
+        user_service.check_task_action_access(working_file["task_id"])
         working_file = self.update_comment(working_file_id, args["comment"])
         return working_file
 

{zou-0.20.19 → zou-0.20.21}/zou/app/blueprints/previews/resources.py

@@ -419,7 +419,7 @@ class CreatePreviewFilePictureResource(
             raise PreviewFileReuploadNotAllowedException
 
         try:
-            user_service.check_task_access(preview_file["task_id"])
+            user_service.check_task_action_access(preview_file["task_id"])
             return True
         except permissions.PermissionDenied:
             return False
@@ -474,14 +474,14 @@ class BaseBatchComment(BaseNewPreviewFilePicture, ArgsMixin):
         args = self.get_comments_args()
 
         if task_id is not None:
-            user_service.check_task_access(task_id)
+            user_service.check_task_action_access(task_id)
 
         new_comments = []
         for i, comment in enumerate(args["comments"]):
             user_service.check_task_status_access(comment["task_status_id"])
 
             if task_id is None:
-                user_service.check_task_access(comment["task_id"])
+                user_service.check_task_action_access(comment["task_id"])
 
             if not permissions.has_manager_permissions():
                 comment["person_id"] = None
@@ -1322,7 +1322,7 @@ class UpdatePreviewPositionResource(Resource, ArgsMixin):
         """
         args = self.get_args([{"name": "position", "default": 0, "type": int}])
         preview_file = files_service.get_preview_file(preview_file_id)
-        user_service.check_task_access(preview_file["task_id"])
+        user_service.check_task_action_access(preview_file["task_id"])
         return preview_files_service.update_preview_file_position(
             preview_file_id, args["position"]
         )

{zou-0.20.19 → zou-0.20.21}/zou/app/blueprints/tasks/resources.py

@@ -69,7 +69,7 @@ class AddPreviewResource(Resource, ArgsMixin):
         """
         args = self.get_args([("revision", 0, False, int)])
 
-        user_service.check_task_access(task_id)
+        user_service.check_task_action_access(task_id)
 
         person = persons_service.get_current_user()
         preview_file = tasks_service.add_preview_file_to_comment(
@@ -117,7 +117,7 @@ class AddExtraPreviewResource(Resource, ArgsMixin):
             201:
                 description: Preview added to given comment
         """
-        user_service.check_task_access(task_id)
+        user_service.check_task_action_access(task_id)
         tasks_service.get_comment(comment_id)
 
         person = persons_service.get_current_user()

{zou-0.20.19 → zou-0.20.21}/zou/app/models/comment.py

@@ -101,6 +101,12 @@ class Comment(db.Model, BaseMixin, SerializerMixin):
         nullable=False,
         index=True,
     )
+    updated_by = db.Column(
+        UUIDType(binary=False),
+        db.ForeignKey("person.id"),
+        default=None,
+        index=True,
+    )
     preview_file_id = db.Column(
         UUIDType(binary=False), db.ForeignKey("preview_file.id")
     )

{zou-0.20.19 → zou-0.20.21}/zou/app/services/sync_service.py

@@ -43,6 +43,7 @@ from zou.app.models.task_status import TaskStatus
 from zou.app.models.task_type import TaskType
 from zou.app.models.time_spent import TimeSpent
 from zou.app.models.studio import Studio
+from zou.app.models.status_automation import StatusAutomation
 
 from zou.app.services import deletion_service, tasks_service, projects_service
 from zou.app.stores import file_store
@@ -103,6 +104,7 @@ event_name_model_map = {
     "subscription": Subscription,
     "search-filter": SearchFilter,
     "search-filter-group": SearchFilterGroup,
+    "status-automation": StatusAutomation,
     "studio": Studio,
     "task": Task,
     "task-status": TaskStatus,
@@ -142,6 +144,7 @@ event_name_model_path_map = {
     "search-filter": "search-filters",
     "search-filter-group": "search-filter-groups",
     "subscription": "subscriptions",
+    "status-automation": "status-automations",
     "studio": "studios",
     "task": "tasks",
     "task-status": "task-status",
@@ -176,6 +179,7 @@ main_events = [
     "department",
     "task-type",
     "task-status",
+    "status-automation",
     "custom-action",
     "organisation",
     "project-status",
@@ -286,6 +290,8 @@ def run_main_data_sync(project=None):
     Retrieve and import all cross-projects data from source instance.
     """
     for event in main_events:
+        if project is None and event == "project":
+            continue
         path = event_name_model_path_map[event]
         model = event_name_model_map[event]
         sync_entries(path, model, project=project)

{zou-0.20.19 → zou-0.20.21}/zou/app/services/tasks_service.py

@@ -587,11 +587,13 @@ def get_comments(task_id, is_client=False, is_manager=False):
 
 
 def _prepare_query(task_id, is_client, is_manager):
+    UpdatedBy = aliased(Person, name="updated_by")
     query = (
         Comment.query.order_by(Comment.created_at.desc())
         .filter_by(object_id=task_id)
         .join(Person, Comment.person_id == Person.id)
         .join(TaskStatus, Comment.task_status_id == TaskStatus.id)
+        .join(UpdatedBy, Comment.updated_by == UpdatedBy.id, isouter=True)
         .add_columns(
             TaskStatus.name,
             TaskStatus.short_name,
@@ -599,6 +601,9 @@ def _prepare_query(task_id, is_client, is_manager):
             Person.first_name,
             Person.last_name,
             Person.has_avatar,
+            UpdatedBy.first_name,
+            UpdatedBy.last_name,
+            UpdatedBy.has_avatar,
         )
     )
     if not is_manager and not is_client:
@@ -618,6 +623,9 @@ def _run_task_comments_query(query):
             person_first_name,
             person_last_name,
             person_has_avatar,
+            updated_by_first_name,
+            updated_by_last_name,
+            updated_by_has_avatar,
         ) = result
 
         comment_dict = comment.serialize()
@@ -627,6 +635,13 @@ def _run_task_comments_query(query):
             "has_avatar": person_has_avatar,
             "id": str(comment.person_id),
         }
+        if comment.updated_by is not None:
+            comment_dict["updated_by"] = {
+                "first_name": updated_by_first_name,
+                "last_name": updated_by_last_name,
+                "has_avatar": updated_by_has_avatar,
+                "id": str(comment.updated_by),
+            }
         comment_dict["task_status"] = {
             "name": task_status_name,
             "short_name": task_status_short_name,
@@ -1140,7 +1155,7 @@ def get_last_comment_map(task_ids):
     task_comment_map = {}
     comments = (
         Comment.query.filter(Comment.object_id.in_(task_ids))
-        .join(Person)
+        .join(Person, Comment.person_id == Person.id)
         .filter(Person.role != "client")
         .order_by(Comment.object_id, Comment.created_at)
         .all()
@@ -1960,22 +1975,26 @@ def get_open_tasks(
             query = query.filter(Task.assignees == None)
             query_stats = query_stats.filter(Task.assignees == None)
         else:
-            query = query.filter(Task.assignees.any(
-                Person.id.in_(person_id.split(","))
-            ))
-            query_stats = query_stats.filter(Task.assignees.any(
-                Person.id.in_(person_id.split(","))
-            ))
+            query = query.filter(
+                Task.assignees.any(Person.id.in_(person_id.split(",")))
+            )
+            query_stats = query_stats.filter(
+                Task.assignees.any(Person.id.in_(person_id.split(",")))
+            )
 
     if studio_id is not None:
         query = query.filter(Task.assignees.any(studio_id=studio_id))
-        query_stats = query_stats.filter(Task.assignees.any(studio_id=studio_id))
+        query_stats = query_stats.filter(
+            Task.assignees.any(studio_id=studio_id)
+        )
 
     if department_id is not None:
         query = query.filter(
-            Task.assignees.any(Person.departments.any(id=department_id)))
+            Task.assignees.any(Person.departments.any(id=department_id))
+        )
         query_stats = query_stats.filter(
-            Task.assignees.any(Person.departments.any(id=department_id)))
+            Task.assignees.any(Person.departments.any(id=department_id))
+        )
 
     if start_date is not None:
         start_date = func.cast(start_date, Task.start_date.type)

{zou-0.20.19 → zou-0.20.21}/zou/app/services/user_service.py

@@ -1,5 +1,5 @@
 from sqlalchemy.orm import aliased
-from sqlalchemy import func, or_
+from sqlalchemy import func, or_, and_
 
 from zou.app import config
 from zou.app.models.comment import Comment
@@ -488,6 +488,37 @@ def check_task_access(task_id):
     return True
 
 
+def check_task_action_access(task_id):
+    """
+    Return true if current user can have access to a task action.
+    """
+    task = tasks_service.get_task(task_id, relations=True)
+    is_allowed = False
+    if permissions.has_admin_permissions():
+        is_allowed = True
+    elif check_belong_to_project(task["project_id"]):
+        if permissions.has_manager_permissions():
+            is_allowed = True
+        else:
+            user = persons_service.get_current_user(relations=True)
+            if permissions.has_supervisor_permissions():
+                is_allowed = (
+                    user["departments"] == []
+                    or tasks_service.get_task_type(task["task_type_id"])[
+                        "department_id"
+                    ]
+                    in user["departments"]
+                )
+            else:
+                is_allowed = user["id"] in task["assignees"]
+    else:
+        is_allowed = False
+
+    if not is_allowed:
+        raise permissions.PermissionDenied
+    return is_allowed
+
+
 def check_comment_access(comment_id):
     """
     Return true if current user can have access to a comment.
@@ -797,10 +828,7 @@ def check_task_department_access_for_unassign(task_id, person_id=None):
                     or task_type["department_id"] in user["departments"]
                 )
             )
-            or (
-                user["id"] in task.get("assignees", [])
-                and person_id == user["id"]
-            )
+            or (user["id"] in task["assignees"] and person_id == user["id"])
         )
     )
     if not is_allowed:
@@ -1302,9 +1330,6 @@ def get_unread_notifications_count(notification_id=None):
     ).count()
 
 
-from sqlalchemy import and_, func
-
-
 def get_last_notifications(
     notification_id=None,
     after=None,

{zou-0.20.19 → zou-0.20.21}/zou/app/utils/commands.py

@@ -409,20 +409,29 @@ def sync_with_ldap_server():
                     and persons_service.is_user_limit_reached()
                 ):
                     raise IsUserLimitReachedException
-                persons_service.update_person(
-                    person["id"],
-                    {
-                        "email": user["email"],
-                        "first_name": user["first_name"],
-                        "last_name": user["last_name"],
-                        "active": user["active"],
-                        "is_generated_from_ldap": True,
-                        "desktop_login": user["desktop_login"],
-                        "ldap_uid": user["ldap_uid"],
-                    },
-                    bypass_protected_accounts=True,
-                )
-                print(f"User {user['desktop_login']} updated.")
+
+                if any(
+                    user[key] != person[key]
+                    for key in [
+                        key
+                        for key in user.keys()
+                        if key not in ["thumbnail", "emails"]
+                    ]
+                ):
+                    persons_service.update_person(
+                        person["id"],
+                        {
+                            "email": user["email"],
+                            "first_name": user["first_name"],
+                            "last_name": user["last_name"],
+                            "active": user["active"],
+                            "is_generated_from_ldap": True,
+                            "desktop_login": user["desktop_login"],
+                            "ldap_uid": user["ldap_uid"],
+                        },
+                        bypass_protected_accounts=True,
+                    )
+                    print(f"User {user['desktop_login']} updated.")
             except IsUserLimitReachedException:
                 print(
                     f"User {user['desktop_login']} update failed (limit reached, limit {config.USER_LIMIT})."

zou-0.20.21/zou/migrations/versions/06552e22f9e7_add_comment_updated_by.py

@@ -0,0 +1,50 @@
+"""Add Comment.updated_by
+
+Revision ID: 06552e22f9e7
+Revises: fba149993140
+Create Date: 2025-02-27 13:44:58.067787
+
+"""
+
+from alembic import op
+import sqlalchemy as sa
+import sqlalchemy_utils
+import sqlalchemy_utils
+import uuid
+
+# revision identifiers, used by Alembic.
+revision = "06552e22f9e7"
+down_revision = "fba149993140"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("comment", schema=None) as batch_op:
+        batch_op.add_column(
+            sa.Column(
+                "updated_by",
+                sqlalchemy_utils.types.uuid.UUIDType(binary=False),
+                default=uuid.uuid4,
+                nullable=True,
+            )
+        )
+        batch_op.create_index(
+            batch_op.f("ix_comment_updated_by"), ["updated_by"], unique=False
+        )
+        batch_op.create_foreign_key(
+            "comment_updated_by_fkey", "person", ["updated_by"], ["id"]
+        )
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("comment", schema=None) as batch_op:
+        batch_op.drop_constraint("comment_updated_by_fkey", type_="foreignkey")
+        batch_op.drop_index(batch_op.f("ix_comment_updated_by"))
+        batch_op.drop_column("updated_by")
+
+    # ### end Alembic commands ###

{zou-0.20.19 → zou-0.20.21/zou.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: zou
-Version: 0.20.19
+Version: 0.20.21
 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.19 → zou-0.20.21}/zou.egg-info/SOURCES.txt

@@ -270,6 +270,7 @@ zou/migrations/versions/003be8a91001_add_start_and_end_dates_to_projects.py
 zou/migrations/versions/0596674df51d_add_department_mentions_to_comments.py
 zou/migrations/versions/05ac7e8caa21_remove_unique_constraint_for_taskstatus_.py
 zou/migrations/versions/05b7dc79a416_add_archived_fields_to_main_tables.py
+zou/migrations/versions/06552e22f9e7_add_comment_updated_by.py
 zou/migrations/versions/0cf5e0e035fa_drop_column_tasktype_for_shots.py
 zou/migrations/versions/0ec3762a745d_add_attachment_table.py
 zou/migrations/versions/0ef6416a507b_.py

zou-0.20.19/zou/__init__.py

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