Skip to content

Commit 6257fec

Browse files
Merge pull request #144 from RedCarpetUp/loan_id_migration
fixes for bulk_insert and loan_id not null
2 parents 9070c93 + d6a38f1 commit 6257fec

File tree

3 files changed

+13
-9
lines changed

3 files changed

+13
-9
lines changed

src/rush/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -543,7 +543,7 @@ class PaymentSplit(AuditMixin):
543543
payment_request_id = Column(String(), nullable=False, index=True)
544544
component = Column(String(50), nullable=False)
545545
amount_settled = Column(Numeric, nullable=False)
546-
loan_id = Column(Integer, ForeignKey(Loan.id), nullable=False)
546+
loan_id = Column(Integer, ForeignKey(Loan.id), nullable=True)
547547

548548

549549
class LoanMoratorium(AuditMixin):

src/rush/payments.py

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -408,11 +408,13 @@ def create_payment_split(session: Session, event: LedgerTriggerEvent):
408408
split_data = get_payment_split_from_event(session, event)
409409
new_ps_objects = []
410410
for component, amount in split_data.items():
411-
ps = PaymentSplit(
412-
payment_request_id=event.extra_details["payment_request_id"],
413-
component=component,
414-
amount_settled=amount,
415-
loan_id=event.loan_id,
411+
new_ps_objects.append(
412+
{
413+
"payment_request_id": event.extra_details["payment_request_id"],
414+
"component": component,
415+
"amount_settled": amount,
416+
"loan_id": event.loan_id,
417+
}
416418
)
417-
new_ps_objects.append(ps)
418-
session.bulk_save_objects(new_ps_objects)
419+
420+
session.bulk_insert_mappings(PaymentSplit, new_ps_objects)

src/test/alembic_config/versions/e2467923fab_loan_schedule.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,9 @@ def upgrade() -> None:
6666
sa.Column("payment_request_id", sa.String(), nullable=False, index=True),
6767
sa.Column("component", sa.String(50), nullable=False),
6868
sa.Column("amount_settled", sa.DECIMAL(), nullable=False),
69-
sa.Column("loan_id", sa.Integer(), nullable=False),
69+
sa.Column(
70+
"loan_id", sa.Integer(), nullable=True
71+
), # this will be fixed later, doing this for testing purposes.
7072
sa.Column("created_at", sa.TIMESTAMP(), nullable=False),
7173
sa.Column("updated_at", sa.TIMESTAMP(), nullable=False),
7274
sa.Column("performed_by", sa.Integer(), nullable=False),

0 commit comments

Comments
 (0)