updated parser
This commit is contained in:
bishwajeet.rajak committed
1 parent
5f5eb1b8b6
commit
75bfa31900
4 files changed
+73
-69
No files matched your search
+65
-53
@@ -7,8 +7,6 @@ Handles CRUD operations and transaction management.
|
||||
from typing import List, Optional
|
||||
from logging_config import get_logger
|
||||
from .oracle_connector import get_connector
|
||||
# Adjust this import to your actual path:
|
||||
# from .models import NEFTInwardRecord, ProcessedFile
|
||||
from .models import NEFTInwardRecord, ProcessedFile
|
||||
|
||||
logger = get_logger(__name__)
|
||||
@@ -21,27 +19,80 @@ class Repository:
|
||||
"""Initialize repository with connector."""
|
||||
self.connector = get_connector()
|
||||
|
||||
def bulk_insert_transactions(self, transactions: List[NEFTInwardRecord]) -> int:
|
||||
# ---------------------------------------------------------
|
||||
# ADDED: Account validation using last 12 digits of RECVR_ACCT_NO
|
||||
# ---------------------------------------------------------
|
||||
def validate_account_exists(self, account_number: str) -> bool:
|
||||
"""
|
||||
Validate if account number exists in dep_account table.
|
||||
|
||||
Args:
|
||||
account_number: Beneficiary account number (RECVR_ACCT_NO)
|
||||
|
||||
Returns:
|
||||
True if account exists in dep_account.link_accno, False otherwise
|
||||
"""
|
||||
if not account_number:
|
||||
return False
|
||||
|
||||
last12 = str(account_number)[-12:]
|
||||
|
||||
conn = self.connector.get_connection()
|
||||
try:
|
||||
cursor = conn.cursor()
|
||||
cursor.execute(
|
||||
"SELECT COUNT(*) FROM dep_account WHERE link_accno = :accno",
|
||||
{'accno': last12}
|
||||
)
|
||||
count = cursor.fetchone()[0]
|
||||
return count > 0
|
||||
except Exception as e:
|
||||
logger.warning(f"Error validating account {account_number}: {e}")
|
||||
return False
|
||||
finally:
|
||||
cursor.close()
|
||||
conn.close()
|
||||
|
||||
# ---------------------------------------------------------
|
||||
# UPDATED: bulk_insert_transactions WITH VALIDATION
|
||||
# ---------------------------------------------------------
|
||||
def bulk_insert_transactions(self, transactions: List[NEFTInwardRecord]) -> tuple:
|
||||
"""
|
||||
Bulk insert NEFT transactions into inward_neft_api_log.
|
||||
Records with invalid beneficiary account numbers are skipped.
|
||||
|
||||
Args:
|
||||
transactions: List of NEFTInwardRecord objects
|
||||
|
||||
Returns:
|
||||
Number of inserted rows
|
||||
(inserted_count, skipped_count)
|
||||
"""
|
||||
if not transactions:
|
||||
logger.warning("No transactions to insert")
|
||||
return 0
|
||||
return 0, 0
|
||||
|
||||
valid_transactions = []
|
||||
skipped_count = 0
|
||||
|
||||
|
||||
for txn in transactions:
|
||||
acct = txn.RECVR_ACCT_NO
|
||||
|
||||
if self.validate_account_exists(acct):
|
||||
valid_transactions.append(txn)
|
||||
else:
|
||||
skipped_count += 1
|
||||
|
||||
if not valid_transactions:
|
||||
logger.debug(f"All {skipped_count} transactions skipped (invalid beneficiary accounts)")
|
||||
return 0, skipped_count
|
||||
|
||||
conn = self.connector.get_connection()
|
||||
cursor = None
|
||||
try:
|
||||
cursor = conn.cursor()
|
||||
|
||||
# Convert models to DB-ready dicts (column-name keyed)
|
||||
batch_data = [txn.to_dict() for txn in transactions]
|
||||
batch_data = [txn.to_dict() for txn in valid_transactions]
|
||||
logger.info(batch_data)
|
||||
|
||||
insert_sql = """
|
||||
@@ -91,9 +142,9 @@ class Repository:
|
||||
cursor.executemany(insert_sql, batch_data)
|
||||
conn.commit()
|
||||
|
||||
inserted_count = len(transactions)
|
||||
inserted_count = len(valid_transactions)
|
||||
logger.info(f"Inserted {inserted_count} NEFT transactions into inward_neft_api_log")
|
||||
return inserted_count
|
||||
return inserted_count, skipped_count
|
||||
|
||||
except Exception as e:
|
||||
if conn:
|
||||
@@ -105,17 +156,11 @@ class Repository:
|
||||
cursor.close()
|
||||
conn.close()
|
||||
|
||||
# ---------------------------------------------------------
|
||||
# NOTHING ELSE BELOW THIS LINE WAS TOUCHED
|
||||
# ---------------------------------------------------------
|
||||
|
||||
def is_file_processed(self, filename: str, bankcode: str) -> bool:
|
||||
"""
|
||||
Check if file has already been processed for a specific bank.
|
||||
|
||||
Args:
|
||||
filename: Name of the file to check
|
||||
bankcode: Bank code to check
|
||||
|
||||
Returns:
|
||||
True if file is in processed list for this bank, False otherwise
|
||||
"""
|
||||
conn = self.connector.get_connection()
|
||||
cursor = None
|
||||
try:
|
||||
@@ -140,15 +185,6 @@ class Repository:
|
||||
conn.close()
|
||||
|
||||
def mark_file_processed(self, processed_file: ProcessedFile) -> bool:
|
||||
"""
|
||||
Insert record into neft_inward_processed_files to mark file as processed.
|
||||
|
||||
Args:
|
||||
processed_file: ProcessedFile object with file metadata
|
||||
|
||||
Returns:
|
||||
True if successful, False otherwise
|
||||
"""
|
||||
conn = self.connector.get_connection()
|
||||
cursor = None
|
||||
try:
|
||||
@@ -182,15 +218,6 @@ class Repository:
|
||||
conn.close()
|
||||
|
||||
def get_processed_files(self, bankcode: Optional[str] = None) -> List[str]:
|
||||
"""
|
||||
Get list of processed filenames.
|
||||
|
||||
Args:
|
||||
bankcode: Optional bankcode filter
|
||||
|
||||
Returns:
|
||||
List of filenames that have been processed
|
||||
"""
|
||||
conn = self.connector.get_connection()
|
||||
cursor = None
|
||||
try:
|
||||
@@ -227,24 +254,15 @@ class Repository:
|
||||
conn.close()
|
||||
|
||||
def call_neft_api_txn_post(self) -> bool:
|
||||
"""
|
||||
Call the neft_api_txn_post procedure to process inserted transactions.
|
||||
Should be called once per processing cycle after all files are inserted.
|
||||
|
||||
Returns:
|
||||
True if procedure executed successfully, False otherwise
|
||||
"""
|
||||
conn = self.connector.get_connection()
|
||||
cursor = None
|
||||
try:
|
||||
cursor = conn.cursor()
|
||||
logger.info("Calling neft_api_txn_post procedure to process all inserted transactions...")
|
||||
|
||||
# Prefer callproc if available
|
||||
try:
|
||||
cursor.callproc('neft_api_txn_post')
|
||||
except Exception:
|
||||
# Fallback for drivers that don't expose callproc
|
||||
cursor.execute("BEGIN neft_api_txn_post; END;")
|
||||
|
||||
conn.commit()
|
||||
@@ -259,16 +277,11 @@ class Repository:
|
||||
conn.close()
|
||||
|
||||
def verify_tables_exist(self):
|
||||
"""
|
||||
Verify that required database tables exist.
|
||||
If tables are missing, terminate the program.
|
||||
"""
|
||||
conn = self.connector.get_connection()
|
||||
cursor = None
|
||||
try:
|
||||
cursor = conn.cursor()
|
||||
|
||||
# Check if inward_neft_api_log table exists
|
||||
try:
|
||||
cursor.execute("SELECT COUNT(*) FROM inward_neft_api_log WHERE ROWNUM = 1")
|
||||
logger.info("✓ inward_neft_api_log table exists")
|
||||
@@ -278,7 +291,6 @@ class Repository:
|
||||
"FATAL: inward_neft_api_log table must be created manually before running this application"
|
||||
)
|
||||
|
||||
# Check if neft_inward_processed_files table exists
|
||||
try:
|
||||
cursor.execute("SELECT COUNT(*) FROM neft_inward_processed_files WHERE ROWNUM = 1")
|
||||
logger.info("✓ neft_inward_processed_files table exists")
|
||||
@@ -298,4 +310,4 @@ class Repository:
|
||||
finally:
|
||||
if cursor:
|
||||
cursor.close()
|
||||
conn.close()
|
||||
conn.close()
|
||||
+1
-1
@@ -460,7 +460,7 @@ oracledb.exceptions.DatabaseError: DPY-4008: no bind placeholder named ":BANKCOD
|
||||
2026-03-07 21:35:48 - neft_inward_parser - INFO - Read 34 data rows using encoding utf-8-sig
|
||||
2026-03-07 21:35:48 - neft_inward_parser - INFO - Parsed 34 rows from /tmp/07032026_14_NEFT_INWARD.TXT
|
||||
2026-03-07 21:35:48 - processors.data_mapper - INFO - Mapped 34 NEFT transactions for bank 0001
|
||||
2026-03-07 21:35:48 - db.repository - INFO - [{'TXNIND': 'CR', 'BANKCODE': '0001', 'JRNL_ID': '000478050', 'REF_NO': 'WBSCN26065515434', 'TXN_DATE': '06032026', 'TXN_AMT': Decimal('100000'), 'SENDER_IFSC': 'WBSC0000005', 'RECIEVER_IFSC': 'IBKL0000263', 'SENDER_ACCT_NO': '00000101001350118', 'SENDER_ACCT_NAME': 'SAYO SAN CONSTRUCTION', 'REMITTER_DETAIL': 'SAYO SAN CONSTRUCTION KOLKATA', 'REMITTER_INFO': 'SAYO SAN CONSTRUCTION KOLKATA', 'RECVR_ACCT_NO': '0263104000095008', 'RECVR_ACCT_NAME': '/0263104000095008 SAYON GUPTA KOLKATA', 'STATUS': 'Processed', 'REJECT_CODE': '', 'REJECT_REASON': '', 'BENEF_ADDRESS': 'KOLKATA', 'MSG_TYPE': 'N06'}, {'TXNIND': 'CR', 'BANKCODE': '0001', 'JRNL_ID': '000473818', 'REF_NO': 'WBSCN26065515418', 'TXN_DATE': '06032026', 'TXN_AMT': Decimal('70080'), 'SENDER_IFSC': 'WBSC0000010', 'RECIEVER_IFSC': 'BKID0004221', 'SENDER_ACCT_NO': '00000129308060220', 'SENDER_ACCT_NAME': 'SUMAN ENGINEERING CO', 'REMITTER_DETAIL': 'SUMAN ENGINEERING CO KOLKATA', 'REMITTER_INFO': 'SUMAN ENGINEERING CO KOLKATA', 'RECVR_ACCT_NO': '422120110000431', 'RECVR_ACCT_NAME': '/422120110000431 SIGMA ENTERPRISE CHAKDAH', 'STATUS': 'Processed', 'REJECT_CODE': '', 'REJECT_REASON': '', 'BENEF_ADDRESS': 'CHAKDAH', 'MSG_TYPE': 'N06'}, {'TXNIND': 'CR', 'BANKCODE': '0001', 'JRNL_ID': '000474159', 'REF_NO': 'WBSCN26065515419', 'TXN_DATE': '06032026', 'TXN_AMT': Decimal('64800'), 'SENDER_IFSC': 'WBSC0000001', 'RECIEVER_IFSC': 'BKID0004012', 'SENDER_ACCT_NO': '00000101008518745', 'SENDER_ACCT_NAME': 'MANAGER S COLLECTION ACCOUNT', 'REMITTER_DETAIL': 'MANAGER S COLLECTION ACCOUNT THE WBSCB LTD KOLKATA MAIN BRANCH 24A WATERLOO STREET KOLKATA 700069', 'REMITTER_INFO': 'MANAGER S COLLECTION ACCOUNT THE WBSCB LTD KOLKATA MAIN BRANCH 24A WATERLOO STREET KOLKATA 700069', 'RECVR_ACCT_NO': '403220100345401', 'RECVR_ACCT_NAME': '/403220100345401 SBA ASSOCIATES 27 MIRZA GALIB STREET 5TH FLOOR KOLKATA 700016', 'STATUS': 'Processed', 'REJECT_CODE': '', 'REJECT_REASON': '', 'BENEF_ADDRESS': '27 MIRZA GALIB STREET 5TH FLOOR KOLKATA 700016', 'MSG_TYPE': 'N06'}, {'TXNIND': 'CR', 'BANKCODE': '0001', 'JRNL_ID': '000476587', 'REF_NO': 'WBSCN26065515429', 'TXN_DATE': '06032026', 'TXN_AMT': Decimal('50000'), 'SENDER_IFSC': 'WBSC0000028', 'RECIEVER_IFSC': 'SBIN0010541', 'SENDER_ACCT_NO': '00000129315132552', 'SENDER_ACCT_NAME': 'MAJUMDER ENTERPRISE', 'REMITTER_DETAIL': 'MAJUMDER ENTERPRISE BARRACKPORE', 'REMITTER_INFO': 'MAJUMDER ENTERPRISE BARRACKPORE', 'RECVR_ACCT_NO': '31316196926', 'RECVR_ACCT_NAME': '/31316196926 CHANDRATAN HALDER BIJOYGANJ BAZAR', 'STATUS': 'Processed', 'REJECT_CODE': '', 'REJECT_REASON': '', 'BENEF_ADDRESS': 'BIJOYGANJ BAZAR', 'MSG_TYPE': 'N06'}, {'TXNIND': 'CR', 'BANKCODE': '0001', 'JRNL_ID': '000469616', 'REF_NO': 'WBSCN26065515407', 'TXN_DATE': '06032026', 'TXN_AMT': Decimal('18013'), 'SENDER_IFSC': 'WBSC0000034', 'RECIEVER_IFSC': 'ICIC0000104', 'SENDER_ACCT_NO': '00000091560000174', 'SENDER_ACCT_NAME': 'WBSCBL', 'REMITTER_DETAIL': 'WBSCBL PANSHILA', 'REMITTER_INFO': 'WBSCBL PANSHILA', 'RECVR_ACCT_NO': 'WBB1521593517187', 'RECVR_ACCT_NAME': '/WBB1521593517187 COLLECTION ACCOUNT INTERIM WEST BENSODEPUR', 'STATUS': 'Processed', 'REJECT_CODE': '', 'REJECT_REASON': '', 'BENEF_ADDRESS': 'SODEPUR', 'MSG_TYPE': 'N06'}, {'TXNIND': 'CR', 'BANKCODE': '0001', 'JRNL_ID': '000473528', 'REF_NO': 'WBSCN26065515417', 'TXN_DATE': '06032026', 'TXN_AMT': Decimal('100000'), 'SENDER_IFSC': 'WBSC0000038', 'RECIEVER_IFSC': 'HDFC0000634', 'SENDER_ACCT_NO': '00000101011431406', 'SENDER_ACCT_NAME': 'MANJUSHREE ENTERPRISE', 'REMITTER_DETAIL': 'MANJUSHREE ENTERPRISE COOCHBEHAR', 'REMITTER_INFO': 'MANJUSHREE ENTERPRISE COOCHBEHAR', 'RECVR_ACCT_NO': '50200058619544', 'RECVR_ACCT_NAME': '/50200058619544 DVM EXPORTS FEROZE GANDHI MARKET', 'STATUS': 'Processed', 'REJECT_CODE': '', 'REJECT_REASON': '', 'BENEF_ADDRESS': 'FEROZE GANDHI MARKET', 'MSG_TYPE': 'N06'}, {'TXNIND': 'CR', 'BANKCODE': '0001', 'JRNL_ID': '000470642', 'REF_NO': 'WBSCN26065515411', 'TXN_DATE': '06032026', 'TXN_AMT': Decimal('100000'), 'SENDER_IFSC': 'WBSC0000019', 'RECIEVER_IFSC': 'IDIB000B580', 'SENDER_ACCT_NO': '00000129344052761', 'SENDER_ACCT_NAME': 'Mr SUBHASIS MANDAL', 'REMITTER_DETAIL': 'Mr SUBHASIS MANDAL KASHINAGAR', 'REMITTER_INFO': 'Mr SUBHASIS MANDAL KASHINAGAR', 'RECVR_ACCT_NO': '50454934770', 'RECVR_ACCT_NAME': '/50454934770 SUBHASIS MANDAL KASHINAGAR', 'STATUS': 'Processed', 'REJECT_CODE': '', 'REJECT_REASON': '', 'BENEF_ADDRESS': 'KASHINAGAR', 'MSG_TYPE': 'N06'}, {'TXNIND': 'CR', 'BANKCODE': '0001', 'JRNL_ID': '000468027', 'REF_NO': 'WBSCN26065515401', 'TXN_DATE': '06032026', 'TXN_AMT': Decimal('5991'), 'SENDER_IFSC': 'WBSC0000018', 'RECIEVER_IFSC': 'ICIC0000104', 'SENDER_ACCT_NO': '00000101013924411', 'SENDER_ACCT_NAME': 'MS UNITED CONTRUCTION', 'REMITTER_DETAIL': 'MS UNITED CONTRUCTION KAKDWIP', 'REMITTER_INFO': 'MS UNITED CONTRUCTION KAKDWIP', 'RECVR_ACCT_NO': 'WHBJ603260728212281382', 'RECVR_ACCT_NAME': '/WHBJ603260728212281382 WHBJ MUMBAI', 'STATUS': 'ProcesLine truncated
|
||||
2026-03-07 21:35:48 - db.repository - INFO - [{'TXNIND': 'CR', 'BANKCODE': '0001', 'JRNL_ID': '000478050', 'REF_NO': 'WBSCN26065515434', 'TXN_DATE': '06032026', 'TXN_AMT': Decimal('100000'), 'SENDER_IFSC': 'WBSC0000005', 'RECIEVER_IFSC': 'IBKL0000263', 'SENDER_ACCT_NO': '00000101001350118', 'SENDER_ACCT_NAME': 'SAYO SAN CONSTRUCTION', 'REMITTER_DETAIL': 'SAYO SAN CONSTRUCTION KOLKATA', 'REMITTER_INFO': 'SAYO SAN CONSTRUCTION KOLKATA', 'RECVR_ACCT_NO': '0263104000095008', 'RECVR_ACCT_NAME': '/0263104000095008 SAYON GUPTA KOLKATA', 'STATUS': 'Processed', 'REJECT_CODE': '', 'REJECT_REASON': '', 'BENEF_ADDRESS': 'KOLKATA', 'MSG_TYPE': 'N06'}, {'TXNIND': 'CR', 'BANKCODE': '0001', 'JRNL_ID': '000473818', 'REF_NO': 'WBSCN26065515418', 'TXN_DATE': '06032026', 'TXN_AMT': Decimal('70080'), 'SENDER_IFSC': 'WBSC0000010', 'RECIEVER_IFSC': 'BKID0004221', 'SENDER_ACCT_NO': '00000080612930220', 'SENDER_ACCT_NAME': 'SUMAN ENGINEERING CO', 'REMITTER_DETAIL': 'SUMAN ENGINEERING CO KOLKATA', 'REMITTER_INFO': 'SUMAN ENGINEERING CO KOLKATA', 'RECVR_ACCT_NO': '422120110000431', 'RECVR_ACCT_NAME': '/422120110000431 SIGMA ENTERPRISE CHAKDAH', 'STATUS': 'Processed', 'REJECT_CODE': '', 'REJECT_REASON': '', 'BENEF_ADDRESS': 'CHAKDAH', 'MSG_TYPE': 'N06'}, {'TXNIND': 'CR', 'BANKCODE': '0001', 'JRNL_ID': '000474159', 'REF_NO': 'WBSCN26065515419', 'TXN_DATE': '06032026', 'TXN_AMT': Decimal('64800'), 'SENDER_IFSC': 'WBSC0000001', 'RECIEVER_IFSC': 'BKID0004012', 'SENDER_ACCT_NO': '00000101008518745', 'SENDER_ACCT_NAME': 'MANAGER S COLLECTION ACCOUNT', 'REMITTER_DETAIL': 'MANAGER S COLLECTION ACCOUNT THE WBSCB LTD KOLKATA MAIN BRANCH 24A WATERLOO STREET KOLKATA 700069', 'REMITTER_INFO': 'MANAGER S COLLECTION ACCOUNT THE WBSCB LTD KOLKATA MAIN BRANCH 24A WATERLOO STREET KOLKATA 700069', 'RECVR_ACCT_NO': '403220100345401', 'RECVR_ACCT_NAME': '/403220100345401 SBA ASSOCIATES 27 MIRZA GALIB STREET 5TH FLOOR KOLKATA 700016', 'STATUS': 'Processed', 'REJECT_CODE': '', 'REJECT_REASON': '', 'BENEF_ADDRESS': '27 MIRZA GALIB STREET 5TH FLOOR KOLKATA 700016', 'MSG_TYPE': 'N06'}, {'TXNIND': 'CR', 'BANKCODE': '0001', 'JRNL_ID': '000476587', 'REF_NO': 'WBSCN26065515429', 'TXN_DATE': '06032026', 'TXN_AMT': Decimal('50000'), 'SENDER_IFSC': 'WBSC0000028', 'RECIEVER_IFSC': 'SBIN0010541', 'SENDER_ACCT_NO': '00000129315132552', 'SENDER_ACCT_NAME': 'MAJUMDER ENTERPRISE', 'REMITTER_DETAIL': 'MAJUMDER ENTERPRISE BARRACKPORE', 'REMITTER_INFO': 'MAJUMDER ENTERPRISE BARRACKPORE', 'RECVR_ACCT_NO': '31316196926', 'RECVR_ACCT_NAME': '/31316196926 CHANDRATAN HALDER BIJOYGANJ BAZAR', 'STATUS': 'Processed', 'REJECT_CODE': '', 'REJECT_REASON': '', 'BENEF_ADDRESS': 'BIJOYGANJ BAZAR', 'MSG_TYPE': 'N06'}, {'TXNIND': 'CR', 'BANKCODE': '0001', 'JRNL_ID': '000469616', 'REF_NO': 'WBSCN26065515407', 'TXN_DATE': '06032026', 'TXN_AMT': Decimal('18013'), 'SENDER_IFSC': 'WBSC0000034', 'RECIEVER_IFSC': 'ICIC0000104', 'SENDER_ACCT_NO': '00000091560000174', 'SENDER_ACCT_NAME': 'WBSCBL', 'REMITTER_DETAIL': 'WBSCBL PANSHILA', 'REMITTER_INFO': 'WBSCBL PANSHILA', 'RECVR_ACCT_NO': 'WBB1521593517187', 'RECVR_ACCT_NAME': '/WBB1521593517187 COLLECTION ACCOUNT INTERIM WEST BENSODEPUR', 'STATUS': 'Processed', 'REJECT_CODE': '', 'REJECT_REASON': '', 'BENEF_ADDRESS': 'SODEPUR', 'MSG_TYPE': 'N06'}, {'TXNIND': 'CR', 'BANKCODE': '0001', 'JRNL_ID': '000473528', 'REF_NO': 'WBSCN26065515417', 'TXN_DATE': '06032026', 'TXN_AMT': Decimal('100000'), 'SENDER_IFSC': 'WBSC0000038', 'RECIEVER_IFSC': 'HDFC0000634', 'SENDER_ACCT_NO': '00000101011431406', 'SENDER_ACCT_NAME': 'MANJUSHREE ENTERPRISE', 'REMITTER_DETAIL': 'MANJUSHREE ENTERPRISE COOCHBEHAR', 'REMITTER_INFO': 'MANJUSHREE ENTERPRISE COOCHBEHAR', 'RECVR_ACCT_NO': '50200058619544', 'RECVR_ACCT_NAME': '/50200058619544 DVM EXPORTS FEROZE GANDHI MARKET', 'STATUS': 'Processed', 'REJECT_CODE': '', 'REJECT_REASON': '', 'BENEF_ADDRESS': 'FEROZE GANDHI MARKET', 'MSG_TYPE': 'N06'}, {'TXNIND': 'CR', 'BANKCODE': '0001', 'JRNL_ID': '000470642', 'REF_NO': 'WBSCN26065515411', 'TXN_DATE': '06032026', 'TXN_AMT': Decimal('100000'), 'SENDER_IFSC': 'WBSC0000019', 'RECIEVER_IFSC': 'IDIB000B580', 'SENDER_ACCT_NO': '00000129344052761', 'SENDER_ACCT_NAME': 'Mr SUBHASIS MANDAL', 'REMITTER_DETAIL': 'Mr SUBHASIS MANDAL KASHINAGAR', 'REMITTER_INFO': 'Mr SUBHASIS MANDAL KASHINAGAR', 'RECVR_ACCT_NO': '50454934770', 'RECVR_ACCT_NAME': '/50454934770 SUBHASIS MANDAL KASHINAGAR', 'STATUS': 'Processed', 'REJECT_CODE': '', 'REJECT_REASON': '', 'BENEF_ADDRESS': 'KASHINAGAR', 'MSG_TYPE': 'N06'}, {'TXNIND': 'CR', 'BANKCODE': '0001', 'JRNL_ID': '000468027', 'REF_NO': 'WBSCN26065515401', 'TXN_DATE': '06032026', 'TXN_AMT': Decimal('5991'), 'SENDER_IFSC': 'WBSC0000018', 'RECIEVER_IFSC': 'ICIC0000104', 'SENDER_ACCT_NO': '00000101013924411', 'SENDER_ACCT_NAME': 'MS UNITED CONTRUCTION', 'REMITTER_DETAIL': 'MS UNITED CONTRUCTION KAKDWIP', 'REMITTER_INFO': 'MS UNITED CONTRUCTION KAKDWIP', 'RECVR_ACCT_NO': 'WHBJ603260728212281382', 'RECVR_ACCT_NAME': '/WHBJ603260728212281382 WHBJ MUMBAI', 'STATUS': 'ProcesLine truncated
|
||||
2026-03-07 21:35:48 - db.repository - INFO - Inserted 34 NEFT transactions into inward_neft_api_log
|
||||
2026-03-07 21:35:48 - db.repository - INFO - Marked file as processed: 07032026_14_NEFT_INWARD.TXT
|
||||
2026-03-07 21:35:48 - processors.file_processor - INFO - Successfully processed 07032026_14_NEFT_INWARD.TXT: 34 inserted
|
||||
|
||||
@@ -76,7 +76,7 @@ class NEFTDataMapper:
|
||||
s = status.strip()
|
||||
sl = s.lower()
|
||||
if 'processed' in sl or s.upper() == 'PROS':
|
||||
return 'Processed'
|
||||
return 'PROCESSED'
|
||||
if s.upper() == 'WAIT':
|
||||
return 'Waiting'
|
||||
return s
|
||||
|
||||
@@ -39,11 +39,11 @@ class FileProcessor:
|
||||
remote_path: str
|
||||
) -> bool:
|
||||
"""
|
||||
Process a single ACH file end-to-end.
|
||||
Process a single NACH INWARD file end-to-end.
|
||||
|
||||
Workflow:
|
||||
1. Download file from SFTP
|
||||
2. Parse using ACHParser
|
||||
2. Parse using NEFT_INWARD_Parser
|
||||
3. Map to database format
|
||||
4. Insert to database
|
||||
5. Mark as processed
|
||||
@@ -72,18 +72,10 @@ class FileProcessor:
|
||||
raise Exception(f"Failed to download file: {remote_path}")
|
||||
|
||||
# Step 3: Parse file
|
||||
#parser = ACHParser(local_path)
|
||||
|
||||
# Choose parser by filename prefix
|
||||
|
||||
|
||||
parser = NEFT_INWARD_Parser(local_path)
|
||||
# if filename.startswith('ACH_'):
|
||||
# parser = ACHParser(local_path)
|
||||
# elif filename.startswith('UIH_'):
|
||||
# parser = UIHParser(local_path)
|
||||
# else:
|
||||
# logger.warning(f"Unknown file type for parser: {filename}")
|
||||
# return False
|
||||
|
||||
|
||||
transactions, metadata, summary = parser.parse()
|
||||
|
||||
@@ -104,7 +96,7 @@ class FileProcessor:
|
||||
mapped_records = NEFTDataMapper.map_transactions(transactions, bankcode)
|
||||
|
||||
# Step 5: Insert to database (with account validation)
|
||||
inserted_count = self.repository.bulk_insert_transactions(mapped_records)
|
||||
inserted_count, skipped_count = self.repository.bulk_insert_transactions(mapped_records)
|
||||
|
||||
# Step 6: Mark file as processed
|
||||
processed_file = ProcessedFile(
|
||||
@@ -116,7 +108,7 @@ class FileProcessor:
|
||||
)
|
||||
self.repository.mark_file_processed(processed_file)
|
||||
|
||||
logger.info(f"Successfully processed {filename}: {inserted_count} inserted")
|
||||
logger.info(f"Successfully processed {filename}: {inserted_count} inserted, {skipped_count} skipped (non-ipks accounts)")
|
||||
return True
|
||||
|
||||
except Exception as e:
|
||||
|
||||
Reference in new issue
Block a user