Dju/new run trough fixes (#192)

* full single repay

* correclty compute exposure

* yarn build passes

* disable analytics

* rename component

* adjust test to not send request without support

* full single repay not optional

* SupporterView & CorpusView typed

* simplified tests & and increase jest.TimeOut

Co-authored-by: Gaurav Paruthi <gparuthi@umich.edu>

Author: djudjuu

src/components/borrower/repayments.tsx

@@ -35,6 +35,10 @@ export function RepaymentsForm({ user }: Props) {
     user.loans_to_repay[0].loan.schedule.next_borrower_payment
   )
 
+  const fullRepay = Math.ceil(
+    user.loans_to_repay[0].loan.schedule.full_single_repay
+  )
+
   return (
     <Box maxW="lg">
       <form onSubmit={handleSubmit(onSubmit)} method="post">
@@ -43,6 +47,7 @@ export function RepaymentsForm({ user }: Props) {
           <AmountInputWithHelper
             helpers={{
               Next: suggestedNextBorrowerPayment,
+              All: fullRepay,
             }}
             passRef={register({ required: true })}
             setValue={setValue}

src/components/lender/Loans.tsx src/components/lender/InvestedLoans.tsxsrc/components/lender/Loans.tsx renamed to src/components/lender/InvestedLoans.tsx

@@ -19,7 +19,7 @@ import { User } from "../../lib/types"
 import { Currency } from "../common/Currency"
 import LenderModel from "./LenderModel"
 import PledgeInvestments from "./Pledges"
-import InvestedLoans from "./Loans"
+import InvestedLoans from "./InvestedLoans"
 
 interface Props {
   user: User
@@ -58,7 +58,7 @@ const AllocatedAsset = (title: string, percentage: number, color?: string) => (
 
 const LenderDashboard = ({ user }: Props) => {
   const lender = new LenderModel(user)
-  console.log("roi", user.roi)
+  // console.log("roi", user.roi.apr_on_loans.loans)
 
   return (
     <Stack w="100%" spacing={8}>

src/components/lender/LenderDashboard.tsx

@@ -230,16 +230,16 @@ export default class DbClient {
     })
     const loan: LoanInfo = loans.loans[loan_id]
     let newStatus = LoanRequestStatus.active
-    if (loan.state.repayments.length >= loan.terms.tenor) {
-      const noOutstandingDebt =
-        loan.schedule.borrower_view.total_payments.remain <= 10e-7 &&
-        loan.schedule.borrower_view.corpus_principal.remain <= 10e-7 &&
-        loan.schedule.borrower_view.supporter_principal.remain <= 10e-7 &&
-        loan.schedule.borrower_view.supporter_interest.remain <= 10e-7 &&
-        loan.schedule.borrower_view.corpus_interest.remain <= 10e-7
-      newStatus = noOutstandingDebt
-        ? LoanRequestStatus.settled
-        : LoanRequestStatus.defaulted
+    const noOutstandingDebt =
+      loan.schedule.borrower_view.total_payments.remain <= 1 &&
+      loan.schedule.borrower_view.corpus_principal.remain <= 1 &&
+      loan.schedule.borrower_view.supporter_principal.remain <= 1 &&
+      loan.schedule.borrower_view.supporter_interest.remain <= 1 &&
+      loan.schedule.borrower_view.corpus_interest.remain <= 1
+    if (noOutstandingDebt) {
+      newStatus = LoanRequestStatus.settled
+    } else if (loan.state.repayments.length >= loan.terms.tenor) {
+      newStatus = LoanRequestStatus.defaulted
     }
     const { loanRequest } = await this.sdk.UpdateLoanRequestWithLoanData({
       requestId: loan_id,

src/gql/db_client.ts

@@ -111,6 +111,7 @@ export class Fixtures {
       },
       supporter_view: null,
       next_borrower_payment: 15799.51,
+      full_single_repay: 94797,
       apr: {
         corpus: 0.17,
         supporter: 0.16,

src/lib/demo/fixtures.ts

@@ -183,6 +183,27 @@ export type BorrowerView = {
   borrower_collateral: PaidRemain
 }
 
+export type SupporterView = {
+  total_receipts: PaidRemain
+  supporter_principal: PaidRemain
+  supporter_interest: PaidRemain
+  receipts_in_escrow: PaidRemain
+  receipts_rtrn_from_brw: PaidRemain
+  cash_unencumbered: PaidRemain
+  cash_rtrn_from_brw: PaidRemain
+  ptfl_unencumbered: PaidRemain
+  ptfl_rtrn_from_brw: PaidRemain
+  principal_released: PaidRemain
+  interest_released: PaidRemain
+  total_released: PaidRemain
+}
+
+export type CorpusView = {
+  total_receipts: PaidRemain
+  principal: PaidRemain
+  interest: PaidRemain
+}
+
 export type APR = {
   corpus: number
   supporter: number
@@ -191,9 +212,10 @@ export type APR = {
 export type LoanScheduleSummary = {
   borrower_view: BorrowerView
   next_borrower_payment: number
-  supporter_view?: any
-  corpus_view?: any
+  supporter_view: SupporterView
+  corpus_view: CorpusView
   apr: APR
+  full_single_repay: number
 }
 
 // =========== End of risk module types ========

src/lib/types.ts

@@ -228,27 +228,24 @@ describe("Loan Request Flow: confirm loan offer", () => {
     )
     // escrow is again nonzero, as second payment is now being withheld
     expect(updated_request.balance).toBeGreaterThan(0)
-  })
+  }, 10000)
 
   test("make full repayment", async () => {
     const data = await sdk.GetLoanRequest({ requestId })
     let loan = data.loanRequest.loan
-    let ideal_repayment = loan.schedule.next_borrower_payment
-    let updated_request
-    while (loan.state.repayments.length < loan.terms.tenor) {
-      await sdk.ChangeUserCashBalance({
-        userId: BORROWER1.id,
-        delta: ideal_repayment,
-      })
-      updated_request = await dbClient.make_repayment(
-        requestId,
-        ideal_repayment
-      )
-      ideal_repayment = updated_request.loan.schedule.next_borrower_payment
-      loan = updated_request.loan
-    }
+    const ideal_repayment = loan.schedule.full_single_repay
+    await sdk.ChangeUserCashBalance({
+      userId: BORROWER1.id,
+      delta: ideal_repayment,
+    })
+    const updated_request = await dbClient.make_repayment(
+      requestId,
+      ideal_repayment
+    )
+    loan = updated_request.loan
+    // console.log(updated_request)
     expect(updated_request.status).toBe(LoanRequestStatus.settled)
-  })
+  }, 10000)
 
   test.skip("make defaulting repayments", async () => {
     // # TODO make a new loan

tests/src/loan/loan-confirm.integration.test.ts

@@ -6,7 +6,7 @@ import {
   SystemUpdate,
   LoanRequestInfo,
 } from "lib/types"
-import { BORROWER1, SUPPORTER2 } from "../../fixtures/basic_network"
+import { BORROWER1, SUPPORTER2, SUPPORTER3 } from "../../fixtures/basic_network"
 import { addAndConfirmSupporter } from "../common/test_helpers"
 import { dbClient, sdk } from "../common/utils"
 
@@ -18,13 +18,20 @@ beforeAll(async () => {
   await sdk.ResetDB()
   await sdk.CreateUser({ user: BORROWER1 })
   await sdk.CreateUser({ user: SUPPORTER2 })
+  await sdk.CreateUser({ user: SUPPORTER3 })
 
   const { loanRequest } = await dbClient.createLoanRequest(
     BORROWER1.id,
     amount,
     purpose
   )
   requestId = loanRequest.request_id
+  await addAndConfirmSupporter(
+    dbClient,
+    requestId,
+    SUPPORTER2.id,
+    (amount * MIN_SUPPORT_RATIO) / 2
+  )
 })
 
 afterAll(async () => {
@@ -39,7 +46,7 @@ describe("Loan Request Flow", () => {
     const loan = res.loans.loan_offers[requestId]
     expect(loan.request_id).toBe(requestId)
     expect(loan.terms).toHaveProperty("corpus_share")
-    expect(loan.terms.corpus_share).toBe(1)
+    expect(loan.terms.corpus_share).toBe(1 - MIN_SUPPORT_RATIO / 2)
     expect(loan).toHaveProperty("terms.borrower_apr")
   })
 
@@ -60,8 +67,8 @@ describe("Loan Request Flow", () => {
     await addAndConfirmSupporter(
       dbClient,
       requestId,
-      SUPPORTER2.id,
-      amount * MIN_SUPPORT_RATIO
+      SUPPORTER3.id,
+      (amount * MIN_SUPPORT_RATIO) / 2
     )
     const { loanRequest } = await sdk.GetLoanRequest({
       requestId: requestId,

tests/src/loan/loan-offer.integration.test.ts

@@ -70,7 +70,7 @@ describe("Scenario unit tests", () => {
       scenario.actions[scenario.actions.length - 1].payload.amount,
     ])
     generate_yaml = await scenarioToYAML(dbClient)
-  })
+  }, 7000)
 
   test("from generated", async () => {
     const scenario = await Scenario.fromYAML(generate_yaml, dbClient)
@@ -81,5 +81,5 @@ describe("Scenario unit tests", () => {
     // This won't be equal because generated json has much more info (action.id, demographic info, loan_ids are UUIDs )
     // uncomment to compare
     // expect(await scenarioToJSON(dbClient)).toStrictEqual(simple)
-  })
+  }, 10000)
 })