From d100b223e002a2a4eea12544a9b9d539b0d2242f Mon Sep 17 00:00:00 2001 From: Todd Rizzolo Date: Fri, 22 Nov 2024 08:27:16 -0700 Subject: [PATCH] Revert "Update schema.js (#948)" (#960) This reverts commit 451e84357e94c21339839db890ec4fbd48cedd38. --- ...21P-0969-KITCHEN_SINK-cypress-example.json | 188 ------------- dist/21P-0969-KITCHEN_SINK-example.json | 188 ------------- dist/21P-0969-KITCHEN_SINK-schema.json | 74 +++++- dist/21P-0969-OVERFLOW-cypress-example.json | 192 +------------- dist/21P-0969-OVERFLOW-example.json | 192 +------------- dist/21P-0969-OVERFLOW-schema.json | 74 +++++- dist/21P-0969-SIMPLE-schema.json | 74 +++++- dist/21P-0969-schema.json | 74 +++++- .../21P-0969-kitchen_sink/example.json | 240 ++--------------- src/schemas/21P-0969-overflow/example.json | 246 +++--------------- src/schemas/21P-0969/schema.js | 34 ++- 11 files changed, 333 insertions(+), 1243 deletions(-) diff --git a/dist/21P-0969-KITCHEN_SINK-cypress-example.json b/dist/21P-0969-KITCHEN_SINK-cypress-example.json index 7c25f974..44da6e31 100644 --- a/dist/21P-0969-KITCHEN_SINK-cypress-example.json +++ b/dist/21P-0969-KITCHEN_SINK-cypress-example.json @@ -57,194 +57,6 @@ "grossMonthlyIncome": 12345.67, "payer": "Personnel Management" } - ], - "associatedIncomes": [ - { - "recipientRelationship": "CHILD", - "recipientName": "Emily Doe", - "incomeType": "INTEREST", - "grossMonthlyIncome": 300, - "payer": "Bank of America", - "accountValue": 20000 - }, - { - "recipientRelationship": "SPOUSE", - "incomeType": "DIVIDENDS", - "grossMonthlyIncome": 500.5, - "payer": "Stock Company", - "accountValue": 50000 - }, - { - "recipientRelationship": "OTHER", - "otherRecipientRelationshipType": "Aunt", - "recipientName": "Martha Doe", - "incomeType": "OTHER", - "otherIncomeType": "Rental Property", - "grossMonthlyIncome": 800.75, - "payer": "Real Estate Agency", - "accountValue": 120000 - } - ], - "ownedAssets": [ - { - "recipientRelationship": "SPOUSE", - "recipientName": "Jane Doe", - "assetType": "FARM", - "grossMonthlyIncome": 2500, - "ownedPortionValue": 60000 - }, - { - "recipientRelationship": "CHILD", - "recipientName": "Jane Doe", - "assetType": "BUSINESS", - "grossMonthlyIncome": 1500, - "ownedPortionValue": 40000 - }, - { - "recipientRelationship": "OTHER", - "otherRecipientRelationshipType": "Uncle", - "recipientName": "James Doe", - "assetType": "RENTAL_PROPERTY", - "grossMonthlyIncome": 3000, - "ownedPortionValue": 80000 - } - ], - "royaltiesAndOtherProperties": [ - { - "recipientRelationship": "VETERAN", - "incomeGenerationMethod": "INTELLECTUAL_PROPERTY", - "grossMonthlyIncome": 1000, - "fairMarketValue": 50000, - "canBeSold": true, - "mitigatingCircumstances": "None" - }, - { - "recipientRelationship": "SPOUSE", - "incomeGenerationMethod": "MINERALS_LUMBER", - "grossMonthlyIncome": 1200, - "fairMarketValue": 75000, - "canBeSold": false, - "mitigatingCircumstances": "Legal dispute over property rights" - }, - { - "recipientRelationship": "OTHER", - "otherRecipientRelationshipType": "Nephew", - "recipientName": "Adam Doe", - "incomeGenerationMethod": "USE_OF_LAND", - "grossMonthlyIncome": 800, - "fairMarketValue": 40000, - "canBeSold": true, - "mitigatingCircumstances": "Leased for long term" - } - ], - "assetTransfers": [ - { - "originalOwnerRelationship": "VETERAN", - "otherOriginalOwnerRelationshipType": "", - "transferMethod": "SOLD", - "otherTransferMethod": "", - "assetType": "Real estate property", - "newOwnerName": "Alice Johnson", - "newOwnerRelationship": "Friend", - "saleReportedToIrs": true, - "transferDate": "2023-05-15", - "assetTransferredUnderFairMarketValue": false, - "fairMarketValue": 250000, - "saleValue": 240000, - "capitalGainValue": 10000 - }, - { - "originalOwnerRelationship": "SPOUSE", - "otherOriginalOwnerRelationshipType": "", - "transferMethod": "GIFTED", - "otherTransferMethod": "", - "assetType": "Vehicle", - "newOwnerName": "James Smith", - "newOwnerRelationship": "Child", - "saleReportedToIrs": false, - "transferDate": "2022-11-10", - "assetTransferredUnderFairMarketValue": true, - "fairMarketValue": 15000, - "saleValue": 0, - "capitalGainValue": 0 - }, - { - "originalOwnerRelationship": "CHILD", - "otherOriginalOwnerRelationshipType": "Step-child", - "transferMethod": "TRADED", - "otherTransferMethod": "", - "assetType": "Artwork", - "newOwnerName": "Michael Green", - "newOwnerRelationship": "Cousin", - "saleReportedToIrs": true, - "transferDate": "2021-09-21", - "assetTransferredUnderFairMarketValue": false, - "fairMarketValue": 5000, - "saleValue": 5000, - "capitalGainValue": 2000 - } - ], - "trusts": [ - { - "establishedDate": "2020-03-15", - "marketValueAtEstablishment": 100000, - "trustType": "REVOCABLE", - "addedFundsAfterEstablishment": true, - "addedFundsDate": "2021-05-10", - "addedFundsAmount": 5000, - "receivingIncomeFromTrust": true, - "annualReceivedIncome": 12000, - "trustUsedForMedicalExpenses": false, - "trustEstablishedForVeteransChild": false, - "haveAuthorityOrControlOfTrust": true - }, - { - "establishedDate": "2018-09-25", - "marketValueAtEstablishment": 50000, - "trustType": "IRREVOCABLE", - "addedFundsAfterEstablishment": false, - "receivingIncomeFromTrust": false, - "trustUsedForMedicalExpenses": true, - "monthlyMedicalReimbursementAmount": 300, - "trustEstablishedForVeteransChild": true, - "haveAuthorityOrControlOfTrust": false - }, - { - "establishedDate": "2022-01-01", - "marketValueAtEstablishment": 75000, - "trustType": "BURIAL", - "addedFundsAfterEstablishment": true, - "addedFundsDate": "2023-06-20", - "addedFundsAmount": 2000, - "receivingIncomeFromTrust": false, - "trustUsedForMedicalExpenses": false, - "trustEstablishedForVeteransChild": false, - "haveAuthorityOrControlOfTrust": true - } - ], - "annuities": [ - { - "establishedDate": "2015-03-01", - "marketValueAtEstablishment": 150000, - "addedFundsAfterEstablishment": true, - "addedFundsAmount": 50000, - "addedFundsDate": "2018-06-15", - "revocable": false, - "receivingIncomeFromAnnuity": true, - "annualReceivedIncome": 6000, - "canBeLiquidated": false, - "surrenderValue": 100000 - }, - { - "establishedDate": "2010-05-22", - "marketValueAtEstablishment": 100000, - "addedFundsAfterEstablishment": false, - "revocable": true, - "receivingIncomeFromAnnuity": false, - "annualReceivedIncome": 0, - "canBeLiquidated": true, - "surrenderValue": 80000 - } ] } } diff --git a/dist/21P-0969-KITCHEN_SINK-example.json b/dist/21P-0969-KITCHEN_SINK-example.json index bfa183d9..edd0b98f 100644 --- a/dist/21P-0969-KITCHEN_SINK-example.json +++ b/dist/21P-0969-KITCHEN_SINK-example.json @@ -56,193 +56,5 @@ "grossMonthlyIncome": 12345.67, "payer": "Personnel Management" } - ], - "associatedIncomes": [ - { - "recipientRelationship": "CHILD", - "recipientName": "Emily Doe", - "incomeType": "INTEREST", - "grossMonthlyIncome": 300, - "payer": "Bank of America", - "accountValue": 20000 - }, - { - "recipientRelationship": "SPOUSE", - "incomeType": "DIVIDENDS", - "grossMonthlyIncome": 500.5, - "payer": "Stock Company", - "accountValue": 50000 - }, - { - "recipientRelationship": "OTHER", - "otherRecipientRelationshipType": "Aunt", - "recipientName": "Martha Doe", - "incomeType": "OTHER", - "otherIncomeType": "Rental Property", - "grossMonthlyIncome": 800.75, - "payer": "Real Estate Agency", - "accountValue": 120000 - } - ], - "ownedAssets": [ - { - "recipientRelationship": "SPOUSE", - "recipientName": "Jane Doe", - "assetType": "FARM", - "grossMonthlyIncome": 2500, - "ownedPortionValue": 60000 - }, - { - "recipientRelationship": "CHILD", - "recipientName": "Jane Doe", - "assetType": "BUSINESS", - "grossMonthlyIncome": 1500, - "ownedPortionValue": 40000 - }, - { - "recipientRelationship": "OTHER", - "otherRecipientRelationshipType": "Uncle", - "recipientName": "James Doe", - "assetType": "RENTAL_PROPERTY", - "grossMonthlyIncome": 3000, - "ownedPortionValue": 80000 - } - ], - "royaltiesAndOtherProperties": [ - { - "recipientRelationship": "VETERAN", - "incomeGenerationMethod": "INTELLECTUAL_PROPERTY", - "grossMonthlyIncome": 1000, - "fairMarketValue": 50000, - "canBeSold": true, - "mitigatingCircumstances": "None" - }, - { - "recipientRelationship": "SPOUSE", - "incomeGenerationMethod": "MINERALS_LUMBER", - "grossMonthlyIncome": 1200, - "fairMarketValue": 75000, - "canBeSold": false, - "mitigatingCircumstances": "Legal dispute over property rights" - }, - { - "recipientRelationship": "OTHER", - "otherRecipientRelationshipType": "Nephew", - "recipientName": "Adam Doe", - "incomeGenerationMethod": "USE_OF_LAND", - "grossMonthlyIncome": 800, - "fairMarketValue": 40000, - "canBeSold": true, - "mitigatingCircumstances": "Leased for long term" - } - ], - "assetTransfers": [ - { - "originalOwnerRelationship": "VETERAN", - "otherOriginalOwnerRelationshipType": "", - "transferMethod": "SOLD", - "otherTransferMethod": "", - "assetType": "Real estate property", - "newOwnerName": "Alice Johnson", - "newOwnerRelationship": "Friend", - "saleReportedToIrs": true, - "transferDate": "2023-05-15", - "assetTransferredUnderFairMarketValue": false, - "fairMarketValue": 250000, - "saleValue": 240000, - "capitalGainValue": 10000 - }, - { - "originalOwnerRelationship": "SPOUSE", - "otherOriginalOwnerRelationshipType": "", - "transferMethod": "GIFTED", - "otherTransferMethod": "", - "assetType": "Vehicle", - "newOwnerName": "James Smith", - "newOwnerRelationship": "Child", - "saleReportedToIrs": false, - "transferDate": "2022-11-10", - "assetTransferredUnderFairMarketValue": true, - "fairMarketValue": 15000, - "saleValue": 0, - "capitalGainValue": 0 - }, - { - "originalOwnerRelationship": "CHILD", - "otherOriginalOwnerRelationshipType": "Step-child", - "transferMethod": "TRADED", - "otherTransferMethod": "", - "assetType": "Artwork", - "newOwnerName": "Michael Green", - "newOwnerRelationship": "Cousin", - "saleReportedToIrs": true, - "transferDate": "2021-09-21", - "assetTransferredUnderFairMarketValue": false, - "fairMarketValue": 5000, - "saleValue": 5000, - "capitalGainValue": 2000 - } - ], - "trusts": [ - { - "establishedDate": "2020-03-15", - "marketValueAtEstablishment": 100000, - "trustType": "REVOCABLE", - "addedFundsAfterEstablishment": true, - "addedFundsDate": "2021-05-10", - "addedFundsAmount": 5000, - "receivingIncomeFromTrust": true, - "annualReceivedIncome": 12000, - "trustUsedForMedicalExpenses": false, - "trustEstablishedForVeteransChild": false, - "haveAuthorityOrControlOfTrust": true - }, - { - "establishedDate": "2018-09-25", - "marketValueAtEstablishment": 50000, - "trustType": "IRREVOCABLE", - "addedFundsAfterEstablishment": false, - "receivingIncomeFromTrust": false, - "trustUsedForMedicalExpenses": true, - "monthlyMedicalReimbursementAmount": 300, - "trustEstablishedForVeteransChild": true, - "haveAuthorityOrControlOfTrust": false - }, - { - "establishedDate": "2022-01-01", - "marketValueAtEstablishment": 75000, - "trustType": "BURIAL", - "addedFundsAfterEstablishment": true, - "addedFundsDate": "2023-06-20", - "addedFundsAmount": 2000, - "receivingIncomeFromTrust": false, - "trustUsedForMedicalExpenses": false, - "trustEstablishedForVeteransChild": false, - "haveAuthorityOrControlOfTrust": true - } - ], - "annuities": [ - { - "establishedDate": "2015-03-01", - "marketValueAtEstablishment": 150000, - "addedFundsAfterEstablishment": true, - "addedFundsAmount": 50000, - "addedFundsDate": "2018-06-15", - "revocable": false, - "receivingIncomeFromAnnuity": true, - "annualReceivedIncome": 6000, - "canBeLiquidated": false, - "surrenderValue": 100000 - }, - { - "establishedDate": "2010-05-22", - "marketValueAtEstablishment": 100000, - "addedFundsAfterEstablishment": false, - "revocable": true, - "receivingIncomeFromAnnuity": false, - "annualReceivedIncome": 0, - "canBeLiquidated": true, - "surrenderValue": 80000 - } ] } diff --git a/dist/21P-0969-KITCHEN_SINK-schema.json b/dist/21P-0969-KITCHEN_SINK-schema.json index e9a94190..e672ac45 100644 --- a/dist/21P-0969-KITCHEN_SINK-schema.json +++ b/dist/21P-0969-KITCHEN_SINK-schema.json @@ -42,6 +42,25 @@ "OTHER" ] }, + "addedFunds": { + "type": "array", + "items": { + "type": "object", + "required": [ + "fundsAddedDate", + "amountAdded" + ], + "properties": { + "fundsAddedDate": { + "$ref": "#/definitions/date" + }, + "amountAdded": { + "type": "number", + "default": 0 + } + } + } + }, "unassociatedIncomes": { "type": "array", "items": { @@ -140,7 +159,7 @@ "recipientRelationship", "assetType", "grossMonthlyIncome", - "ownedPortionValue" + "payer" ], "properties": { "recipientName": { @@ -167,6 +186,9 @@ "type": "number", "default": 0 }, + "payer": { + "type": "string" + }, "ownedPortionValue": { "type": "number", "default": 0 @@ -232,12 +254,14 @@ "originalOwnerRelationship", "transferMethod", "assetType", + "payer", "newOwnerName", "newOwnerRelationship", "saleReportedToIrs", "transferDate", "assetTransferredUnderFairMarketValue", "fairMarketValue", + "saleValue", "capitalGainValue" ], "properties": { @@ -298,7 +322,7 @@ "items": { "type": "object", "required": [ - "establishedDate", + "establishmentDate", "marketValueAtEstablishment", "trustType", "addedFundsAfterEstablishment", @@ -326,12 +350,8 @@ "addedFundsAfterEstablishment": { "type": "boolean" }, - "addedFundsDate": { - "$ref": "#/definitions/date" - }, - "addedFundsAmount": { - "type": "number", - "default": 0 + "addedFunds": { + "$ref": "#/definitions/addedFunds" }, "receivingIncomeFromTrust": { "type": "boolean" @@ -379,12 +399,8 @@ "addedFundsAfterEstablishment": { "type": "boolean" }, - "addedFundsDate": { - "$ref": "#/definitions/date" - }, - "addedFundsAmount": { - "type": "number", - "default": 0 + "addedFunds": { + "$ref": "#/definitions/addedFunds" }, "revocable": { "type": "boolean" @@ -588,33 +604,63 @@ "dateReceivedByVa": { "type": "boolean" }, + "hasUnassociatedIncomes": { + "type": "boolean" + }, "unassociatedIncomes": { "$ref": "#/definitions/unassociatedIncomes" }, + "hasAssociatedIncomes": { + "type": "boolean" + }, "associatedIncomes": { "$ref": "#/definitions/associatedIncomes" }, + "hasOwnedAssets": { + "type": "boolean" + }, "ownedAssets": { "$ref": "#/definitions/ownedAssets" }, + "hasRoyaltiesAndOtherProperties": { + "type": "boolean" + }, "royaltiesAndOtherProperties": { "$ref": "#/definitions/royaltiesAndOtherProperties" }, + "hasAssetTransfers": { + "type": "boolean" + }, "assetTransfers": { "$ref": "#/definitions/assetTransfers" }, + "hasTrusts": { + "type": "boolean" + }, "trusts": { "$ref": "#/definitions/trusts" }, + "hasAnnuities": { + "type": "boolean" + }, "annuities": { "$ref": "#/definitions/annuities" }, + "hasUnreportedAssets": { + "type": "boolean" + }, "unreportedAssets": { "$ref": "#/definitions/unreportedAssets" }, + "hasDiscontinuedIncomes": { + "type": "boolean" + }, "discontinuedIncomes": { "$ref": "#/definitions/discontinuedIncomes" }, + "hasIncomeReceiptWaivers": { + "type": "boolean" + }, "incomeReceiptWaivers": { "$ref": "#/definitions/incomeReceiptWaivers" }, diff --git a/dist/21P-0969-OVERFLOW-cypress-example.json b/dist/21P-0969-OVERFLOW-cypress-example.json index 53eb0247..5c160960 100644 --- a/dist/21P-0969-OVERFLOW-cypress-example.json +++ b/dist/21P-0969-OVERFLOW-cypress-example.json @@ -56,197 +56,13 @@ "incomeType": "CIVIL_SERVICE", "grossMonthlyIncome": 12345.67, "payer": "Personnel Management" - } - ], - "associatedIncomes": [ - { - "recipientRelationship": "CHILD", - "recipientName": "Emily Doe", - "incomeType": "INTEREST", - "grossMonthlyIncome": 300, - "payer": "Bank of America", - "accountValue": 20000 - }, - { - "recipientRelationship": "SPOUSE", - "incomeType": "DIVIDENDS", - "grossMonthlyIncome": 500.5, - "payer": "Stock Company", - "accountValue": 50000 - }, - { - "recipientRelationship": "OTHER", - "otherRecipientRelationshipType": "Aunt", - "recipientName": "Martha Doe", - "incomeType": "OTHER", - "otherIncomeType": "Rental Property", - "grossMonthlyIncome": 800.75, - "payer": "Real Estate Agency", - "accountValue": 120000 - } - ], - "ownedAssets": [ - { - "recipientRelationship": "SPOUSE", - "recipientName": "Jane Doe", - "assetType": "FARM", - "grossMonthlyIncome": 2500, - "payer": "Doe Family Farm", - "ownedPortionValue": 60000 }, { - "recipientRelationship": "CHILD", - "recipientName": "Jane Doe", - "assetType": "BUSINESS", - "grossMonthlyIncome": 1500, - "payer": "Doe Family Enterprises", - "ownedPortionValue": 40000 - }, - { - "recipientRelationship": "OTHER", - "otherRecipientRelationshipType": "Uncle", - "recipientName": "James Doe", - "assetType": "RENTAL_PROPERTY", - "grossMonthlyIncome": 3000, - "payer": "Doe Real Estate", - "ownedPortionValue": 80000 - } - ], - "royaltiesAndOtherProperties": [ - { - "recipientRelationship": "VETERAN", - "incomeGenerationMethod": "INTELLECTUAL_PROPERTY", + "recipientRelationship": "CUSTODIAN", + "recipientName": "Sam Doe", + "incomeType": "UNEMPLOYMENT", "grossMonthlyIncome": 1000, - "fairMarketValue": 50000, - "canBeSold": true, - "mitigatingCircumstances": "None" - }, - { - "recipientRelationship": "SPOUSE", - "incomeGenerationMethod": "MINERALS_LUMBER", - "grossMonthlyIncome": 1200, - "fairMarketValue": 75000, - "canBeSold": false, - "mitigatingCircumstances": "Legal dispute over property rights" - }, - { - "recipientRelationship": "OTHER", - "otherRecipientRelationshipType": "Nephew", - "recipientName": "Adam Doe", - "incomeGenerationMethod": "USE_OF_LAND", - "grossMonthlyIncome": 800, - "fairMarketValue": 40000, - "canBeSold": true, - "mitigatingCircumstances": "Leased for long term" - } - ], - "assetTransfers": [ - { - "originalOwnerRelationship": "VETERAN", - "otherOriginalOwnerRelationshipType": "", - "transferMethod": "SOLD", - "otherTransferMethod": "", - "assetType": "Real estate property", - "newOwnerName": "Alice Johnson", - "newOwnerRelationship": "Friend", - "saleReportedToIrs": true, - "transferDate": "2023-05-15", - "assetTransferredUnderFairMarketValue": false, - "fairMarketValue": 250000, - "saleValue": 240000, - "capitalGainValue": 10000 - }, - { - "originalOwnerRelationship": "SPOUSE", - "otherOriginalOwnerRelationshipType": "", - "transferMethod": "GIFTED", - "otherTransferMethod": "", - "assetType": "Vehicle", - "newOwnerName": "James Smith", - "newOwnerRelationship": "Child", - "saleReportedToIrs": false, - "transferDate": "2022-11-10", - "assetTransferredUnderFairMarketValue": true, - "fairMarketValue": 15000, - "saleValue": 0, - "capitalGainValue": 0 - }, - { - "originalOwnerRelationship": "CHILD", - "otherOriginalOwnerRelationshipType": "Step-child", - "transferMethod": "TRADED", - "otherTransferMethod": "", - "assetType": "Artwork", - "newOwnerName": "Michael Green", - "newOwnerRelationship": "Cousin", - "saleReportedToIrs": true, - "transferDate": "2021-09-21", - "assetTransferredUnderFairMarketValue": false, - "fairMarketValue": 5000, - "saleValue": 5000, - "capitalGainValue": 2000 - } - ], - "trusts": [ - { - "establishedDate": "2020-03-15", - "marketValueAtEstablishment": 100000, - "trustType": "REVOCABLE", - "addedFundsAfterEstablishment": true, - "addedFundsDate": "2021-05-10", - "addedFundsAmount": 5000, - "receivingIncomeFromTrust": true, - "annualReceivedIncome": 12000, - "trustUsedForMedicalExpenses": false, - "trustEstablishedForVeteransChild": false, - "haveAuthorityOrControlOfTrust": true - }, - { - "establishedDate": "2018-09-25", - "marketValueAtEstablishment": 50000, - "trustType": "IRREVOCABLE", - "addedFundsAfterEstablishment": false, - "receivingIncomeFromTrust": false, - "trustUsedForMedicalExpenses": true, - "monthlyMedicalReimbursementAmount": 300, - "trustEstablishedForVeteransChild": true, - "haveAuthorityOrControlOfTrust": false - }, - { - "establishedDate": "2022-01-01", - "marketValueAtEstablishment": 75000, - "trustType": "BURIAL", - "addedFundsAfterEstablishment": true, - "addedFundsDate": "2023-06-20", - "addedFundsAmount": 2000, - "receivingIncomeFromTrust": false, - "trustUsedForMedicalExpenses": false, - "trustEstablishedForVeteransChild": false, - "haveAuthorityOrControlOfTrust": true - } - ], - "annuities": [ - { - "establishedDate": "2015-03-01", - "marketValueAtEstablishment": 150000, - "addedFundsAfterEstablishment": true, - "addedFundsAmount": 50000, - "addedFundsDate": "2018-06-15", - "revocable": false, - "receivingIncomeFromAnnuity": true, - "annualReceivedIncome": 6000, - "canBeLiquidated": false, - "surrenderValue": 100000 - }, - { - "establishedDate": "2010-05-22", - "marketValueAtEstablishment": 100000, - "addedFundsAfterEstablishment": false, - "revocable": true, - "receivingIncomeFromAnnuity": false, - "annualReceivedIncome": 0, - "canBeLiquidated": true, - "surrenderValue": 80000 + "payer": "Agency of Unemployment" } ] } diff --git a/dist/21P-0969-OVERFLOW-example.json b/dist/21P-0969-OVERFLOW-example.json index c4636391..c1574f8d 100644 --- a/dist/21P-0969-OVERFLOW-example.json +++ b/dist/21P-0969-OVERFLOW-example.json @@ -55,197 +55,13 @@ "incomeType": "CIVIL_SERVICE", "grossMonthlyIncome": 12345.67, "payer": "Personnel Management" - } - ], - "associatedIncomes": [ - { - "recipientRelationship": "CHILD", - "recipientName": "Emily Doe", - "incomeType": "INTEREST", - "grossMonthlyIncome": 300, - "payer": "Bank of America", - "accountValue": 20000 - }, - { - "recipientRelationship": "SPOUSE", - "incomeType": "DIVIDENDS", - "grossMonthlyIncome": 500.5, - "payer": "Stock Company", - "accountValue": 50000 - }, - { - "recipientRelationship": "OTHER", - "otherRecipientRelationshipType": "Aunt", - "recipientName": "Martha Doe", - "incomeType": "OTHER", - "otherIncomeType": "Rental Property", - "grossMonthlyIncome": 800.75, - "payer": "Real Estate Agency", - "accountValue": 120000 - } - ], - "ownedAssets": [ - { - "recipientRelationship": "SPOUSE", - "recipientName": "Jane Doe", - "assetType": "FARM", - "grossMonthlyIncome": 2500, - "payer": "Doe Family Farm", - "ownedPortionValue": 60000 }, { - "recipientRelationship": "CHILD", - "recipientName": "Jane Doe", - "assetType": "BUSINESS", - "grossMonthlyIncome": 1500, - "payer": "Doe Family Enterprises", - "ownedPortionValue": 40000 - }, - { - "recipientRelationship": "OTHER", - "otherRecipientRelationshipType": "Uncle", - "recipientName": "James Doe", - "assetType": "RENTAL_PROPERTY", - "grossMonthlyIncome": 3000, - "payer": "Doe Real Estate", - "ownedPortionValue": 80000 - } - ], - "royaltiesAndOtherProperties": [ - { - "recipientRelationship": "VETERAN", - "incomeGenerationMethod": "INTELLECTUAL_PROPERTY", + "recipientRelationship": "CUSTODIAN", + "recipientName": "Sam Doe", + "incomeType": "UNEMPLOYMENT", "grossMonthlyIncome": 1000, - "fairMarketValue": 50000, - "canBeSold": true, - "mitigatingCircumstances": "None" - }, - { - "recipientRelationship": "SPOUSE", - "incomeGenerationMethod": "MINERALS_LUMBER", - "grossMonthlyIncome": 1200, - "fairMarketValue": 75000, - "canBeSold": false, - "mitigatingCircumstances": "Legal dispute over property rights" - }, - { - "recipientRelationship": "OTHER", - "otherRecipientRelationshipType": "Nephew", - "recipientName": "Adam Doe", - "incomeGenerationMethod": "USE_OF_LAND", - "grossMonthlyIncome": 800, - "fairMarketValue": 40000, - "canBeSold": true, - "mitigatingCircumstances": "Leased for long term" - } - ], - "assetTransfers": [ - { - "originalOwnerRelationship": "VETERAN", - "otherOriginalOwnerRelationshipType": "", - "transferMethod": "SOLD", - "otherTransferMethod": "", - "assetType": "Real estate property", - "newOwnerName": "Alice Johnson", - "newOwnerRelationship": "Friend", - "saleReportedToIrs": true, - "transferDate": "2023-05-15", - "assetTransferredUnderFairMarketValue": false, - "fairMarketValue": 250000, - "saleValue": 240000, - "capitalGainValue": 10000 - }, - { - "originalOwnerRelationship": "SPOUSE", - "otherOriginalOwnerRelationshipType": "", - "transferMethod": "GIFTED", - "otherTransferMethod": "", - "assetType": "Vehicle", - "newOwnerName": "James Smith", - "newOwnerRelationship": "Child", - "saleReportedToIrs": false, - "transferDate": "2022-11-10", - "assetTransferredUnderFairMarketValue": true, - "fairMarketValue": 15000, - "saleValue": 0, - "capitalGainValue": 0 - }, - { - "originalOwnerRelationship": "CHILD", - "otherOriginalOwnerRelationshipType": "Step-child", - "transferMethod": "TRADED", - "otherTransferMethod": "", - "assetType": "Artwork", - "newOwnerName": "Michael Green", - "newOwnerRelationship": "Cousin", - "saleReportedToIrs": true, - "transferDate": "2021-09-21", - "assetTransferredUnderFairMarketValue": false, - "fairMarketValue": 5000, - "saleValue": 5000, - "capitalGainValue": 2000 - } - ], - "trusts": [ - { - "establishedDate": "2020-03-15", - "marketValueAtEstablishment": 100000, - "trustType": "REVOCABLE", - "addedFundsAfterEstablishment": true, - "addedFundsDate": "2021-05-10", - "addedFundsAmount": 5000, - "receivingIncomeFromTrust": true, - "annualReceivedIncome": 12000, - "trustUsedForMedicalExpenses": false, - "trustEstablishedForVeteransChild": false, - "haveAuthorityOrControlOfTrust": true - }, - { - "establishedDate": "2018-09-25", - "marketValueAtEstablishment": 50000, - "trustType": "IRREVOCABLE", - "addedFundsAfterEstablishment": false, - "receivingIncomeFromTrust": false, - "trustUsedForMedicalExpenses": true, - "monthlyMedicalReimbursementAmount": 300, - "trustEstablishedForVeteransChild": true, - "haveAuthorityOrControlOfTrust": false - }, - { - "establishedDate": "2022-01-01", - "marketValueAtEstablishment": 75000, - "trustType": "BURIAL", - "addedFundsAfterEstablishment": true, - "addedFundsDate": "2023-06-20", - "addedFundsAmount": 2000, - "receivingIncomeFromTrust": false, - "trustUsedForMedicalExpenses": false, - "trustEstablishedForVeteransChild": false, - "haveAuthorityOrControlOfTrust": true - } - ], - "annuities": [ - { - "establishedDate": "2015-03-01", - "marketValueAtEstablishment": 150000, - "addedFundsAfterEstablishment": true, - "addedFundsAmount": 50000, - "addedFundsDate": "2018-06-15", - "revocable": false, - "receivingIncomeFromAnnuity": true, - "annualReceivedIncome": 6000, - "canBeLiquidated": false, - "surrenderValue": 100000 - }, - { - "establishedDate": "2010-05-22", - "marketValueAtEstablishment": 100000, - "addedFundsAfterEstablishment": false, - "revocable": true, - "receivingIncomeFromAnnuity": false, - "annualReceivedIncome": 0, - "canBeLiquidated": true, - "surrenderValue": 80000 + "payer": "Agency of Unemployment" } ] } diff --git a/dist/21P-0969-OVERFLOW-schema.json b/dist/21P-0969-OVERFLOW-schema.json index e9a94190..e672ac45 100644 --- a/dist/21P-0969-OVERFLOW-schema.json +++ b/dist/21P-0969-OVERFLOW-schema.json @@ -42,6 +42,25 @@ "OTHER" ] }, + "addedFunds": { + "type": "array", + "items": { + "type": "object", + "required": [ + "fundsAddedDate", + "amountAdded" + ], + "properties": { + "fundsAddedDate": { + "$ref": "#/definitions/date" + }, + "amountAdded": { + "type": "number", + "default": 0 + } + } + } + }, "unassociatedIncomes": { "type": "array", "items": { @@ -140,7 +159,7 @@ "recipientRelationship", "assetType", "grossMonthlyIncome", - "ownedPortionValue" + "payer" ], "properties": { "recipientName": { @@ -167,6 +186,9 @@ "type": "number", "default": 0 }, + "payer": { + "type": "string" + }, "ownedPortionValue": { "type": "number", "default": 0 @@ -232,12 +254,14 @@ "originalOwnerRelationship", "transferMethod", "assetType", + "payer", "newOwnerName", "newOwnerRelationship", "saleReportedToIrs", "transferDate", "assetTransferredUnderFairMarketValue", "fairMarketValue", + "saleValue", "capitalGainValue" ], "properties": { @@ -298,7 +322,7 @@ "items": { "type": "object", "required": [ - "establishedDate", + "establishmentDate", "marketValueAtEstablishment", "trustType", "addedFundsAfterEstablishment", @@ -326,12 +350,8 @@ "addedFundsAfterEstablishment": { "type": "boolean" }, - "addedFundsDate": { - "$ref": "#/definitions/date" - }, - "addedFundsAmount": { - "type": "number", - "default": 0 + "addedFunds": { + "$ref": "#/definitions/addedFunds" }, "receivingIncomeFromTrust": { "type": "boolean" @@ -379,12 +399,8 @@ "addedFundsAfterEstablishment": { "type": "boolean" }, - "addedFundsDate": { - "$ref": "#/definitions/date" - }, - "addedFundsAmount": { - "type": "number", - "default": 0 + "addedFunds": { + "$ref": "#/definitions/addedFunds" }, "revocable": { "type": "boolean" @@ -588,33 +604,63 @@ "dateReceivedByVa": { "type": "boolean" }, + "hasUnassociatedIncomes": { + "type": "boolean" + }, "unassociatedIncomes": { "$ref": "#/definitions/unassociatedIncomes" }, + "hasAssociatedIncomes": { + "type": "boolean" + }, "associatedIncomes": { "$ref": "#/definitions/associatedIncomes" }, + "hasOwnedAssets": { + "type": "boolean" + }, "ownedAssets": { "$ref": "#/definitions/ownedAssets" }, + "hasRoyaltiesAndOtherProperties": { + "type": "boolean" + }, "royaltiesAndOtherProperties": { "$ref": "#/definitions/royaltiesAndOtherProperties" }, + "hasAssetTransfers": { + "type": "boolean" + }, "assetTransfers": { "$ref": "#/definitions/assetTransfers" }, + "hasTrusts": { + "type": "boolean" + }, "trusts": { "$ref": "#/definitions/trusts" }, + "hasAnnuities": { + "type": "boolean" + }, "annuities": { "$ref": "#/definitions/annuities" }, + "hasUnreportedAssets": { + "type": "boolean" + }, "unreportedAssets": { "$ref": "#/definitions/unreportedAssets" }, + "hasDiscontinuedIncomes": { + "type": "boolean" + }, "discontinuedIncomes": { "$ref": "#/definitions/discontinuedIncomes" }, + "hasIncomeReceiptWaivers": { + "type": "boolean" + }, "incomeReceiptWaivers": { "$ref": "#/definitions/incomeReceiptWaivers" }, diff --git a/dist/21P-0969-SIMPLE-schema.json b/dist/21P-0969-SIMPLE-schema.json index e9a94190..e672ac45 100644 --- a/dist/21P-0969-SIMPLE-schema.json +++ b/dist/21P-0969-SIMPLE-schema.json @@ -42,6 +42,25 @@ "OTHER" ] }, + "addedFunds": { + "type": "array", + "items": { + "type": "object", + "required": [ + "fundsAddedDate", + "amountAdded" + ], + "properties": { + "fundsAddedDate": { + "$ref": "#/definitions/date" + }, + "amountAdded": { + "type": "number", + "default": 0 + } + } + } + }, "unassociatedIncomes": { "type": "array", "items": { @@ -140,7 +159,7 @@ "recipientRelationship", "assetType", "grossMonthlyIncome", - "ownedPortionValue" + "payer" ], "properties": { "recipientName": { @@ -167,6 +186,9 @@ "type": "number", "default": 0 }, + "payer": { + "type": "string" + }, "ownedPortionValue": { "type": "number", "default": 0 @@ -232,12 +254,14 @@ "originalOwnerRelationship", "transferMethod", "assetType", + "payer", "newOwnerName", "newOwnerRelationship", "saleReportedToIrs", "transferDate", "assetTransferredUnderFairMarketValue", "fairMarketValue", + "saleValue", "capitalGainValue" ], "properties": { @@ -298,7 +322,7 @@ "items": { "type": "object", "required": [ - "establishedDate", + "establishmentDate", "marketValueAtEstablishment", "trustType", "addedFundsAfterEstablishment", @@ -326,12 +350,8 @@ "addedFundsAfterEstablishment": { "type": "boolean" }, - "addedFundsDate": { - "$ref": "#/definitions/date" - }, - "addedFundsAmount": { - "type": "number", - "default": 0 + "addedFunds": { + "$ref": "#/definitions/addedFunds" }, "receivingIncomeFromTrust": { "type": "boolean" @@ -379,12 +399,8 @@ "addedFundsAfterEstablishment": { "type": "boolean" }, - "addedFundsDate": { - "$ref": "#/definitions/date" - }, - "addedFundsAmount": { - "type": "number", - "default": 0 + "addedFunds": { + "$ref": "#/definitions/addedFunds" }, "revocable": { "type": "boolean" @@ -588,33 +604,63 @@ "dateReceivedByVa": { "type": "boolean" }, + "hasUnassociatedIncomes": { + "type": "boolean" + }, "unassociatedIncomes": { "$ref": "#/definitions/unassociatedIncomes" }, + "hasAssociatedIncomes": { + "type": "boolean" + }, "associatedIncomes": { "$ref": "#/definitions/associatedIncomes" }, + "hasOwnedAssets": { + "type": "boolean" + }, "ownedAssets": { "$ref": "#/definitions/ownedAssets" }, + "hasRoyaltiesAndOtherProperties": { + "type": "boolean" + }, "royaltiesAndOtherProperties": { "$ref": "#/definitions/royaltiesAndOtherProperties" }, + "hasAssetTransfers": { + "type": "boolean" + }, "assetTransfers": { "$ref": "#/definitions/assetTransfers" }, + "hasTrusts": { + "type": "boolean" + }, "trusts": { "$ref": "#/definitions/trusts" }, + "hasAnnuities": { + "type": "boolean" + }, "annuities": { "$ref": "#/definitions/annuities" }, + "hasUnreportedAssets": { + "type": "boolean" + }, "unreportedAssets": { "$ref": "#/definitions/unreportedAssets" }, + "hasDiscontinuedIncomes": { + "type": "boolean" + }, "discontinuedIncomes": { "$ref": "#/definitions/discontinuedIncomes" }, + "hasIncomeReceiptWaivers": { + "type": "boolean" + }, "incomeReceiptWaivers": { "$ref": "#/definitions/incomeReceiptWaivers" }, diff --git a/dist/21P-0969-schema.json b/dist/21P-0969-schema.json index e9a94190..e672ac45 100644 --- a/dist/21P-0969-schema.json +++ b/dist/21P-0969-schema.json @@ -42,6 +42,25 @@ "OTHER" ] }, + "addedFunds": { + "type": "array", + "items": { + "type": "object", + "required": [ + "fundsAddedDate", + "amountAdded" + ], + "properties": { + "fundsAddedDate": { + "$ref": "#/definitions/date" + }, + "amountAdded": { + "type": "number", + "default": 0 + } + } + } + }, "unassociatedIncomes": { "type": "array", "items": { @@ -140,7 +159,7 @@ "recipientRelationship", "assetType", "grossMonthlyIncome", - "ownedPortionValue" + "payer" ], "properties": { "recipientName": { @@ -167,6 +186,9 @@ "type": "number", "default": 0 }, + "payer": { + "type": "string" + }, "ownedPortionValue": { "type": "number", "default": 0 @@ -232,12 +254,14 @@ "originalOwnerRelationship", "transferMethod", "assetType", + "payer", "newOwnerName", "newOwnerRelationship", "saleReportedToIrs", "transferDate", "assetTransferredUnderFairMarketValue", "fairMarketValue", + "saleValue", "capitalGainValue" ], "properties": { @@ -298,7 +322,7 @@ "items": { "type": "object", "required": [ - "establishedDate", + "establishmentDate", "marketValueAtEstablishment", "trustType", "addedFundsAfterEstablishment", @@ -326,12 +350,8 @@ "addedFundsAfterEstablishment": { "type": "boolean" }, - "addedFundsDate": { - "$ref": "#/definitions/date" - }, - "addedFundsAmount": { - "type": "number", - "default": 0 + "addedFunds": { + "$ref": "#/definitions/addedFunds" }, "receivingIncomeFromTrust": { "type": "boolean" @@ -379,12 +399,8 @@ "addedFundsAfterEstablishment": { "type": "boolean" }, - "addedFundsDate": { - "$ref": "#/definitions/date" - }, - "addedFundsAmount": { - "type": "number", - "default": 0 + "addedFunds": { + "$ref": "#/definitions/addedFunds" }, "revocable": { "type": "boolean" @@ -588,33 +604,63 @@ "dateReceivedByVa": { "type": "boolean" }, + "hasUnassociatedIncomes": { + "type": "boolean" + }, "unassociatedIncomes": { "$ref": "#/definitions/unassociatedIncomes" }, + "hasAssociatedIncomes": { + "type": "boolean" + }, "associatedIncomes": { "$ref": "#/definitions/associatedIncomes" }, + "hasOwnedAssets": { + "type": "boolean" + }, "ownedAssets": { "$ref": "#/definitions/ownedAssets" }, + "hasRoyaltiesAndOtherProperties": { + "type": "boolean" + }, "royaltiesAndOtherProperties": { "$ref": "#/definitions/royaltiesAndOtherProperties" }, + "hasAssetTransfers": { + "type": "boolean" + }, "assetTransfers": { "$ref": "#/definitions/assetTransfers" }, + "hasTrusts": { + "type": "boolean" + }, "trusts": { "$ref": "#/definitions/trusts" }, + "hasAnnuities": { + "type": "boolean" + }, "annuities": { "$ref": "#/definitions/annuities" }, + "hasUnreportedAssets": { + "type": "boolean" + }, "unreportedAssets": { "$ref": "#/definitions/unreportedAssets" }, + "hasDiscontinuedIncomes": { + "type": "boolean" + }, "discontinuedIncomes": { "$ref": "#/definitions/discontinuedIncomes" }, + "hasIncomeReceiptWaivers": { + "type": "boolean" + }, "incomeReceiptWaivers": { "$ref": "#/definitions/incomeReceiptWaivers" }, diff --git a/src/schemas/21P-0969-kitchen_sink/example.json b/src/schemas/21P-0969-kitchen_sink/example.json index e3335ea2..f2ed76a5 100644 --- a/src/schemas/21P-0969-kitchen_sink/example.json +++ b/src/schemas/21P-0969-kitchen_sink/example.json @@ -23,228 +23,40 @@ "statementOfTruthSignature": "John Edmund Doe", "unassociatedIncomes": [ { - "recipientRelationship": "CHILD", - "recipientName": "Jane Doe", - "incomeType": "WAGES", - "grossMonthlyIncome": 99999.99, - "payer": "Generic Company, LLC" + "recipientRelationship": "CHILD", + "recipientName": "Jane Doe", + "incomeType": "WAGES", + "grossMonthlyIncome": 99999.99, + "payer": "Generic Company, LLC" }, { - "recipientRelationship": "OTHER", - "otherRecipientRelationshipType": "Cousin", - "recipientName": "Sam Jenkins", - "incomeType": "OTHER", - "otherIncomeType": "Stocks", - "grossMonthlyIncome": 99, - "payer": "Investment Company" + "recipientRelationship": "OTHER", + "otherRecipientRelationshipType": "Cousin", + "recipientName": "Sam Jenkins", + "incomeType": "OTHER", + "otherIncomeType": "Stocks", + "grossMonthlyIncome": 99, + "payer": "Investment Company" }, { - "recipientRelationship": "VETERAN", - "incomeType": "SOCIAL_SECURITY", - "grossMonthlyIncome": 102.33, - "payer": "Social Security Administration" + "recipientRelationship": "VETERAN", + "incomeType": "SOCIAL_SECURITY", + "grossMonthlyIncome": 102.33, + "payer": "Social Security Administration" }, { - "recipientRelationship": "SPOUSE", - "incomeType": "RETIREMENT_PENSION", - "grossMonthlyIncome": 1099.99, - "payer": "Pension Benefit Management" + "recipientRelationship": "SPOUSE", + "incomeType": "RETIREMENT_PENSION", + "grossMonthlyIncome": 1099.99, + "payer": "Pension Benefit Management" }, { - "recipientRelationship": "PARENT", - "recipientName": "Edmund Doe", - "incomeType": "CIVIL_SERVICE", - "grossMonthlyIncome": 12345.67, - "payer": "Personnel Management" - } - ], - "associatedIncomes": [ - { - "recipientRelationship": "CHILD", - "recipientName": "Emily Doe", - "incomeType": "INTEREST", - "grossMonthlyIncome": 300.0, - "payer": "Bank of America", - "accountValue": 20000.0 - }, - { - "recipientRelationship": "SPOUSE", - "incomeType": "DIVIDENDS", - "grossMonthlyIncome": 500.5, - "payer": "Stock Company", - "accountValue": 50000.0 - }, - { - "recipientRelationship": "OTHER", - "otherRecipientRelationshipType": "Aunt", - "recipientName": "Martha Doe", - "incomeType": "OTHER", - "otherIncomeType": "Rental Property", - "grossMonthlyIncome": 800.75, - "payer": "Real Estate Agency", - "accountValue": 120000.0 - } - ], - "ownedAssets": [ - { - "recipientRelationship": "SPOUSE", - "recipientName": "Jane Doe", - "assetType": "FARM", - "grossMonthlyIncome": 2500.0, - "ownedPortionValue": 60000.0 - }, - { - "recipientRelationship": "CHILD", - "recipientName": "Jane Doe", - "assetType": "BUSINESS", - "grossMonthlyIncome": 1500.0, - "ownedPortionValue": 40000.0 - }, - { - "recipientRelationship": "OTHER", - "otherRecipientRelationshipType": "Uncle", - "recipientName": "James Doe", - "assetType": "RENTAL_PROPERTY", - "grossMonthlyIncome": 3000.0, - "ownedPortionValue": 80000.0 - } - ], - "royaltiesAndOtherProperties": [ - { - "recipientRelationship": "VETERAN", - "incomeGenerationMethod": "INTELLECTUAL_PROPERTY", - "grossMonthlyIncome": 1000.0, - "fairMarketValue": 50000.0, - "canBeSold": true, - "mitigatingCircumstances": "None" - }, - { - "recipientRelationship": "SPOUSE", - "incomeGenerationMethod": "MINERALS_LUMBER", - "grossMonthlyIncome": 1200.0, - "fairMarketValue": 75000.0, - "canBeSold": false, - "mitigatingCircumstances": "Legal dispute over property rights" - }, - { - "recipientRelationship": "OTHER", - "otherRecipientRelationshipType": "Nephew", - "recipientName": "Adam Doe", - "incomeGenerationMethod": "USE_OF_LAND", - "grossMonthlyIncome": 800.0, - "fairMarketValue": 40000.0, - "canBeSold": true, - "mitigatingCircumstances": "Leased for long term" - } - ], - "assetTransfers": [ - { - "originalOwnerRelationship": "VETERAN", - "otherOriginalOwnerRelationshipType": "", - "transferMethod": "SOLD", - "otherTransferMethod": "", - "assetType": "Real estate property", - "newOwnerName": "Alice Johnson", - "newOwnerRelationship": "Friend", - "saleReportedToIrs": true, - "transferDate": "2023-05-15", - "assetTransferredUnderFairMarketValue": false, - "fairMarketValue": 250000.0, - "saleValue": 240000.0, - "capitalGainValue": 10000.0 - }, - { - "originalOwnerRelationship": "SPOUSE", - "otherOriginalOwnerRelationshipType": "", - "transferMethod": "GIFTED", - "otherTransferMethod": "", - "assetType": "Vehicle", - "newOwnerName": "James Smith", - "newOwnerRelationship": "Child", - "saleReportedToIrs": false, - "transferDate": "2022-11-10", - "assetTransferredUnderFairMarketValue": true, - "fairMarketValue": 15000.0, - "saleValue": 0.0, - "capitalGainValue": 0.0 - }, - { - "originalOwnerRelationship": "CHILD", - "otherOriginalOwnerRelationshipType": "Step-child", - "transferMethod": "TRADED", - "otherTransferMethod": "", - "assetType": "Artwork", - "newOwnerName": "Michael Green", - "newOwnerRelationship": "Cousin", - "saleReportedToIrs": true, - "transferDate": "2021-09-21", - "assetTransferredUnderFairMarketValue": false, - "fairMarketValue": 5000.0, - "saleValue": 5000.0, - "capitalGainValue": 2000.0 - } - ], - "trusts": [ - { - "establishedDate": "2020-03-15", - "marketValueAtEstablishment": 100000.0, - "trustType": "REVOCABLE", - "addedFundsAfterEstablishment": true, - "addedFundsDate": "2021-05-10", - "addedFundsAmount": 5000.0, - "receivingIncomeFromTrust": true, - "annualReceivedIncome": 12000.0, - "trustUsedForMedicalExpenses": false, - "trustEstablishedForVeteransChild": false, - "haveAuthorityOrControlOfTrust": true - }, - { - "establishedDate": "2018-09-25", - "marketValueAtEstablishment": 50000.0, - "trustType": "IRREVOCABLE", - "addedFundsAfterEstablishment": false, - "receivingIncomeFromTrust": false, - "trustUsedForMedicalExpenses": true, - "monthlyMedicalReimbursementAmount": 300.0, - "trustEstablishedForVeteransChild": true, - "haveAuthorityOrControlOfTrust": false - }, - { - "establishedDate": "2022-01-01", - "marketValueAtEstablishment": 75000.0, - "trustType": "BURIAL", - "addedFundsAfterEstablishment": true, - "addedFundsDate": "2023-06-20", - "addedFundsAmount": 2000.0, - "receivingIncomeFromTrust": false, - "trustUsedForMedicalExpenses": false, - "trustEstablishedForVeteransChild": false, - "haveAuthorityOrControlOfTrust": true - } - ], - "annuities": [ - { - "establishedDate": "2015-03-01", - "marketValueAtEstablishment": 150000.0, - "addedFundsAfterEstablishment": true, - "addedFundsAmount": 50000.0, - "addedFundsDate": "2018-06-15", - "revocable": false, - "receivingIncomeFromAnnuity": true, - "annualReceivedIncome": 6000.0, - "canBeLiquidated": false, - "surrenderValue": 100000.0 - }, - { - "establishedDate": "2010-05-22", - "marketValueAtEstablishment": 100000.0, - "addedFundsAfterEstablishment": false, - "revocable": true, - "receivingIncomeFromAnnuity": false, - "annualReceivedIncome": 0.0, - "canBeLiquidated": true, - "surrenderValue": 80000.0 + "recipientRelationship": "PARENT", + "recipientName": "Edmund Doe", + "incomeType": "CIVIL_SERVICE", + "grossMonthlyIncome": 12345.67, + "payer": "Personnel Management" } ] } -} +} \ No newline at end of file diff --git a/src/schemas/21P-0969-overflow/example.json b/src/schemas/21P-0969-overflow/example.json index 558d1208..5d08b2e1 100644 --- a/src/schemas/21P-0969-overflow/example.json +++ b/src/schemas/21P-0969-overflow/example.json @@ -23,231 +23,47 @@ "statementOfTruthSignature": "John Edmund Doe", "unassociatedIncomes": [ { - "recipientRelationship": "CHILD", - "recipientName": "Jane Doe", - "incomeType": "WAGES", - "grossMonthlyIncome": 99999.99, - "payer": "Generic Company, LLC" + "recipientRelationship": "CHILD", + "recipientName": "Jane Doe", + "incomeType": "WAGES", + "grossMonthlyIncome": 99999.99, + "payer": "Generic Company, LLC" }, { - "recipientRelationship": "OTHER", - "otherRecipientRelationshipType": "Cousin", - "recipientName": "Sam Jenkins", - "incomeType": "OTHER", - "otherIncomeType": "Stocks", - "grossMonthlyIncome": 99, - "payer": "Investment Company" + "recipientRelationship": "OTHER", + "otherRecipientRelationshipType": "Cousin", + "recipientName": "Sam Jenkins", + "incomeType": "OTHER", + "otherIncomeType": "Stocks", + "grossMonthlyIncome": 99, + "payer": "Investment Company" }, { - "recipientRelationship": "VETERAN", - "incomeType": "SOCIAL_SECURITY", - "grossMonthlyIncome": 102.33, - "payer": "Social Security Administration" + "recipientRelationship": "VETERAN", + "incomeType": "SOCIAL_SECURITY", + "grossMonthlyIncome": 102.33, + "payer": "Social Security Administration" }, { - "recipientRelationship": "SPOUSE", - "incomeType": "RETIREMENT_PENSION", - "grossMonthlyIncome": 1099.99, - "payer": "Pension Benefit Management" + "recipientRelationship": "SPOUSE", + "incomeType": "RETIREMENT_PENSION", + "grossMonthlyIncome": 1099.99, + "payer": "Pension Benefit Management" }, { - "recipientRelationship": "PARENT", - "recipientName": "Edmund Doe", - "incomeType": "CIVIL_SERVICE", - "grossMonthlyIncome": 12345.67, - "payer": "Personnel Management" - } - ], - "associatedIncomes": [ - { - "recipientRelationship": "CHILD", - "recipientName": "Emily Doe", - "incomeType": "INTEREST", - "grossMonthlyIncome": 300.0, - "payer": "Bank of America", - "accountValue": 20000.0 - }, - { - "recipientRelationship": "SPOUSE", - "incomeType": "DIVIDENDS", - "grossMonthlyIncome": 500.5, - "payer": "Stock Company", - "accountValue": 50000.0 - }, - { - "recipientRelationship": "OTHER", - "otherRecipientRelationshipType": "Aunt", - "recipientName": "Martha Doe", - "incomeType": "OTHER", - "otherIncomeType": "Rental Property", - "grossMonthlyIncome": 800.75, - "payer": "Real Estate Agency", - "accountValue": 120000.0 - } - ], - "ownedAssets": [ - { - "recipientRelationship": "SPOUSE", - "recipientName": "Jane Doe", - "assetType": "FARM", - "grossMonthlyIncome": 2500.0, - "payer": "Doe Family Farm", - "ownedPortionValue": 60000.0 - }, - { - "recipientRelationship": "CHILD", - "recipientName": "Jane Doe", - "assetType": "BUSINESS", - "grossMonthlyIncome": 1500.0, - "payer": "Doe Family Enterprises", - "ownedPortionValue": 40000.0 - }, - { - "recipientRelationship": "OTHER", - "otherRecipientRelationshipType": "Uncle", - "recipientName": "James Doe", - "assetType": "RENTAL_PROPERTY", - "grossMonthlyIncome": 3000.0, - "payer": "Doe Real Estate", - "ownedPortionValue": 80000.0 - } - ], - "royaltiesAndOtherProperties": [ - { - "recipientRelationship": "VETERAN", - "incomeGenerationMethod": "INTELLECTUAL_PROPERTY", - "grossMonthlyIncome": 1000.0, - "fairMarketValue": 50000.0, - "canBeSold": true, - "mitigatingCircumstances": "None" - }, - { - "recipientRelationship": "SPOUSE", - "incomeGenerationMethod": "MINERALS_LUMBER", - "grossMonthlyIncome": 1200.0, - "fairMarketValue": 75000.0, - "canBeSold": false, - "mitigatingCircumstances": "Legal dispute over property rights" - }, - { - "recipientRelationship": "OTHER", - "otherRecipientRelationshipType": "Nephew", - "recipientName": "Adam Doe", - "incomeGenerationMethod": "USE_OF_LAND", - "grossMonthlyIncome": 800.0, - "fairMarketValue": 40000.0, - "canBeSold": true, - "mitigatingCircumstances": "Leased for long term" - } - ], - "assetTransfers": [ - { - "originalOwnerRelationship": "VETERAN", - "otherOriginalOwnerRelationshipType": "", - "transferMethod": "SOLD", - "otherTransferMethod": "", - "assetType": "Real estate property", - "newOwnerName": "Alice Johnson", - "newOwnerRelationship": "Friend", - "saleReportedToIrs": true, - "transferDate": "2023-05-15", - "assetTransferredUnderFairMarketValue": false, - "fairMarketValue": 250000.0, - "saleValue": 240000.0, - "capitalGainValue": 10000.0 - }, - { - "originalOwnerRelationship": "SPOUSE", - "otherOriginalOwnerRelationshipType": "", - "transferMethod": "GIFTED", - "otherTransferMethod": "", - "assetType": "Vehicle", - "newOwnerName": "James Smith", - "newOwnerRelationship": "Child", - "saleReportedToIrs": false, - "transferDate": "2022-11-10", - "assetTransferredUnderFairMarketValue": true, - "fairMarketValue": 15000.0, - "saleValue": 0.0, - "capitalGainValue": 0.0 - }, - { - "originalOwnerRelationship": "CHILD", - "otherOriginalOwnerRelationshipType": "Step-child", - "transferMethod": "TRADED", - "otherTransferMethod": "", - "assetType": "Artwork", - "newOwnerName": "Michael Green", - "newOwnerRelationship": "Cousin", - "saleReportedToIrs": true, - "transferDate": "2021-09-21", - "assetTransferredUnderFairMarketValue": false, - "fairMarketValue": 5000.0, - "saleValue": 5000.0, - "capitalGainValue": 2000.0 - } - ], - "trusts": [ - { - "establishedDate": "2020-03-15", - "marketValueAtEstablishment": 100000.0, - "trustType": "REVOCABLE", - "addedFundsAfterEstablishment": true, - "addedFundsDate": "2021-05-10", - "addedFundsAmount": 5000.0, - "receivingIncomeFromTrust": true, - "annualReceivedIncome": 12000.0, - "trustUsedForMedicalExpenses": false, - "trustEstablishedForVeteransChild": false, - "haveAuthorityOrControlOfTrust": true - }, - { - "establishedDate": "2018-09-25", - "marketValueAtEstablishment": 50000.0, - "trustType": "IRREVOCABLE", - "addedFundsAfterEstablishment": false, - "receivingIncomeFromTrust": false, - "trustUsedForMedicalExpenses": true, - "monthlyMedicalReimbursementAmount": 300.0, - "trustEstablishedForVeteransChild": true, - "haveAuthorityOrControlOfTrust": false - }, - { - "establishedDate": "2022-01-01", - "marketValueAtEstablishment": 75000.0, - "trustType": "BURIAL", - "addedFundsAfterEstablishment": true, - "addedFundsDate": "2023-06-20", - "addedFundsAmount": 2000.0, - "receivingIncomeFromTrust": false, - "trustUsedForMedicalExpenses": false, - "trustEstablishedForVeteransChild": false, - "haveAuthorityOrControlOfTrust": true - } - ], - "annuities": [ - { - "establishedDate": "2015-03-01", - "marketValueAtEstablishment": 150000.0, - "addedFundsAfterEstablishment": true, - "addedFundsAmount": 50000.0, - "addedFundsDate": "2018-06-15", - "revocable": false, - "receivingIncomeFromAnnuity": true, - "annualReceivedIncome": 6000.0, - "canBeLiquidated": false, - "surrenderValue": 100000.0 + "recipientRelationship": "PARENT", + "recipientName": "Edmund Doe", + "incomeType": "CIVIL_SERVICE", + "grossMonthlyIncome": 12345.67, + "payer": "Personnel Management" }, { - "establishedDate": "2010-05-22", - "marketValueAtEstablishment": 100000.0, - "addedFundsAfterEstablishment": false, - "revocable": true, - "receivingIncomeFromAnnuity": false, - "annualReceivedIncome": 0.0, - "canBeLiquidated": true, - "surrenderValue": 80000.0 + "recipientRelationship": "CUSTODIAN", + "recipientName": "Sam Doe", + "incomeType": "UNEMPLOYMENT", + "grossMonthlyIncome": 1000.00, + "payer": "Agency of Unemployment" } ] } -} +} \ No newline at end of file diff --git a/src/schemas/21P-0969/schema.js b/src/schemas/21P-0969/schema.js index 0853a7e7..dcc55b26 100644 --- a/src/schemas/21P-0969/schema.js +++ b/src/schemas/21P-0969/schema.js @@ -31,6 +31,17 @@ const schema = { type: 'string', enum: ['VETERAN', 'SPOUSE', 'CUSTODIAN', 'CHILD', 'PARENT', 'OTHER'], }, + addedFunds: { + type: 'array', + items: { + type: 'object', + required: ['fundsAddedDate', 'amountAdded'], + properties: { + fundsAddedDate: schemaHelpers.getDefinition('date'), + amountAdded: financialNumber, + }, + }, + }, unassociatedIncomes: { type: 'array', items: { @@ -74,7 +85,7 @@ const schema = { type: 'array', items: { type: 'object', - required: ['recipientRelationship', 'assetType', 'grossMonthlyIncome', 'ownedPortionValue'], + required: ['recipientRelationship', 'assetType', 'grossMonthlyIncome', 'payer'], properties: { recipientName: { type: 'string' }, recipientRelationship: schemaHelpers.getDefinition('relationshipToVeteran'), @@ -85,6 +96,7 @@ const schema = { }, otherIncomeType: { type: 'string' }, grossMonthlyIncome: financialNumber, + payer: { type: 'string' }, ownedPortionValue: financialNumber, }, }, @@ -124,12 +136,14 @@ const schema = { 'originalOwnerRelationship', 'transferMethod', 'assetType', + 'payer', 'newOwnerName', 'newOwnerRelationship', 'saleReportedToIrs', 'transferDate', 'assetTransferredUnderFairMarketValue', 'fairMarketValue', + 'saleValue', 'capitalGainValue', ], properties: { @@ -157,7 +171,7 @@ const schema = { items: { type: 'object', required: [ - 'establishedDate', + 'establishmentDate', 'marketValueAtEstablishment', 'trustType', 'addedFundsAfterEstablishment', @@ -174,8 +188,7 @@ const schema = { enum: ['REVOCABLE', 'IRREVOCABLE', 'BURIAL'], }, addedFundsAfterEstablishment: definitions.yesNoSchema, - addedFundsDate: schemaHelpers.getDefinition('date'), - addedFundsAmount: financialNumber, + addedFunds: schemaHelpers.getDefinition('addedFunds'), receivingIncomeFromTrust: definitions.yesNoSchema, annualReceivedIncome: financialNumber, trustUsedForMedicalExpenses: definitions.yesNoSchema, @@ -201,8 +214,7 @@ const schema = { establishedDate: schemaHelpers.getDefinition('date'), marketValueAtEstablishment: financialNumber, addedFundsAfterEstablishment: definitions.yesNoSchema, - addedFundsDate: schemaHelpers.getDefinition('date'), - addedFundsAmount: financialNumber, + addedFunds: schemaHelpers.getDefinition('addedFunds'), revocable: definitions.yesNoSchema, receivingIncomeFromAnnuity: definitions.yesNoSchema, annualReceivedIncome: financialNumber, @@ -274,15 +286,25 @@ const schema = { type: 'string', }, dateReceivedByVa: definitions.yesNoSchema, + hasUnassociatedIncomes: definitions.yesNoSchema, unassociatedIncomes: schemaHelpers.getDefinition('unassociatedIncomes'), + hasAssociatedIncomes: definitions.yesNoSchema, associatedIncomes: schemaHelpers.getDefinition('associatedIncomes'), + hasOwnedAssets: definitions.yesNoSchema, ownedAssets: schemaHelpers.getDefinition('ownedAssets'), + hasRoyaltiesAndOtherProperties: definitions.yesNoSchema, royaltiesAndOtherProperties: schemaHelpers.getDefinition('royaltiesAndOtherProperties'), + hasAssetTransfers: definitions.yesNoSchema, assetTransfers: schemaHelpers.getDefinition('assetTransfers'), + hasTrusts: definitions.yesNoSchema, trusts: schemaHelpers.getDefinition('trusts'), + hasAnnuities: definitions.yesNoSchema, annuities: schemaHelpers.getDefinition('annuities'), + hasUnreportedAssets: definitions.yesNoSchema, unreportedAssets: schemaHelpers.getDefinition('unreportedAssets'), + hasDiscontinuedIncomes: definitions.yesNoSchema, discontinuedIncomes: schemaHelpers.getDefinition('discontinuedIncomes'), + hasIncomeReceiptWaivers: definitions.yesNoSchema, incomeReceiptWaivers: schemaHelpers.getDefinition('incomeReceiptWaivers'), statementOfTruthCertified: definitions.yesNoSchema, statementOfTruthSignature: {