From 7ee77adbb91071d49f8ad8754b853962a7702351 Mon Sep 17 00:00:00 2001
From: Cizz22 <cisatraa@gmail.com>
Date: Mon, 10 Feb 2025 16:47:50 +0700
Subject: [PATCH] fix job

---
 src/job/model.py  | 20 +++++++++++++++++++-
 src/job/schema.py |  8 +++++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/job/model.py b/src/job/model.py
index f5b5f64..df5a425 100644
--- a/src/job/model.py
+++ b/src/job/model.py
@@ -7,10 +7,28 @@ from src.workorder.model import MasterWorkOrder
 from sqlalchemy.ext.hybrid import hybrid_property
 
 
+
+
+class MasterActivitytask(Base, DefaultMixin):
+    __tablename__ = "oh_ms_job_task"
+
+    description = Column(String, nullable=False)
+    oh_type = Column(String, nullable=False)
+    job_id = Column(UUID(as_uuid=True), ForeignKey(
+        "oh_ms_job.id", ondelete="cascade"), nullable=False)
+
+
 class MasterActivity(Base, DefaultMixin):
     __tablename__ = "oh_ms_job"
 
-    description = Column(String, nullable=False)
+    workscope = Column(String, nullable=True)
+    system = Column(String, nullable=True)
+    subsystem = Column(String, nullable=True)
+
+    tasks = relationship(
+        "MasterActivitytask",
+        lazy="selectin",
+    )
 
     # details = relationship(
     #     "MasterActivityDetail",
diff --git a/src/job/schema.py b/src/job/schema.py
index 057c37c..1e097a8 100644
--- a/src/job/schema.py
+++ b/src/job/schema.py
@@ -18,10 +18,16 @@ class ActivityMasterDetail(DefultBase):
 class ActivityMasterCreate(ActivityMaster):
     description: str
 
+class ActivityMasterTasks(DefultBase):
+    description: str
+    oh_type: str
 
 class ActivityMasterRead(ActivityMaster):
     id: UUID
-    description: str
+    workscope: str
+    system: str
+    subsystem: str
+    tasks: List[ActivityMasterTasks]
 
 
 class ActivityMasterPagination(Pagination):