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

zou/app/services/user_service.py

@@ -7,7 +7,7 @@ from zou.app.models.entity import Entity
 from zou.app.models.entity_type import EntityType
 from zou.app.models.notification import Notification
 from zou.app.models.person import Person
-from zou.app.models.project import Project
+from zou.app.models.project import Project, ProjectPersonLink
 from zou.app.models.project_status import ProjectStatus
 from zou.app.models.subscription import Subscription
 from zou.app.models.search_filter import SearchFilter
@@ -15,6 +15,7 @@ from zou.app.models.search_filter_group import SearchFilterGroup
 from zou.app.models.task import Task
 from zou.app.models.task_type import TaskType
 
+
 from zou.app.services import (
     assets_service,
     custom_actions_service,
@@ -35,7 +36,7 @@ from zou.app.services.exception import (
     NotificationNotFoundException,
     WrongParameterException,
 )
-from zou.app.utils import cache, fields, permissions
+from zou.app.utils import cache, fields, permissions, events
 
 
 def clear_filter_cache(user_id=None):
@@ -77,7 +78,8 @@ def build_open_project_filter():
     """
     Query filter for project to retrieve only open projects.
     """
-    return ProjectStatus.name.in_(("Active", "open", "Open"))
+    open_status = projects_service.get_open_status()
+    return Project.project_status_id == open_status["id"]
 
 
 def build_related_projects_filter():
@@ -85,15 +87,8 @@ def build_related_projects_filter():
     Query filter for project to retrieve open projects of which the user
     is part of the team.
     """
-    projects = (
-        Project.query.join(
-            ProjectStatus, Project.project_status_id == ProjectStatus.id
-        )
-        .filter(build_team_filter())
-        .filter(build_open_project_filter())
-        .all()
-    )
-    project_ids = [project.id for project in projects]
+    projects = related_projects()
+    project_ids = [project["id"] for project in projects]
     if len(project_ids) > 0:
         return Project.id.in_(project_ids)
     else:
@@ -103,16 +98,30 @@ def build_related_projects_filter():
 def related_projects():
     """
     Return all projects related to current user: open projects of which the user
-    is part of the team.
+    is part of the team as dicts.
+    """
+    persons_service.get_current_user()
+    projects = related_projects_raw()
+    return Project.serialize_list(projects)
+
+
+def related_projects_raw():
     """
+    Return all projects related to current user: open projects of which the user
+    is part of the team as models.
+    """
+    current_user = persons_service.get_current_user()
     projects = (
-        Project.query.join(Task)
-        .join(ProjectStatus, Project.project_status_id == ProjectStatus.id)
-        .filter(build_team_filter())
+        Project.query.join(
+            ProjectStatus, Project.project_status_id == ProjectStatus.id
+        )
+        .join(ProjectPersonLink, Project.id == ProjectPersonLink.project_id)
+        .filter(ProjectPersonLink.person_id == current_user["id"])
         .filter(build_open_project_filter())
+        .distinct()
         .all()
     )
-    return Project.serialize_list(projects)
+    return projects
 
 
 def get_todos():
@@ -328,7 +337,11 @@ def get_open_projects(name=None):
         query = query.filter(Project.name == name)
 
     if not permissions.has_admin_permissions():
-        query = query.filter(build_team_filter())
+        current_user = persons_service.get_current_user()
+        query = query.join(
+            ProjectPersonLink, Project.id == ProjectPersonLink.project_id
+        )
+        query = query.filter(ProjectPersonLink.person_id == current_user["id"])
 
     for_client = False
     vendor_departments = None
@@ -353,11 +366,16 @@ def get_open_project_ids():
 
 def get_projects(name=None):
     """
-    Get all projects for which current user has a task assigned.
+    Get all projects for which current user is part of the team.
     """
-    query = Project.query.join(
-        ProjectStatus, Project.project_status_id == ProjectStatus.id
-    ).filter(build_team_filter())
+    current_user = persons_service.get_current_user()
+    query = (
+        Project.query.join(
+            ProjectStatus, Project.project_status_id == ProjectStatus.id
+        )
+        .join(ProjectPersonLink, Project.id == ProjectPersonLink.project_id)
+        .filter(ProjectPersonLink.person_id == current_user["id"])
+    )
 
     if name is not None:
         query = query.filter(Project.name == name)
@@ -1316,6 +1334,22 @@ def update_notification(notification_id, read):
         id=notification_id, person_id=current_user["id"]
     )
     notification.update({"read": read})
+    if read:
+        events.emit(
+            "notification:read",
+            {
+                "person_id": current_user["id"],
+                "notification_id": notification_id,
+            },
+        )
+    else:
+        events.emit(
+            "notification:unread",
+            {
+                "person_id": current_user["id"],
+                "notification_id": notification_id,
+            },
+        )
     return notification.serialize()
 
 
@@ -1513,7 +1547,7 @@ def mark_notifications_as_read():
 
     db.session.execute(update_stmt)
     db.session.commit()
-
+    events.emit("notification:all-read", {"person_id": current_user["id"]})
     return True
 
 

zou/migrations/alembic.ini

@@ -30,7 +30,7 @@ handlers =
 qualname = sqlalchemy.engine
 
 [logger_alembic]
-level = WARN
+level = INFO
 handlers =
 qualname = alembic
 

zou/migrations/versions/0bd1e89f2a6f_add_productionscheduleversiontasklink_uc.py

@@ -0,0 +1,58 @@
+"""Add ProductionScheduleVersionTaskLink uc
+
+Revision ID: 0bd1e89f2a6f
+Revises: e4b48ca33539
+Create Date: 2025-07-22 17:13:16.680191
+
+"""
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = "0bd1e89f2a6f"
+down_revision = "e4b48ca33539"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table(
+        "production_schedule_version_task_link", schema=None
+    ) as batch_op:
+        batch_op.alter_column(
+            "production_schedule_version_id",
+            existing_type=sa.UUID(),
+            nullable=False,
+        )
+        batch_op.alter_column(
+            "task_id", existing_type=sa.UUID(), nullable=False
+        )
+        batch_op.create_unique_constraint(
+            "production_schedule_version_task_link_uc",
+            ["production_schedule_version_id", "task_id"],
+        )
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table(
+        "production_schedule_version_task_link", schema=None
+    ) as batch_op:
+        batch_op.drop_constraint(
+            "production_schedule_version_task_link_uc", type_="unique"
+        )
+        batch_op.alter_column(
+            "task_id", existing_type=sa.UUID(), nullable=False
+        )
+        batch_op.alter_column(
+            "production_schedule_version_id",
+            existing_type=sa.UUID(),
+            nullable=False,
+        )
+
+    # ### end Alembic commands ###

zou/migrations/versions/26f96f65cfa3_add_productionversionschedule_uc.py

@@ -0,0 +1,40 @@
+"""Add productionversionschedule uc
+
+Revision ID: 26f96f65cfa3
+Revises: 3d8e68dffeee
+Create Date: 2025-07-18 11:49:59.302576
+
+"""
+
+from alembic import op
+
+
+# revision identifiers, used by Alembic.
+revision = "26f96f65cfa3"
+down_revision = "3d8e68dffeee"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table(
+        "production_schedule_version", schema=None
+    ) as batch_op:
+        batch_op.create_unique_constraint(
+            "production_schedule_version_uc", ["name", "project_id"]
+        )
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table(
+        "production_schedule_version", schema=None
+    ) as batch_op:
+        batch_op.drop_constraint(
+            "production_schedule_version_uc", type_="unique"
+        )
+
+    # ### end Alembic commands ###

zou/migrations/versions/3d8e68dffeee_fix_task_person_link.py

@@ -0,0 +1,56 @@
+"""Fix TaskPersonLink
+
+Revision ID: 3d8e68dffeee
+Revises: d97f2730bf7b
+Create Date: 2025-07-18 11:39:02.795034
+
+"""
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "3d8e68dffeee"
+down_revision = "d97f2730bf7b"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("task_person_link", schema=None) as batch_op:
+        batch_op.alter_column("task", new_column_name="task_id")
+        batch_op.alter_column("person", new_column_name="person_id")
+        batch_op.drop_constraint(
+            batch_op.f("assignations_person_fkey"), type_="foreignkey"
+        )
+        batch_op.drop_constraint(
+            batch_op.f("assignations_task_fkey"), type_="foreignkey"
+        )
+        batch_op.create_foreign_key(None, "person", ["person_id"], ["id"])
+        batch_op.create_foreign_key(None, "task", ["task_id"], ["id"])
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("task_person_link", schema=None) as batch_op:
+        batch_op.alter_column("task_id", new_column_name="task")
+        batch_op.alter_column("person_id", new_column_name="person")
+        batch_op.drop_constraint(
+            "task_person_link_person_id_fkey", type_="foreignkey"
+        )
+        batch_op.drop_constraint(
+            "task_person_link_task_id_fkey", type_="foreignkey"
+        )
+        batch_op.create_foreign_key(
+            batch_op.f("assignations_task_fkey"), "task", ["task"], ["id"]
+        )
+        batch_op.create_foreign_key(
+            batch_op.f("assignations_person_fkey"),
+            "person",
+            ["person"],
+            ["id"],
+        )
+
+    # ### end Alembic commands ###

zou/migrations/versions/4368137b44e1_productionscheduleversion_add_on_delete_.py

@@ -0,0 +1,188 @@
+"""ProductionScheduleVersion add on delete cascade to fkey
+
+Revision ID: 4368137b44e1
+Revises: 0bd1e89f2a6f
+Create Date: 2025-07-23 00:41:37.354903
+
+"""
+
+from alembic import op
+
+
+# revision identifiers, used by Alembic.
+revision = "4368137b44e1"
+down_revision = "0bd1e89f2a6f"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table(
+        "production_schedule_version", schema=None
+    ) as batch_op:
+        batch_op.drop_constraint(
+            batch_op.f(
+                "production_schedule_version_production_schedule_from_fkey"
+            ),
+            type_="foreignkey",
+        )
+        batch_op.drop_constraint(
+            batch_op.f("production_schedule_version_project_id_fkey"),
+            type_="foreignkey",
+        )
+        batch_op.create_foreign_key(
+            None, "project", ["project_id"], ["id"], ondelete="CASCADE"
+        )
+        batch_op.create_foreign_key(
+            None,
+            "production_schedule_version",
+            ["production_schedule_from"],
+            ["id"],
+            ondelete="CASCADE",
+        )
+
+    with op.batch_alter_table(
+        "production_schedule_version_task_link", schema=None
+    ) as batch_op:
+        batch_op.drop_constraint(
+            batch_op.f(
+                "production_schedule_version_t_production_schedule_version__fkey"
+            ),
+            type_="foreignkey",
+        )
+        batch_op.drop_constraint(
+            batch_op.f("production_schedule_version_task_link_task_id_fkey"),
+            type_="foreignkey",
+        )
+        batch_op.create_foreign_key(
+            None,
+            "production_schedule_version",
+            ["production_schedule_version_id"],
+            ["id"],
+            ondelete="CASCADE",
+        )
+        batch_op.create_foreign_key(
+            None, "task", ["task_id"], ["id"], ondelete="CASCADE"
+        )
+
+    with op.batch_alter_table(
+        "production_schedule_version_task_link_person_link", schema=None
+    ) as batch_op:
+        batch_op.drop_constraint(
+            batch_op.f(
+                "production_schedule_version_task_link_person_lin_person_id_fkey"
+            ),
+            type_="foreignkey",
+        )
+        batch_op.drop_constraint(
+            batch_op.f(
+                "production_schedule_version__production_schedule_version__fkey1"
+            ),
+            type_="foreignkey",
+        )
+        batch_op.create_foreign_key(
+            None,
+            "production_schedule_version_task_link",
+            ["production_schedule_version_task_link_id"],
+            ["id"],
+            ondelete="CASCADE",
+        )
+        batch_op.create_foreign_key(
+            None, "person", ["person_id"], ["id"], ondelete="CASCADE"
+        )
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table(
+        "production_schedule_version_task_link_person_link", schema=None
+    ) as batch_op:
+        batch_op.drop_constraint(
+            batch_op.f(
+                "production_schedule_version_task_link_person_lin_person_id_fkey"
+            ),
+            type_="foreignkey",
+        )
+        batch_op.drop_constraint(
+            batch_op.f(
+                "production_schedule_version__production_schedule_version__fkey1"
+            ),
+            type_="foreignkey",
+        )
+        batch_op.create_foreign_key(
+            batch_op.f(
+                "production_schedule_version__production_schedule_version__fkey1"
+            ),
+            "production_schedule_version_task_link",
+            ["production_schedule_version_task_link_id"],
+            ["id"],
+        )
+        batch_op.create_foreign_key(
+            batch_op.f(
+                "production_schedule_version_task_link_person_lin_person_id_fkey"
+            ),
+            "person",
+            ["person_id"],
+            ["id"],
+        )
+
+    with op.batch_alter_table(
+        "production_schedule_version_task_link", schema=None
+    ) as batch_op:
+        batch_op.drop_constraint(
+            batch_op.f(
+                "production_schedule_version_t_production_schedule_version__fkey"
+            ),
+            type_="foreignkey",
+        )
+        batch_op.drop_constraint(
+            batch_op.f("production_schedule_version_task_link_task_id_fkey"),
+            type_="foreignkey",
+        )
+        batch_op.create_foreign_key(
+            batch_op.f("production_schedule_version_task_link_task_id_fkey"),
+            "task",
+            ["task_id"],
+            ["id"],
+        )
+        batch_op.create_foreign_key(
+            batch_op.f(
+                "production_schedule_version_t_production_schedule_version__fkey"
+            ),
+            "production_schedule_version",
+            ["production_schedule_version_id"],
+            ["id"],
+        )
+
+    with op.batch_alter_table(
+        "production_schedule_version", schema=None
+    ) as batch_op:
+        batch_op.drop_constraint(
+            batch_op.f(
+                "production_schedule_version_production_schedule_from_fkey"
+            ),
+            type_="foreignkey",
+        )
+        batch_op.drop_constraint(
+            batch_op.f("production_schedule_version_project_id_fkey"),
+            type_="foreignkey",
+        )
+        batch_op.create_foreign_key(
+            batch_op.f("production_schedule_version_project_id_fkey"),
+            "project",
+            ["project_id"],
+            ["id"],
+        )
+        batch_op.create_foreign_key(
+            batch_op.f(
+                "production_schedule_version_production_schedule_from_fkey"
+            ),
+            "production_schedule_version",
+            ["production_schedule_from"],
+            ["id"],
+        )
+
+    # ### end Alembic commands ###

zou/migrations/versions/4bd9bfb73f11_add_fields_to_the_software_table.py

@@ -0,0 +1,49 @@
+"""add fields to the software table
+
+Revision ID: 4bd9bfb73f11
+Revises: 4d585b6956f2
+Create Date: 2025-07-14 12:07:08.700862
+
+"""
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = "4bd9bfb73f11"
+down_revision = "4d585b6956f2"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("salary_scale", schema=None) as batch_op:
+        batch_op.alter_column(
+            "salary", existing_type=sa.INTEGER(), nullable=False
+        )
+
+    with op.batch_alter_table("software", schema=None) as batch_op:
+        batch_op.add_column(
+            sa.Column("monthly_cost", sa.Integer(), nullable=True)
+        )
+        batch_op.add_column(
+            sa.Column("inventory_amount", sa.Integer(), 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.drop_column("inventory_amount")
+        batch_op.drop_column("monthly_cost")
+
+    with op.batch_alter_table("salary_scale", schema=None) as batch_op:
+        batch_op.alter_column(
+            "salary", existing_type=sa.INTEGER(), nullable=True
+        )
+
+    # ### end Alembic commands ###

zou/migrations/versions/5f715f2b6348_add_new_table_productionscheduleversion.py

@@ -0,0 +1,128 @@
+"""Add new table ProductionScheduleVersion
+
+Revision ID: 5f715f2b6348
+Revises: dde6be40f54f
+Create Date: 2025-07-11 03:57:29.859765
+
+"""
+
+from alembic import op
+import sqlalchemy as sa
+import sqlalchemy_utils
+import sqlalchemy_utils
+import uuid
+
+# revision identifiers, used by Alembic.
+revision = "5f715f2b6348"
+down_revision = "dde6be40f54f"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table(
+        "production_schedule_version",
+        sa.Column("name", sa.String(length=80), nullable=False),
+        sa.Column(
+            "project_id",
+            sqlalchemy_utils.types.uuid.UUIDType(binary=False),
+            default=uuid.uuid4,
+            nullable=False,
+        ),
+        sa.Column(
+            "production_schedule_from",
+            sqlalchemy_utils.types.uuid.UUIDType(binary=False),
+            default=uuid.uuid4,
+            nullable=True,
+        ),
+        sa.Column("locked", sa.Boolean(), nullable=True),
+        sa.Column("canceled", sa.Boolean(), nullable=True),
+        sa.Column(
+            "id",
+            sqlalchemy_utils.types.uuid.UUIDType(binary=False),
+            default=uuid.uuid4,
+            nullable=False,
+        ),
+        sa.Column("created_at", sa.DateTime(), nullable=True),
+        sa.Column("updated_at", sa.DateTime(), nullable=True),
+        sa.ForeignKeyConstraint(
+            ["production_schedule_from"],
+            ["production_schedule_version.id"],
+        ),
+        sa.ForeignKeyConstraint(
+            ["project_id"],
+            ["project.id"],
+        ),
+        sa.PrimaryKeyConstraint("id"),
+    )
+    with op.batch_alter_table(
+        "production_schedule_version", schema=None
+    ) as batch_op:
+        batch_op.create_index(
+            batch_op.f(
+                "ix_production_schedule_version_production_schedule_from"
+            ),
+            ["production_schedule_from"],
+            unique=False,
+        )
+        batch_op.create_index(
+            batch_op.f("ix_production_schedule_version_project_id"),
+            ["project_id"],
+            unique=False,
+        )
+
+    op.create_table(
+        "production_schedule_version_task_link",
+        sa.Column(
+            "production_schedule_version_id",
+            sqlalchemy_utils.types.uuid.UUIDType(binary=False),
+            default=uuid.uuid4,
+            nullable=False,
+        ),
+        sa.Column(
+            "task_id",
+            sqlalchemy_utils.types.uuid.UUIDType(binary=False),
+            default=uuid.uuid4,
+            nullable=False,
+        ),
+        sa.Column("start_date", sa.DateTime(), nullable=True),
+        sa.Column("due_date", sa.DateTime(), nullable=True),
+        sa.Column(
+            "id",
+            sqlalchemy_utils.types.uuid.UUIDType(binary=False),
+            default=uuid.uuid4,
+            nullable=False,
+        ),
+        sa.Column("created_at", sa.DateTime(), nullable=True),
+        sa.Column("updated_at", sa.DateTime(), nullable=True),
+        sa.ForeignKeyConstraint(
+            ["production_schedule_version_id"],
+            ["production_schedule_version.id"],
+        ),
+        sa.ForeignKeyConstraint(
+            ["task_id"],
+            ["task.id"],
+        ),
+        sa.PrimaryKeyConstraint("id"),
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table("production_schedule_version_task_link")
+    with op.batch_alter_table(
+        "production_schedule_version", schema=None
+    ) as batch_op:
+        batch_op.drop_index(
+            batch_op.f("ix_production_schedule_version_project_id")
+        )
+        batch_op.drop_index(
+            batch_op.f(
+                "ix_production_schedule_version_production_schedule_from"
+            )
+        )
+
+    op.drop_table("production_schedule_version")
+    # ### end Alembic commands ###

zou/migrations/versions/7a16258f2fab_add_currency_field_to_budgets.py

@@ -26,8 +26,6 @@ def upgrade():
 
 def downgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    with op.batch_alter_table("task", schema=None) as batch_op:
-        batch_op.alter_column(
-            "difficulty", existing_type=sa.INTEGER(), nullable=True
-        )
+    with op.batch_alter_table("budget", schema=None) as batch_op:
+        batch_op.drop_column("currency")
     # ### end Alembic commands ###