zou 0.19.48__py3-none-any.whl → 0.19.50__py3-none-any.whl

zou/__init__.py

@@ -1 +1 @@
-__version__ = "0.19.48"
+__version__ = "0.19.50"

zou/app/blueprints/persons/resources.py

@@ -308,7 +308,7 @@ class PersonDurationTimeSpentsResource(Resource, ArgsMixin):
                         raise permissions.PermissionDenied
                     if permissions.has_supervisor_permissions():
                         department_ids = persons_service.get_current_user(
-                            True
+                            relations=True
                         )["departments"]
                 else:
                     raise permissions.PermissionDenied
@@ -533,7 +533,24 @@ class PersonDayTimeSpentsResource(PersonDurationTimeSpentsResource):
             abort(404)
 
 
-class PersonMonthQuotaShotsResource(Resource, ArgsMixin):
+class PersonQuotaMixin:
+
+    def get_quota_arguments(self):
+        project_id = self.get_project_id()
+        task_type_id = self.get_task_type_id()
+        count_mode = self.get_text_parameter("count_mode", default="weigthed")
+        if count_mode not in ["weighted", "weighteddone", "feedback", "done"]:
+            raise WrongParameterException(
+                "count_mode must be equal to weighted, weigtheddone, feedback"
+                ", or done"
+            )
+        feedback = "done" not in count_mode
+        weighted = "weighted" in count_mode
+
+        return (project_id, task_type_id, count_mode, feedback, weighted)
+
+
+class PersonMonthQuotaShotsResource(Resource, ArgsMixin, PersonQuotaMixin):
     """
     Get ended shots used for quota calculation of this month.
     """
@@ -564,6 +581,12 @@ class PersonMonthQuotaShotsResource(Resource, ArgsMixin):
             x-example: 07
             minimum: 1
             maximum: 12
+          - in: query
+            name: count_mode
+            required: True
+            type: string
+            enum: [weighted, weigtheddone, feedback, done]
+            x-example: weighted
         responses:
             200:
                 description: Ended shots used for quota calculation of this month
@@ -571,10 +594,11 @@ class PersonMonthQuotaShotsResource(Resource, ArgsMixin):
                 description: Wrong date format
         """
         user_service.check_person_is_not_bot(person_id)
-        project_id = self.get_project_id()
-        task_type_id = self.get_task_type_id()
         user_service.check_person_access(person_id)
-        weighted = self.get_bool_parameter("weighted", default="true")
+        (project_id, task_type_id, count_mode, feedback, weighted) = (
+            self.get_quota_arguments()
+        )
+
         try:
             return shots_service.get_month_quota_shots(
                 person_id,
@@ -583,12 +607,13 @@ class PersonMonthQuotaShotsResource(Resource, ArgsMixin):
                 project_id=project_id,
                 task_type_id=task_type_id,
                 weighted=weighted,
+                feedback=feedback,
             )
         except WrongDateFormatException:
             abort(404)
 
 
-class PersonWeekQuotaShotsResource(Resource, ArgsMixin):
+class PersonWeekQuotaShotsResource(Resource, ArgsMixin, PersonQuotaMixin):
     """
     Get ended shots used for quota calculation of this week.
     """
@@ -619,6 +644,12 @@ class PersonWeekQuotaShotsResource(Resource, ArgsMixin):
             x-example: 35
             minimum: 1
             maximum: 52
+          - in: query
+            name: count_mode
+            required: True
+            type: string
+            enum: [weighted, weigtheddone, feedback, done]
+            x-example: weighted
         responses:
             200:
                 description: Ended shots used for quota calculation of this week
@@ -626,10 +657,11 @@ class PersonWeekQuotaShotsResource(Resource, ArgsMixin):
                 description: Wrong date format
         """
         user_service.check_person_is_not_bot(person_id)
-        project_id = self.get_project_id()
-        task_type_id = self.get_task_type_id()
         user_service.check_person_access(person_id)
-        weighted = self.get_bool_parameter("weighted", default="true")
+        (project_id, task_type_id, count_mode, feedback, weighted) = (
+            self.get_quota_arguments()
+        )
+
         try:
             return shots_service.get_week_quota_shots(
                 person_id,
@@ -638,12 +670,13 @@ class PersonWeekQuotaShotsResource(Resource, ArgsMixin):
                 project_id=project_id,
                 task_type_id=task_type_id,
                 weighted=weighted,
+                feedback=feedback,
             )
         except WrongDateFormatException:
             abort(404)
 
 
-class PersonDayQuotaShotsResource(Resource, ArgsMixin):
+class PersonDayQuotaShotsResource(Resource, ArgsMixin, PersonQuotaMixin):
     """
     Get ended shots used for quota calculation of this day.
     """
@@ -681,6 +714,12 @@ class PersonDayQuotaShotsResource(Resource, ArgsMixin):
             x-example: 12
             minimum: 1
             maximum: 31
+          - in: query
+            name: count_mode
+            required: True
+            type: string
+            enum: [weighted, weigtheddone, feedback, done]
+            x-example: weighted
         responses:
             200:
                 description: Ended shots used for quota calculation of this day
@@ -688,10 +727,11 @@ class PersonDayQuotaShotsResource(Resource, ArgsMixin):
                 description: Wrong date format
         """
         user_service.check_person_is_not_bot(person_id)
-        project_id = self.get_project_id()
-        task_type_id = self.get_task_type_id()
         user_service.check_person_access(person_id)
-        weighted = self.get_bool_parameter("weighted", default="true")
+        (project_id, task_type_id, count_mode, feedback, weighted) = (
+            self.get_quota_arguments()
+        )
+
         try:
             return shots_service.get_day_quota_shots(
                 person_id,
@@ -701,6 +741,7 @@ class PersonDayQuotaShotsResource(Resource, ArgsMixin):
                 project_id=project_id,
                 task_type_id=task_type_id,
                 weighted=weighted,
+                feedback=feedback,
             )
         except WrongDateFormatException:
             abort(404)

zou/app/blueprints/shots/resources.py

@@ -1507,6 +1507,18 @@ class ProjectQuotasResource(Resource, ArgsMixin):
             type: string
             format: UUID
             x-example: a24a6ea4-ce75-4665-a070-57453082c25
+          - in: query
+            name: count_mode
+            required: True
+            type: string
+            enum: [weighted, weigtheddone, feedback, done]
+            x-example: weighted
+          - in: query
+            name: studio_id
+            required: False
+            type: string
+            format: UUID
+            x-example: a24a6ea4-ce75-4665-a070-57453082c25
         responses:
             200:
                 description: Quotas statistics for shots
@@ -1515,17 +1527,35 @@ class ProjectQuotasResource(Resource, ArgsMixin):
         user_service.check_project_access(project_id)
         args = self.get_args(
             [
-                ("weighted", False, False, bool),
+                ("count_mode", "weighted", False, str),
                 ("studio_id", None, False, str),
             ]
         )
-        if args["weighted"]:
+        count_mode = args["count_mode"]
+        studio_id = args["studio_id"]
+
+        if count_mode not in ["weighted", "weighteddone", "feedback", "done"]:
+            raise WrongParameterException(
+                "count_mode must be equal to weighted, weigtheddone, feedback"
+                ", or done"
+            )
+
+        feedback = "done" not in count_mode
+        weighted = "weighted" in count_mode
+
+        if weighted:
             return shots_service.get_weighted_quotas(
-                project_id, task_type_id, args["studio_id"]
+                project_id,
+                task_type_id,
+                feedback=feedback,
+                studio_id=studio_id,
             )
         else:
             return shots_service.get_raw_quotas(
-                project_id, task_type_id, args["studio_id"]
+                project_id,
+                task_type_id,
+                feedback=feedback,
+                studio_id=studio_id,
             )
 
 

zou/app/mixin.py

@@ -14,6 +14,7 @@ class ArgsMixin(object):
         parser = reqparse.RequestParser()
         if location is None:
             location = ["values", "json"] if request.is_json else ["values"]
+
         for descriptor in descriptors:
             action = None
             data_type = str

zou/app/models/task.py

@@ -42,6 +42,7 @@ class Task(db.Model, BaseMixin, SerializerMixin):
     due_date = db.Column(db.DateTime)
     real_start_date = db.Column(db.DateTime)
     end_date = db.Column(db.DateTime)
+    done_date = db.Column(db.DateTime)
     last_comment_date = db.Column(db.DateTime)
     nb_assets_ready = db.Column(db.Integer, default=0)
     data = db.Column(JSONB)

zou/app/services/assets_service.py

@@ -194,6 +194,7 @@ def get_assets_and_tasks(criterions={}, page=1, with_episode_ids=False):
         Task.end_date,
         Task.start_date,
         Task.due_date,
+        Task.done_date,
         Task.last_comment_date,
         assignees_table.columns.person,
     ).order_by(EntityType.name, Entity.name)
@@ -272,6 +273,7 @@ def get_assets_and_tasks(criterions={}, page=1, with_episode_ids=False):
         task_end_date,
         task_start_date,
         task_due_date,
+        task_done_date,
         task_last_comment_date,
         person_id,
     ) in query_result:
@@ -314,6 +316,7 @@ def get_assets_and_tasks(criterions={}, page=1, with_episode_ids=False):
                 task_dict = {
                     "id": task_id,
                     "due_date": fields.serialize_value(task_due_date),
+                    "done_date": fields.serialize_value(task_done_date),
                     "duration": task_duration,
                     "entity_id": asset_id,
                     "estimation": task_estimation,

zou/app/services/entities_service.py

@@ -240,6 +240,7 @@ def get_entities_and_tasks(criterions={}):
             Task.end_date,
             Task.start_date,
             Task.due_date,
+            Task.done_date,
             Task.last_comment_date,
             assignees_table.columns.person,
         )
@@ -269,6 +270,7 @@ def get_entities_and_tasks(criterions={}):
         task_end_date,
         task_start_date,
         task_due_date,
+        task_done_date,
         task_last_comment_date,
         person_id,
     ) in query.all():
@@ -305,6 +307,7 @@ def get_entities_and_tasks(criterions={}):
                         "entity_id": entity_id,
                         "end_date": task_end_date,
                         "due_date": task_due_date,
+                        "done_date": task_done_date,
                         "duration": task_duration,
                         "is_subscribed": subscription_map.get(task_id, False),
                         "last_comment_date": task_last_comment_date,

zou/app/services/shots_service.py

@@ -251,6 +251,7 @@ def get_shots_and_tasks(criterions={}):
             Task.end_date,
             Task.start_date,
             Task.due_date,
+            Task.done_date,
             Task.last_comment_date,
             Task.nb_assets_ready,
             assignees_table.columns.person,
@@ -300,6 +301,7 @@ def get_shots_and_tasks(criterions={}):
         task_end_date,
         task_start_date,
         task_due_date,
+        task_done_date,
         task_last_comment_date,
         task_nb_assets_ready,
         person_id,
@@ -355,6 +357,7 @@ def get_shots_and_tasks(criterions={}):
                         "duration": task_duration,
                         "due_date": task_due_date,
                         "end_date": task_end_date,
+                        "done_date": task_done_date,
                         "entity_id": shot_id,
                         "estimation": task_estimation,
                         "is_subscribed": subscription_map.get(task_id, False),
@@ -1113,24 +1116,31 @@ def get_base_entity_type_name(entity_dict):
     return type_name
 
 
-def get_weighted_quotas(project_id, task_type_id, studio_id=None):
+def get_weighted_quotas(
+    project_id, task_type_id, studio_id=None, feedback=True
+):
     """
     Build quota statistics. It counts the number of frames done for each day.
-    A shot is considered done at the first feedback request. If time spent is
-    filled for it, it weights the result with the frame number with the time
-    spents. If there is no time spent, it considers that the work was done
-    from the wip date to the feedback date.
+    A shot is considered done at the first feedback request or at last
+    approval.
+
+    If time spent is  filled for it, it weights the result with the frame
+    number with the time spents. If there is no time spent, it considers that
+    the work was done from the wip date to the feedback date (or approval date).
     It computes the shot count and the number of seconds too.
+
+    If the `feedback` flag is set to True, it uses the feedback date
+    (real_end_date), if feedback is set to False, it uses the approval date
+    (done_date).
     """
     fps = projects_service.get_project_fps(project_id)
     timezone = user_service.get_timezone()
     shot_type = get_shot_type()
     quotas = {}
     query = (
-        Task.query.filter(Task.project_id == project_id)
-        .filter(Entity.entity_type_id == shot_type["id"])
+        Task.query.filter(Entity.entity_type_id == shot_type["id"])
+        .filter(Task.project_id == project_id)
         .filter(Task.task_type_id == task_type_id)
-        .filter(Task.end_date != None)
         .join(Entity, Entity.id == Task.entity_id)
         .join(Project, Project.id == Task.project_id)
         .join(TimeSpent, Task.id == TimeSpent.task_id)
@@ -1142,6 +1152,11 @@ def get_weighted_quotas(project_id, task_type_id, studio_id=None):
         )
     )
 
+    if feedback:
+        query = query.filter(Task.end_date != None)
+    else:
+        query = query.filter(Task.done_date != None)
+
     if studio_id is not None:
         persons_from_studio = Person.query.filter(
             Person.studio_id == studio_id
@@ -1162,7 +1177,6 @@ def get_weighted_quotas(project_id, task_type_id, studio_id=None):
         .filter(Entity.entity_type_id == shot_type["id"])
         .filter(Task.task_type_id == task_type_id)
         .filter(Task.real_start_date != None)
-        .filter(Task.end_date != None)
         .filter(TimeSpent.id == None)
         .join(Entity, Entity.id == Task.entity_id)
         .join(Project, Project.id == Task.project_id)
@@ -1171,6 +1185,11 @@ def get_weighted_quotas(project_id, task_type_id, studio_id=None):
         .add_columns(Entity.nb_frames, Person.id)
     )
 
+    if feedback:
+        query = query.filter(Task.end_date != None)
+    else:
+        query = query.filter(Task.done_date != None)
+
     if studio_id is not None:
         query = query.filter(
             or_(*[Task.assignees.contains(p) for p in persons_from_studio])
@@ -1178,16 +1197,19 @@ def get_weighted_quotas(project_id, task_type_id, studio_id=None):
     result = query.all()
 
     for task, nb_frames, person_id in result:
+        date = task.done_date
+        if feedback:
+            date = task.end_date
+
         business_days = (
-            date_helpers.get_business_days(task.real_start_date, task.end_date)
-            + 1
+            date_helpers.get_business_days(task.real_start_date, date) + 1
         )
         if nb_frames is not None:
             nb_frames = round(nb_frames / business_days) or 0
         else:
             nb_frames = 0
-        date = task.real_start_date
-        for x in range((task.end_date - task.real_start_date).days + 1):
+
+        for x in range((date - task.real_start_date).days + 1):
             if date.weekday() < 5:
                 _add_quota_entry(
                     quotas, str(person_id), date, timezone, nb_frames, fps
@@ -1196,11 +1218,13 @@ def get_weighted_quotas(project_id, task_type_id, studio_id=None):
     return quotas
 
 
-def get_raw_quotas(project_id, task_type_id, studio_id=None):
+def get_raw_quotas(project_id, task_type_id, studio_id=None, feedback=True):
     """
     Build quota statistics in a raw way. It counts the number of frames done
     for each day. A shot is considered done at the first feedback request (end
-    date). It considers that all the work was done at the end date.
+    date) or approval date (done_date).
+
+    It considers that all the work was done at the end date.
     It computes the shot count and the number of seconds too.
     """
     fps = projects_service.get_project_fps(project_id)
@@ -1211,13 +1235,17 @@ def get_raw_quotas(project_id, task_type_id, studio_id=None):
         Task.query.filter(Task.project_id == project_id)
         .filter(Entity.entity_type_id == shot_type["id"])
         .filter(Task.task_type_id == task_type_id)
-        .filter(Task.end_date != None)
         .join(Entity, Entity.id == Task.entity_id)
         .join(Project, Project.id == Task.project_id)
         .join(Task.assignees)
         .add_columns(Entity.nb_frames, Person.id)
     )
 
+    if feedback:
+        query = query.filter(Task.end_date != None)
+    else:
+        query = query.filter(Task.done_date != None)
+
     if studio_id is not None:
         persons_from_studio = Person.query.filter(
             Person.studio_id == studio_id
@@ -1229,7 +1257,10 @@ def get_raw_quotas(project_id, task_type_id, studio_id=None):
     result = query.all()
 
     for task, nb_frames, person_id in result:
-        date = task.end_date
+        date = task.done_date
+        if feedback:
+            date = task.end_date
+
         if nb_frames is None:
             nb_frames = 0
         _add_quota_entry(
@@ -1303,7 +1334,13 @@ def _init_quota_person(quotas, person_id):
 
 
 def get_month_quota_shots(
-    person_id, year, month, project_id=None, task_type_id=None, weighted=True
+    person_id,
+    year,
+    month,
+    project_id=None,
+    task_type_id=None,
+    weighted=True,
+    feedback=True,
 ):
     """
     Return shots that are included in quota comptutation for given
@@ -1318,6 +1355,7 @@ def get_month_quota_shots(
             end,
             project_id=project_id,
             task_type_id=task_type_id,
+            feedback=feedback,
         )
     else:
         return get_raw_quota_shots_between(
@@ -1326,11 +1364,18 @@ def get_month_quota_shots(
             end,
             project_id=project_id,
             task_type_id=task_type_id,
+            feedback=feedback,
         )
 
 
 def get_week_quota_shots(
-    person_id, year, week, project_id=None, task_type_id=None, weighted=True
+    person_id,
+    year,
+    week,
+    project_id=None,
+    task_type_id=None,
+    weighted=True,
+    feedback=True,
 ):
     """
     Return shots that are included in quota comptutation for given
@@ -1345,6 +1390,7 @@ def get_week_quota_shots(
             end,
             project_id=project_id,
             task_type_id=task_type_id,
+            feedback=feedback,
         )
     else:
         return get_raw_quota_shots_between(
@@ -1353,6 +1399,7 @@ def get_week_quota_shots(
             end,
             project_id=project_id,
             task_type_id=task_type_id,
+            feedback=feedback,
         )
 
 
@@ -1364,13 +1411,14 @@ def get_day_quota_shots(
     project_id=None,
     task_type_id=None,
     weighted=True,
+    feedback=True,
 ):
     """
     Return shots that are included in quota comptutation for given
     person and day.
     """
     start, end = date_helpers.get_day_interval(year, month, day)
-    start, end = _get_timezoned_interval(start, end)
+    # start, end = _get_timezoned_interval(start, end)
     if weighted:
         return get_weighted_quota_shots_between(
             person_id,
@@ -1378,6 +1426,7 @@ def get_day_quota_shots(
             end,
             project_id=project_id,
             task_type_id=task_type_id,
+            feedback=feedback,
         )
     else:
         return get_raw_quota_shots_between(
@@ -1386,11 +1435,12 @@ def get_day_quota_shots(
             end,
             project_id=project_id,
             task_type_id=task_type_id,
+            feedback=feedback,
         )
 
 
 def get_weighted_quota_shots_between(
-    person_id, start, end, project_id=None, task_type_id=None
+    person_id, start, end, project_id=None, task_type_id=None, feedback=True
 ):
     """
     Get all shots leading to a quota computation during the given period.
@@ -1410,7 +1460,6 @@ def get_weighted_quota_shots_between(
         Entity.query.filter(Entity.entity_type_id == shot_type["id"])
         .filter(Task.project_id == project_id)
         .filter(Task.task_type_id == task_type_id)
-        .filter(Task.end_date != None)
         .filter(TimeSpent.person_id == person_id)
         .filter(TimeSpent.date >= func.cast(start, TimeSpent.date.type))
         .filter(TimeSpent.date < func.cast(end, TimeSpent.date.type))
@@ -1419,6 +1468,12 @@ def get_weighted_quota_shots_between(
         .join(TimeSpent, Task.id == TimeSpent.task_id)
         .add_columns(Task.duration, TimeSpent.duration)
     )
+
+    if feedback:
+        query = query.filter(Task.end_date != None)
+    else:
+        query = query.filter(Task.done_date != None)
+
     query_shots = query.all()
     for entity, task_duration, duration in query_shots:
         shot = entity.serialize()
@@ -1432,22 +1487,36 @@ def get_weighted_quota_shots_between(
             shot = already_listed[shot["id"]]
             shot["weight"] += round(duration / task_duration, 2)
 
-    start = date_helpers.get_datetime_from_string(start)
-    end = date_helpers.get_datetime_from_string(end)
+    print(start, end)
+    if type(start) is str:
+        start = date_helpers.get_datetime_from_string(start)
+    if type(end) is str:
+        end = date_helpers.get_datetime_from_string(end)
     query = (
         Entity.query.filter(Entity.entity_type_id == shot_type["id"])
         .filter(Task.project_id == project_id)
         .filter(Task.task_type_id == task_type_id)
-        .filter(Task.end_date != None)
         .filter(Task.real_start_date != None)
         .filter(Task.assignees.contains(person))
-        .filter((Task.real_start_date <= end) & (Task.end_date >= start))
         .filter(TimeSpent.id == None)
         .join(Task, Entity.id == Task.entity_id)
         .join(Project, Project.id == Task.project_id)
         .outerjoin(TimeSpent, TimeSpent.task_id == Task.id)
-        .add_columns(Task.real_start_date, Task.end_date)
     )
+
+    if feedback:
+        query = (
+            query.filter(Task.end_date != None)
+            .filter((Task.real_start_date <= end) & (Task.end_date >= start))
+            .add_columns(Task.real_start_date, Task.end_date)
+        )
+    else:
+        query = (
+            query.filter(Task.done_date != None)
+            .filter((Task.real_start_date <= end) & (Task.done_date >= start))
+            .add_columns(Task.real_start_date, Task.done_date)
+        )
+
     query_shots = query.all()
 
     for entity, task_start, task_end in query_shots:
@@ -1477,7 +1546,7 @@ def get_weighted_quota_shots_between(
 
 
 def get_raw_quota_shots_between(
-    person_id, start, end, project_id=None, task_type_id=None
+    person_id, start, end, project_id=None, task_type_id=None, feedback=True
 ):
     """
     Get all shots leading to a quota computation during the given period.
@@ -1490,16 +1559,26 @@ def get_raw_quota_shots_between(
         Entity.query.filter(Entity.entity_type_id == shot_type["id"])
         .filter(Task.project_id == project_id)
         .filter(Task.task_type_id == task_type_id)
-        .filter(
+        .filter(Task.assignees.contains(person))
+        .join(Task, Entity.id == Task.entity_id)
+        .join(Project, Project.id == Task.project_id)
+    )
+
+    if feedback:
+        query = query.filter(
             Task.end_date.between(
                 func.cast(start, Task.end_date.type),
                 func.cast(end, Task.end_date.type),
             )
         )
-        .filter(Task.assignees.contains(person))
-        .join(Task, Entity.id == Task.entity_id)
-        .join(Project, Project.id == Task.project_id)
-    )
+    else:
+        query = query.filter(
+            Task.done_date.between(
+                func.cast(start, Task.done_date.type),
+                func.cast(end, Task.done_date.type),
+            )
+        )
+
     query_shots = query.all()
 
     for entity in query_shots:

zou/app/services/tasks_service.py

@@ -1297,6 +1297,9 @@ def update_task(task_id, data):
     if is_finished(task, data):
         data["end_date"] = date_helpers.get_utc_now_datetime()
 
+    if is_done(task, data):
+        data["done_date"] = date_helpers.get_utc_now_datetime()
+
     task.update(data)
     clear_task_cache(task_id)
     events.emit(
@@ -1490,7 +1493,7 @@ def delete_time_spent(task_id, person_id, date):
 
 def is_finished(task, data):
     """
-    Return True if task status is set to done.
+    Return True if task status is set to feedback request.
     """
     if "task_status_id" in data:
         task_status = get_task_status_raw(task.task_status_id)
@@ -1503,6 +1506,18 @@ def is_finished(task, data):
         return False
 
 
+def is_done(task, data):
+    """
+    Return True if task status is set to done.
+    """
+    if "task_status_id" in data:
+        task_status = get_task_status_raw(task.task_status_id)
+        new_task_status = get_task_status_raw(data["task_status_id"])
+        return new_task_status.id != task_status.id and new_task_status.is_done
+    else:
+        return False
+
+
 def clear_assignation(task_id, person_id=None):
     """
     Clear task assignation and emit a *task:unassign* event.
@@ -1758,6 +1773,7 @@ def reset_task_data(task_id):
     real_start_date = None
     last_comment_date = None
     end_date = None
+    done_date = None
     entity = entities_service.get_entity(task.entity_id)
     task_status_id = get_default_status(
         for_concept=entity["entity_type_id"]
@@ -1770,6 +1786,7 @@ def reset_task_data(task_id):
         .add_columns(
             TaskStatus.is_retake,
             TaskStatus.is_feedback_request,
+            TaskStatus.is_done,
             TaskStatus.short_name,
         )
         .all()
@@ -1780,6 +1797,7 @@ def reset_task_data(task_id):
         comment,
         task_status_is_retake,
         task_status_is_feedback_request,
+        task_status_is_done,
         task_status_short_name,
     ) in comments:
         if task_status_is_retake and not previous_is_retake:
@@ -1792,6 +1810,11 @@ def reset_task_data(task_id):
         if task_status_is_feedback_request:
             end_date = comment.created_at
 
+        print("ok", task_status_is_done)
+        if task_status_is_done:
+            done_date = comment.created_at
+            print(done_date)
+
         task_status_id = comment.task_status_id
         last_comment_date = comment.created_at
 
@@ -1807,6 +1830,7 @@ def reset_task_data(task_id):
             "real_start_date": real_start_date,
             "last_comment_date": last_comment_date,
             "end_date": end_date,
+            "done_date": done_date,
             "task_status_id": task_status_id,
         }
     )
@@ -2036,6 +2060,7 @@ def get_open_tasks(
                 "duration": task.duration,
                 "start_date": fields.serialize_value(task.start_date),
                 "due_date": fields.serialize_value(task.due_date),
+                "done_date": fields.serialize_value(task.done_date),
                 "type_name": task_type_name,
                 "task_type_for_entity": task_type_for_entity,
                 "status_name": task_status_name,

zou/migrations/versions/ca28796a2a62_add_is_done_field_to_the_task_model.py

@@ -0,0 +1,108 @@
+"""add is_done field to the task model
+
+Revision ID: ca28796a2a62
+Revises: 971dbf5a0faf
+Create Date: 2024-07-19 15:24:21.064991
+
+"""
+
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy import orm
+from sqlalchemy.ext.declarative import declarative_base
+from zou.migrations.utils.base import BaseMixin
+from sqlalchemy_utils import UUIDType, ChoiceType
+
+
+# revision identifiers, used by Alembic.
+revision = "ca28796a2a62"
+down_revision = "971dbf5a0faf"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    base = declarative_base()
+
+    TYPES = [
+        ("comment", "Comment"),
+        ("mention", "Mention"),
+        ("assignation", "Assignation"),
+        ("reply", "Reply"),
+        ("reply-mention", "Reply Mention"),
+    ]
+
+    class Notification(base, BaseMixin):
+        """
+        A notification is stored each time a comment is posted.
+        """
+
+        __tablename__ = "notification"
+        read = sa.Column(sa.Boolean, nullable=False, default=False)
+        change = sa.Column(sa.Boolean, nullable=False, default=False)
+        type = sa.Column(ChoiceType(TYPES), nullable=False)
+        person_id = sa.Column(
+            UUIDType(binary=False),
+            nullable=False,
+            index=True,
+        )
+        author_id = sa.Column(
+            UUIDType(binary=False),
+            nullable=False,
+            index=True,
+        )
+        comment_id = sa.Column(
+            UUIDType(binary=False),
+            nullable=True,
+            index=True,
+        )
+        task_id = sa.Column(
+            UUIDType(binary=False),
+            nullable=False,
+            index=True,
+        )
+        reply_id = sa.Column(UUIDType(binary=False), nullable=True, index=True)
+
+        __table_args__ = (
+            sa.UniqueConstraint(
+                "person_id",
+                "author_id",
+                "comment_id",
+                "reply_id",
+                "type",
+                name="notification_uc",
+            ),
+        )
+
+    bind = op.get_bind()
+    session = orm.Session(bind=bind)
+    session.query(Notification).where(Notification.type == None).update(
+        {Notification.type: "comment"}
+    )
+    session.commit()
+
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("notification", schema=None) as batch_op:
+        batch_op.alter_column(
+            "type", existing_type=sa.VARCHAR(length=255), nullable=False
+        )
+
+    with op.batch_alter_table("task", schema=None) as batch_op:
+        batch_op.add_column(
+            sa.Column("done_date", sa.DateTime(), nullable=True)
+        )
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("task", schema=None) as batch_op:
+        batch_op.drop_column("done_date")
+
+    with op.batch_alter_table("notification", schema=None) as batch_op:
+        batch_op.alter_column(
+            "type", existing_type=sa.VARCHAR(length=255), nullable=True
+        )
+
+    # ### end Alembic commands ###

{zou-0.19.48.dist-info → zou-0.19.50.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zou
-Version: 0.19.48
+Version: 0.19.50
 Summary: API to store and manage the data of your animation production
 Home-page: https://zou.cg-wire.com
 Author: CG Wire
@@ -40,7 +40,7 @@ Requires-Dist: flask-jwt-extended ==4.6.0
 Requires-Dist: flask-migrate ==4.0.7
 Requires-Dist: flask-socketio ==5.3.6
 Requires-Dist: flask ==3.0.3
-Requires-Dist: gazu ==0.10.11
+Requires-Dist: gazu ==0.10.13
 Requires-Dist: gevent-websocket ==0.10.1
 Requires-Dist: gevent ==24.2.1
 Requires-Dist: gunicorn ==22.0.0
@@ -77,11 +77,11 @@ Requires-Dist: wheel ; extra == 'dev'
 Provides-Extra: lint
 Requires-Dist: autoflake ==2.3.1 ; extra == 'lint'
 Requires-Dist: black ==24.4.2 ; extra == 'lint'
-Requires-Dist: pre-commit ==3.7.1 ; (python_version >= "3.9") and extra == 'lint'
+Requires-Dist: pre-commit ==3.8.0 ; (python_version >= "3.9") and extra == 'lint'
 Provides-Extra: monitoring
 Requires-Dist: prometheus-flask-exporter ==0.23.1 ; extra == 'monitoring'
 Requires-Dist: pygelf ==0.4.2 ; extra == 'monitoring'
-Requires-Dist: sentry-sdk ==2.10.0 ; extra == 'monitoring'
+Requires-Dist: sentry-sdk ==2.11.0 ; extra == 'monitoring'
 Provides-Extra: prod
 Requires-Dist: gunicorn ; extra == 'prod'
 Requires-Dist: gevent ; extra == 'prod'
@@ -89,7 +89,7 @@ Provides-Extra: test
 Requires-Dist: fakeredis ==2.23.3 ; extra == 'test'
 Requires-Dist: mixer ==7.2.2 ; extra == 'test'
 Requires-Dist: pytest-cov ==5.0.0 ; extra == 'test'
-Requires-Dist: pytest ==8.3.1 ; extra == 'test'
+Requires-Dist: pytest ==8.3.2 ; extra == 'test'
 
 .. figure:: https://zou.cg-wire.com/kitsu.png
    :alt: Kitsu Logo

{zou-0.19.48.dist-info → zou-0.19.50.dist-info}/RECORD

@@ -1,4 +1,4 @@
-zou/__init__.py,sha256=UqE6NTTLYFAIm4eEbzfIb6fa4GOIKkSgT4bob7C4OsQ,24
+zou/__init__.py,sha256=_Gy_AT8DQ-udpLfSZgx_ouKt88H4OjNcTtS35Oi8b7I,24
 zou/cli.py,sha256=2cDkbEOqp_m9hzBQf5wpxc_h0WjoH8KtxQQMNuREYlc,18201
 zou/debug.py,sha256=1fawPbkD4wn0Y9Gk0BiBFSa-CQe5agFi8R9uJYl2Uyk,520
 zou/event_stream.py,sha256=zgob2dZKray2lxPa11hdRNmOg8XRlKDdRcGdF80ylwg,8245
@@ -6,7 +6,7 @@ zou/job_settings.py,sha256=WB_RkYxmh4ffQHqg63_wsUDiS0zP3yxiwrxK7DhHG0g,150
 zou/app/__init__.py,sha256=aWh9K5n63TpXdLDxpfFtNNoCYZVE6OV3YLCXLuygWQg,6700
 zou/app/api.py,sha256=JTB_IMVO8EOoyqx9KdRkiIix0chOLi0yGDY-verUJXA,5127
 zou/app/config.py,sha256=J0jmGmyvk8JqcMPAEW8KfvwP8GwEoC9BxQG8AQV9aiY,6393
-zou/app/mixin.py,sha256=A4iIOwpkfYmRKXvF2Ykdc8BUQgufB0r_I4RdZYTiS3E,4896
+zou/app/mixin.py,sha256=eYwfS_CUFvNmldaQXrjsN5mK_gX0wYrBFykfx60uUM8,4897
 zou/app/swagger.py,sha256=UW9DSik3a8GuH1_-7F5P7EYgjZ9DA_kFjukO-6n4kgk,54682
 zou/app/blueprints/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zou/app/blueprints/assets/__init__.py,sha256=tSRvVrnPj732F4k_lkxoTJBJNmIUAqKXPLJDHvOtAA4,2178
@@ -87,7 +87,7 @@ zou/app/blueprints/index/resources.py,sha256=DsYpNSO_wCAxyjWOaB9QmEqOBcjn1miLiGn
 zou/app/blueprints/news/__init__.py,sha256=HxBXjC15dVbotNAZ0CLf02iwUjxJr20kgf8_kT_9nwM,505
 zou/app/blueprints/news/resources.py,sha256=6e3Ex_Q-djxWDjQQ-eD1fBcylea6XaJphO7Tl9zWKcY,7057
 zou/app/blueprints/persons/__init__.py,sha256=0cnHHw3K_8OEMm0qOi3wKVomSAg9IJSnVjAXabMeHks,3893
-zou/app/blueprints/persons/resources.py,sha256=-5J8ZswusYEBTNmX4I7fLFDZVMKyO0qhO_dkMs9SkXA,41406
+zou/app/blueprints/persons/resources.py,sha256=wYM5xcjP7Q0-ETZTom4yjvOnTO9kYzfjYP8wEa6X030,42674
 zou/app/blueprints/playlists/__init__.py,sha256=vuEk1F3hFHsmuKWhdepMoLyOzmNKDn1YrjjfcaIz0lQ,1596
 zou/app/blueprints/playlists/resources.py,sha256=alRlMHypUFErXLsEYxpFK84cdjFJ3YWwamZtW0KcwLY,17211
 zou/app/blueprints/previews/__init__.py,sha256=qGohO6LRNZKXBAegINcUXuZlrtxobJKQg84-rQ1L3AU,4202
@@ -97,7 +97,7 @@ zou/app/blueprints/projects/resources.py,sha256=v9_TLh3mujL-p7QcGkfSOJnNojzoJA15
 zou/app/blueprints/search/__init__.py,sha256=QCjQIY_85l_orhdEiqav_GifjReuwsjZggN3V0GeUVY,356
 zou/app/blueprints/search/resources.py,sha256=ni-dX8Xfib_0FonLttoXgntXBR957-xhifPSQHHnOnY,2696
 zou/app/blueprints/shots/__init__.py,sha256=HfgLneZBYUMa2OGwIgEZTz8zrIEYFRiYmRbreBPYeYw,4076
-zou/app/blueprints/shots/resources.py,sha256=NiuRZG2ltSn6KgaZvr_W7bHXJOQkBTFPUDYisShWZ6M,47738
+zou/app/blueprints/shots/resources.py,sha256=H9-TbHod5e7w6fO-1-C81Npk2reJkfiqTjRe7KgjaLI,48669
 zou/app/blueprints/source/__init__.py,sha256=H7K-4TDs4pc5EJvcYTYMJBHesxyqsE5-xq7J8ckOS2g,6093
 zou/app/blueprints/source/kitsu.py,sha256=4lWdqxaKDzwx-5POAIHIgZ6ODbDMOOVRxaSb_FOLcCk,5012
 zou/app/blueprints/source/otio.py,sha256=WkzpKylVkNlbY_jwf6uV5-HPylrktQznOcbCs_p8TDQ,13391
@@ -173,13 +173,13 @@ zou/app/models/software.py,sha256=3y9xEOS8BBxqgTaRrCaSYHaB6uOdJ88uU5i-cACoCSk,51
 zou/app/models/status_automation.py,sha256=95c0lmOetujyGWViLd_qsR4GWPhrmlvi9ZfkC0x1NuM,1391
 zou/app/models/studio.py,sha256=cXnYFh-8m5Kw05QawYcCr59eeLp25NDI0VIb77oqUOs,384
 zou/app/models/subscription.py,sha256=0GDQTHUThnydD4VwZg6YW2daC31zsu16j3ik4Im8d6g,1026
-zou/app/models/task.py,sha256=UDUhR_L1s29Lo2mIak8ihGOhGlx3sASAq_698Jp-Yek,3398
+zou/app/models/task.py,sha256=DiDCXdAOuKwR6LO8_ECZHunuZ5a19GVqRC5SA-8cdcs,3437
 zou/app/models/task_status.py,sha256=J7mNWIFd9KMWfUOLHjmuxIupjs59iSh8aQ_9LEFXqH4,1227
 zou/app/models/task_type.py,sha256=IsixVAfz3pyMf0eQw8x-uFNM9OHNkZpsPLEz_VNQ0hA,1005
 zou/app/models/time_spent.py,sha256=n7i3FO9g1eE_zATkItoCgrGVqq3iMSfdlKSveEZPloc,795
 zou/app/models/working_file.py,sha256=q0LM3s1ziw_9AmmPDCkwyf1-TJkWTBMgo2LdHyVRwxg,1509
 zou/app/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-zou/app/services/assets_service.py,sha256=Vea-Ra69-Zi0Q2S-Apb5fsZv5E9f_6XYVn2HxaGQBE8,21339
+zou/app/services/assets_service.py,sha256=BvAi5mnvZvMJJXnxFF3bofu4JZjiPvdlPrgUyW8PuKY,21460
 zou/app/services/auth_service.py,sha256=AxKN_THkjN2tmOHTSyFspwwFHqGBnslXuidfbav8Rxk,23224
 zou/app/services/backup_service.py,sha256=_ZtZp6wkcVYnHxBosziwLGdrTvsUttXGphiydq53iy8,4840
 zou/app/services/base_service.py,sha256=OZd0STFh-DyBBdwsmA7DMMnrwv4C8wJUbShvZ1isndU,1383
@@ -191,7 +191,7 @@ zou/app/services/custom_actions_service.py,sha256=fWISEOOdthadrxeHuacEel5Xj6msn0
 zou/app/services/deletion_service.py,sha256=ddaup7i_CTugcJDrynczNcfhjSKgDeGhPQjQ68We_l8,17255
 zou/app/services/edits_service.py,sha256=KTk5KUJx1yB-mRka8rQXMgQLIcWq4mNYZfnVhVlKwyQ,12122
 zou/app/services/emails_service.py,sha256=ZSwfL3iO9mIyHttqH61vI4WA-DTVdBk7lo6t9zbvfDA,11922
-zou/app/services/entities_service.py,sha256=IqDnI-mPdPqCJ-t6_O-M_IXyiNCamm2moCCKGJCNLrM,16222
+zou/app/services/entities_service.py,sha256=j_dyMHUVISqXFkxm2ydqvAo0nbcEE7_5v9jFauZhSe4,16327
 zou/app/services/events_service.py,sha256=_gU19herxiAo47WRxVNhvl7v-RKhp-8wZ3gAiHKpOzI,2716
 zou/app/services/exception.py,sha256=OBhVlLel081vNUUVywJkY4_8lJE8pFbWa-mrSKrtZuc,4288
 zou/app/services/file_tree_service.py,sha256=8JNBDgnXtV-AmSJ3gnUGB4oSwLjPgi1WYyL0Kc98JRE,33875
@@ -206,11 +206,11 @@ zou/app/services/preview_files_service.py,sha256=SIZ_SB1bWNRE_Zm7SuEpvFWqVpHKOgf
 zou/app/services/projects_service.py,sha256=_J8hIHy3MX5MsdEMRIKNfbyewwhxtMEcc_ymeHBsF38,21434
 zou/app/services/scenes_service.py,sha256=iXN19HU4njPF5VtZXuUrVJ-W23ZQuQNPC3ADXltbWtU,992
 zou/app/services/schedule_service.py,sha256=E99HKYsXgnK2sw58fw-NNHXWBgVJiA60upztjkNSCaM,6989
-zou/app/services/shots_service.py,sha256=w96EbNyXZNKmZg1eUMbaQPAEng3WkfJaPkqEr39F2ug,50310
+zou/app/services/shots_service.py,sha256=Y1oTewc2TNxwPzU5CZFfEhjJznjR54a9GTirFZxBhv4,52078
 zou/app/services/stats_service.py,sha256=cAlc92i9d6eYtsuwe3hYHYwdytg8KEMi1-TADfysJwM,11733
 zou/app/services/status_automations_service.py,sha256=tVio7Sj7inhvKS4UOyRhcdpwr_KNP96hT1o0X7XcGF4,715
 zou/app/services/sync_service.py,sha256=EunfXlma_IIb7011A_xLQLVQGAi-MteKgm2Y2NAxvMs,41586
-zou/app/services/tasks_service.py,sha256=05Vy7cBhHFr7PYBuTNiggw1TydtOhP5ekuBoTZLTLOA,67797
+zou/app/services/tasks_service.py,sha256=Y7VlDJon41m3wjMSOqvoxo0y7UDxlI7NuFPprRMySU0,68602
 zou/app/services/telemetry_services.py,sha256=xQm1h1t_JxSFW59zQGf4NuNdUi1UfMa_6pQ-ytRbmGA,1029
 zou/app/services/time_spents_service.py,sha256=TBLC1O9Dg_UbciG5Nw-dejqX2-5n6q44lACeN6OnUkQ,15206
 zou/app/services/user_service.py,sha256=BiOhPV7O-vowet7jOksjXk2V4yxZkdqsIyNboJ-Oz_A,46595
@@ -374,6 +374,7 @@ zou/migrations/versions/c49e41f1298b_add_previewbackground.py,sha256=7TOXMsEK9YW
 zou/migrations/versions/c68c2a62cfac_add_mimetype_column_to_attachment.py,sha256=cEFnRMYHurag8D9-7ycE34gnVH5TdsDfRYQqs5v_g8M,727
 zou/migrations/versions/c726b98be194_.py,sha256=nbqWFmPg4OUCL-txrVjWyQiFm_PuuaDZeE2gOB-DM3w,701
 zou/migrations/versions/c81f3e83bdb5_.py,sha256=eGoGIOImywjBRSqe-isbt_N_o3zK1ktrPWSo0nyAXgA,720
+zou/migrations/versions/ca28796a2a62_add_is_done_field_to_the_task_model.py,sha256=adalMYr3AvOEpPR5V1nj6QxsVJUz-44VYaGnHM_tQyA,3046
 zou/migrations/versions/cf3d365de164_add_entity_version_model.py,sha256=n3k3ojRQAk0tJAOBIUgDEoZbNFERx4vs3hg5hrFm7v4,1763
 zou/migrations/versions/cf6cec6d6bf5_add_status_field_to_preview_file.py,sha256=0c8_OghAaaM0R6bKbs7MADvOkZ1sFE3SVp_nNB2ACgQ,950
 zou/migrations/versions/d80267806131_task_status_new_column_is_default.py,sha256=7HtK0bfBUh9MrJIbpUgz6S-Ye_R_4DbHILpODMBVVwE,2610
@@ -407,9 +408,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=u9LCEOvmkxwm-KiZ6jKNdB9LSC6XXUDwJpVx8LkDwJg,16416
-zou-0.19.48.dist-info/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
-zou-0.19.48.dist-info/METADATA,sha256=f9e2kAoECSKBCRjpIPUVerRJK6wmTEqlwXGYCVhEbIo,6725
-zou-0.19.48.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
-zou-0.19.48.dist-info/entry_points.txt,sha256=PelQoIx3qhQ_Tmne7wrLY-1m2izuzgpwokoURwSohy4,130
-zou-0.19.48.dist-info/top_level.txt,sha256=4S7G_jk4MzpToeDItHGjPhHx_fRdX52zJZWTD4SL54g,4
-zou-0.19.48.dist-info/RECORD,,
+zou-0.19.50.dist-info/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
+zou-0.19.50.dist-info/METADATA,sha256=QQwGEWHpVwuuwp5RgWo0k6rFY2flwv1AHlRLtDDJ4xo,6725
+zou-0.19.50.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+zou-0.19.50.dist-info/entry_points.txt,sha256=PelQoIx3qhQ_Tmne7wrLY-1m2izuzgpwokoURwSohy4,130
+zou-0.19.50.dist-info/top_level.txt,sha256=4S7G_jk4MzpToeDItHGjPhHx_fRdX52zJZWTD4SL54g,4
+zou-0.19.50.dist-info/RECORD,,

{zou-0.19.48.dist-info → zou-0.19.50.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (71.1.0)
+Generator: setuptools (72.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any