From 291055ce338312b546a8786ad7078b4469ed39c4 Mon Sep 17 00:00:00 2001 From: Adarsh Date: Mon, 10 Jul 2017 10:36:14 -0400 Subject: [PATCH 1/2] Add No fund to funds fixture. Add all lenders to No fund fund. --- .../fixtures/default_loan.json | 55 +++++++++++++++++++ .../apps/budgetSimulator/fixtures/funds.json | 6 ++ 2 files changed, 61 insertions(+) diff --git a/blocnote/apps/budgetSimulator/fixtures/default_loan.json b/blocnote/apps/budgetSimulator/fixtures/default_loan.json index fe300d0..482df2f 100644 --- a/blocnote/apps/budgetSimulator/fixtures/default_loan.json +++ b/blocnote/apps/budgetSimulator/fixtures/default_loan.json @@ -64,5 +64,60 @@ "duration": "84", "max_loan_amount": "2000000.00" } + }, + { + "model": "financialInputs.defaultloan", + "pk": 7, + "fields": { + "lender": 1, + "fund": 3, + "interest_rate": "7.000", + "duration": "84", + "max_loan_amount": "5000000.00" + } + }, + { + "model": "financialInputs.defaultloan", + "pk": 8, + "fields": { + "lender": 2, + "fund": 3, + "interest_rate": "8.000", + "duration": "96", + "max_loan_amount": "7000000.00" + } + }, + { + "model": "financialInputs.defaultloan", + "pk": 9, + "fields": { + "lender": 3, + "fund": 3, + "interest_rate": "10.000", + "duration": "72", + "max_loan_amount": "10000000.00" + } + }, + { + "model": "financialInputs.defaultloan", + "pk": 10, + "fields": { + "lender": 4, + "fund": 3, + "interest_rate": "4.500", + "duration": "120", + "max_loan_amount": "8000000.00" + } + }, + { + "model": "financialInputs.defaultloan", + "pk": 11, + "fields": { + "lender": 5, + "fund": 3, + "interest_rate": "4.500", + "duration": "120", + "max_loan_amount": "2000000.00" + } } ] diff --git a/blocnote/apps/budgetSimulator/fixtures/funds.json b/blocnote/apps/budgetSimulator/fixtures/funds.json index e3d3dd2..2db1048 100644 --- a/blocnote/apps/budgetSimulator/fixtures/funds.json +++ b/blocnote/apps/budgetSimulator/fixtures/funds.json @@ -12,5 +12,11 @@ "fields": { "Name": "Bronx Healthy Buildings Fund" } + }, { + "model": "financialInputs.fund", + "pk": 3, + "fields": { + "Name": "No Fund" + } } ] -- GitLab From 8d702cca42428f7a7e96f524827688e915f80b5e Mon Sep 17 00:00:00 2001 From: Adarsh Date: Mon, 10 Jul 2017 12:13:47 -0400 Subject: [PATCH 2/2] Add the command to run loaddata on fund, lender and defaultloan. --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 11e6f37..f2312d2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -72,6 +72,9 @@ RUN \ # Make migrations RUN cd $CODEROOT && python3 manage.py migrate --noinput +RUN python3 manage.py loaddata blocnote/apps/budgetSimulator/fixtures/funds.json +RUN python3 manage.py loaddata blocnote/apps/budgetSimulator/fixtures/lender.json +RUN python3 manage.py loaddata blocnote/apps/budgetSimulator/fixtures/default_loan.json # Collect static files RUN cd $CODEROOT && python3 manage.py collectstatic --noinput -- GitLab