npm - @dynamatix/gb-schemas - Versions diffs - 2.0.68 → 2.3.237 - Mend

@dynamatix/gb-schemas 2.0.68 → 2.3.237

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (596) hide show

package/dist/applicants/applicant-self-employment.model.d.ts ADDED Viewed

@@ -0,0 +1,269 @@
+/// <reference path="../value-objects/pound.d.ts" />
+/// <reference path="../value-objects/account-number.d.ts" />
+/// <reference path="../value-objects/sort-code.d.ts" />
+/// <reference types="mongoose/types/aggregate" />
+/// <reference types="mongoose/types/callback" />
+/// <reference types="mongoose/types/collection" />
+/// <reference types="mongoose/types/connection" />
+/// <reference types="mongoose/types/cursor" />
+/// <reference types="mongoose/types/document" />
+/// <reference types="mongoose/types/error" />
+/// <reference types="mongoose/types/expressions" />
+/// <reference types="mongoose/types/helpers" />
+/// <reference types="mongoose/types/middlewares" />
+/// <reference types="mongoose/types/indexes" />
+/// <reference types="mongoose/types/models" />
+/// <reference types="mongoose/types/mongooseoptions" />
+/// <reference types="mongoose/types/pipelinestage" />
+/// <reference types="mongoose/types/populate" />
+/// <reference types="mongoose/types/query" />
+/// <reference types="mongoose/types/schemaoptions" />
+/// <reference types="mongoose/types/session" />
+/// <reference types="mongoose/types/types" />
+/// <reference types="mongoose/types/utility" />
+/// <reference types="mongoose/types/validation" />
+/// <reference types="mongoose/types/virtuals" />
+/// <reference types="mongoose/types/schematypes" />
+/// <reference types="mongoose/types/inferschematype" />
+/// <reference types="mongoose/types/inferrawdoctype" />
+import mongoose from "mongoose";
+declare const ApplicantSelfEmploymentModel: mongoose.Model<{
+    applicantId: mongoose.Types.ObjectId;
+    industryLid: mongoose.Types.ObjectId;
+    accountantsCity: string;
+    businessCity: string;
+    doYouHaveAccountant: boolean;
+    isBusinessAddressDifferent: boolean;
+    registeredCity: string;
+    businessTypeLid?: mongoose.Types.ObjectId | null | undefined;
+    natureOfBusiness?: string | null | undefined;
+    accountantsAddressLine1?: string | null | undefined;
+    accountantsAddressLine2?: string | null | undefined;
+    accountantsAddressLine3?: string | null | undefined;
+    accountantsCountryLid?: mongoose.Types.ObjectId | null | undefined;
+    accountantsEmail?: string | null | undefined;
+    accountantsPostCode?: string | null | undefined;
+    accountantsPractice?: string | null | undefined;
+    accountantsTelephoneNumber?: string | null | undefined;
+    businessAddressLine1?: string | null | undefined;
+    businessAddressLine2?: string | null | undefined;
+    businessAddressLine3?: string | null | undefined;
+    businessCountryLid?: mongoose.Types.ObjectId | null | undefined;
+    businessPostCode?: string | null | undefined;
+    businessTelephoneNumber?: string | null | undefined;
+    charteredCertifiedOrOtherLid?: mongoose.Types.ObjectId | null | undefined;
+    contactName?: string | null | undefined;
+    currentYearEnd?: string | null | undefined;
+    dateEstablished?: string | null | undefined;
+    nameOfBusiness?: string | null | undefined;
+    percentageOfShareholding?: number | null | undefined;
+    registeredAddressLine1?: string | null | undefined;
+    registeredAddressLine2?: string | null | undefined;
+    registeredAddressLine3?: string | null | undefined;
+    registeredCountryLid?: mongoose.Types.ObjectId | null | undefined;
+    registeredPostCode?: string | null | undefined;
+    registeredTelephone?: string | null | undefined;
+    selfEmployedDate?: string | null | undefined;
+}, {}, {}, {}, mongoose.Document<unknown, {}, {
+    applicantId: mongoose.Types.ObjectId;
+    industryLid: mongoose.Types.ObjectId;
+    accountantsCity: string;
+    businessCity: string;
+    doYouHaveAccountant: boolean;
+    isBusinessAddressDifferent: boolean;
+    registeredCity: string;
+    businessTypeLid?: mongoose.Types.ObjectId | null | undefined;
+    natureOfBusiness?: string | null | undefined;
+    accountantsAddressLine1?: string | null | undefined;
+    accountantsAddressLine2?: string | null | undefined;
+    accountantsAddressLine3?: string | null | undefined;
+    accountantsCountryLid?: mongoose.Types.ObjectId | null | undefined;
+    accountantsEmail?: string | null | undefined;
+    accountantsPostCode?: string | null | undefined;
+    accountantsPractice?: string | null | undefined;
+    accountantsTelephoneNumber?: string | null | undefined;
+    businessAddressLine1?: string | null | undefined;
+    businessAddressLine2?: string | null | undefined;
+    businessAddressLine3?: string | null | undefined;
+    businessCountryLid?: mongoose.Types.ObjectId | null | undefined;
+    businessPostCode?: string | null | undefined;
+    businessTelephoneNumber?: string | null | undefined;
+    charteredCertifiedOrOtherLid?: mongoose.Types.ObjectId | null | undefined;
+    contactName?: string | null | undefined;
+    currentYearEnd?: string | null | undefined;
+    dateEstablished?: string | null | undefined;
+    nameOfBusiness?: string | null | undefined;
+    percentageOfShareholding?: number | null | undefined;
+    registeredAddressLine1?: string | null | undefined;
+    registeredAddressLine2?: string | null | undefined;
+    registeredAddressLine3?: string | null | undefined;
+    registeredCountryLid?: mongoose.Types.ObjectId | null | undefined;
+    registeredPostCode?: string | null | undefined;
+    registeredTelephone?: string | null | undefined;
+    selfEmployedDate?: string | null | undefined;
+}, {}> & {
+    applicantId: mongoose.Types.ObjectId;
+    industryLid: mongoose.Types.ObjectId;
+    accountantsCity: string;
+    businessCity: string;
+    doYouHaveAccountant: boolean;
+    isBusinessAddressDifferent: boolean;
+    registeredCity: string;
+    businessTypeLid?: mongoose.Types.ObjectId | null | undefined;
+    natureOfBusiness?: string | null | undefined;
+    accountantsAddressLine1?: string | null | undefined;
+    accountantsAddressLine2?: string | null | undefined;
+    accountantsAddressLine3?: string | null | undefined;
+    accountantsCountryLid?: mongoose.Types.ObjectId | null | undefined;
+    accountantsEmail?: string | null | undefined;
+    accountantsPostCode?: string | null | undefined;
+    accountantsPractice?: string | null | undefined;
+    accountantsTelephoneNumber?: string | null | undefined;
+    businessAddressLine1?: string | null | undefined;
+    businessAddressLine2?: string | null | undefined;
+    businessAddressLine3?: string | null | undefined;
+    businessCountryLid?: mongoose.Types.ObjectId | null | undefined;
+    businessPostCode?: string | null | undefined;
+    businessTelephoneNumber?: string | null | undefined;
+    charteredCertifiedOrOtherLid?: mongoose.Types.ObjectId | null | undefined;
+    contactName?: string | null | undefined;
+    currentYearEnd?: string | null | undefined;
+    dateEstablished?: string | null | undefined;
+    nameOfBusiness?: string | null | undefined;
+    percentageOfShareholding?: number | null | undefined;
+    registeredAddressLine1?: string | null | undefined;
+    registeredAddressLine2?: string | null | undefined;
+    registeredAddressLine3?: string | null | undefined;
+    registeredCountryLid?: mongoose.Types.ObjectId | null | undefined;
+    registeredPostCode?: string | null | undefined;
+    registeredTelephone?: string | null | undefined;
+    selfEmployedDate?: string | null | undefined;
+} & {
+    _id: mongoose.Types.ObjectId;
+} & {
+    __v: number;
+}, mongoose.Schema<any, mongoose.Model<any, any, any, any, any, any>, {}, {}, {}, {}, {
+    toJSON: {
+        getters: true;
+    };
+    toObject: {
+        getters: true;
+    };
+}, {
+    applicantId: mongoose.Types.ObjectId;
+    industryLid: mongoose.Types.ObjectId;
+    accountantsCity: string;
+    businessCity: string;
+    doYouHaveAccountant: boolean;
+    isBusinessAddressDifferent: boolean;
+    registeredCity: string;
+    businessTypeLid?: mongoose.Types.ObjectId | null | undefined;
+    natureOfBusiness?: string | null | undefined;
+    accountantsAddressLine1?: string | null | undefined;
+    accountantsAddressLine2?: string | null | undefined;
+    accountantsAddressLine3?: string | null | undefined;
+    accountantsCountryLid?: mongoose.Types.ObjectId | null | undefined;
+    accountantsEmail?: string | null | undefined;
+    accountantsPostCode?: string | null | undefined;
+    accountantsPractice?: string | null | undefined;
+    accountantsTelephoneNumber?: string | null | undefined;
+    businessAddressLine1?: string | null | undefined;
+    businessAddressLine2?: string | null | undefined;
+    businessAddressLine3?: string | null | undefined;
+    businessCountryLid?: mongoose.Types.ObjectId | null | undefined;
+    businessPostCode?: string | null | undefined;
+    businessTelephoneNumber?: string | null | undefined;
+    charteredCertifiedOrOtherLid?: mongoose.Types.ObjectId | null | undefined;
+    contactName?: string | null | undefined;
+    currentYearEnd?: string | null | undefined;
+    dateEstablished?: string | null | undefined;
+    nameOfBusiness?: string | null | undefined;
+    percentageOfShareholding?: number | null | undefined;
+    registeredAddressLine1?: string | null | undefined;
+    registeredAddressLine2?: string | null | undefined;
+    registeredAddressLine3?: string | null | undefined;
+    registeredCountryLid?: mongoose.Types.ObjectId | null | undefined;
+    registeredPostCode?: string | null | undefined;
+    registeredTelephone?: string | null | undefined;
+    selfEmployedDate?: string | null | undefined;
+}, mongoose.Document<unknown, {}, mongoose.FlatRecord<{
+    applicantId: mongoose.Types.ObjectId;
+    industryLid: mongoose.Types.ObjectId;
+    accountantsCity: string;
+    businessCity: string;
+    doYouHaveAccountant: boolean;
+    isBusinessAddressDifferent: boolean;
+    registeredCity: string;
+    businessTypeLid?: mongoose.Types.ObjectId | null | undefined;
+    natureOfBusiness?: string | null | undefined;
+    accountantsAddressLine1?: string | null | undefined;
+    accountantsAddressLine2?: string | null | undefined;
+    accountantsAddressLine3?: string | null | undefined;
+    accountantsCountryLid?: mongoose.Types.ObjectId | null | undefined;
+    accountantsEmail?: string | null | undefined;
+    accountantsPostCode?: string | null | undefined;
+    accountantsPractice?: string | null | undefined;
+    accountantsTelephoneNumber?: string | null | undefined;
+    businessAddressLine1?: string | null | undefined;
+    businessAddressLine2?: string | null | undefined;
+    businessAddressLine3?: string | null | undefined;
+    businessCountryLid?: mongoose.Types.ObjectId | null | undefined;
+    businessPostCode?: string | null | undefined;
+    businessTelephoneNumber?: string | null | undefined;
+    charteredCertifiedOrOtherLid?: mongoose.Types.ObjectId | null | undefined;
+    contactName?: string | null | undefined;
+    currentYearEnd?: string | null | undefined;
+    dateEstablished?: string | null | undefined;
+    nameOfBusiness?: string | null | undefined;
+    percentageOfShareholding?: number | null | undefined;
+    registeredAddressLine1?: string | null | undefined;
+    registeredAddressLine2?: string | null | undefined;
+    registeredAddressLine3?: string | null | undefined;
+    registeredCountryLid?: mongoose.Types.ObjectId | null | undefined;
+    registeredPostCode?: string | null | undefined;
+    registeredTelephone?: string | null | undefined;
+    selfEmployedDate?: string | null | undefined;
+}>, {}> & mongoose.FlatRecord<{
+    applicantId: mongoose.Types.ObjectId;
+    industryLid: mongoose.Types.ObjectId;
+    accountantsCity: string;
+    businessCity: string;
+    doYouHaveAccountant: boolean;
+    isBusinessAddressDifferent: boolean;
+    registeredCity: string;
+    businessTypeLid?: mongoose.Types.ObjectId | null | undefined;
+    natureOfBusiness?: string | null | undefined;
+    accountantsAddressLine1?: string | null | undefined;
+    accountantsAddressLine2?: string | null | undefined;
+    accountantsAddressLine3?: string | null | undefined;
+    accountantsCountryLid?: mongoose.Types.ObjectId | null | undefined;
+    accountantsEmail?: string | null | undefined;
+    accountantsPostCode?: string | null | undefined;
+    accountantsPractice?: string | null | undefined;
+    accountantsTelephoneNumber?: string | null | undefined;
+    businessAddressLine1?: string | null | undefined;
+    businessAddressLine2?: string | null | undefined;
+    businessAddressLine3?: string | null | undefined;
+    businessCountryLid?: mongoose.Types.ObjectId | null | undefined;
+    businessPostCode?: string | null | undefined;
+    businessTelephoneNumber?: string | null | undefined;
+    charteredCertifiedOrOtherLid?: mongoose.Types.ObjectId | null | undefined;
+    contactName?: string | null | undefined;
+    currentYearEnd?: string | null | undefined;
+    dateEstablished?: string | null | undefined;
+    nameOfBusiness?: string | null | undefined;
+    percentageOfShareholding?: number | null | undefined;
+    registeredAddressLine1?: string | null | undefined;
+    registeredAddressLine2?: string | null | undefined;
+    registeredAddressLine3?: string | null | undefined;
+    registeredCountryLid?: mongoose.Types.ObjectId | null | undefined;
+    registeredPostCode?: string | null | undefined;
+    registeredTelephone?: string | null | undefined;
+    selfEmployedDate?: string | null | undefined;
+}> & {
+    _id: mongoose.Types.ObjectId;
+} & {
+    __v: number;
+}>>;
+export default ApplicantSelfEmploymentModel;
+//# sourceMappingURL=applicant-self-employment.model.d.ts.map

package/dist/applicants/applicant-self-employment.model.d.ts.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"applicant-self-employment.model.d.ts","sourceRoot":"","sources":["../../applicants/applicant-self-employment.model.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,QAAQ,MAAM,UAAU,CAAC;AAmDhC,QAAA,MAAM,4BAA4B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAA6E,CAAC;AAEhH,eAAe,4BAA4B,CAAC"}

package/dist/applicants/applicant-self-employment.model.js ADDED Viewed

@@ -0,0 +1,50 @@
+import mongoose from "mongoose";
+const applicantSelfEmploymentSchema = new mongoose.Schema({
+    applicantId: { type: mongoose.Schema.Types.ObjectId, ref: "Applicant", required: true },
+    accountantsAddressLine1: { type: String, },
+    accountantsAddressLine2: { type: String, },
+    accountantsAddressLine3: { type: String, },
+    accountantsCity: { type: String, default: '' },
+    accountantsCountryLid: { type: mongoose.Schema.Types.ObjectId, ref: "Lookup", },
+    accountantsEmail: { type: String, },
+    accountantsPostCode: { type: String, },
+    accountantsPractice: { type: String, },
+    accountantsTelephoneNumber: { type: String, },
+    businessAddressLine1: { type: String, },
+    businessAddressLine2: { type: String, },
+    businessAddressLine3: { type: String, },
+    businessCity: { type: String, default: '' },
+    businessCountryLid: { type: mongoose.Schema.Types.ObjectId, ref: "Lookup", },
+    businessPostCode: { type: String, },
+    businessTelephoneNumber: { type: String, },
+    businessTypeLid: { type: mongoose.Schema.Types.ObjectId, ref: "Lookup", },
+    charteredCertifiedOrOtherLid: { type: mongoose.Schema.Types.ObjectId, ref: "Lookup", },
+    contactName: { type: String, },
+    currentYearEnd: { type: String, },
+    dateEstablished: { type: String, },
+    doYouHaveAccountant: {
+        type: Boolean,
+        default: false
+    },
+    isBusinessAddressDifferent: {
+        type: Boolean,
+        default: false
+    },
+    nameOfBusiness: { type: String, },
+    natureOfBusiness: { type: String, },
+    percentageOfShareholding: { type: Number, min: 0, max: 100 },
+    registeredAddressLine1: { type: String, },
+    registeredAddressLine2: { type: String, },
+    registeredAddressLine3: { type: String, },
+    registeredCity: { type: String, default: '' },
+    registeredCountryLid: { type: mongoose.Schema.Types.ObjectId, ref: "Lookup", },
+    registeredPostCode: { type: String, },
+    registeredTelephone: { type: String, },
+    selfEmployedDate: { type: String, },
+    industryLid: { type: mongoose.Schema.Types.ObjectId, ref: "Lookup", required: true },
+}, {
+    toJSON: { getters: true },
+    toObject: { getters: true }
+});
+const ApplicantSelfEmploymentModel = mongoose.model("Applicant_Self_Employment", applicantSelfEmploymentSchema);
+export default ApplicantSelfEmploymentModel;

package/dist/applicants/applicant-sole-trader-income.model.d.ts CHANGED Viewed

@@ -1,3 +1,30 @@
+/// <reference path="../value-objects/account-number.d.ts" />
+/// <reference path="../value-objects/sort-code.d.ts" />
+/// <reference types="mongoose/types/aggregate" />
+/// <reference types="mongoose/types/callback" />
+/// <reference types="mongoose/types/collection" />
+/// <reference types="mongoose/types/connection" />
+/// <reference types="mongoose/types/cursor" />
+/// <reference types="mongoose/types/document" />
+/// <reference types="mongoose/types/error" />
+/// <reference types="mongoose/types/expressions" />
+/// <reference types="mongoose/types/helpers" />
+/// <reference types="mongoose/types/middlewares" />
+/// <reference types="mongoose/types/indexes" />
+/// <reference types="mongoose/types/models" />
+/// <reference types="mongoose/types/mongooseoptions" />
+/// <reference types="mongoose/types/pipelinestage" />
+/// <reference types="mongoose/types/populate" />
+/// <reference types="mongoose/types/query" />
+/// <reference types="mongoose/types/schemaoptions" />
+/// <reference types="mongoose/types/session" />
+/// <reference types="mongoose/types/types" />
+/// <reference types="mongoose/types/utility" />
+/// <reference types="mongoose/types/validation" />
+/// <reference types="mongoose/types/virtuals" />
+/// <reference types="mongoose/types/schematypes" />
+/// <reference types="mongoose/types/inferschematype" />
+/// <reference types="mongoose/types/inferrawdoctype" />
 import mongoose from "mongoose";
 import { Pound } from "../value-objects/pound";
 declare const ApplicantSoleTraderIncomeModel: mongoose.Model<{
@@ -46,6 +73,7 @@ declare const ApplicantSoleTraderIncomeModel: mongoose.Model<{
         instance?: unknown;
         isRequired?: unknown;
         path?: unknown;
+        toJSONSchema?: {} | null | undefined;
         validateAll?: {} | null | undefined;
         defaultOptions?: unknown;
     } | null | undefined;
@@ -96,11 +124,12 @@ declare const ApplicantSoleTraderIncomeModel: mongoose.Model<{
         instance?: unknown;
         isRequired?: unknown;
         path?: unknown;
+        toJSONSchema?: {} | null | undefined;
         validateAll?: {} | null | undefined;
         defaultOptions?: unknown;
     } | null | undefined;
     incomeSourceLid?: mongoose.Types.ObjectId | null | undefined;
-}> & {
+}, {}> & {
     applicantId?: mongoose.Types.ObjectId | null | undefined;
     amount?: {
         validators: mongoose.Types.DocumentArray<{
@@ -146,6 +175,7 @@ declare const ApplicantSoleTraderIncomeModel: mongoose.Model<{
         instance?: unknown;
         isRequired?: unknown;
         path?: unknown;
+        toJSONSchema?: {} | null | undefined;
         validateAll?: {} | null | undefined;
         defaultOptions?: unknown;
     } | null | undefined;
@@ -169,7 +199,7 @@ declare const ApplicantSoleTraderIncomeModel: mongoose.Model<{
     applicantId: mongoose.Types.ObjectId;
     amount: Pound;
     incomeSourceLid: mongoose.Types.ObjectId;
-}>> & mongoose.FlatRecord<{
+}>, {}> & mongoose.FlatRecord<{
     applicantId: mongoose.Types.ObjectId;
     amount: Pound;
     incomeSourceLid: mongoose.Types.ObjectId;

package/dist/applicants/applicant-sole-trader-income.model.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"applicant-sole-trader-income.model.d.ts","sourceRoot":"","sources":["../../applicants/applicant-sole-trader-income.model.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,UAAU,CAAC;AAChC,OAAO,EAAE,KAAK,~~EAAE~~,MAAM,wBAAwB,CAAC;~~AAa/C~~,QAAA,MAAM,8BAA8B~~;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;~~GAAyE,CAAC;AAE9G,eAAe,8BAA8B,CAAC"}
1	+ {"version":3,"file":"applicant-sole-trader-income.model.d.ts","sourceRoot":"","sources":["../../applicants/applicant-sole-trader-income.model.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,QAAQ,MAAM,UAAU,CAAC;AAChC,OAAO,EAAE,KAAK,EAAe,MAAM,wBAAwB,CAAC;AAiB5D,QAAA,MAAM,8BAA8B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAAyE,CAAC;AAE9G,eAAe,8BAA8B,CAAC"}

package/dist/applicants/applicant-sole-trader-income.model.js CHANGED Viewed

@@ -1,12 +1,17 @@
 import mongoose from "mongoose";
-import { Pound } from "../value-objects/pound";
+import { Pound, formatPound } from "../value-objects/pound";
 const soleTraderIncomeSchema = new mongoose.Schema({
     applicantId: { type: mongoose.Schema.Types.ObjectId, ref: "Applicant", required: true },
     incomeSourceLid: { type: mongoose.Schema.Types.ObjectId, ref: "Lookup", required: true },
-    amount: { type: Pound, default: 0.00 },
+    amount: { type: Pound, default: 0.00, get: formatPound },
 }, {
     toJSON: { getters: true },
     toObject: { getters: true }
 });
+soleTraderIncomeSchema.virtual('incomeSourceId').get(function () {
+    return this.applicantId?.incomeSourceId instanceof mongoose.Types.ObjectId
+        ? null
+        : this.applicantId?.incomeSourceId?.incomeFromEmployment || null;
+});
 const ApplicantSoleTraderIncomeModel = mongoose.model("Applicant_Sole_Trader_Income", soleTraderIncomeSchema);
 export default ApplicantSoleTraderIncomeModel;