zou 1.0.2__tar.gz → 1.0.3__tar.gz

{zou-1.0.2/zou.egg-info → zou-1.0.3}/PKG-INFO

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

zou-1.0.3/zou/__init__.py

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

{zou-1.0.2 → zou-1.0.3}/zou/app/blueprints/crud/playlist.py

@@ -1,10 +1,11 @@
 from flask_jwt_extended import jwt_required
 
 from zou.app.models.playlist import Playlist
-from zou.app.services import user_service, playlists_service
+from zou.app.models.build_job import BuildJob
+from zou.app.services import user_service, playlists_service, persons_service
 
 from zou.app.blueprints.crud.base import BaseModelResource, BaseModelsResource
-from zou.app.utils import fields
+from zou.app.utils import fields, permissions
 
 
 class PlaylistsResource(BaseModelsResource):
@@ -169,6 +170,7 @@ class PlaylistsResource(BaseModelsResource):
             data["task_type_id"]
         ):
             data["task_type_id"] = None
+        data["created_by"] = persons_service.get_current_user()["id"]
         return data
 
 
@@ -353,12 +355,23 @@ class PlaylistResource(BaseModelResource):
             400:
               description: Integrity error or cannot delete
         """
-        playlists_service.remove_playlist(instance_id)
-        return "", 204
+        return super().delete(instance_id)
+
+    def pre_delete(self, playlist):
+        query = BuildJob.query.filter_by(playlist_id=playlist["id"])
+        for job in query.all():
+            playlists_service.remove_build_job(playlist, job.id)
 
     def check_update_permissions(self, playlist, data):
-        user_service.check_project_access(playlist["project_id"])
-        user_service.block_access_to_vendor()
+        if user_service.has_manager_project_access(playlist["project_id"]):
+            return True
+        elif permissions.has_supervisor_permissions() and (
+            playlist["created_by"]
+            in [None, persons_service.get_current_user()["id"]]
+        ):
+            return True
+        else:
+            raise permissions.PermissionDenied()
 
     def pre_update(self, instance_dict, data):
         if "shots" in data:
@@ -372,3 +385,14 @@ class PlaylistResource(BaseModelResource):
             ]
             data["shots"] = shots
         return data
+
+    def check_delete_permissions(self, playlist):
+        if user_service.has_manager_project_access(playlist["project_id"]):
+            return True
+        elif permissions.has_supervisor_permissions() and (
+            playlist["created_by"]
+            in [None, persons_service.get_current_user()["id"]]
+        ):
+            return True
+        else:
+            raise permissions.PermissionDenied()

{zou-1.0.2 → zou-1.0.3}/zou/app/blueprints/tasks/resources.py

@@ -2681,6 +2681,7 @@ class SetTaskMainPreviewResource(Resource):
         preview_file = preview_files_service.get_last_preview_file_for_task(
             task_id
         )
+        entity = None
         if preview_file is not None:
             entity = entities_service.update_entity_preview(
                 task["entity_id"], preview_file["id"]

{zou-1.0.2 → zou-1.0.3}/zou/app/models/playlist.py

@@ -30,6 +30,12 @@ class Playlist(db.Model, BaseMixin, SerializerMixin):
 
     build_jobs = relationship("BuildJob")
 
+    created_by = db.Column(
+        UUIDType(binary=False),
+        db.ForeignKey("person.id"),
+        nullable=True,
+    )
+
     __table_args__ = (
         db.UniqueConstraint(
             "name", "project_id", "episode_id", name="playlist_uc"

zou-1.0.3/zou/migrations/versions/a0f668430352_add_created_by_field_to_playlists.py

@@ -0,0 +1,36 @@
+"""add created_by field to playlists
+
+Revision ID: a0f668430352
+Revises: a1b2c3d4e5f6
+Create Date: 2025-12-03 12:10:52.626583
+
+"""
+from alembic import op
+import sqlalchemy as sa
+import sqlalchemy_utils
+import sqlalchemy_utils
+import uuid
+
+# revision identifiers, used by Alembic.
+revision = 'a0f668430352'
+down_revision = 'a1b2c3d4e5f6'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('playlist', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('created_by', sqlalchemy_utils.types.uuid.UUIDType(binary=False), default=uuid.uuid4, nullable=True))
+        batch_op.create_foreign_key(None, 'person', ['created_by'], ['id'])
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('playlist', schema=None) as batch_op:
+        batch_op.drop_constraint(None, type_='foreignkey')
+        batch_op.drop_column('created_by')
+
+    # ### end Alembic commands ###

{zou-1.0.2 → zou-1.0.3/zou.egg-info}/PKG-INFO

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

{zou-1.0.2 → zou-1.0.3}/zou.egg-info/SOURCES.txt

@@ -412,6 +412,7 @@ zou/migrations/versions/9bd17364fc18_.py
 zou/migrations/versions/9d3bb33c6fc6_add_department_keys_to_filter_models.py
 zou/migrations/versions/9e5b3a9b0cee_add_new_column_metadatadescriptor_data_type_.py
 zou/migrations/versions/9f8445f9b42c_add_man_days_fields.py
+zou/migrations/versions/a0f668430352_add_created_by_field_to_playlists.py
 zou/migrations/versions/a1b2c3d4e5f6_add_position_to_metadata_descriptor.py
 zou/migrations/versions/a23682ccc1f1_.py
 zou/migrations/versions/a252a094e977_add_descriptions_for_entities_tasks_and_.py

zou-1.0.2/zou/__init__.py

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