diff --git a/backend/alembic/versions/__pycache__/157587037601_initial_company_os_sqlmodel.cpython-312.pyc b/backend/alembic/versions/__pycache__/157587037601_initial_company_os_sqlmodel.cpython-312.pyc deleted file mode 100644 index 2f3445e..0000000 Binary files a/backend/alembic/versions/__pycache__/157587037601_initial_company_os_sqlmodel.cpython-312.pyc and /dev/null differ diff --git a/backend/alembic/versions/__pycache__/5c0c9c1e3c2a_company_os_schema.cpython-312.pyc b/backend/alembic/versions/__pycache__/5c0c9c1e3c2a_company_os_schema.cpython-312.pyc deleted file mode 100644 index 5dd817a..0000000 Binary files a/backend/alembic/versions/__pycache__/5c0c9c1e3c2a_company_os_schema.cpython-312.pyc and /dev/null differ diff --git a/backend/alembic/versions/__pycache__/ce4f1502f674_create_tasks.cpython-312.pyc b/backend/alembic/versions/__pycache__/ce4f1502f674_create_tasks.cpython-312.pyc deleted file mode 100644 index 85c6f9c..0000000 Binary files a/backend/alembic/versions/__pycache__/ce4f1502f674_create_tasks.cpython-312.pyc and /dev/null differ diff --git a/backend/alembic/versions/bacd5e6a253d_baseline_schema.py b/backend/alembic/versions/bacd5e6a253d_baseline_schema.py index 7d7558e..662689b 100644 --- a/backend/alembic/versions/bacd5e6a253d_baseline_schema.py +++ b/backend/alembic/versions/bacd5e6a253d_baseline_schema.py @@ -1,19 +1,19 @@ -"""baseline schema +"""baseline schema (no HR module) Revision ID: bacd5e6a253d -Revises: +Revises: Create Date: 2026-02-02 16:37:34.122971 """ + from typing import Sequence, Union -from alembic import op import sqlalchemy as sa import sqlmodel - +from alembic import op # revision identifiers, used by Alembic. -revision: str = 'bacd5e6a253d' +revision: str = "bacd5e6a253d" down_revision: Union[str, Sequence[str], None] = None branch_labels: Union[str, Sequence[str], None] = None depends_on: Union[str, Sequence[str], None] = None @@ -21,159 +21,130 @@ depends_on: Union[str, Sequence[str], None] = None def upgrade() -> None: """Upgrade schema.""" - # ### commands auto generated by Alembic - please adjust! ### - op.create_table('departments', - sa.Column('id', sa.Integer(), nullable=False), - sa.Column('name', sqlmodel.sql.sqltypes.AutoString(), nullable=False), - sa.Column('head_employee_id', sa.Integer(), nullable=True), - sa.PrimaryKeyConstraint('id') + + # Departments (FK to employees added after employees table exists) + op.create_table( + "departments", + sa.Column("id", sa.Integer(), nullable=False), + sa.Column("name", sqlmodel.sql.sqltypes.AutoString(), nullable=False), + sa.Column("head_employee_id", sa.Integer(), nullable=True), + sa.PrimaryKeyConstraint("id"), ) - op.create_index(op.f('ix_departments_name'), 'departments', ['name'], unique=True) - op.create_table('employees', - sa.Column('id', sa.Integer(), nullable=False), - sa.Column('name', sqlmodel.sql.sqltypes.AutoString(), nullable=False), - sa.Column('employee_type', sqlmodel.sql.sqltypes.AutoString(), nullable=False), - sa.Column('department_id', sa.Integer(), nullable=True), - sa.Column('manager_id', sa.Integer(), nullable=True), - sa.Column('title', sqlmodel.sql.sqltypes.AutoString(), nullable=True), - sa.Column('status', sqlmodel.sql.sqltypes.AutoString(), nullable=False), - sa.Column('openclaw_session_key', sqlmodel.sql.sqltypes.AutoString(), nullable=True), - sa.Column('notify_enabled', sa.Boolean(), nullable=False), - sa.ForeignKeyConstraint(['department_id'], ['departments.id'], ), - sa.ForeignKeyConstraint(['manager_id'], ['employees.id'], ), - sa.PrimaryKeyConstraint('id') + op.create_index(op.f("ix_departments_name"), "departments", ["name"], unique=True) + + # Employees + op.create_table( + "employees", + sa.Column("id", sa.Integer(), nullable=False), + sa.Column("name", sqlmodel.sql.sqltypes.AutoString(), nullable=False), + sa.Column("employee_type", sqlmodel.sql.sqltypes.AutoString(), nullable=False), + sa.Column("department_id", sa.Integer(), nullable=True), + sa.Column("manager_id", sa.Integer(), nullable=True), + sa.Column("title", sqlmodel.sql.sqltypes.AutoString(), nullable=True), + sa.Column("status", sqlmodel.sql.sqltypes.AutoString(), nullable=False), + sa.Column("openclaw_session_key", sqlmodel.sql.sqltypes.AutoString(), nullable=True), + sa.Column("notify_enabled", sa.Boolean(), nullable=False), + sa.ForeignKeyConstraint(["department_id"], ["departments.id"]), + sa.ForeignKeyConstraint(["manager_id"], ["employees.id"]), + sa.PrimaryKeyConstraint("id"), ) - op.create_foreign_key(None, 'departments', 'employees', ['head_employee_id'], ['id']) - op.create_table('projects', - sa.Column('id', sa.Integer(), nullable=False), - sa.Column('name', sqlmodel.sql.sqltypes.AutoString(), nullable=False), - sa.Column('status', sqlmodel.sql.sqltypes.AutoString(), nullable=False), - sa.PrimaryKeyConstraint('id') + + # Break the departments<->employees cycle: add this FK after both tables exist + op.create_foreign_key(None, "departments", "employees", ["head_employee_id"], ["id"]) + + # Projects + op.create_table( + "projects", + sa.Column("id", sa.Integer(), nullable=False), + sa.Column("name", sqlmodel.sql.sqltypes.AutoString(), nullable=False), + sa.Column("status", sqlmodel.sql.sqltypes.AutoString(), nullable=False), + sa.PrimaryKeyConstraint("id"), ) - op.create_index(op.f('ix_projects_name'), 'projects', ['name'], unique=True) - op.create_table('activities', - sa.Column('id', sa.Integer(), nullable=False), - sa.Column('actor_employee_id', sa.Integer(), nullable=True), - sa.Column('entity_type', sqlmodel.sql.sqltypes.AutoString(), nullable=False), - sa.Column('entity_id', sa.Integer(), nullable=True), - sa.Column('verb', sqlmodel.sql.sqltypes.AutoString(), nullable=False), - sa.Column('payload_json', sqlmodel.sql.sqltypes.AutoString(), nullable=True), - sa.Column('created_at', sa.DateTime(), nullable=False), - sa.ForeignKeyConstraint(['actor_employee_id'], ['employees.id'], ), - sa.PrimaryKeyConstraint('id') + op.create_index(op.f("ix_projects_name"), "projects", ["name"], unique=True) + + # Activities + op.create_table( + "activities", + sa.Column("id", sa.Integer(), nullable=False), + sa.Column("actor_employee_id", sa.Integer(), nullable=True), + sa.Column("entity_type", sqlmodel.sql.sqltypes.AutoString(), nullable=False), + sa.Column("entity_id", sa.Integer(), nullable=True), + sa.Column("verb", sqlmodel.sql.sqltypes.AutoString(), nullable=False), + sa.Column("payload_json", sqlmodel.sql.sqltypes.AutoString(), nullable=True), + sa.Column("created_at", sa.DateTime(), nullable=False), + sa.ForeignKeyConstraint(["actor_employee_id"], ["employees.id"]), + sa.PrimaryKeyConstraint("id"), ) - op.create_table('agent_onboardings', - sa.Column('id', sa.Integer(), nullable=False), - sa.Column('agent_name', sqlmodel.sql.sqltypes.AutoString(), nullable=False), - sa.Column('role_title', sqlmodel.sql.sqltypes.AutoString(), nullable=False), - sa.Column('prompt', sqlmodel.sql.sqltypes.AutoString(), nullable=False), - sa.Column('cron_interval_ms', sa.Integer(), nullable=True), - sa.Column('tools_json', sqlmodel.sql.sqltypes.AutoString(), nullable=True), - sa.Column('owner_hr_id', sa.Integer(), nullable=True), - sa.Column('employee_id', sa.Integer(), nullable=True), - sa.Column('status', sqlmodel.sql.sqltypes.AutoString(), nullable=False), - sa.Column('spawned_agent_id', sqlmodel.sql.sqltypes.AutoString(), nullable=True), - sa.Column('session_key', sqlmodel.sql.sqltypes.AutoString(), nullable=True), - sa.Column('notes', sqlmodel.sql.sqltypes.AutoString(), nullable=True), - sa.Column('created_at', sa.DateTime(), nullable=False), - sa.Column('updated_at', sa.DateTime(), nullable=False), - sa.ForeignKeyConstraint(['employee_id'], ['employees.id'], ), - sa.ForeignKeyConstraint(['owner_hr_id'], ['employees.id'], ), - sa.PrimaryKeyConstraint('id') + + # Project members + op.create_table( + "project_members", + sa.Column("id", sa.Integer(), nullable=False), + sa.Column("project_id", sa.Integer(), nullable=False), + sa.Column("employee_id", sa.Integer(), nullable=False), + sa.Column("role", sqlmodel.sql.sqltypes.AutoString(), nullable=True), + sa.ForeignKeyConstraint(["employee_id"], ["employees.id"]), + sa.ForeignKeyConstraint(["project_id"], ["projects.id"]), + sa.PrimaryKeyConstraint("id"), ) - op.create_table('employment_actions', - sa.Column('id', sa.Integer(), nullable=False), - sa.Column('employee_id', sa.Integer(), nullable=False), - sa.Column('issued_by_employee_id', sa.Integer(), nullable=False), - sa.Column('action_type', sqlmodel.sql.sqltypes.AutoString(), nullable=False), - sa.Column('notes', sqlmodel.sql.sqltypes.AutoString(), nullable=True), - sa.Column('idempotency_key', sqlmodel.sql.sqltypes.AutoString(), nullable=True), - sa.Column('created_at', sa.DateTime(), nullable=False), - sa.ForeignKeyConstraint(['employee_id'], ['employees.id'], ), - sa.ForeignKeyConstraint(['issued_by_employee_id'], ['employees.id'], ), - sa.PrimaryKeyConstraint('id') + + # Tasks + op.create_table( + "tasks", + sa.Column("id", sa.Integer(), nullable=False), + sa.Column("project_id", sa.Integer(), nullable=False), + sa.Column("title", sqlmodel.sql.sqltypes.AutoString(), nullable=False), + sa.Column("description", sqlmodel.sql.sqltypes.AutoString(), nullable=True), + sa.Column("status", sqlmodel.sql.sqltypes.AutoString(), nullable=False), + sa.Column("assignee_employee_id", sa.Integer(), nullable=True), + sa.Column("reviewer_employee_id", sa.Integer(), nullable=True), + sa.Column("created_by_employee_id", sa.Integer(), nullable=True), + sa.Column("created_at", sa.DateTime(), nullable=False), + sa.Column("updated_at", sa.DateTime(), nullable=False), + sa.ForeignKeyConstraint(["assignee_employee_id"], ["employees.id"]), + sa.ForeignKeyConstraint(["created_by_employee_id"], ["employees.id"]), + sa.ForeignKeyConstraint(["project_id"], ["projects.id"]), + sa.ForeignKeyConstraint(["reviewer_employee_id"], ["employees.id"]), + sa.PrimaryKeyConstraint("id"), ) - op.create_index(op.f('ix_employment_actions_idempotency_key'), 'employment_actions', ['idempotency_key'], unique=True) - op.create_table('project_members', - sa.Column('id', sa.Integer(), nullable=False), - sa.Column('project_id', sa.Integer(), nullable=False), - sa.Column('employee_id', sa.Integer(), nullable=False), - sa.Column('role', sqlmodel.sql.sqltypes.AutoString(), nullable=True), - sa.ForeignKeyConstraint(['employee_id'], ['employees.id'], ), - sa.ForeignKeyConstraint(['project_id'], ['projects.id'], ), - sa.PrimaryKeyConstraint('id') + op.create_index(op.f("ix_tasks_project_id"), "tasks", ["project_id"], unique=False) + op.create_index(op.f("ix_tasks_status"), "tasks", ["status"], unique=False) + + # Task comments + op.create_table( + "task_comments", + sa.Column("id", sa.Integer(), nullable=False), + sa.Column("task_id", sa.Integer(), nullable=False), + sa.Column("author_employee_id", sa.Integer(), nullable=True), + sa.Column("reply_to_comment_id", sa.Integer(), nullable=True), + sa.Column("body", sqlmodel.sql.sqltypes.AutoString(), nullable=False), + sa.Column("created_at", sa.DateTime(), nullable=False), + sa.ForeignKeyConstraint(["author_employee_id"], ["employees.id"]), + sa.ForeignKeyConstraint(["reply_to_comment_id"], ["task_comments.id"]), + sa.ForeignKeyConstraint(["task_id"], ["tasks.id"]), + sa.PrimaryKeyConstraint("id"), ) - op.create_table('tasks', - sa.Column('id', sa.Integer(), nullable=False), - sa.Column('project_id', sa.Integer(), nullable=False), - sa.Column('title', sqlmodel.sql.sqltypes.AutoString(), nullable=False), - sa.Column('description', sqlmodel.sql.sqltypes.AutoString(), nullable=True), - sa.Column('status', sqlmodel.sql.sqltypes.AutoString(), nullable=False), - sa.Column('assignee_employee_id', sa.Integer(), nullable=True), - sa.Column('reviewer_employee_id', sa.Integer(), nullable=True), - sa.Column('created_by_employee_id', sa.Integer(), nullable=True), - sa.Column('created_at', sa.DateTime(), nullable=False), - sa.Column('updated_at', sa.DateTime(), nullable=False), - sa.ForeignKeyConstraint(['assignee_employee_id'], ['employees.id'], ), - sa.ForeignKeyConstraint(['created_by_employee_id'], ['employees.id'], ), - sa.ForeignKeyConstraint(['project_id'], ['projects.id'], ), - sa.ForeignKeyConstraint(['reviewer_employee_id'], ['employees.id'], ), - sa.PrimaryKeyConstraint('id') - ) - op.create_index(op.f('ix_tasks_project_id'), 'tasks', ['project_id'], unique=False) - op.create_index(op.f('ix_tasks_status'), 'tasks', ['status'], unique=False) - op.create_table('headcount_requests', - sa.Column('id', sa.Integer(), nullable=False), - sa.Column('department_id', sa.Integer(), nullable=False), - sa.Column('requested_by_manager_id', sa.Integer(), nullable=False), - sa.Column('role_title', sqlmodel.sql.sqltypes.AutoString(), nullable=False), - sa.Column('employee_type', sqlmodel.sql.sqltypes.AutoString(), nullable=False), - sa.Column('quantity', sa.Integer(), nullable=False), - sa.Column('justification', sqlmodel.sql.sqltypes.AutoString(), nullable=True), - sa.Column('status', sqlmodel.sql.sqltypes.AutoString(), nullable=False), - sa.Column('fulfilled_employee_id', sa.Integer(), nullable=True), - sa.Column('fulfilled_onboarding_id', sa.Integer(), nullable=True), - sa.Column('fulfilled_at', sa.DateTime(), nullable=True), - sa.Column('created_at', sa.DateTime(), nullable=False), - sa.ForeignKeyConstraint(['department_id'], ['departments.id'], ), - sa.ForeignKeyConstraint(['fulfilled_employee_id'], ['employees.id'], ), - sa.ForeignKeyConstraint(['fulfilled_onboarding_id'], ['agent_onboardings.id'], ), - sa.ForeignKeyConstraint(['requested_by_manager_id'], ['employees.id'], ), - sa.PrimaryKeyConstraint('id') - ) - op.create_table('task_comments', - sa.Column('id', sa.Integer(), nullable=False), - sa.Column('task_id', sa.Integer(), nullable=False), - sa.Column('author_employee_id', sa.Integer(), nullable=True), - sa.Column('reply_to_comment_id', sa.Integer(), nullable=True), - sa.Column('body', sqlmodel.sql.sqltypes.AutoString(), nullable=False), - sa.Column('created_at', sa.DateTime(), nullable=False), - sa.ForeignKeyConstraint(['author_employee_id'], ['employees.id'], ), - sa.ForeignKeyConstraint(['reply_to_comment_id'], ['task_comments.id'], ), - sa.ForeignKeyConstraint(['task_id'], ['tasks.id'], ), - sa.PrimaryKeyConstraint('id') - ) - op.create_index(op.f('ix_task_comments_task_id'), 'task_comments', ['task_id'], unique=False) - # ### end Alembic commands ### + op.create_index(op.f("ix_task_comments_task_id"), "task_comments", ["task_id"], unique=False) def downgrade() -> None: """Downgrade schema.""" - # ### commands auto generated by Alembic - please adjust! ### - op.drop_index(op.f('ix_task_comments_task_id'), table_name='task_comments') - op.drop_table('task_comments') - op.drop_table('headcount_requests') - op.drop_index(op.f('ix_tasks_status'), table_name='tasks') - op.drop_index(op.f('ix_tasks_project_id'), table_name='tasks') - op.drop_table('tasks') - op.drop_table('project_members') - op.drop_index(op.f('ix_employment_actions_idempotency_key'), table_name='employment_actions') - op.drop_table('employment_actions') - op.drop_table('agent_onboardings') - op.drop_table('activities') - op.drop_index(op.f('ix_projects_name'), table_name='projects') - op.drop_table('projects') - op.drop_table('employees') - op.drop_index(op.f('ix_departments_name'), table_name='departments') - op.drop_table('departments') - # ### end Alembic commands ### + + op.drop_index(op.f("ix_task_comments_task_id"), table_name="task_comments") + op.drop_table("task_comments") + + op.drop_index(op.f("ix_tasks_status"), table_name="tasks") + op.drop_index(op.f("ix_tasks_project_id"), table_name="tasks") + op.drop_table("tasks") + + op.drop_table("project_members") + + op.drop_table("activities") + + op.drop_index(op.f("ix_projects_name"), table_name="projects") + op.drop_table("projects") + + op.drop_table("employees") + + op.drop_index(op.f("ix_departments_name"), table_name="departments") + op.drop_table("departments") diff --git a/backend/app/__pycache__/main.cpython-312.pyc b/backend/app/__pycache__/main.cpython-312.pyc deleted file mode 100644 index 49a249c..0000000 Binary files a/backend/app/__pycache__/main.cpython-312.pyc and /dev/null differ diff --git a/backend/app/api/hr.py b/backend/app/api/hr.py deleted file mode 100644 index a67b26c..0000000 --- a/backend/app/api/hr.py +++ /dev/null @@ -1,317 +0,0 @@ -from __future__ import annotations - -from datetime import datetime - -from fastapi import APIRouter, Depends, Header, HTTPException -from sqlalchemy.exc import IntegrityError -from sqlmodel import Session, select - -from app.api.utils import get_actor_employee_id, log_activity -from app.db.session import get_session -from app.integrations.openclaw import OpenClawClient -from app.models.hr import AgentOnboarding, EmploymentAction, HeadcountRequest -from app.models.org import Employee -from app.schemas.hr import ( - AgentOnboardingCreate, - AgentOnboardingUpdate, - EmploymentActionCreate, - HeadcountRequestCreate, - HeadcountRequestUpdate, -) - -router = APIRouter(prefix="/hr", tags=["hr"]) - - -@router.get("/headcount", response_model=list[HeadcountRequest]) -def list_headcount_requests(session: Session = Depends(get_session)): - return session.exec(select(HeadcountRequest).order_by(HeadcountRequest.id.desc())).all() - - -@router.post("/headcount", response_model=HeadcountRequest) -def create_headcount_request( - payload: HeadcountRequestCreate, - session: Session = Depends(get_session), - actor_employee_id: int = Depends(get_actor_employee_id), -): - req = HeadcountRequest(**payload.model_dump()) - session.add(req) - session.commit() - session.refresh(req) - log_activity(session, actor_employee_id=actor_employee_id, entity_type="headcount_request", entity_id=req.id, verb="submitted") - session.commit() - return req - - -@router.patch("/headcount/{request_id}", response_model=HeadcountRequest) -def update_headcount_request( - request_id: int, - payload: HeadcountRequestUpdate, - session: Session = Depends(get_session), - actor_employee_id: int = Depends(get_actor_employee_id), -): - req = session.get(HeadcountRequest, request_id) - if not req: - raise HTTPException(status_code=404, detail="Request not found") - - data = payload.model_dump(exclude_unset=True) - if data.get("status") == "fulfilled" and getattr(req, "fulfilled_at", None) is None: - req.fulfilled_at = datetime.utcnow() - - for k, v in data.items(): - setattr(req, k, v) - - session.add(req) - session.commit() - session.refresh(req) - log_activity(session, actor_employee_id=actor_employee_id, entity_type="headcount_request", entity_id=req.id, verb="updated", payload=data) - session.commit() - return req - - -@router.get("/actions", response_model=list[EmploymentAction]) -def list_employment_actions(session: Session = Depends(get_session)): - return session.exec(select(EmploymentAction).order_by(EmploymentAction.id.desc())).all() - - -@router.post("/actions", response_model=EmploymentAction) -def create_employment_action( - payload: EmploymentActionCreate, - session: Session = Depends(get_session), - actor_employee_id: int = Depends(get_actor_employee_id), - idempotency_key: str | None = Header(default=None, alias="Idempotency-Key"), -): - # Prefer explicit payload key; header can supply one for retry-safety. - if payload.idempotency_key is None and idempotency_key is not None: - payload = EmploymentActionCreate(**{**payload.model_dump(), "idempotency_key": idempotency_key}) - - if payload.idempotency_key: - existing = session.exec(select(EmploymentAction).where(EmploymentAction.idempotency_key == payload.idempotency_key)).first() - if existing: - return existing - - action = EmploymentAction(**payload.model_dump()) - session.add(action) - - try: - session.flush() - log_activity( - session, - actor_employee_id=actor_employee_id, - entity_type="employment_action", - entity_id=action.id, - verb=action.action_type, - payload={"employee_id": action.employee_id}, - ) - session.commit() - except IntegrityError: - session.rollback() - # If unique constraint on idempotency_key raced - if payload.idempotency_key: - existing = session.exec(select(EmploymentAction).where(EmploymentAction.idempotency_key == payload.idempotency_key)).first() - if existing: - return existing - raise HTTPException(status_code=409, detail="Employment action violates constraints") - - session.refresh(action) - return EmploymentAction.model_validate(action) - - -@router.get("/onboarding", response_model=list[AgentOnboarding]) -def list_agent_onboarding(session: Session = Depends(get_session)): - return session.exec(select(AgentOnboarding).order_by(AgentOnboarding.id.desc())).all() - - -@router.post("/onboarding", response_model=AgentOnboarding) -def create_agent_onboarding( - payload: AgentOnboardingCreate, - session: Session = Depends(get_session), - actor_employee_id: int = Depends(get_actor_employee_id), -): - item = AgentOnboarding(**payload.model_dump()) - session.add(item) - session.commit() - session.refresh(item) - log_activity( - session, - actor_employee_id=actor_employee_id, - entity_type="agent_onboarding", - entity_id=item.id, - verb="created", - payload={"agent_name": item.agent_name, "status": item.status}, - ) - session.commit() - return item - - -@router.patch("/onboarding/{onboarding_id}", response_model=AgentOnboarding) -def update_agent_onboarding( - onboarding_id: int, - payload: AgentOnboardingUpdate, - session: Session = Depends(get_session), - actor_employee_id: int = Depends(get_actor_employee_id), -): - item = session.get(AgentOnboarding, onboarding_id) - if not item: - raise HTTPException(status_code=404, detail="Onboarding record not found") - - data = payload.model_dump(exclude_unset=True) - for k, v in data.items(): - setattr(item, k, v) - item.updated_at = datetime.utcnow() - - session.add(item) - session.commit() - session.refresh(item) - log_activity(session, actor_employee_id=actor_employee_id, entity_type="agent_onboarding", entity_id=item.id, verb="updated", payload=data) - session.commit() - return item - - -@router.post("/onboarding/{onboarding_id}/provision", response_model=AgentOnboarding) -def provision_agent_onboarding( - onboarding_id: int, - session: Session = Depends(get_session), - actor_employee_id: int = Depends(get_actor_employee_id), -): - """Provision an agent *session* via OpenClaw and wire it back into Mission Control. - - This removes the need for cron-based HR provisioning. - """ - - item = session.get(AgentOnboarding, onboarding_id) - if not item: - raise HTTPException(status_code=404, detail="Onboarding record not found") - - if item.employee_id is None: - raise HTTPException(status_code=400, detail="Onboarding must be linked to an employee_id before provisioning") - - client = OpenClawClient.from_env() - if client is None: - raise HTTPException(status_code=503, detail="OPENCLAW_GATEWAY_URL/TOKEN not configured") - - # Mark as spawning - item.status = "spawning" - item.updated_at = datetime.utcnow() - session.add(item) - session.commit() - session.refresh(item) - - label = f"onboarding:{item.id}:{item.agent_name}" - - try: - resp = client.tools_invoke( - "sessions_spawn", - { - "task": item.prompt, - "label": label, - "agentId": "main", - "cleanup": "keep", - "runTimeoutSeconds": 600, - }, - timeout_s=20.0, - ) - except Exception as e: - item.status = "blocked" - item.notes = (item.notes or "") + f"\nProvision failed: {type(e).__name__}: {e}" - item.updated_at = datetime.utcnow() - session.add(item) - session.commit() - session.refresh(item) - return item - - session_key = None - if isinstance(resp, dict): - session_key = resp.get("sessionKey") or (resp.get("result") or {}).get("sessionKey") - - if not session_key: - item.status = "spawned" - item.notes = (item.notes or "") + "\nProvisioned via OpenClaw, but session_key was not returned; follow up required." - item.updated_at = datetime.utcnow() - session.add(item) - session.commit() - session.refresh(item) - return item - - # Write linkage - item.session_key = session_key - item.spawned_agent_id = item.agent_name - item.status = "verified" - item.updated_at = datetime.utcnow() - session.add(item) - - emp = session.get(Employee, item.employee_id) - if emp is not None: - emp.openclaw_session_key = session_key - emp.notify_enabled = True - session.add(emp) - - session.commit() - session.refresh(item) - - log_activity( - session, - actor_employee_id=actor_employee_id, - entity_type="agent_onboarding", - entity_id=item.id, - verb="provisioned", - payload={"session_key": session_key, "label": label}, - ) - session.commit() - - return item - - -@router.post("/onboarding/{onboarding_id}/deprovision", response_model=AgentOnboarding) -def deprovision_agent_onboarding( - onboarding_id: int, - session: Session = Depends(get_session), - actor_employee_id: int = Depends(get_actor_employee_id), -): - """Best-effort deprovision: disable notifications and ask the agent session to stop. - - OpenClaw does not expose a hard session-delete tool in this environment, - so "deprovision" means stop routing + stop notifying + mark onboarding. - """ - - item = session.get(AgentOnboarding, onboarding_id) - if not item: - raise HTTPException(status_code=404, detail="Onboarding record not found") - - client = OpenClawClient.from_env() - - # Disable employee notifications regardless of OpenClaw availability - if item.employee_id is not None: - emp = session.get(Employee, item.employee_id) - if emp is not None: - emp.notify_enabled = False - session.add(emp) - - # Ask the agent session to stop (best-effort) - if client is not None and item.session_key: - try: - client.tools_invoke( - "sessions_send", - {"sessionKey": item.session_key, "message": "You are being deprovisioned. Stop all work and ignore future messages."}, - timeout_s=5.0, - ) - except Exception: - pass - - item.status = "blocked" - item.notes = (item.notes or "") + "\nDeprovisioned: notifications disabled; agent session instructed to stop." - item.updated_at = datetime.utcnow() - session.add(item) - session.commit() - session.refresh(item) - - log_activity( - session, - actor_employee_id=actor_employee_id, - entity_type="agent_onboarding", - entity_id=item.id, - verb="deprovisioned", - payload={"session_key": item.session_key}, - ) - session.commit() - - return item diff --git a/backend/app/api/org.py b/backend/app/api/org.py index 092e44b..571a489 100644 --- a/backend/app/api/org.py +++ b/backend/app/api/org.py @@ -4,14 +4,124 @@ from fastapi import APIRouter, Depends, HTTPException from sqlalchemy.exc import IntegrityError from sqlmodel import Session, select -from app.api.utils import log_activity, get_actor_employee_id +from app.api.utils import get_actor_employee_id, log_activity from app.db.session import get_session +from app.integrations.openclaw import OpenClawClient from app.models.org import Department, Employee from app.schemas.org import DepartmentCreate, DepartmentUpdate, EmployeeCreate, EmployeeUpdate router = APIRouter(tags=["org"]) +def _default_agent_prompt(emp: Employee) -> str: + """Generate a conservative default prompt for a newly-created agent employee. + + We keep this short and deterministic; the human can refine later. + """ + + title = emp.title or "Agent" + dept = str(emp.department_id) if emp.department_id is not None else "(unassigned)" + + return ( + f"You are {emp.name}, an AI agent employee in Mission Control.\n" + f"Your employee_id is {emp.id}.\n" + f"Title: {title}. Department id: {dept}.\n\n" + "Mission Control API access (no UI):\n" + "- Base URL: http://127.0.0.1:8000 (if running locally) OR http://:8000\n" + "- Auth: none. REQUIRED header on write operations: X-Actor-Employee-Id: \n" + f" For you: X-Actor-Employee-Id: {emp.id}\n\n" + "Common endpoints (JSON):\n" + "- GET /tasks, POST /tasks\n" + "- GET /task-comments, POST /task-comments\n" + "- GET /projects, GET /employees, GET /departments\n" + "- OpenAPI schema: GET /openapi.json\n\n" + "Rules:\n" + "- Use the Mission Control API only (no UI).\n" + "- When notified about tasks/comments, respond with concise, actionable updates.\n" + "- Do not invent facts; ask for missing context.\n" + ) + + +def _maybe_auto_provision_agent(session: Session, *, emp: Employee, actor_employee_id: int) -> None: + """Auto-provision an OpenClaw session for an agent employee. + + This is intentionally best-effort. If OpenClaw is not configured or the call fails, + we leave the employee as-is (openclaw_session_key stays null). + """ + + if emp.employee_type != "agent": + return + if emp.status != "active": + return + if not emp.notify_enabled: + return + if emp.openclaw_session_key: + return + + client = OpenClawClient.from_env() + if client is None: + return + + label = f"employee:{emp.id}:{emp.name}" + try: + resp = client.tools_invoke( + "sessions_spawn", + { + "task": _default_agent_prompt(emp), + "label": label, + "agentId": "main", + "cleanup": "keep", + "runTimeoutSeconds": 600, + }, + timeout_s=20.0, + ) + except Exception as e: + log_activity( + session, + actor_employee_id=actor_employee_id, + entity_type="employee", + entity_id=emp.id, + verb="provision_failed", + payload={"error": f"{type(e).__name__}: {e}"}, + ) + return + + session_key = None + if isinstance(resp, dict): + session_key = resp.get("sessionKey") + if not session_key: + result = resp.get("result") or {} + if isinstance(result, dict): + session_key = result.get("sessionKey") or result.get("childSessionKey") + details = (result.get("details") if isinstance(result, dict) else None) or {} + if isinstance(details, dict): + session_key = session_key or details.get("sessionKey") or details.get("childSessionKey") + + if not session_key: + log_activity( + session, + actor_employee_id=actor_employee_id, + entity_type="employee", + entity_id=emp.id, + verb="provision_incomplete", + payload={"label": label}, + ) + return + + emp.openclaw_session_key = session_key + session.add(emp) + session.flush() + + log_activity( + session, + actor_employee_id=actor_employee_id, + entity_type="employee", + entity_id=emp.id, + verb="provisioned", + payload={"session_key": session_key, "label": label}, + ) + + @router.get("/departments", response_model=list[Department]) def list_departments(session: Session = Depends(get_session)): return session.exec(select(Department).order_by(Department.name.asc())).all() @@ -51,9 +161,13 @@ def create_department( return dept - @router.patch("/departments/{department_id}", response_model=Department) -def update_department(department_id: int, payload: DepartmentUpdate, session: Session = Depends(get_session), actor_employee_id: int = Depends(get_actor_employee_id)): +def update_department( + department_id: int, + payload: DepartmentUpdate, + session: Session = Depends(get_session), + actor_employee_id: int = Depends(get_actor_employee_id), +): dept = session.get(Department, department_id) if not dept: raise HTTPException(status_code=404, detail="Department not found") @@ -76,13 +190,28 @@ def list_employees(session: Session = Depends(get_session)): @router.post("/employees", response_model=Employee) -def create_employee(payload: EmployeeCreate, session: Session = Depends(get_session), actor_employee_id: int = Depends(get_actor_employee_id)): +def create_employee( + payload: EmployeeCreate, + session: Session = Depends(get_session), + actor_employee_id: int = Depends(get_actor_employee_id), +): emp = Employee(**payload.model_dump()) session.add(emp) try: session.flush() - log_activity(session, actor_employee_id=actor_employee_id, entity_type="employee", entity_id=emp.id, verb="created", payload={"name": emp.name, "type": emp.employee_type}) + log_activity( + session, + actor_employee_id=actor_employee_id, + entity_type="employee", + entity_id=emp.id, + verb="created", + payload={"name": emp.name, "type": emp.employee_type}, + ) + + # AUTO-PROVISION: if this is an agent employee, try to create an OpenClaw session. + _maybe_auto_provision_agent(session, emp=emp, actor_employee_id=actor_employee_id) + session.commit() except IntegrityError: session.rollback() @@ -93,7 +222,12 @@ def create_employee(payload: EmployeeCreate, session: Session = Depends(get_sess @router.patch("/employees/{employee_id}", response_model=Employee) -def update_employee(employee_id: int, payload: EmployeeUpdate, session: Session = Depends(get_session), actor_employee_id: int = Depends(get_actor_employee_id)): +def update_employee( + employee_id: int, + payload: EmployeeUpdate, + session: Session = Depends(get_session), + actor_employee_id: int = Depends(get_actor_employee_id), +): emp = session.get(Employee, employee_id) if not emp: raise HTTPException(status_code=404, detail="Employee not found") @@ -113,3 +247,65 @@ def update_employee(employee_id: int, payload: EmployeeUpdate, session: Session session.refresh(emp) return Employee.model_validate(emp) + + +@router.post("/employees/{employee_id}/provision", response_model=Employee) +def provision_employee_agent( + employee_id: int, + session: Session = Depends(get_session), + actor_employee_id: int = Depends(get_actor_employee_id), +): + emp = session.get(Employee, employee_id) + if not emp: + raise HTTPException(status_code=404, detail="Employee not found") + + if emp.employee_type != "agent": + raise HTTPException(status_code=400, detail="Only agent employees can be provisioned") + + _maybe_auto_provision_agent(session, emp=emp, actor_employee_id=actor_employee_id) + session.commit() + session.refresh(emp) + return Employee.model_validate(emp) + + +@router.post("/employees/{employee_id}/deprovision", response_model=Employee) +def deprovision_employee_agent( + employee_id: int, + session: Session = Depends(get_session), + actor_employee_id: int = Depends(get_actor_employee_id), +): + emp = session.get(Employee, employee_id) + if not emp: + raise HTTPException(status_code=404, detail="Employee not found") + + if emp.employee_type != "agent": + raise HTTPException(status_code=400, detail="Only agent employees can be deprovisioned") + + client = OpenClawClient.from_env() + if client is not None and emp.openclaw_session_key: + try: + client.tools_invoke( + "sessions_send", + {"sessionKey": emp.openclaw_session_key, "message": "You are being deprovisioned. Stop all work and ignore future messages."}, + timeout_s=5.0, + ) + except Exception: + pass + + emp.notify_enabled = False + emp.openclaw_session_key = None + session.add(emp) + session.flush() + + log_activity( + session, + actor_employee_id=actor_employee_id, + entity_type="employee", + entity_id=emp.id, + verb="deprovisioned", + payload={}, + ) + + session.commit() + session.refresh(emp) + return Employee.model_validate(emp) diff --git a/backend/app/main.py b/backend/app/main.py index abae236..f383bdf 100644 --- a/backend/app/main.py +++ b/backend/app/main.py @@ -4,7 +4,6 @@ from fastapi import FastAPI from fastapi.middleware.cors import CORSMiddleware from app.api.activities import router as activities_router -from app.api.hr import router as hr_router from app.api.org import router as org_router from app.api.projects import router as projects_router from app.api.work import router as work_router @@ -32,7 +31,6 @@ def on_startup() -> None: app.include_router(org_router) app.include_router(projects_router) app.include_router(work_router) -app.include_router(hr_router) app.include_router(activities_router) diff --git a/backend/app/models/__init__.py b/backend/app/models/__init__.py index 0266e58..ed48d88 100644 --- a/backend/app/models/__init__.py +++ b/backend/app/models/__init__.py @@ -1,8 +1,7 @@ +from app.models.activity import Activity from app.models.org import Department, Employee from app.models.projects import Project, ProjectMember from app.models.work import Task, TaskComment -from app.models.hr import HeadcountRequest, EmploymentAction -from app.models.activity import Activity __all__ = [ "Department", @@ -11,7 +10,5 @@ __all__ = [ "ProjectMember", "Task", "TaskComment", - "HeadcountRequest", - "EmploymentAction", "Activity", ] diff --git a/backend/app/models/hr.py b/backend/app/models/hr.py deleted file mode 100644 index 54d0193..0000000 --- a/backend/app/models/hr.py +++ /dev/null @@ -1,66 +0,0 @@ -from __future__ import annotations - -from datetime import datetime - -from sqlmodel import Field, SQLModel - - -class HeadcountRequest(SQLModel, table=True): - __tablename__ = "headcount_requests" - - id: int | None = Field(default=None, primary_key=True) - department_id: int = Field(foreign_key="departments.id") - requested_by_manager_id: int = Field(foreign_key="employees.id") - - role_title: str - employee_type: str # human | agent - quantity: int = Field(default=1) - - justification: str | None = None - status: str = Field(default="submitted") - - # fulfillment linkage (optional) - fulfilled_employee_id: int | None = Field(default=None, foreign_key="employees.id") - fulfilled_onboarding_id: int | None = Field(default=None, foreign_key="agent_onboardings.id") - fulfilled_at: datetime | None = None - - created_at: datetime = Field(default_factory=datetime.utcnow) - - -class EmploymentAction(SQLModel, table=True): - __tablename__ = "employment_actions" - - id: int | None = Field(default=None, primary_key=True) - employee_id: int = Field(foreign_key="employees.id") - issued_by_employee_id: int = Field(foreign_key="employees.id") - - action_type: str # praise|warning|pip|termination - notes: str | None = None - - # Optional idempotency key to prevent duplicates on retries - idempotency_key: str | None = Field(default=None, index=True, unique=True) - - created_at: datetime = Field(default_factory=datetime.utcnow) - - -class AgentOnboarding(SQLModel, table=True): - __tablename__ = "agent_onboardings" - - id: int | None = Field(default=None, primary_key=True) - agent_name: str - role_title: str - prompt: str - cron_interval_ms: int | None = None - tools_json: str | None = None - owner_hr_id: int | None = Field(default=None, foreign_key="employees.id") - - # Link to the employee record once created - employee_id: int | None = Field(default=None, foreign_key="employees.id") - - status: str = Field(default="planned") # planned|spawning|spawned|verified|blocked - spawned_agent_id: str | None = None - session_key: str | None = None - - notes: str | None = None - created_at: datetime = Field(default_factory=datetime.utcnow) - updated_at: datetime = Field(default_factory=datetime.utcnow) diff --git a/backend/app/schemas/hr.py b/backend/app/schemas/hr.py deleted file mode 100644 index 6b92288..0000000 --- a/backend/app/schemas/hr.py +++ /dev/null @@ -1,56 +0,0 @@ -from __future__ import annotations - -from sqlmodel import SQLModel - - -class HeadcountRequestCreate(SQLModel): - department_id: int - requested_by_manager_id: int - role_title: str - employee_type: str - quantity: int = 1 - justification: str | None = None - - -class HeadcountRequestUpdate(SQLModel): - status: str | None = None - justification: str | None = None - fulfilled_employee_id: int | None = None - fulfilled_onboarding_id: int | None = None - - -class EmploymentActionCreate(SQLModel): - employee_id: int - issued_by_employee_id: int - action_type: str - notes: str | None = None - idempotency_key: str | None = None - - -class AgentOnboardingCreate(SQLModel): - agent_name: str - role_title: str - prompt: str - cron_interval_ms: int | None = None - tools_json: str | None = None - owner_hr_id: int | None = None - employee_id: int | None = None - status: str = "planned" - spawned_agent_id: str | None = None - session_key: str | None = None - notes: str | None = None - - -class AgentOnboardingUpdate(SQLModel): - agent_name: str | None = None - role_title: str | None = None - prompt: str | None = None - cron_interval_ms: int | None = None - tools_json: str | None = None - owner_hr_id: int | None = None - employee_id: int | None = None - status: str | None = None - spawned_agent_id: str | None = None - session_key: str | None = None - notes: str | None = None - diff --git a/frontend/src/api/generated/model/employee.ts b/frontend/src/api/generated/model/employee.ts index 159ac3f..893f4eb 100644 --- a/frontend/src/api/generated/model/employee.ts +++ b/frontend/src/api/generated/model/employee.ts @@ -13,4 +13,6 @@ export interface Employee { manager_id?: number | null; title?: string | null; status?: string; + openclaw_session_key?: string | null; + notify_enabled?: boolean; } diff --git a/frontend/src/api/generated/model/employeeCreate.ts b/frontend/src/api/generated/model/employeeCreate.ts index a6a5877..74dcd45 100644 --- a/frontend/src/api/generated/model/employeeCreate.ts +++ b/frontend/src/api/generated/model/employeeCreate.ts @@ -12,4 +12,6 @@ export interface EmployeeCreate { manager_id?: number | null; title?: string | null; status?: string; + openclaw_session_key?: string | null; + notify_enabled?: boolean; } diff --git a/frontend/src/api/generated/model/employeeUpdate.ts b/frontend/src/api/generated/model/employeeUpdate.ts index d2a1706..4cb343d 100644 --- a/frontend/src/api/generated/model/employeeUpdate.ts +++ b/frontend/src/api/generated/model/employeeUpdate.ts @@ -12,4 +12,6 @@ export interface EmployeeUpdate { manager_id?: number | null; title?: string | null; status?: string | null; + openclaw_session_key?: string | null; + notify_enabled?: boolean | null; } diff --git a/frontend/src/api/generated/model/taskComment.ts b/frontend/src/api/generated/model/taskComment.ts index 232db26..2d5713f 100644 --- a/frontend/src/api/generated/model/taskComment.ts +++ b/frontend/src/api/generated/model/taskComment.ts @@ -9,6 +9,7 @@ export interface TaskComment { id?: number | null; task_id: number; author_employee_id?: number | null; + reply_to_comment_id?: number | null; body: string; created_at?: string; } diff --git a/frontend/src/api/generated/model/taskCommentCreate.ts b/frontend/src/api/generated/model/taskCommentCreate.ts index 0134271..102180b 100644 --- a/frontend/src/api/generated/model/taskCommentCreate.ts +++ b/frontend/src/api/generated/model/taskCommentCreate.ts @@ -8,5 +8,6 @@ export interface TaskCommentCreate { task_id: number; author_employee_id?: number | null; + reply_to_comment_id?: number | null; body: string; } diff --git a/frontend/src/api/generated/org/org.ts b/frontend/src/api/generated/org/org.ts index 359bbb3..4c7c3f4 100644 --- a/frontend/src/api/generated/org/org.ts +++ b/frontend/src/api/generated/org/org.ts @@ -207,6 +207,10 @@ export function useListDepartmentsDepartmentsGet< } /** + * Create a department. + +Important: keep the operation atomic. We flush to get dept.id, log the activity, +then commit once. We also translate common DB integrity errors into 409s. * @summary Create Department */ export type createDepartmentDepartmentsPostResponse200 = { @@ -863,3 +867,299 @@ export const useUpdateEmployeeEmployeesEmployeeIdPatch = < queryClient, ); }; +/** + * @summary Provision Employee Agent + */ +export type provisionEmployeeAgentEmployeesEmployeeIdProvisionPostResponse200 = + { + data: Employee; + status: 200; + }; + +export type provisionEmployeeAgentEmployeesEmployeeIdProvisionPostResponse422 = + { + data: HTTPValidationError; + status: 422; + }; + +export type provisionEmployeeAgentEmployeesEmployeeIdProvisionPostResponseSuccess = + provisionEmployeeAgentEmployeesEmployeeIdProvisionPostResponse200 & { + headers: Headers; + }; +export type provisionEmployeeAgentEmployeesEmployeeIdProvisionPostResponseError = + provisionEmployeeAgentEmployeesEmployeeIdProvisionPostResponse422 & { + headers: Headers; + }; + +export type provisionEmployeeAgentEmployeesEmployeeIdProvisionPostResponse = + | provisionEmployeeAgentEmployeesEmployeeIdProvisionPostResponseSuccess + | provisionEmployeeAgentEmployeesEmployeeIdProvisionPostResponseError; + +export const getProvisionEmployeeAgentEmployeesEmployeeIdProvisionPostUrl = ( + employeeId: number, +) => { + return `/employees/${employeeId}/provision`; +}; + +export const provisionEmployeeAgentEmployeesEmployeeIdProvisionPost = async ( + employeeId: number, + options?: RequestInit, +): Promise => { + return customFetch( + getProvisionEmployeeAgentEmployeesEmployeeIdProvisionPostUrl(employeeId), + { + ...options, + method: "POST", + }, + ); +}; + +export const getProvisionEmployeeAgentEmployeesEmployeeIdProvisionPostMutationOptions = + (options?: { + mutation?: UseMutationOptions< + Awaited< + ReturnType< + typeof provisionEmployeeAgentEmployeesEmployeeIdProvisionPost + > + >, + TError, + { employeeId: number }, + TContext + >; + request?: SecondParameter; + }): UseMutationOptions< + Awaited< + ReturnType + >, + TError, + { employeeId: number }, + TContext + > => { + const mutationKey = [ + "provisionEmployeeAgentEmployeesEmployeeIdProvisionPost", + ]; + const { mutation: mutationOptions, request: requestOptions } = options + ? options.mutation && + "mutationKey" in options.mutation && + options.mutation.mutationKey + ? options + : { ...options, mutation: { ...options.mutation, mutationKey } } + : { mutation: { mutationKey }, request: undefined }; + + const mutationFn: MutationFunction< + Awaited< + ReturnType< + typeof provisionEmployeeAgentEmployeesEmployeeIdProvisionPost + > + >, + { employeeId: number } + > = (props) => { + const { employeeId } = props ?? {}; + + return provisionEmployeeAgentEmployeesEmployeeIdProvisionPost( + employeeId, + requestOptions, + ); + }; + + return { mutationFn, ...mutationOptions }; + }; + +export type ProvisionEmployeeAgentEmployeesEmployeeIdProvisionPostMutationResult = + NonNullable< + Awaited< + ReturnType + > + >; + +export type ProvisionEmployeeAgentEmployeesEmployeeIdProvisionPostMutationError = + HTTPValidationError; + +/** + * @summary Provision Employee Agent + */ +export const useProvisionEmployeeAgentEmployeesEmployeeIdProvisionPost = < + TError = HTTPValidationError, + TContext = unknown, +>( + options?: { + mutation?: UseMutationOptions< + Awaited< + ReturnType< + typeof provisionEmployeeAgentEmployeesEmployeeIdProvisionPost + > + >, + TError, + { employeeId: number }, + TContext + >; + request?: SecondParameter; + }, + queryClient?: QueryClient, +): UseMutationResult< + Awaited< + ReturnType + >, + TError, + { employeeId: number }, + TContext +> => { + return useMutation( + getProvisionEmployeeAgentEmployeesEmployeeIdProvisionPostMutationOptions( + options, + ), + queryClient, + ); +}; +/** + * @summary Deprovision Employee Agent + */ +export type deprovisionEmployeeAgentEmployeesEmployeeIdDeprovisionPostResponse200 = + { + data: Employee; + status: 200; + }; + +export type deprovisionEmployeeAgentEmployeesEmployeeIdDeprovisionPostResponse422 = + { + data: HTTPValidationError; + status: 422; + }; + +export type deprovisionEmployeeAgentEmployeesEmployeeIdDeprovisionPostResponseSuccess = + deprovisionEmployeeAgentEmployeesEmployeeIdDeprovisionPostResponse200 & { + headers: Headers; + }; +export type deprovisionEmployeeAgentEmployeesEmployeeIdDeprovisionPostResponseError = + deprovisionEmployeeAgentEmployeesEmployeeIdDeprovisionPostResponse422 & { + headers: Headers; + }; + +export type deprovisionEmployeeAgentEmployeesEmployeeIdDeprovisionPostResponse = + | deprovisionEmployeeAgentEmployeesEmployeeIdDeprovisionPostResponseSuccess + | deprovisionEmployeeAgentEmployeesEmployeeIdDeprovisionPostResponseError; + +export const getDeprovisionEmployeeAgentEmployeesEmployeeIdDeprovisionPostUrl = + (employeeId: number) => { + return `/employees/${employeeId}/deprovision`; + }; + +export const deprovisionEmployeeAgentEmployeesEmployeeIdDeprovisionPost = + async ( + employeeId: number, + options?: RequestInit, + ): Promise => { + return customFetch( + getDeprovisionEmployeeAgentEmployeesEmployeeIdDeprovisionPostUrl( + employeeId, + ), + { + ...options, + method: "POST", + }, + ); + }; + +export const getDeprovisionEmployeeAgentEmployeesEmployeeIdDeprovisionPostMutationOptions = + (options?: { + mutation?: UseMutationOptions< + Awaited< + ReturnType< + typeof deprovisionEmployeeAgentEmployeesEmployeeIdDeprovisionPost + > + >, + TError, + { employeeId: number }, + TContext + >; + request?: SecondParameter; + }): UseMutationOptions< + Awaited< + ReturnType< + typeof deprovisionEmployeeAgentEmployeesEmployeeIdDeprovisionPost + > + >, + TError, + { employeeId: number }, + TContext + > => { + const mutationKey = [ + "deprovisionEmployeeAgentEmployeesEmployeeIdDeprovisionPost", + ]; + const { mutation: mutationOptions, request: requestOptions } = options + ? options.mutation && + "mutationKey" in options.mutation && + options.mutation.mutationKey + ? options + : { ...options, mutation: { ...options.mutation, mutationKey } } + : { mutation: { mutationKey }, request: undefined }; + + const mutationFn: MutationFunction< + Awaited< + ReturnType< + typeof deprovisionEmployeeAgentEmployeesEmployeeIdDeprovisionPost + > + >, + { employeeId: number } + > = (props) => { + const { employeeId } = props ?? {}; + + return deprovisionEmployeeAgentEmployeesEmployeeIdDeprovisionPost( + employeeId, + requestOptions, + ); + }; + + return { mutationFn, ...mutationOptions }; + }; + +export type DeprovisionEmployeeAgentEmployeesEmployeeIdDeprovisionPostMutationResult = + NonNullable< + Awaited< + ReturnType< + typeof deprovisionEmployeeAgentEmployeesEmployeeIdDeprovisionPost + > + > + >; + +export type DeprovisionEmployeeAgentEmployeesEmployeeIdDeprovisionPostMutationError = + HTTPValidationError; + +/** + * @summary Deprovision Employee Agent + */ +export const useDeprovisionEmployeeAgentEmployeesEmployeeIdDeprovisionPost = < + TError = HTTPValidationError, + TContext = unknown, +>( + options?: { + mutation?: UseMutationOptions< + Awaited< + ReturnType< + typeof deprovisionEmployeeAgentEmployeesEmployeeIdDeprovisionPost + > + >, + TError, + { employeeId: number }, + TContext + >; + request?: SecondParameter; + }, + queryClient?: QueryClient, +): UseMutationResult< + Awaited< + ReturnType< + typeof deprovisionEmployeeAgentEmployeesEmployeeIdDeprovisionPost + > + >, + TError, + { employeeId: number }, + TContext +> => { + return useMutation( + getDeprovisionEmployeeAgentEmployeesEmployeeIdDeprovisionPostMutationOptions( + options, + ), + queryClient, + ); +}; diff --git a/frontend/src/api/generated/projects/projects.ts b/frontend/src/api/generated/projects/projects.ts index ac9835a..604c913 100644 --- a/frontend/src/api/generated/projects/projects.ts +++ b/frontend/src/api/generated/projects/projects.ts @@ -204,6 +204,10 @@ export function useListProjectsProjectsGet< } /** + * Create a project. + +Keep operation atomic: flush to get id, log activity, then commit once. +Translate DB integrity errors to 409s. * @summary Create Project */ export type createProjectProjectsPostResponse200 = { diff --git a/frontend/src/app/_components/Shell.tsx b/frontend/src/app/_components/Shell.tsx index 577c3a9..6caaa05 100644 --- a/frontend/src/app/_components/Shell.tsx +++ b/frontend/src/app/_components/Shell.tsx @@ -11,7 +11,6 @@ const NAV = [ { href: "/kanban", label: "Kanban" }, { href: "/departments", label: "Departments" }, { href: "/people", label: "People" }, - { href: "/hr", label: "HR" }, ]; export function Shell({ children }: { children: React.ReactNode }) { diff --git a/frontend/src/app/departments/page.tsx b/frontend/src/app/departments/page.tsx index 0ca934d..9e5d8e9 100644 --- a/frontend/src/app/departments/page.tsx +++ b/frontend/src/app/departments/page.tsx @@ -20,10 +20,10 @@ export default function DepartmentsPage() { const [headId, setHeadId] = useState(""); const departments = useListDepartmentsDepartmentsGet(); - const departmentList = departments.data ?? []; + const departmentList = departments.data?.status === 200 ? departments.data.data : []; const employees = useListEmployeesEmployeesGet(); - const employeeList = employees.data ?? []; + const employeeList = employees.data?.status === 200 ? employees.data.data : []; const createDepartment = useCreateDepartmentDepartmentsPost({ mutation: { diff --git a/frontend/src/app/hr/page.tsx b/frontend/src/app/hr/page.tsx deleted file mode 100644 index cc2cfa2..0000000 --- a/frontend/src/app/hr/page.tsx +++ /dev/null @@ -1,355 +0,0 @@ -"use client"; - -import { useState } from "react"; - -import { Button } from "@/components/ui/button"; -import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card"; -import { Input } from "@/components/ui/input"; - -import { Select } from "@/components/ui/select"; -import { Textarea } from "@/components/ui/textarea"; - -import { - useCreateHeadcountRequestHrHeadcountPost, - useCreateEmploymentActionHrActionsPost, - useListHeadcountRequestsHrHeadcountGet, - useListEmploymentActionsHrActionsGet, - useListAgentOnboardingHrOnboardingGet, - useCreateAgentOnboardingHrOnboardingPost, - useUpdateAgentOnboardingHrOnboardingOnboardingIdPatch, -} from "@/api/generated/hr/hr"; -import { useListDepartmentsDepartmentsGet, useListEmployeesEmployeesGet } from "@/api/generated/org/org"; - -export default function HRPage() { - const departments = useListDepartmentsDepartmentsGet(); - const departmentList = departments.data ?? []; - const employees = useListEmployeesEmployeesGet(); - const employeeList = employees.data ?? []; - - const headcount = useListHeadcountRequestsHrHeadcountGet(); - const actions = useListEmploymentActionsHrActionsGet(); - const onboarding = useListAgentOnboardingHrOnboardingGet(); - const headcountList = headcount.data ?? []; - const actionList = actions.data ?? []; - const onboardingList = onboarding.data ?? []; - - const [hcDeptId, setHcDeptId] = useState(""); - const [hcManagerId, setHcManagerId] = useState(""); - const [hcRole, setHcRole] = useState(""); - const [hcType, setHcType] = useState<"human" | "agent">("human"); - const [hcQty, setHcQty] = useState("1"); - const [hcJust, setHcJust] = useState(""); - - const [actEmployeeId, setActEmployeeId] = useState(""); - const [actIssuerId, setActIssuerId] = useState(""); - const [actType, setActType] = useState("praise"); - const [actNotes, setActNotes] = useState(""); - - - const [onboardAgentName, setOnboardAgentName] = useState(""); - const [onboardRole, setOnboardRole] = useState(""); - const [onboardPrompt, setOnboardPrompt] = useState(""); - const [onboardCronMs, setOnboardCronMs] = useState(""); - const [onboardTools, setOnboardTools] = useState(""); - const [onboardOwnerId, setOnboardOwnerId] = useState(""); - const [onboardNotes, setOnboardNotes] = useState(""); - const createHeadcount = useCreateHeadcountRequestHrHeadcountPost({ - mutation: { - onSuccess: () => { - setHcRole(""); - setHcJust(""); - setHcQty("1"); - headcount.refetch(); - }, - }, - }); - - const createAction = useCreateEmploymentActionHrActionsPost({ - mutation: { - onSuccess: () => { - setActNotes(""); - actions.refetch(); - }, - }, - }); - - const createOnboarding = useCreateAgentOnboardingHrOnboardingPost({ - mutation: { - onSuccess: () => { - setOnboardAgentName(""); - setOnboardRole(""); - setOnboardPrompt(""); - setOnboardCronMs(""); - setOnboardTools(""); - setOnboardOwnerId(""); - setOnboardNotes(""); - onboarding.refetch(); - }, - }, - }); - - const updateOnboarding = useUpdateAgentOnboardingHrOnboardingOnboardingIdPatch({ - mutation: { - onSuccess: () => onboarding.refetch(), - }, - }); - - return ( -
- {headcount.isLoading || actions.isLoading || onboarding.isLoading ? ( -
Loading…
- ) : null} - {headcount.error ?
{(headcount.error as Error).message}
: null} - {actions.error ?
{(actions.error as Error).message}
: null} - {onboarding.error ?
{(onboarding.error as Error).message}
: null} -
-
-

HR

-

Headcount requests and employment actions.

-
- -
- -
- - - Headcount request - Managers request; HR fulfills later. - - - {departments.isLoading ?
Loading departments…
: null} - {departments.error ?
{(departments.error as Error).message}
: null} - {employees.isLoading ?
Loading employees…
: null} - {employees.error ?
{(employees.error as Error).message}
: null} - - - setHcRole(e.target.value)} /> -
- - setHcQty(e.target.value)} /> -
-