From f9653eaa2647a416741b1bce5d80b7b933e40407 Mon Sep 17 00:00:00 2001 From: MrWaradana Date: Mon, 10 Nov 2025 17:10:01 +0700 Subject: [PATCH] fix: MasterRecord rename to EquipmentTransactionRecord --- src/equipment/model.py | 2 +- src/equipment/service.py | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/equipment/model.py b/src/equipment/model.py index bfd7478..deb638c 100644 --- a/src/equipment/model.py +++ b/src/equipment/model.py @@ -41,7 +41,7 @@ class EquipmentTransactionRecords(Base, DefaultMixin, IdentityMixin): "Equipment", backref="maintenance_records", lazy="raise", - primaryjoin="and_(MasterRecords.assetnum == foreign(Equipment.assetnum))", + primaryjoin="and_(EquipmentTransactionRecordss.assetnum == foreign(Equipment.assetnum))", viewonly=True, ) diff --git a/src/equipment/service.py b/src/equipment/service.py index 46e6ec0..f8f786c 100644 --- a/src/equipment/service.py +++ b/src/equipment/service.py @@ -256,9 +256,9 @@ async def generate_transaction( # # Query existing records with is_actual=1 # actual_years_query = ( - # Select(MasterRecords.tahun) - # .filter(MasterRecords.assetnum == data_in.assetnum) - # .filter(MasterRecords.is_actual == 1) + # Select(EquipmentTransactionRecordss.tahun) + # .filter(EquipmentTransactionRecordss.assetnum == data_in.assetnum) + # .filter(EquipmentTransactionRecordss.is_actual == 1) # ) # result = await db_session.execute(actual_years_query) # actual_years = {row[0] for row in result.all()} @@ -280,9 +280,9 @@ async def generate_transaction( # # # Calculate sum of previous failures for this asset # # previous_failures_query = ( - # # Select(func.sum(MasterRecords.raw_cm_interval)) - # # .filter(MasterRecords.assetnum == data_in.assetnum) - # # .filter(MasterRecords.tahun < year) + # # Select(func.sum(EquipmentTransactionRecordss.raw_cm_interval)) + # # .filter(EquipmentTransactionRecordss.assetnum == data_in.assetnum) + # # .filter(EquipmentTransactionRecordss.tahun < year) # # ) # # previous_failures_result = await db_session.execute(previous_failures_query) # # previous_failures_sum = previous_failures_result.scalar() or 0 @@ -291,7 +291,7 @@ async def generate_transaction( # # transaction.update({"raw_cm_interval": current_num_fail - previous_failures_sum}) # transaction.update({"raw_cm_interval": current_num_fail}) # transaction.update({"tahun": int(year), "seq": int(sequence)}) - # transactions.append(MasterRecords(**transaction)) + # transactions.append(EquipmentTransactionRecordss(**transaction)) # db_session.add_all(transactions) # await db_session.commit()