Compare commits

...

9 Commits

Author SHA1 Message Date
VivianDee 64fc119ca7 Update events_service.py 2026-04-10 10:55:09 +01:00
VivianDee d94d104380 [add]: Timeout 2026-04-10 10:41:21 +01:00
ameye ff78788254 Merge branch 'add_last_penal_date' of DigiFi/digifi-BankToProductCore into master 2026-03-12 09:02:30 +00:00
VivianDee 3acb5f098a [add]: last penal date 2026-03-12 09:12:45 +01:00
CHIEFSOFT\ameye 363cdaf192 last_penal_date 2026-03-11 20:30:50 -04:00
ameye 697e848994 Merge branch 'penal_charges' of DigiFi/digifi-BankToProductCore into master 2026-03-11 14:06:54 +00:00
VivianDee 7fa5cb6a83 [add]: penal charges 2026-03-11 14:27:44 +01:00
CHIEFSOFT\ameye 03d5882a3c New penal charges columns 2026-03-11 06:20:11 -04:00
ameye a87259a6ca Merge branch 'verify_balance_check' of DigiFi/digifi-BankToProductCore into master 2026-03-02 12:48:00 +00:00
7 changed files with 92 additions and 8 deletions
+4 -3
View File
@@ -8,6 +8,7 @@ class EventServiceIntegration:
EVENTS_SERVICE_BASE_URL = settings.EVENTS_SERVICE_BASE_URL
ENDPOINT_DIRECT_LOAN = settings.ENDPOINT_DIRECT_LOAN
ENDPOINT_DIRECT_REPAYMENT = settings.ENDPOINT_DIRECT_REPAYMENT
TIMEOUT = settings.TIMEOUT
@staticmethod
def direct_loan(transaction_id: str):
@@ -23,7 +24,7 @@ class EventServiceIntegration:
}
try:
response = httpx.post(url, json=payload, headers=headers, timeout=10.0)
response = httpx.post(url, json=payload, headers=headers, timeout=EventServiceIntegration.TIMEOUT)
logger.info(f"Loan Response: {response.text}")
return response
except Exception as e:
@@ -44,7 +45,7 @@ class EventServiceIntegration:
}
try:
response = httpx.post(url, json=payload, headers=headers, timeout=10.0)
response = httpx.post(url, json=payload, headers=headers, timeout=EventServiceIntegration.TIMEOUT)
logger.info(f"Repayment Response: {response.text}")
return response
except Exception as e:
@@ -61,7 +62,7 @@ class EventServiceIntegration:
logger.info(f"Health Check URL: {url}")
try:
response = httpx.get(url, timeout=5.0)
response = httpx.get(url, timeout=EventServiceIntegration.TIMEOUT)
logger.info(f"Health Check Response: {response.text}")
return response
except Exception as e:
+5 -4
View File
@@ -11,6 +11,7 @@ class SimbrellaIntegration:
HEALTH_ENDPOINT = settings.SIMBRELLA_HEALTH
AUTH_ENDPOINT = settings.BANK_CALL_AUTH_ENDPOINT
SIMBRELLA_VERIFY_BALANCE_ENDPOINT = settings.SIMBRELLA_VERIFY_BALANCE_ENDPOINT
TIMEOUT = settings.TIMEOUT
_access_token = None # cache token in memory
_token_expiry = 0
@@ -33,7 +34,7 @@ class SimbrellaIntegration:
try:
logger.info(f"Requesting Bank token from {url}")
response = httpx.post(url, json=payload, headers=headers, timeout=10.0)
response = httpx.post(url, json=payload, headers=headers, timeout=SimbrellaIntegration.TIMEOUT)
response.raise_for_status()
data = response.json()
@@ -86,7 +87,7 @@ class SimbrellaIntegration:
}
response = httpx.post(url, json=payload, headers=headers, timeout=10.0)
response = httpx.post(url, json=payload, headers=headers, timeout=SimbrellaIntegration.TIMEOUT)
logger.info(f"This is Response: {str(response)}", exc_info=True)
@@ -122,7 +123,7 @@ class SimbrellaIntegration:
url,
json=payload,
headers=headers,
timeout=10.0,
timeout=SimbrellaIntegration.TIMEOUT,
)
logger.info(
@@ -164,7 +165,7 @@ class SimbrellaIntegration:
"Authorization": f"Bearer {access_token}"
}
response = httpx.get(url, headers=headers, timeout=10.0)
response = httpx.get(url, headers=headers, timeout=SimbrellaIntegration.TIMEOUT)
logger.info(f"Bank Health Check Response: {response.text}")
return response
except Exception as e:
+1 -1
View File
@@ -52,7 +52,7 @@ class Config:
BANK_CALL_AUTH_ENDPOINT = os.getenv("BANK_CALL_AUTH_ENDPOINT", "/api/Auth/generate-token")
BANK_CALL_USERNAME = os.getenv("BANK_CALL_USERNAME", "simbrella")
BANK_CALL_PASSWORD = os.getenv("BANK_CALL_PASSWORD", "G7$k9@pL2!qR")
TIMEOUT = os.getenv("TIMEOUT", 60.0)
EVENTS_SERVICE_BASE_URL = os.getenv("EVENTS_SERVICE_BASE_URL","https://event-core.simbrellang.net")
+3
View File
@@ -52,6 +52,9 @@ class Loan(db.Model):
verify_result = db.Column(db.String(10), nullable=True)
verify_description = db.Column(db.String(100), nullable=True)
total_penal_charge = db.Column(db.Float, default=0.0)
last_penal_date = db.Column(db.DateTime, nullable=True)
customer = relationship(
"Customer",
primaryjoin="Customer.id == Loan.customer_id",
+5
View File
@@ -26,6 +26,11 @@ class LoanRepaymentSchedule(db.Model):
created_at = db.Column(db.DateTime(timezone=True), server_default=func.now())
updated_at = db.Column(db.DateTime(timezone=True), server_default=func.now(), onupdate=func.now())
penal_charge = db.Column(db.Float, default=0.0)
penal_count = db.Column(db.Integer, default=0)
last_penal_date = db.Column(db.DateTime, nullable=True)
loan = relationship(
"Loan",
primaryjoin="LoanRepaymentSchedule.loan_id == Loan.id",
+32
View File
@@ -0,0 +1,32 @@
"""empty message
Revision ID: 284be77cb54e
Revises: 718dc29fbd38
Create Date: 2026-03-12 09:10:37.170288
"""
from alembic import op
import sqlalchemy as sa
# revision identifiers, used by Alembic.
revision = "284be77cb54e"
down_revision = "718dc29fbd38"
branch_labels = None
depends_on = None
def upgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.add_column(
"loan_repayment_schedules",
sa.Column("last_penal_date", sa.Float(), nullable=True),
)
### end Alembic commands ###
def downgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.drop_column("loan_repayment_schedules", "last_penal_date")
# ### end Alembic commands ###
+42
View File
@@ -0,0 +1,42 @@
"""empty message
Revision ID: 718dc29fbd38
Revises: 30b45df851fa
Create Date: 2026-03-11 14:18:47.523948
"""
from alembic import op
import sqlalchemy as sa
# revision identifiers, used by Alembic.
revision = '718dc29fbd38'
down_revision = '30b45df851fa'
branch_labels = None
depends_on = None
def upgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.add_column('loan_repayment_schedules',
sa.Column('penal_charge', sa.Float(), nullable=True),
)
op.add_column('loan_repayment_schedules',
sa.Column('penal_count', sa.Integer(), nullable=True),
)
op.add_column('loans',
sa.Column('total_penal_charge', sa.Float(), nullable=True),
)
op.add_column('loans',
sa.Column('last_penal_date', sa.DateTime(), nullable=True),
)
# ### end Alembic commands ###
def downgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.drop_column('loan_repayment_schedules', 'penal_count')
op.drop_column('loan_repayment_schedules', 'penal_charge')
op.drop_column('loans', 'total_penal_charge')
op.drop_column('loans', 'last_penal_date')
# ### end Alembic commands ###