refactor: minimum eac record to database structure

src/equipment/model.py

@@ -15,15 +15,21 @@ class Equipment(Base, DefaultMixin, IdentityMixin):
     forecasting_start_year = Column(Integer, nullable=False)
     forecasting_target_year = Column(Integer, nullable=False)
     manhours_rate = Column(Float, nullable=False)
-    min_eac_info = Column(Text, nullable=True)
     harga_saat_ini = Column(Float, nullable=True)
+    minimum_eac_seq = Column(Integer, nullable=False)
+    minimum_eac_year = Column(Integer, nullable=False)
+    minimum_eac = Column(Float, nullable=False)
+    minimum_npv = Column(Float, nullable=False)
+    minimum_pmt = Column(Float, nullable=False)
+    minimum_pmt_aq_cost = Column(Float, nullable=False)
+    minimum_is_actual = Column(Integer, nullable=False)
 
     equipment_master = relationship(
         "EquipmentMaster",
         # backref="equipment",
         lazy="raise",
         primaryjoin="and_(Equipment.assetnum == foreign(EquipmentMaster.assetnum))",
-        viewonly=True,  
+        viewonly=True,
         uselist=False,
     )
 

src/equipment/schema.py

@@ -88,7 +88,14 @@ class EquipmentDataMaster(EquipmentBase):
     id: UUID
     equipment_master: EquipmentMasterBase
     forecasting_target_year: Optional[int] = Field(None, nullable=True)
-    min_eac_info: Optional[str] = Field(None, nullable=True)
+    minimum_eac_seq: Optional[int] = Field(None, nullable=True)
+    minimum_eac_year: Optional[int] = Field(None, nullable=True)
+    minimum_eac: Optional[float] = Field(None, nullable=True)
+    minimum_npv: Optional[float] = Field(None, nullable=True)
+    minimum_pmt: Optional[float] = Field(None, nullable=True)
+    minimum_pmt_aq_cost: Optional[float] = Field(None, nullable=True)
+    minimum_is_actual: Optional[int] = Field(None, nullable=True)
+    # min_eac_info: Optional[str] = Field(None, nullable=True)
     harga_saat_ini: Optional[float] = Field(None, nullable=True)
 
 

src/modules/equipment/Eac.py

@@ -210,11 +210,21 @@ class Eac:
             # Update lcc_equipment_tr_data
             update_query = """
                 UPDATE lcc_ms_equipment_data
-                SET min_eac_info = %s, updated_by = 'Sys', updated_at = NOW()
+                SET minimum_eac_seq = %s, minimum_eac_year=%s, minimum_eac=%s, minimum_npv=%s, minimum_pmt=%s, minimum_pmt_aq_cost=%s, minimum_is_actual=%s, updated_by = 'Sys', updated_at = NOW()
                 WHERE assetnum = %s;
                 """
             cursor.execute(
-                update_query, (json.dumps(lowest_eac_record), p_equipment_id)
+                update_query,
+                (
+                    lowest_eac_record["seq"],
+                    lowest_eac_record["year"],
+                    float(lowest_eac_record["eac"]),
+                    float(lowest_eac_record["npv"]),
+                    float(lowest_eac_record["pmt"]),
+                    float(lowest_eac_record["pmt_aq_cost"]),
+                    lowest_eac_record["is_actual"],
+                    p_equipment_id,
+                ),
             )
 
             connection.commit()