zou 0.20.67__py3-none-any.whl → 0.20.69__py3-none-any.whl

zou/app/blueprints/user/resources.py

@@ -32,8 +32,8 @@ class AssetTasksResource(Resource):
             name: asset_id
             required: True
             type: string
-            format: UUID
-            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+            format: uuid
+            example: a24a6ea4-ce75-4665-a070-57453082c25
         responses:
             200:
                 description: Tasks related to given asset for current user
@@ -58,8 +58,8 @@ class AssetTaskTypesResource(Resource):
             name: asset_id
             required: True
             type: string
-            format: UUID
-            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+            format: uuid
+            example: a24a6ea4-ce75-4665-a070-57453082c25
         responses:
             200:
                 description: Task types related to given asset for current user
@@ -84,8 +84,8 @@ class ShotTaskTypesResource(Resource):
             name: shot_id
             required: True
             type: string
-            format: UUID
-            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+            format: uuid
+            example: a24a6ea4-ce75-4665-a070-57453082c25
         responses:
             200:
                 description: Tasks related to given shot for current user
@@ -110,8 +110,8 @@ class SceneTaskTypesResource(Resource):
             name: scene_id
             required: True
             type: string
-            format: UUID
-            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+            format: uuid
+            example: a24a6ea4-ce75-4665-a070-57453082c25
         responses:
             200:
                 description: Tasks related to given scene for current user
@@ -136,8 +136,8 @@ class SequenceTaskTypesResource(Resource):
             name: sequence_id
             required: True
             type: string
-            format: UUID
-            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+            format: uuid
+            example: a24a6ea4-ce75-4665-a070-57453082c25
         responses:
             200:
                 description: Tasks related to given sequence for current user
@@ -164,14 +164,14 @@ class AssetTypeAssetsResource(Resource):
             name: project_id
             required: True
             type: string
-            format: UUID
-            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+            format: uuid
+            example: a24a6ea4-ce75-4665-a070-57453082c25
           - in: path
             name: asset_type_id
             required: True
             type: string
-            format: UUID
-            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+            format: uuid
+            example: a24a6ea4-ce75-4665-a070-57453082c25
         responses:
             200:
                 description: Assets of which type is given asset type and are
@@ -222,8 +222,8 @@ class ProjectSequencesResource(Resource):
             name: project_id
             required: True
             type: string
-            format: UUID
-            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+            format: uuid
+            example: a24a6ea4-ce75-4665-a070-57453082c25
         responses:
             200:
                 description: Sequences related to given project
@@ -250,8 +250,8 @@ class ProjectEpisodesResource(Resource):
             name: project_id
             required: True
             type: string
-            format: UUID
-            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+            format: uuid
+            example: a24a6ea4-ce75-4665-a070-57453082c25
         responses:
             200:
                 description: Episodes related to given project
@@ -278,8 +278,8 @@ class ProjectAssetTypesResource(Resource):
             name: project_id
             required: True
             type: string
-            format: UUID
-            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+            format: uuid
+            example: a24a6ea4-ce75-4665-a070-57453082c25
         responses:
             200:
                 description: Asset types related to given project
@@ -306,8 +306,8 @@ class SequenceShotsResource(Resource):
             name: sequence_id
             required: True
             type: string
-            format: UUID
-            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+            format: uuid
+            example: a24a6ea4-ce75-4665-a070-57453082c25
         responses:
             200:
                 description: Shots related to given sequence
@@ -334,8 +334,8 @@ class SequenceScenesResource(Resource):
             name: sequence_id
             required: True
             type: string
-            format: UUID
-            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+            format: uuid
+            example: a24a6ea4-ce75-4665-a070-57453082c25
         responses:
             200:
                 description: Scenes related to given sequence
@@ -360,8 +360,8 @@ class ShotTasksResource(Resource):
             name: shot_id
             required: True
             type: string
-            format: UUID
-            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+            format: uuid
+            example: a24a6ea4-ce75-4665-a070-57453082c25
         responses:
             200:
                 description: Tasks related to given shot
@@ -386,8 +386,8 @@ class SceneTasksResource(Resource):
             name: scene_id
             required: True
             type: string
-            format: UUID
-            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+            format: uuid
+            example: a24a6ea4-ce75-4665-a070-57453082c25
         responses:
             200:
                 description: Tasks related to given scene
@@ -412,8 +412,8 @@ class SequenceTasksResource(Resource):
             name: sequence_id
             required: True
             type: string
-            format: UUID
-            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+            format: uuid
+            example: a24a6ea4-ce75-4665-a070-57453082c25
         responses:
             200:
                 description: Tasks related to given sequence
@@ -509,7 +509,7 @@ class FiltersResource(Resource, ArgsMixin):
             name: name
             required: True
             type: string
-            x-example: Name of filter
+            example: Name of filter
           - in: formData
             name: query
             required: True
@@ -526,7 +526,7 @@ class FiltersResource(Resource, ArgsMixin):
             name: project_id
             required: True
             type: string
-            format: UUID
+            format: uuid
             example: a24a6ea4-ce75-4665-a070-57453082c25
         responses:
             201:
@@ -580,8 +580,8 @@ class FilterResource(Resource, ArgsMixin):
             name: filter_id
             required: True
             type: string
-            format: UUID
-            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+            format: uuid
+            example: a24a6ea4-ce75-4665-a070-57453082c25
         responses:
             200:
                 description: Given filter with updated data.
@@ -613,8 +613,8 @@ class FilterResource(Resource, ArgsMixin):
             name: filter_id
             required: True
             type: string
-            format: UUID
-            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+            format: uuid
+            example: a24a6ea4-ce75-4665-a070-57453082c25
         responses:
             204:
                 description: Empty response
@@ -653,7 +653,7 @@ class FilterGroupsResource(Resource, ArgsMixin):
             name: name
             required: True
             type: string
-            x-example: Name of filter
+            example: Name of filter
           - in: formData
             name: color
             required: True
@@ -674,12 +674,12 @@ class FilterGroupsResource(Resource, ArgsMixin):
             name: project_id
             required: True
             type: string
-            format: UUID
+            format: uuid
             example: a24a6ea4-ce75-4665-a070-57453082c25
           - in: formData
             name: department_id
             required: False
-            format: UUID
+            format: uuid
             example: a24a6ea4-ce75-4665-a070-57453082c25
         responses:
             201:
@@ -744,30 +744,30 @@ class FilterGroupResource(Resource, ArgsMixin):
             name: filter_id
             required: True
             type: string
-            format: UUID
-            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+            format: uuid
+            example: a24a6ea4-ce75-4665-a070-57453082c25
           - in: formData
             name: name
             type: string
-            x-example: Name of the filter group
+            example: Name of the filter group
           - in: formData
             name: color
             type: string
-            x-example: Color of the filter group
+            example: Color of the filter group
           - in: formData
             name: is_shared
             type: boolean
-            x-example: True
+            example: True
           - in: formData
             name: project_id
             type: string
-            format: UUID
-            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+            format: uuid
+            example: a24a6ea4-ce75-4665-a070-57453082c25
           - in: formData
             name: department_id
             type: string
-            format: UUID
-            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+            format: uuid
+            example: a24a6ea4-ce75-4665-a070-57453082c25
         responses:
             200:
                 description: Given filter group with updated data
@@ -797,8 +797,8 @@ class FilterGroupResource(Resource, ArgsMixin):
             name: filter_id
             required: True
             type: string
-            format: UUID
-            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+            format: uuid
+            example: a24a6ea4-ce75-4665-a070-57453082c25
         responses:
             204:
                 description: Empty response
@@ -839,7 +839,7 @@ class DesktopLoginLogsResource(Resource, ArgsMixin):
             name: date
             type: string
             format: date
-            x-example: "2022-07-12"
+            example: "2022-07-12"
         responses:
             201:
                 description: Desktop login log created
@@ -866,12 +866,12 @@ class NotificationsResource(Resource, ArgsMixin):
             name: after
             type: string
             format: date
-            x-example: "2022-07-12"
+            example: "2022-07-12"
           - in: formData
             name: before
             type: string
             format: date
-            x-example: "2022-07-12"
+            example: "2022-07-12"
         responses:
             200:
                 description: 100 last user notifications
@@ -929,8 +929,8 @@ class NotificationResource(Resource, ArgsMixin):
             name: notification_id
             required: True
             type: string
-            format: UUID
-            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+            format: uuid
+            example: a24a6ea4-ce75-4665-a070-57453082c25
 
         responses:
             200:
@@ -949,8 +949,8 @@ class NotificationResource(Resource, ArgsMixin):
             name: notification_id
             required: True
             type: string
-            format: UUID
-            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+            format: uuid
+            example: a24a6ea4-ce75-4665-a070-57453082c25
         responses:
             200:
                 description: Notification
@@ -991,8 +991,8 @@ class HasTaskSubscribedResource(Resource):
             name: task_id
             required: True
             type: string
-            format: UUID
-            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+            format: uuid
+            example: a24a6ea4-ce75-4665-a070-57453082c25
         responses:
             200:
                 description: True if current user has subscribed to given task,
@@ -1021,8 +1021,8 @@ class TaskSubscribeResource(Resource):
             name: task_id
             required: True
             type: string
-            format: UUID
-            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+            format: uuid
+            example: a24a6ea4-ce75-4665-a070-57453082c25
         responses:
             201:
                 description: Subscription entry created
@@ -1049,8 +1049,8 @@ class TaskUnsubscribeResource(Resource):
             name: task_id
             required: True
             type: string
-            format: UUID
-            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+            format: uuid
+            example: a24a6ea4-ce75-4665-a070-57453082c25
         responses:
             204:
                 description: Subscription entry removed
@@ -1076,14 +1076,14 @@ class HasSequenceSubscribedResource(Resource):
             name: sequence_id
             required: True
             type: string
-            format: UUID
-            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+            format: uuid
+            example: a24a6ea4-ce75-4665-a070-57453082c25
           - in: path
             name: task_type_id
             required: True
             type: string
-            format: UUID
-            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+            format: uuid
+            example: a24a6ea4-ce75-4665-a070-57453082c25
         responses:
             200:
                 description: True if current user has subscribed to given
@@ -1115,14 +1115,14 @@ class SequenceSubscribeResource(Resource):
             name: sequence_id
             required: True
             type: string
-            format: UUID
-            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+            format: uuid
+            example: a24a6ea4-ce75-4665-a070-57453082c25
           - in: path
             name: task_type_id
             required: True
             type: string
-            format: UUID
-            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+            format: uuid
+            example: a24a6ea4-ce75-4665-a070-57453082c25
         responses:
             201:
                 description: Subscription entry created
@@ -1150,14 +1150,14 @@ class SequenceUnsubscribeResource(Resource):
             name: sequence_id
             required: True
             type: string
-            format: UUID
-            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+            format: uuid
+            example: a24a6ea4-ce75-4665-a070-57453082c25
           - in: path
             name: task_type_id
             required: True
             type: string
-            format: UUID
-            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+            format: uuid
+            example: a24a6ea4-ce75-4665-a070-57453082c25
         responses:
             204:
                 description: Subscription entry removed
@@ -1184,14 +1184,14 @@ class SequenceSubscriptionsResource(Resource):
             name: project_id
             required: True
             type: string
-            format: UUID
-            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+            format: uuid
+            example: a24a6ea4-ce75-4665-a070-57453082c25
           - in: path
             name: task_type_id
             required: True
             type: string
-            format: UUID
-            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+            format: uuid
+            example: a24a6ea4-ce75-4665-a070-57453082c25
         responses:
             200:
                 description:  List of sequence ids to which the current user
@@ -1264,14 +1264,14 @@ class TaskTimeSpentResource(Resource):
             name: task_id
             required: True
             type: string
-            format: UUID
-            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+            format: uuid
+            example: a24a6ea4-ce75-4665-a070-57453082c25
           - in: path
             name: date
             required: True
             type: string
             format: date
-            x-example: "2022-07-12"
+            example: "2022-07-12"
         responses:
             200:
                 description:  Time spents for current user and given date
@@ -1304,7 +1304,7 @@ class DayOffResource(Resource):
             required: True
             type: string
             format: date
-            x-example: "2022-07-12"
+            example: "2022-07-12"
         responses:
             200:
                 description:  Day off object for current user and given date
@@ -1380,8 +1380,8 @@ class JoinChatResource(Resource):
             name: entity_id
             required: True
             type: string
-            format: UUID
-            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+            format: uuid
+            example: a24a6ea4-ce75-4665-a070-57453082c25
         responses:
             201:
                 description: Chat joined
@@ -1403,8 +1403,8 @@ class JoinChatResource(Resource):
             name: entity_id
             required: True
             type: string
-            format: UUID
-            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+            format: uuid
+            example: a24a6ea4-ce75-4665-a070-57453082c25
         responses:
             204:
                 description: empty response

zou/app/models/attachment_file.py

@@ -21,6 +21,10 @@ class AttachmentFile(db.Model, BaseMixin, SerializerMixin):
         index=True,
         nullable=True,
     )
+    reply_id = db.Column(
+        UUIDType(binary=False),
+        nullable=True,
+    )
     chat_message_id = db.Column(
         UUIDType(binary=False),
         db.ForeignKey("chat_message.id"),

zou/app/services/comments_service.py

@@ -19,6 +19,7 @@ from zou.app.services import (
     assets_service,
     base_service,
     breakdown_service,
+    deletion_service,
     entities_service,
     news_service,
     notifications_service,
@@ -355,7 +356,7 @@ def reset_mentions(comment):
     return comment_dict
 
 
-def create_attachment(comment, uploaded_file, randomize=False):
+def create_attachment(comment, uploaded_file, randomize=False, reply_id=None):
     tmp_folder = current_app.config["TMP_DIR"]
     filename = uploaded_file.filename
     mimetype = uploaded_file.mimetype
@@ -366,11 +367,19 @@ def create_attachment(comment, uploaded_file, randomize=False):
         filename = f"{filename[:len(filename) - len(extension) - 1]}"
         filename += f"-{random_str}.{extension}"
 
+    if reply_id is not None:
+        is_reply_present = any(
+            reply["id"] == reply_id for reply in comment.get("replies", [])
+        )
+        if not is_reply_present:
+            reply_id = None
+
     attachment_file = AttachmentFile.create(
         name=filename,
         size=0,
         extension=extension,
         mimetype=mimetype,
+        reply_id=reply_id,
         comment_id=comment["id"],
     )
     attachment_file_id = str(attachment_file.id)
@@ -455,7 +464,7 @@ def _send_ack_event(project_id, comment, user_id, name="acknowledge"):
     )
 
 
-def reply_comment(comment_id, text, person_id=None):
+def reply_comment(comment_id, text, person_id=None, files={}):
     """
     Add a reply entry to the JSONB field of given comment model. Create
     notifications needed for this.
@@ -469,6 +478,7 @@ def reply_comment(comment_id, text, person_id=None):
     task = tasks_service.get_task(comment.object_id, relations=True)
     if comment.replies is None:
         comment.replies = []
+
     reply = {
         "id": str(fields.gen_uuid()),
         "date": date_helpers.get_now(),
@@ -483,18 +493,26 @@ def reply_comment(comment_id, text, person_id=None):
     replies = list(comment.replies)
     replies.append(reply)
     comment.update({"replies": replies})
+    if len(files.keys()) > 0:
+        comment = comment.serialize(relations=True)
+        new_attachment_files = add_attachments_to_comment(
+            comment, files, reply_id=reply["id"]
+        )
+        for new_attachment_file in new_attachment_files:
+            new_attachment_file["reply_id"] = reply["id"]
+        reply["attachment_files"] = new_attachment_files
     tasks_service.clear_comment_cache(comment_id)
     events.emit(
         "comment:reply",
         {
             "task_id": task["id"],
-            "comment_id": str(comment.id),
+            "comment_id": comment_id,
             "reply_id": reply["id"],
         },
         project_id=task["project_id"],
     )
     notifications_service.create_notifications_for_task_and_reply(
-        task, comment.serialize(), reply
+        task, comment, reply
     )
     return reply
 
@@ -508,6 +526,14 @@ def get_reply(comment_id, reply_id):
 def delete_reply(comment_id, reply_id):
     comment = tasks_service.get_comment_raw(comment_id)
     task = tasks_service.get_task(comment.object_id)
+
+    if comment.attachment_files is None:
+        comment.attachment_files = []
+        for attachment_file in comment.attachment_files:
+            if attachment_file.reply_id == reply_id:
+                deletion_service.remove_attachment_file_by_id(
+                    attachment_file["id"]
+                )
     if comment.replies is None:
         comment.replies = []
     comment.replies = [
@@ -567,19 +593,25 @@ def get_comment_department_mention_ids(project_id, text):
     ]
 
 
-def add_attachments_to_comment(comment, files):
+def add_attachments_to_comment(comment, files, reply_id=None):
     """
     Create an attachment entry and for each given uploaded files and tie it
     to given comment.
     """
-    comment["attachment_files"] = []
+    if comment["attachment_files"] is None:
+        comment["attachment_files"] = []
+    new_attachment_files = []
     for uploaded_file in files.values():
         try:
-            attachment_file = create_attachment(comment, uploaded_file)
+            attachment_file = create_attachment(
+                comment, uploaded_file, reply_id=reply_id
+            )
             comment["attachment_files"].append(attachment_file)
+            new_attachment_files.append(attachment_file)
         except IntegrityError:
             attachment_file = create_attachment(
-                comment, uploaded_file, randomize=True
+                comment, uploaded_file, randomize=True, reply_id=reply_id
             )
             comment["attachment_files"].append(attachment_file)
-    return comment
+            new_attachment_files.append(attachment_file)
+    return new_attachment_files

zou/app/services/tasks_service.py

@@ -752,6 +752,7 @@ def _build_attachment_map_for_comments(comment_ids):
                 "id": attachment_file_id,
                 "name": attachment_file.name,
                 "extension": attachment_file.extension,
+                "reply_id": attachment_file.reply_id,
                 "size": attachment_file.size,
             }
         )

zou/migrations/versions/1b0ab951adca_add_reply_id_to_attachments.py

@@ -0,0 +1,44 @@
+"""add reply id to attachments
+
+Revision ID: 1b0ab951adca
+Revises: ce7f46f445dc
+Create Date: 2025-08-27 14:14:16.237272
+
+"""
+from alembic import op
+import sqlalchemy as sa
+import sqlalchemy_utils
+import sqlalchemy_utils
+import uuid
+
+# revision identifiers, used by Alembic.
+revision = '1b0ab951adca'
+down_revision = 'ce7f46f445dc'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('attachment_file', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('reply_id', sqlalchemy_utils.types.uuid.UUIDType(binary=False), default=uuid.uuid4, nullable=True))
+
+    with op.batch_alter_table('software', schema=None) as batch_op:
+        batch_op.alter_column('version',
+               existing_type=sa.VARCHAR(length=20),
+               nullable=True)
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('software', schema=None) as batch_op:
+        batch_op.alter_column('version',
+               existing_type=sa.VARCHAR(length=20),
+               nullable=False)
+
+    with op.batch_alter_table('attachment_file', schema=None) as batch_op:
+        batch_op.drop_column('reply_id')
+
+    # ### end Alembic commands ###