zou 0.20.61__py3-none-any.whl → 0.20.62__py3-none-any.whl

zou/app/blueprints/projects/resources.py

@@ -1526,3 +1526,203 @@ class ProductionMonthTimeSpentsResource(Resource, ArgsMixin):
         return time_spents_service.get_project_month_time_spents(
             project_id, user["timezone"]
         )
+
+
+class ProductionScheduleVersionTaskLinksResource(Resource, ArgsMixin):
+
+    @jwt_required()
+    def get(self, production_schedule_version_id):
+        """
+        Get task links for given production schedule version.
+        ---
+        tags:
+        - Projects
+        parameters:
+        - in: path
+            name: production_schedule_version_id
+            required: True
+            type: string
+            format: UUID
+            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+          - in: query
+            name: task_type_id
+            required: false
+            type: string
+            format: UUID
+            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+        responses:
+            200:
+                description: Task links for given production schedule version.
+            400:
+                description: Wrong ID format
+        """
+        production_schedule_version = (
+            schedule_service.get_production_schedule_version(
+                production_schedule_version_id
+            )
+        )
+        if (
+            permissions.has_vendor_permissions()
+            or permissions.has_client_permissions()
+        ):
+            raise permissions.PermissionDenied
+        user_service.check_project_access(
+            production_schedule_version["project_id"]
+        )
+
+        args = self.get_args(
+            [
+                ("task_type_id", None, False),
+            ]
+        )
+
+        relations = self.get_relations()
+
+        return schedule_service.get_production_schedule_version_task_links(
+            production_schedule_version_id,
+            task_type_id=args["task_type_id"],
+            relations=relations,
+        )
+
+
+class ProductionScheduleVersionSetTaskLinksFromTasksResource(
+    Resource, ArgsMixin
+):
+
+    @jwt_required()
+    def post(self, production_schedule_version_id):
+        """
+        Set task links for given production schedule version from tasks.
+        ---
+        tags:
+        - Projects
+        parameters:
+        - in: path
+            name: production_schedule_version_id
+            required: True
+            type: string
+            format: UUID
+            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+        responses:
+            200:
+                description: Task links created.
+            400:
+                description: Wrong ID format
+        """
+        production_schedule_version = (
+            schedule_service.get_production_schedule_version(
+                production_schedule_version_id
+            )
+        )
+        user_service.check_manager_project_access(
+            production_schedule_version["project_id"]
+        )
+
+        return schedule_service.set_production_schedule_version_task_links_from_production(
+            production_schedule_version_id
+        )
+
+
+class ProductionScheduleVersionApplyToProductionResource(Resource, ArgsMixin):
+
+    @jwt_required()
+    def post(self, production_schedule_version_id):
+        """
+        Apply production schedule version to production.
+        ---
+        tags:
+        - Projects
+        parameters:
+        - in: path
+            name: production_schedule_version_id
+            required: True
+            type: string
+            format: UUID
+            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+        responses:
+            200:
+                description: Task links created.
+            400:
+                description: Wrong ID format
+        """
+        production_schedule_version = (
+            schedule_service.get_production_schedule_version(
+                production_schedule_version_id
+            )
+        )
+        user_service.check_manager_project_access(
+            production_schedule_version["project_id"]
+        )
+
+        return (
+            schedule_service.apply_production_schedule_version_to_production(
+                production_schedule_version_id,
+            )
+        )
+
+
+class ProductionScheduleVersionSetTaskLinksFromProductionScheduleVersionResource(
+    Resource, ArgsMixin
+):
+
+    @jwt_required()
+    def post(self, production_schedule_version_id):
+        """
+        Set task links for given production schedule version from another production schedule version.
+        ---
+        tags:
+        - Projects
+        parameters:
+        - in: path
+            name: production_schedule_version_id
+            required: True
+            type: string
+            format: UUID
+            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+        - in: formData
+            name: production_schedule_version_id
+            required: True
+            type: string
+            format: UUID
+            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+        responses:
+            200:
+                description: Task links created.
+            400:
+                description: Wrong ID format
+        """
+        production_schedule_version = (
+            schedule_service.get_production_schedule_version(
+                production_schedule_version_id
+            )
+        )
+        user_service.check_manager_project_access(
+            production_schedule_version["project_id"]
+        )
+
+        args = self.get_args(
+            [
+                ("production_schedule_version_id", None, True),
+            ]
+        )
+
+        other_production_schedule_version = (
+            schedule_service.get_production_schedule_version(
+                args["production_schedule_version_id"]
+            )
+        )
+
+        if (
+            production_schedule_version["project_id"]
+            != other_production_schedule_version["project_id"]
+        ):
+            raise WrongParameterException(
+                "Production schedule versions must belong to the same project."
+            )
+
+        return schedule_service.set_production_schedule_version_task_links_from_production_schedule_version(
+            production_schedule_version_id,
+            other_production_schedule_version_id=other_production_schedule_version[
+                "id"
+            ],
+        )

zou/app/blueprints/tasks/resources.py

@@ -1603,7 +1603,7 @@ class SetTaskMainPreviewResource(Resource):
         return entity
 
 
-class PersonsTasksDatesResource(Resource):
+class PersonsTasksDatesResource(Resource, ArgsMixin):
     @jwt_required()
     @permissions.require_admin
     def get(self):
@@ -1625,7 +1625,10 @@ class PersonsTasksDatesResource(Resource):
                 description: For each person, the first start date of all tasks of assigned to this person and the last end date.
         """
         permissions.check_admin_permissions()
-        return tasks_service.get_persons_tasks_dates()
+        args = self.get_args([("project_id", None, True, str)])
+        return tasks_service.get_persons_tasks_dates(
+            project_id=args["project_id"]
+        )
 
 
 class OpenTasksResource(Resource, ArgsMixin):

zou/app/blueprints/user/resources.py

@@ -1229,9 +1229,7 @@ class TimeSpentsResource(Resource):
         except WrongDateFormatException:
             abort(
                 400,
-                "Wrong date format for {} and/or {}".format(
-                    start_date, end_date
-                ),
+                f"Wrong date format for {start_date} and/or {end_date}",
             )
 
 

zou/app/models/base.py

@@ -1,13 +1,14 @@
 from sqlalchemy_utils import UUIDType
-from sqlalchemy import func
-from sqlalchemy import orm
+from sqlalchemy import func, orm
 from zou.app import db
-from zou.app.utils import fields, date_helpers
+from zou.app.utils import date_helpers, fields
 
 
 class BaseMixin(object):
     id = db.Column(
-        UUIDType(binary=False), primary_key=True, default=fields.gen_uuid
+        UUIDType(binary=False),
+        primary_key=True,
+        default=fields.gen_uuid,
     )
 
     # Audit fields
@@ -78,6 +79,16 @@ class BaseMixin(object):
         """
         return cls.query.filter_by(**kw).all()
 
+    @classmethod
+    def get_or_create(cls, **kw):
+        """
+        Shorthand to retrieve data by using filters.
+        """
+        instance = cls.get_by(**kw)
+        if instance is None:
+            instance = cls.create(**kw)
+        return instance
+
     @classmethod
     def create(cls, **kw):
         """

zou/app/models/department.py

@@ -2,6 +2,68 @@ from zou.app import db
 from zou.app.models.serializer import SerializerMixin
 from zou.app.models.base import BaseMixin
 
+from sqlalchemy_utils import UUIDType
+
+
+class HardwareItemDepartmentLink(db.Model, BaseMixin, SerializerMixin):
+    """
+    Uses a many-to-many relationship to link hardware items with departments.
+    It can be used to track which hardware items are used by which departments in
+    order to set budget forecasting.
+    """
+
+    __tablename__ = "hardware_item_department_link"
+    department_id = db.Column(
+        UUIDType(binary=False),
+        db.ForeignKey("department.id"),
+        primary_key=True,
+        index=True,
+    )
+    hardware_item_id = db.Column(
+        UUIDType(binary=False),
+        db.ForeignKey("hardware_item.id"),
+        primary_key=True,
+        index=True,
+    )
+
+    __table_args__ = (
+        db.UniqueConstraint(
+            "hardware_item_id",
+            "department_id",
+            name="hardware_item_department_link_uc",
+        ),
+    )
+
+
+class SoftwareDepartmentLink(db.Model, BaseMixin, SerializerMixin):
+    """
+    Uses a many-to-many relationship to link software with departments.
+    It can be used to track which software is used by which departments in
+    order to set budget forecasting.
+    """
+
+    __tablename__ = "software_department_link"
+    department_id = db.Column(
+        UUIDType(binary=False),
+        db.ForeignKey("department.id"),
+        primary_key=True,
+        index=True,
+    )
+    software_id = db.Column(
+        UUIDType(binary=False),
+        db.ForeignKey("software.id"),
+        primary_key=True,
+        index=True,
+    )
+
+    __table_args__ = (
+        db.UniqueConstraint(
+            "department_id",
+            "software_id",
+            name="software_department_link_uc",
+        ),
+    )
+
 
 class Department(db.Model, BaseMixin, SerializerMixin):
     """

zou/app/models/entity.py

@@ -149,7 +149,7 @@ class Entity(db.Model, BaseMixin, SerializerMixin):
 
     entities_out = db.relationship(
         "Entity",
-        secondary="entity_link",
+        secondary=EntityLink.__table__,
         primaryjoin=(id == EntityLink.entity_in_id),
         secondaryjoin=(id == EntityLink.entity_out_id),
         backref="entities_in",
@@ -157,14 +157,14 @@ class Entity(db.Model, BaseMixin, SerializerMixin):
 
     entity_concept_links = db.relationship(
         "Entity",
-        secondary="entity_concept_link",
+        secondary=EntityConceptLink.__table__,
         primaryjoin=(id == EntityConceptLink.entity_in_id),
         secondaryjoin=(id == EntityConceptLink.entity_out_id),
         lazy="joined",
     )
 
     instance_casting = db.relationship(
-        "AssetInstance", secondary="asset_instance_link", backref="shots"
+        "AssetInstance", secondary=AssetInstanceLink.__table__, backref="shots"
     )
 
     __table_args__ = (

zou/app/models/hardware_item.py

@@ -0,0 +1,15 @@
+from zou.app import db
+from zou.app.models.serializer import SerializerMixin
+from zou.app.models.base import BaseMixin
+
+
+class HardwareItem(db.Model, BaseMixin, SerializerMixin):
+    """
+    Describes hardware items available in the studio.
+    """
+
+    name = db.Column(db.String(40), unique=True, nullable=False)
+    short_name = db.Column(db.String(20), nullable=False)
+    archived = db.Column(db.Boolean, default=False)
+    monthly_cost = db.Column(db.Integer, default=0)
+    inventory_amount = db.Column(db.Integer, default=0)

zou/app/models/person.py

@@ -138,7 +138,7 @@ class Person(db.Model, BaseMixin, SerializerMixin):
     expiration_date = db.Column(db.Date(), nullable=True)
 
     departments = db.relationship(
-        "Department", secondary="department_link", lazy="joined"
+        "Department", secondary=DepartmentLink.__table__, lazy="joined"
     )
     studio_id = db.Column(
         UUIDType(binary=False), db.ForeignKey("studio.id"), index=True

zou/app/models/production_schedule_version.py

@@ -0,0 +1,81 @@
+from zou.app import db
+from zou.app.models.serializer import SerializerMixin
+from zou.app.models.base import BaseMixin
+
+from sqlalchemy_utils import UUIDType
+
+
+class ProductionScheduleVersion(db.Model, BaseMixin, SerializerMixin):
+    """
+    Describe a production schedule.
+    """
+
+    name = db.Column(db.String(80), nullable=False)
+    project_id = db.Column(
+        UUIDType(binary=False),
+        db.ForeignKey("project.id", ondelete="CASCADE"),
+        index=True,
+        nullable=False,
+    )
+    production_schedule_from = db.Column(
+        UUIDType(binary=False),
+        db.ForeignKey("production_schedule_version.id"),
+        index=True,
+        nullable=True,
+    )
+    locked = db.Column(db.Boolean(), default=False)
+    canceled = db.Column(db.Boolean(), default=False)
+    __table_args__ = (
+        db.UniqueConstraint(
+            "name", "project_id", name="production_schedule_version_uc"
+        ),
+    )
+
+
+class ProductionScheduleVersionTaskLinkPersonLink(db.Model):
+    __tablename__ = "production_schedule_version_task_link_person_link"
+    production_schedule_version_task_link_id = db.Column(
+        UUIDType(binary=False),
+        db.ForeignKey(
+            "production_schedule_version_task_link.id", ondelete="CASCADE"
+        ),
+        primary_key=True,
+    )
+    person_id = db.Column(
+        UUIDType(binary=False),
+        db.ForeignKey("person.id", ondelete="CASCADE"),
+        primary_key=True,
+    )
+
+
+class ProductionScheduleVersionTaskLink(db.Model, BaseMixin, SerializerMixin):
+    """
+    Link a task to a production schedule version.
+    """
+
+    production_schedule_version_id = db.Column(
+        UUIDType(binary=False),
+        db.ForeignKey("production_schedule_version.id", ondelete="CASCADE"),
+        index=True,
+        nullable=False,
+    )
+    task_id = db.Column(
+        UUIDType(binary=False),
+        db.ForeignKey("task.id", ondelete="CASCADE"),
+        index=True,
+        nullable=False,
+    )
+    start_date = db.Column(db.DateTime)
+    due_date = db.Column(db.DateTime)
+    estimation = db.Column(db.Float, default=0)
+    assignees = db.relationship(
+        "Person",
+        secondary=ProductionScheduleVersionTaskLinkPersonLink.__table__,
+    )
+    __table_args__ = (
+        db.UniqueConstraint(
+            "production_schedule_version_id",
+            "task_id",
+            name="production_schedule_version_task_link_uc",
+        ),
+    )

zou/app/models/project.py

@@ -178,22 +178,33 @@ class Project(db.Model, BaseMixin, SerializerMixin):
         index=True,
     )
 
-    team = db.relationship("Person", secondary="project_person_link")
+    from_schedule_version_id = db.Column(
+        UUIDType(binary=False),
+        db.ForeignKey(
+            "production_schedule_version.id",
+            name="project_from_schedule_version_id_fkey",
+            use_alter=True,
+        ),
+        index=True,
+        nullable=True,
+    )
+
+    team = db.relationship("Person", secondary=ProjectPersonLink.__table__)
     asset_types = db.relationship(
-        "EntityType", secondary="project_asset_type_link"
+        "EntityType", secondary=ProjectAssetTypeLink.__table__
     )
     task_statuses = db.relationship(
-        "TaskStatus", secondary="project_task_status_link"
+        "TaskStatus", secondary=ProjectTaskStatusLink.__table__
     )
     task_types = db.relationship(
-        "TaskType", secondary="project_task_type_link"
+        "TaskType", secondary=ProjectTaskTypeLink.__table__
     )
     status_automations = db.relationship(
-        "StatusAutomation", secondary="project_status_automation_link"
+        "StatusAutomation", secondary=ProjectStatusAutomationLink.__table__
     )
     preview_background_files = db.relationship(
         "PreviewBackgroundFile",
-        secondary="project_preview_background_file_link",
+        secondary=ProjectPreviewBackgroundFileLink.__table__,
     )
 
     def set_team(self, person_ids):

zou/app/models/software.py

@@ -7,10 +7,14 @@ from sqlalchemy.dialects.postgresql import JSONB
 
 class Software(db.Model, BaseMixin, SerializerMixin):
     """
-    Describes software used by working files.
+    Describes software used in the studio.
     """
 
     name = db.Column(db.String(40), unique=True, nullable=False)
     short_name = db.Column(db.String(20), nullable=False)
+    archived = db.Column(db.Boolean, default=False)
+    version = db.Column(db.String(20), nullable=True)
     file_extension = db.Column(db.String(20), nullable=False)
     secondary_extensions = db.Column(JSONB)
+    monthly_cost = db.Column(db.Integer, default=0)
+    inventory_amount = db.Column(db.Integer, default=0)

zou/app/models/task.py

@@ -5,21 +5,18 @@ from zou.app.models.serializer import SerializerMixin
 from zou.app.models.base import BaseMixin
 
 
-assignees_table = db.Table(
-    "assignations",
-    db.Column(
-        "task",
+class TaskPersonLink(db.Model):
+    __tablename__ = "task_person_link"
+    task_id = db.Column(
         UUIDType(binary=False),
         db.ForeignKey("task.id"),
         primary_key=True,
-    ),
-    db.Column(
-        "person",
+    )
+    person_id = db.Column(
         UUIDType(binary=False),
         db.ForeignKey("person.id"),
         primary_key=True,
-    ),
-)
+    )
 
 
 class Task(db.Model, BaseMixin, SerializerMixin):
@@ -67,7 +64,7 @@ class Task(db.Model, BaseMixin, SerializerMixin):
     assigner_id = db.Column(
         UUIDType(binary=False), db.ForeignKey("person.id"), index=True
     )
-    assignees = db.relationship("Person", secondary=assignees_table)
+    assignees = db.relationship("Person", secondary=TaskPersonLink.__table__)
 
     __table_args__ = (
         db.UniqueConstraint(

zou/app/services/assets_service.py

@@ -14,9 +14,8 @@ from zou.app.models.entity import (
 from zou.app.models.entity_type import EntityType
 from zou.app.models.subscription import Subscription
 from zou.app.models.project import Project
-from zou.app.models.task import Task
+from zou.app.models.task import Task, TaskPersonLink
 from zou.app.models.asset_instance import AssetInstance
-from zou.app.models.task import assignees_table
 
 from zou.app.services import (
     base_service,
@@ -184,7 +183,7 @@ def get_assets_and_tasks(criterions={}, with_episode_ids=False):
         Entity.query.filter(build_asset_type_filter())
         .join(EntityType, Entity.entity_type_id == EntityType.id)
         .outerjoin(Task)
-        .outerjoin(assignees_table)
+        .outerjoin(TaskPersonLink)
     )
 
     tasks_query = query.add_columns(
@@ -204,7 +203,7 @@ def get_assets_and_tasks(criterions={}, with_episode_ids=False):
         Task.last_comment_date,
         Task.last_preview_file_id,
         Task.difficulty,
-        assignees_table.columns.person,
+        TaskPersonLink.person_id,
     ).order_by(EntityType.name, Entity.name)
 
     if "id" in criterions:
@@ -656,8 +655,6 @@ def remove_asset(asset_id, force=False):
         for task in tasks:
             deletion_service.remove_task(task.id, force=True)
             tasks_service.clear_task_cache(str(task.id))
-        asset.delete()
-        clear_asset_cache(str(asset_id))
         index_service.remove_asset_index(str(asset_id))
         events.emit(
             "asset:delete",
@@ -670,6 +667,8 @@ def remove_asset(asset_id, force=False):
         EntityLink.delete_all_by(entity_out_id=asset_id)
         EntityConceptLink.delete_all_by(entity_in_id=asset_id)
         EntityConceptLink.delete_all_by(entity_out_id=asset_id)
+        asset.delete()
+        clear_asset_cache(str(asset_id))
     deleted_asset = asset.serialize(obj_type="Asset")
     return deleted_asset
 

zou/app/services/concepts_service.py

@@ -15,8 +15,7 @@ from zou.app.models.entity import (
 )
 from zou.app.models.project import Project
 from zou.app.models.subscription import Subscription
-from zou.app.models.task import Task
-from zou.app.models.task import assignees_table
+from zou.app.models.task import Task, TaskPersonLink
 
 from zou.app.services import (
     deletion_service,
@@ -177,7 +176,7 @@ def get_concepts_and_tasks(criterions={}):
     query = (
         Entity.query.join(Project, Project.id == Entity.project_id)
         .outerjoin(Task, Task.entity_id == Entity.id)
-        .outerjoin(assignees_table)
+        .outerjoin(TaskPersonLink)
         .add_columns(
             Task.id,
             Task.task_type_id,
@@ -192,7 +191,7 @@ def get_concepts_and_tasks(criterions={}):
             Task.due_date,
             Task.last_comment_date,
             Task.nb_assets_ready,
-            assignees_table.columns.person,
+            TaskPersonLink.person_id,
             Project.id,
             Project.name,
         )

zou/app/services/deletion_service.py

@@ -342,20 +342,13 @@ def remove_project(project_id):
     for task in tasks:
         remove_task(task.id, force=True)
 
-    query = EntityLink.query.join(
-        Entity, EntityLink.entity_in_id == Entity.id
-    ).filter(Entity.project_id == project_id)
-    for link in query:
-        link.delete_no_commit()
-    EntityLink.commit()
-
-    query = EntityVersion.query.join(
-        Entity, EntityVersion.entity_id == Entity.id
-    ).filter(Entity.project_id == project_id)
-    for version in query:
-        version.delete_no_commit()
-    EntityLink.commit()
-
+    EntityLink.query.filter(
+        EntityLink.entity_in_id == Entity.id,
+        Entity.project_id == project_id,
+    ).delete()
+    EntityVersion.query.filter(
+        EntityVersion.entity_id == Entity.id, Entity.project_id == project_id
+    ).delete()
     playlists = Playlist.query.filter_by(project_id=project_id)
     for playlist in playlists:
         playlists_service.remove_playlist(playlist.id)
@@ -372,10 +365,9 @@ def remove_project(project_id):
     ScheduleItem.delete_all_by(project_id=project_id)
     SearchFilterGroup.delete_all_by(project_id=project_id)
     SearchFilter.delete_all_by(project_id=project_id)
-
-    for news in News.query.join(Task).filter_by(project_id=project_id).all():
-        news.delete_no_commit()
-    News.commit()
+    News.query.filter(
+        News.task_id == Task.id, Task.project_id == project_id
+    ).delete()
     project = Project.get(project_id)
     project.delete()
     events.emit("project:delete", {"project_id": project.id})