@lendi/integrations-transform 1.1.5 → 1.2.0

package/lib/utils/is-income-type.d.ts

@@ -39,22 +39,22 @@ export declare function isOtherIncomeWithDesc(incomeType: string): boolean;
  * @returns {boolean} True if either Full Doc or Low Doc Self Employed Income.
  */
 export declare function isFullDocOrLowDocIncome(incomeType: IncomeType): boolean;
-declare type EmploymentTypes = 'PAYG' | 'SelfEmployed' | 'NotEmployed';
 /**
- * @description Get the employment ids for an applicant for a specific employment type.
- * @param {PersonApplicant} applicant An applicant
- * @param {string} key Employment type key: PAYG or SelfEmployed.
- * @returns {string[]} An array of employment ids for the applicant of the specified type.
+ * Checks if there is some employment for the applicant that has the same employment id as the employment id in the income event
+ *
+ * @param {PersonApplicant} applicant - An applicant
+ * @param {string} employmentId - Employment id being searched for
+ * @returns {boolean} - Whether or not the applicant has an employment with matching employmentId
  */
-export declare function getEmploymentIds(applicant: PersonApplicant, key: EmploymentTypes): string[];
+export declare const hasMatchingEmploymentId: (applicant: PersonApplicant, employmentId: string) => boolean;
 /**
- * @description Get applicantId from an array of applicants given an employmentId and employmentType.
- * @param {PersonApplicant[]} applicants An array of applicants.
- * @param {string} employmentId EmploymentId
- * @param {string} key Employment type: PAYG or SelfEmployed
- * @returns {string | undefined} Returns applicantId or undefined.
+ * Gets the applicant id using the employment id
+ *
+ * @param {PersonApplicant[]} applicants - An array of applicants.
+ * @param {string} employmentId - Employment ID
+ * @returns {string | undefined} - Applicant id or undefined
  */
-export declare function getStoredApplicantId(applicants: PersonApplicant[], employmentId: string, key: EmploymentTypes): string | undefined;
+export declare function getApplicantIdFromEmploymentId(applicants: PersonApplicant[], employmentId: string): string | undefined;
 /**
  * @description Get an applicantId from the event or the applicants.
  * @param {Income} income Income.
@@ -69,4 +69,3 @@ export declare function getApplicantId({ percentOwned, employmentId }: Income, a
  * @returns {0 | < 0 | > 0} Returns a number to be used for sorting income.
  */
 export declare const sortBusinessIncome: ({ year: yearA }: IncomeBusinessDetails, { year: yearB }: IncomeBusinessDetails) => number;
-export {};

package/lib/utils/is-income-type.js

@@ -1,6 +1,6 @@
 "use strict";
 exports.__esModule = true;
-exports.sortBusinessIncome = exports.getApplicantId = exports.getStoredApplicantId = exports.getEmploymentIds = exports.isFullDocOrLowDocIncome = exports.isOtherIncomeWithDesc = exports.isOtherIncome = exports.isRentalIncome = exports.isSelfEmployedIncome = exports.isPaygIncome = exports.otherIncomeList = exports.PAYGList = exports.descriptionOtherIncomeTypes = void 0;
+exports.sortBusinessIncome = exports.getApplicantId = exports.getApplicantIdFromEmploymentId = exports.hasMatchingEmploymentId = exports.isFullDocOrLowDocIncome = exports.isOtherIncomeWithDesc = exports.isOtherIncome = exports.isRentalIncome = exports.isSelfEmployedIncome = exports.isPaygIncome = exports.otherIncomeList = exports.PAYGList = exports.descriptionOtherIncomeTypes = void 0;
 var lodash_1 = require("lodash");
 var public_income_1 = require("../types/events/public-income");
 exports.descriptionOtherIncomeTypes = [
@@ -83,32 +83,37 @@ function isFullDocOrLowDocIncome(incomeType) {
 }
 exports.isFullDocOrLowDocIncome = isFullDocOrLowDocIncome;
 /**
- * @description Get the employment ids for an applicant for a specific employment type.
- * @param {PersonApplicant} applicant An applicant
- * @param {string} key Employment type key: PAYG or SelfEmployed.
- * @returns {string[]} An array of employment ids for the applicant of the specified type.
+ * Checks if there is some employment for the applicant that has the same employment id as the employment id in the income event
+ *
+ * @param {PersonApplicant} applicant - An applicant
+ * @param {string} employmentId - Employment id being searched for
+ * @returns {boolean} - Whether or not the applicant has an employment with matching employmentId
  */
-function getEmploymentIds(applicant, key) {
-    return (0, lodash_1.compact)(applicant.Employment.flatMap(function (employment) { return (0, lodash_1.get)(employment, "".concat(key, ".@UniqueID")); }));
-}
-exports.getEmploymentIds = getEmploymentIds;
+var hasMatchingEmploymentId = function (applicant, employmentId) {
+    return (applicant.Employment || []).some(function (employment) {
+        var id = (0, lodash_1.get)(employment, 'PAYG.@UniqueID') ||
+            (0, lodash_1.get)(employment, 'SelfEmployed.@UniqueID') ||
+            (0, lodash_1.get)(employment, 'NotEmployed.@UniqueID');
+        return id === employmentId;
+    });
+};
+exports.hasMatchingEmploymentId = hasMatchingEmploymentId;
 /**
- * @description Get applicantId from an array of applicants given an employmentId and employmentType.
- * @param {PersonApplicant[]} applicants An array of applicants.
- * @param {string} employmentId EmploymentId
- * @param {string} key Employment type: PAYG or SelfEmployed
- * @returns {string | undefined} Returns applicantId or undefined.
+ * Gets the applicant id using the employment id
+ *
+ * @param {PersonApplicant[]} applicants - An array of applicants.
+ * @param {string} employmentId - Employment ID
+ * @returns {string | undefined} - Applicant id or undefined
  */
-function getStoredApplicantId(applicants, employmentId, key) {
-    for (var _i = 0, applicants_1 = applicants; _i < applicants_1.length; _i++) {
-        var applicant = applicants_1[_i];
-        var employmentIds = getEmploymentIds(applicant, key);
-        if (employmentIds.includes(employmentId))
-            return applicant['@UniqueID'];
+function getApplicantIdFromEmploymentId(applicants, employmentId) {
+    var applicantId;
+    if (applicants && employmentId) {
+        var applicant = applicants.find(function (applicant) { return (0, exports.hasMatchingEmploymentId)(applicant, employmentId); });
+        applicantId = applicant === null || applicant === void 0 ? void 0 : applicant['@UniqueID'];
     }
-    return undefined;
+    return applicantId;
 }
-exports.getStoredApplicantId = getStoredApplicantId;
+exports.getApplicantIdFromEmploymentId = getApplicantIdFromEmploymentId;
 /**
  * @description Get an applicantId from the event or the applicants.
  * @param {Income} income Income.
@@ -118,10 +123,7 @@ exports.getStoredApplicantId = getStoredApplicantId;
 function getApplicantId(_a, applicants) {
     var percentOwned = _a.percentOwned, employmentId = _a.employmentId;
     if (applicants === void 0) { applicants = []; }
-    return ((0, lodash_1.get)(percentOwned, 'owners[0].applicantId') ||
-        getStoredApplicantId(applicants, employmentId, 'PAYG') ||
-        getStoredApplicantId(applicants, employmentId, 'SelfEmployed') ||
-        getStoredApplicantId(applicants, employmentId, 'NotEmployed'));
+    return (0, lodash_1.get)(percentOwned, 'owners[0].applicantId') || getApplicantIdFromEmploymentId(applicants, employmentId);
 }
 exports.getApplicantId = getApplicantId;
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lendi/integrations-transform",
-  "version": "1.1.5",
+  "version": "1.2.0",
   "description": "Library for kafka event data transforming",
   "author": "Integrations <integrations@lendi.com.au>",
   "homepage": "https://bitbucket.org/lendi-dev/integrations-shared-packages#readme",