@dynamatix/gb-schemas 1.2.48 → 1.2.49

package/dist/applicants/applicant-employment.model.js

@@ -9,18 +9,18 @@ const applicantEmploymentSchema = new mongoose.Schema({
     addressLine2: { type: String, default: null },
     addressLine3: { type: String, default: null },
     addressPostCode: { type: String, required: true },
-    averageBonusPreviousTwoYears: { type: Pound, default: '£0.00' },
-    basicGrossIncome: { type: Pound, default: '£0.00' },
-    basicPay: { type: Pound, default: '£0.00' },
-    carAllowance: { type: Pound, default: '£0.00' },
-    childBenefit: { type: Pound, default: '£0.00' },
-    childBenefitOrSchoolAllowance: { type: Pound, default: '£0.00' },
+    averageBonusPreviousTwoYears: { type: Pound, default: 0.00 },
+    basicGrossIncome: { type: Pound, default: 0.00 },
+    basicPay: { type: Pound, default: 0.00 },
+    carAllowance: { type: Pound, default: 0.00 },
+    childBenefit: { type: Pound, default: 0.00 },
+    childBenefitOrSchoolAllowance: { type: Pound, default: 0.00 },
     contractRemaining: { type: String },
     dateJoined: { type: String, required: true },
-    disabilityLiving: { type: Pound, default: '£0.00' },
+    disabilityLiving: { type: Pound, default: 0.00 },
     employerName: { type: String, required: true },
     employerTelephone: { type: String, default: null },
-    housingAllowance: { type: Pound, default: '£0.00' },
+    housingAllowance: { type: Pound, default: 0.00 },
     industryLid: { type: mongoose.Schema.Types.ObjectId, ref: "Lookup", required: true },
     isUnderTerminationNotice: {
         type: Boolean,
@@ -28,17 +28,17 @@ const applicantEmploymentSchema = new mongoose.Schema({
         get: (v) => v ? "Yes" : "No"
     },
     jobTitleLid: { type: mongoose.Schema.Types.ObjectId, ref: "Lookup", required: true },
-    maintenance: { type: Pound, default: '£0.00' },
-    maternityIncome: { type: Pound, default: '£0.00' },
+    maintenance: { type: Pound, default: 0.00 },
+    maternityIncome: { type: Pound, default: 0.00 },
     natureOfBusiness: { type: String, required: true },
-    pensionIncome: { type: Pound, default: '£0.00' },
+    pensionIncome: { type: Pound, default: 0.00 },
     previousAddressCity: { type: String, default: null },
     previousAddressCountryLid: { type: mongoose.Schema.Types.ObjectId, ref: "Lookup", required: true },
     previousAddressLine1: { type: String, required: true },
     previousAddressLine2: { type: String, default: null },
     previousAddressLine3: { type: String, default: null },
     previousAddressPostCode: { type: String, required: true },
-    previousBasicGrossIncome: { type: Pound, default: '£0.00', required: true },
+    previousBasicGrossIncome: { type: Pound, default: 0.00, required: true },
     previousDateJoined: { type: String, required: true },
     previousDateLeft: { type: String, required: true },
     previousEmployerName: { type: String, required: true },
@@ -47,8 +47,8 @@ const applicantEmploymentSchema = new mongoose.Schema({
     previousNatureOfBusiness: { type: String, required: true },
     referenceContact: { type: String, default: null },
     referenceContactEmail: { type: String, required: true },
-    secondJob: { type: Pound, default: '£0.00' },
-    travelAllowance: { type: Pound, default: '£0.00' },
+    secondJob: { type: Pound, default: 0.00 },
+    travelAllowance: { type: Pound, default: 0.00 },
     underTerminationNoticeNote: { type: String, default: null }
 }, {
     toJSON: { getters: true },

package/dist/applicants/applicant-expenditure.model.js

@@ -15,7 +15,7 @@ const applicantExpenditureSchema = new mongoose.Schema({
     vehicleInsurance: { type: Pound, required: true },
     mortgagePaymentVehicle: { type: Pound, required: true },
     other: { type: Pound, required: true },
-    totalMontlyExpenditure: { type: String, default: '£0.00' }
+    totalMontlyExpenditure: { type: String, default: 0.00 }
 }, {
     toJSON: { getters: true },
     toObject: { getters: true }

package/dist/applicants/applicant-income.model.js

@@ -34,9 +34,9 @@ const incomeSchema = new mongoose.Schema({
     },
     nameOfBusiness: { type: String, required: true },
     natureOfBusiness: { type: String, required: true },
-    netAssets1: { type: Pound, default: '£0.00' },
-    netAssets2: { type: Pound, default: '£0.00' },
-    netAssets3: { type: Pound, default: '£0.00' },
+    netAssets1: { type: Pound, default: 0.00 },
+    netAssets2: { type: Pound, default: 0.00 },
+    netAssets3: { type: Pound, default: 0.00 },
     pageValidFlag: { type: String, default: true },
     percentageOfShareholding: { type: Number, required: true, min: 0, max: 100 },
     registeredAddressLine1: { type: String, required: true },
@@ -47,12 +47,12 @@ const incomeSchema = new mongoose.Schema({
     registeredPostCode: { type: String, required: true },
     registeredTelephone: { type: String, required: true },
     selfEmployedDate: { type: String, required: true },
-    turnover1: { type: Pound, default: '£0.00' },
-    turnover2: { type: Pound, default: '£0.00' },
-    turnover3: { type: Pound, default: '£0.00' },
-    year1: { type: Pound, default: '£0.00' },
-    year2: { type: Pound, default: '£0.00' },
-    year3: { type: Pound, default: '£0.00' },
+    turnover1: { type: Pound, default: 0.00 },
+    turnover2: { type: Pound, default: 0.00 },
+    turnover3: { type: Pound, default: 0.00 },
+    year1: { type: Pound, default: 0.00 },
+    year2: { type: Pound, default: 0.00 },
+    year3: { type: Pound, default: 0.00 },
     yearEnd1: { type: Number, default: '' },
     yearEnd2: { type: Number, default: '' },
     yearEnd3: { type: Number, default: '' }

package/dist/applicants/applicant-other-income.model.js

@@ -3,7 +3,7 @@ import { Pound } from "../value-objects/pound";
 const applicantOtherIncomeSchema = new mongoose.Schema({
     // Income Source 1
     sourceDetails1: { type: String, default: null },
-    amount1: { type: Pound, default: '£0.00' },
+    amount1: { type: Pound, default: 0.00 },
     payFrequency1Lid: { type: mongoose.Schema.Types.ObjectId, ref: "Lookup", default: null },
     guaranteed1: {
         type: Boolean,
@@ -12,7 +12,7 @@ const applicantOtherIncomeSchema = new mongoose.Schema({
     },
     // Income Source 2
     sourceDetails2: { type: String, default: null },
-    amount2: { type: Pound, default: '£0.00' },
+    amount2: { type: Pound, default: 0.00 },
     payFrequency2Lid: { type: mongoose.Schema.Types.ObjectId, ref: "Lookup", default: null },
     guaranteed2: {
         type: Boolean,
@@ -21,7 +21,7 @@ const applicantOtherIncomeSchema = new mongoose.Schema({
     },
     // Income Source 3
     sourceDetails3: { type: String, default: null },
-    amount3: { type: Pound, default: '£0.00' },
+    amount3: { type: Pound, default: 0.00 },
     payFrequency3Lid: { type: mongoose.Schema.Types.ObjectId, ref: "Lookup", default: null },
     guaranteed3: {
         type: Boolean,
@@ -30,19 +30,19 @@ const applicantOtherIncomeSchema = new mongoose.Schema({
     },
     // Income Source 4
     sourceDetails4: { type: String, default: null },
-    amount4: { type: Pound, default: '£0.00' },
+    amount4: { type: Pound, default: 0.00 },
     payFrequency4Lid: { type: mongoose.Schema.Types.ObjectId, ref: "Lookup", default: null },
     guaranteed4: {
         type: Boolean,
         default: false,
         get: (v) => v ? "Yes" : "No"
     },
-    taxCredits: { type: Pound, default: '£0.00' },
-    maintenance: { type: Pound, default: '£0.00' },
-    otherBenefits: { type: Pound, default: '£0.00' },
-    grossPensionIncome: { type: Pound, default: '£0.00' },
-    privatePensionIncome: { type: Pound, default: '£0.00' },
-    statePensionIncome: { type: Pound, default: '£0.00' },
+    taxCredits: { type: Pound, default: 0.00 },
+    maintenance: { type: Pound, default: 0.00 },
+    otherBenefits: { type: Pound, default: 0.00 },
+    grossPensionIncome: { type: Pound, default: 0.00 },
+    privatePensionIncome: { type: Pound, default: 0.00 },
+    statePensionIncome: { type: Pound, default: 0.00 },
 }, {
     toJSON: { getters: true },
     toObject: { getters: true }

package/dist/applicants/applicant.model.js

@@ -109,7 +109,7 @@ const applicantSchema = new mongoose.Schema({
     maritalStatusLid: { type: mongoose.Schema.Types.ObjectId, ref: "Lookup", required: true },
     mobileNumber: { type: String, default: null },
     nationalityLid: { type: mongoose.Schema.Types.ObjectId, ref: "Lookup", required: true },
-    netIncome: { type: Pound, default: '£0.00' },
+    netIncome: { type: Pound, default: 0.00 },
     niNumber: { type: String, required: true },
     numberOfDependants: { type: Number, default: 0 },
     isOneYearPrior: {

package/dist/applications/application-company-model.js

@@ -28,14 +28,14 @@ const companySchema = new mongoose.Schema({
     //   }
     // ],
     yearEnd1: { type: Number, required: true, max: 9999 }, // form
-    turnoverYear1: { type: Pound, required: true, default: '£0.00' }, // form
-    netProfitYear1: { type: Pound, required: true, default: '£0.00' }, // form
+    turnoverYear1: { type: Pound, required: true, default: 0.00 }, // form
+    netProfitYear1: { type: Pound, required: true, default: 0.00 }, // form
     yearEnd2: { type: Number, required: true, max: 9999 }, // form
-    turnoverYear2: { type: Pound, required: true, default: '£0.00' }, // form
-    netProfitYear2: { type: Pound, required: true, default: '£0.00' }, // form
+    turnoverYear2: { type: Pound, required: true, default: 0.00 }, // form
+    netProfitYear2: { type: Pound, required: true, default: 0.00 }, // form
     yearEnd3: { type: Number, required: true, max: 9999 }, // form
-    turnoverYear3: { type: Pound, required: true, default: '£0.00' }, // form
-    netProfitYear3: { type: Pound, required: true, default: '£0.00' }, // form
+    turnoverYear3: { type: Pound, required: true, default: 0.00 }, // form
+    netProfitYear3: { type: Pound, required: true, default: 0.00 }, // form
     // Purchase form - Company section
     companyCreditDefaults: { type: String, required: true, default: '' }, // form
     companyCountyCourtJudgment: { type: String, required: true, default: '' }, // form

package/dist/applications/application-product.model.js

@@ -10,7 +10,7 @@ const productSchema = new mongoose.Schema({
     repaymentTypeLid: { type: mongoose.Schema.Types.ObjectId, ref: "Lookup" },
     numberOfYearsToRepay: { type: Number, default: 0 },
     repaymentVehicle: { type: String, required: true, default: '', maxLength: 100 },
-    fixedAmount: { type: Pound, default: '£0.00', required: false },
+    fixedAmount: { type: Pound, default: 0.00, required: false },
     isFinanceRecommendedToApplicantLid: { type: mongoose.Schema.Types.ObjectId, ref: "Lookup" },
     procFeeRateLid: { type: mongoose.Schema.Types.ObjectId, ref: "Lookup" },
     networkClubSubmission: { type: Boolean, required: true, get: (value) => (value ? "Yes" : "No") },
@@ -18,7 +18,7 @@ const productSchema = new mongoose.Schema({
     introducerSubmission: { type: Boolean, required: true, get: (value) => (value ? "Yes" : "No") },
     introducer: { type: String, default: '' },
     bdm: { type: String, required: true, default: '' },
-    tempAppFee: { type: Pound, default: '£0.00', required: true },
+    tempAppFee: { type: Pound, default: 0.00, required: true },
     productFeePaymentTypeLid: { type: mongoose.Schema.Types.ObjectId, ref: "Lookup" }
 });
 // virtual property 'lendingType'

package/dist/properties/property.model.js

@@ -62,31 +62,31 @@ const propertySchema = new mongoose.Schema({
     marketValue: {
         type: Pound,
         required: true,
-        default: '£0.00',
+        default: 0.00,
         description: "The market value of the property",
     },
     monthlyRent: {
         type: Pound,
         required: true,
-        default: '£0.00',
+        default: 0.00,
         description: "The monthly rent value of the property"
     },
     monthlyRepayment: {
         type: Pound,
         required: true,
-        default: '£0.00',
+        default: 0.00,
         description: "The monthly repayment value for the property"
     },
     originalLoanBalance: {
         type: Pound,
         required: true,
-        default: '£0.00',
+        default: 0.00,
         description: "The original loan balance for the property"
     },
     outstandingBalance: {
         type: Pound,
         required: true,
-        default: '£0.00',
+        default: 0.00,
         description: "The remaining outstanding balance of the property loan"
     },
     otherOwnershipParties: {

package/dist/properties/security.model.js

@@ -57,11 +57,11 @@ const securitySchema = new mongoose.Schema({
     pageValidFlag: { type: Boolean, default: true, }, //form
     haveAnyBuyToLetProperties: { type: Boolean, required: true, default: false }, // not-form propertyData - not in Property form
     isPropertyInEnglandOrWales: { type: Boolean, required: true, default: false }, // not-form propertyData - not in Property form
-    // price: { type: Pound, required: true, default: '£0.00'} as any,           // *already in Purchase Form    -> not-form mortgateData - pounds
+    // price: { type: Pound, required: true, default: 0.00} as any,           // *already in Purchase Form    -> not-form mortgateData - pounds
     noOfBuyToLetProperties: { type: Number, default: 0 }, // not-form propertyData - not in Property form
-    totalMonthlyRentalIncome: { type: Pound, required: true, default: '£0.00' }, // not-form pound propertyData - not in Property form
-    totalMonthlyRepayment: { type: Pound, required: true, default: '£0.00' }, // not-form pound propertyData - not in Property form
-    totalOutstandingBalance: { type: Pound, required: true, default: '£0.00' }, // not-form pound propertyData - not in Property form
+    totalMonthlyRentalIncome: { type: Pound, required: true, default: 0.00 }, // not-form pound propertyData - not in Property form
+    totalMonthlyRepayment: { type: Pound, required: true, default: 0.00 }, // not-form pound propertyData - not in Property form
+    totalOutstandingBalance: { type: Pound, required: true, default: 0.00 }, // not-form pound propertyData - not in Property form
     areAllBedRoomsOver10sqm: { type: Boolean, required: true, default: false }, // form
     isBrickTileConstruction: { type: Boolean, required: true, default: false }, // form
     constructionDetails: { type: String, required: true, default: '' }, // form
@@ -72,7 +72,7 @@ const securitySchema = new mongoose.Schema({
     isGroundRent: {
         type: Pound,
         required: true,
-        default: '£0.00' // Default value in correct format
+        default: 0.00 // Default value in correct format
     }, // form - pounds
     isHouseLicensed: { type: Boolean, required: true, default: false }, // form
     houseNumberOfFloors: { type: Number, required: true, default: 0 }, // form
@@ -98,7 +98,7 @@ const securitySchema = new mongoose.Schema({
     serviceCharge: {
         type: Pound,
         required: true,
-        default: '£0.00' // Default value in correct format
+        default: 0.00 // Default value in correct format
     }, // form - pounds
     unexpiredRemainingLease: { type: Number, required: true, max: 9999, default: 0 }, // form
     yearLeaseExpires: { type: Number, required: true, default: 0 }, // not-form securityData

package/dist/value-objects/pound.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pound.d.ts","sourceRoot":"","sources":["../../value-objects/pound.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,OAAO,QAAQ,MAAM,UAAU,CAAC;AAGhC,OAAO,QAAQ,UAAU,CAAC;IACtB,UAAU,MAAM,CAAC;QACb,UAAU,KAAK,CAAC;YACZ,MAAM,KAAM,SAAQ,UAAU;aAAI;SACrC;KACJ;CACJ;AAED,cAAM,KAAM,SAAQ,QAAQ,CAAC,UAAU;gBACvB,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,SAAS,GAAG,SAAS;IAKhE,IAAI,CAAC,GAAG,EAAE,GAAG;CA8ChB;AAKD,OAAO,EAAE,KAAK,EAAE,CAAC"}
+{"version":3,"file":"pound.d.ts","sourceRoot":"","sources":["../../value-objects/pound.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,OAAO,QAAQ,MAAM,UAAU,CAAC;AAGhC,OAAO,QAAQ,UAAU,CAAC;IACtB,UAAU,MAAM,CAAC;QACb,UAAU,KAAK,CAAC;YACZ,MAAM,KAAM,SAAQ,UAAU;aAAI;SACrC;KACJ;CACJ;AAED,cAAM,KAAM,SAAQ,QAAQ,CAAC,UAAU;gBACvB,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,SAAS,GAAG,SAAS;IAKhE,IAAI,CAAC,GAAG,EAAE,GAAG;CA4BhB;AAKD,OAAO,EAAE,KAAK,EAAE,CAAC"}

package/dist/value-objects/pound.js

@@ -9,30 +9,16 @@ class Pound extends mongoose.SchemaType {
         if (val == null) {
             return val; // Allow null or undefined values
         }
-        // Convert numbers to string for processing
-        if (typeof val === 'number') {
-            val = val.toFixed(2); // Ensure 2 decimal places
-        }
         // Ensure the value is a string
-        if (typeof val !== 'string') {
+        if (typeof val !== 'number') {
             throw new mongoose.Error.CastError('Pound', val, this.path, new Error('Pound value must be a string or number'));
         }
-        // Remove commas for numeric validation
-        const cleaned = val.replace(/,/g, '');
         // Check if the cleaned value is a valid number
-        if (isNaN(Number(cleaned))) {
+        if (isNaN(Number(val))) {
             throw new mongoose.Error.CastError('Pound', val, this.path, new Error(`${val} is not a valid currency value`));
         }
-        // Convert to number to handle decimal places correctly
-        const numValue = Number(cleaned);
-        // Format the number with commas and 2 decimal places
-        const formattedValue = numValue.toLocaleString('en-GB', {
-            style: 'decimal',
-            minimumFractionDigits: 2,
-            maximumFractionDigits: 2
-        });
         // Return without symbol prefixed
-        return `${formattedValue}`;
+        return val.toFixed(2);
     }
 }
 // Register the custom type globally with Mongoose

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamatix/gb-schemas",
-  "version": "1.2.48",
+  "version": "1.2.49",
   "description": "All the schemas for gatehouse bank back-end",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",