@servicetitan/acquisition-functions 0.6.1 → 0.8.0

package/dist/__tests__/mock.d.ts

@@ -449,3 +449,6 @@ export declare const MOCK: ({
     modifiedon: string;
     location: string;
 })[];
+export declare const filtersToIgnoreMOCK: {
+    name: string;
+}[];

package/dist/__tests__/mock.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MOCK = void 0;
+exports.filtersToIgnoreMOCK = exports.MOCK = void 0;
 exports.MOCK = [
     {
         attomid: 154817956,
@@ -455,3 +455,22 @@ exports.MOCK = [
         location: '33.97984,-118.25633',
     },
 ];
+exports.filtersToIgnoreMOCK = [
+    { name: 'vacant land - exempt' },
+    { name: 'residential - vacant land' },
+    { name: 'industrial - vacant land' },
+    { name: 'rural residence' },
+    { name: 'multi-family - vacant land' },
+    { name: 'waste land, marsh, swamp, submerged - vacant land' },
+    { name: 'vacant land - unspecified improvement' },
+    { name: 'planned unit development (pud)' },
+    { name: 'row house' },
+    { name: 'agricultural (unimproved) - vacant land' },
+    { name: 'water area (lakes, river, shore) - vacant land' },
+    { name: 'recreational - vacant land' },
+    { name: 'vacant land - destroyed/uninhabitable improvement' },
+    { name: 'institutional - vacant land' },
+    { name: 'vacant land' },
+    { name: 'government - vacant land' },
+    { name: 'private preserve, open space - vacant land' },
+];

package/dist/filter-fetcher/calc-filter-count.d.ts

@@ -1,5 +1,5 @@
 import { Property } from '../types';
-export declare const calculateFilterCount: (properties: Property[]) => {
+export declare const calculateFilterCount: (properties: Property[], filtersToIgnore: string[]) => {
     propertyusegroupCounts: {
         name: string;
         count: number;

package/dist/filter-fetcher/calc-filter-count.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.calculateFilterCount = void 0;
 const utils_1 = require("../utils/utils");
-const calculateFilterCount = (properties) => {
+const calculateFilterCount = (properties, filtersToIgnore) => {
     const filterCount = {
         propertyusegroup: {},
         propertyusestandardized: {},
@@ -11,9 +11,10 @@ const calculateFilterCount = (properties) => {
         utilitieswatersource: {},
         flooringmaterialprimary: {},
     };
+    const { isValidFilterName } = (0, utils_1.FilterNameValidator)(filtersToIgnore, utils_1.UNKNOWN);
     properties.forEach(p => {
-        if (p.propertyusestandardized.toLowerCase() !== utils_1.UNKNOWN &&
-            p.propertyusegroup.toLowerCase() !== utils_1.UNKNOWN) {
+        if (isValidFilterName(p.propertyusestandardized.toLowerCase()) &&
+            isValidFilterName(p.propertyusegroup.toLowerCase())) {
             const propertyUseKey = p.propertyusestandardized + utils_1.SEPARATOR_CHARACTER + p.propertyusegroup;
             filterCount.propertyusestandardized[propertyUseKey] =
                 filterCount.propertyusestandardized[propertyUseKey] || 0;
@@ -22,22 +23,22 @@ const calculateFilterCount = (properties) => {
                 filterCount.propertyusegroup[p.propertyusegroup] || 0;
             filterCount.propertyusegroup[p.propertyusegroup] += 1;
         }
-        if (p.hvaccoolingdetail.toLowerCase() !== utils_1.UNKNOWN) {
+        if (isValidFilterName(p.hvaccoolingdetail.toLowerCase())) {
             filterCount.hvaccoolingdetail[p.hvaccoolingdetail] =
                 filterCount.hvaccoolingdetail[p.hvaccoolingdetail] || 0;
             filterCount.hvaccoolingdetail[p.hvaccoolingdetail] += 1;
         }
-        if (p.hvacheatingdetail.toLowerCase() !== utils_1.UNKNOWN) {
+        if (isValidFilterName(p.hvacheatingdetail.toLowerCase())) {
             filterCount.hvacheatingdetail[p.hvacheatingdetail] =
                 filterCount.hvacheatingdetail[p.hvacheatingdetail] || 0;
             filterCount.hvacheatingdetail[p.hvacheatingdetail] += 1;
         }
-        if (p.utilitieswatersource.toLowerCase() !== utils_1.UNKNOWN) {
+        if (isValidFilterName(p.utilitieswatersource.toLowerCase())) {
             filterCount.utilitieswatersource[p.utilitieswatersource] =
                 filterCount.utilitieswatersource[p.utilitieswatersource] || 0;
             filterCount.utilitieswatersource[p.utilitieswatersource] += 1;
         }
-        if (p.flooringmaterialprimary.toLowerCase() !== utils_1.UNKNOWN) {
+        if (isValidFilterName(p.flooringmaterialprimary.toLowerCase())) {
             filterCount.flooringmaterialprimary[p.flooringmaterialprimary] =
                 filterCount.flooringmaterialprimary[p.flooringmaterialprimary] || 0;
             filterCount.flooringmaterialprimary[p.flooringmaterialprimary] += 1;

package/dist/filter-fetcher/index.js

@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFilterFetcherProcessor = void 0;
 const calc_filter_count_1 = require("./calc-filter-count");
 function getFilterFetcherProcessor(db) {
+    let invalidFilters;
+    let fetchInvalidFiltersInProgress = null;
     const getFiltersCollection = async () => {
         return db.collection('filters');
     };
@@ -39,6 +41,30 @@ function getFilterFetcherProcessor(db) {
         })
             .toArray();
     };
+    const getInvalidFilters = async () => {
+        if (invalidFilters !== undefined) {
+            return invalidFilters;
+        }
+        if (!fetchInvalidFiltersInProgress) {
+            fetchInvalidFiltersInProgress = db
+                .collection('badFilters')
+                .find({}, {
+                projection: {
+                    _id: 0,
+                    name: 1,
+                },
+            })
+                .toArray()
+                .then(results => {
+                invalidFilters = results.map(doc => doc.name);
+            })
+                .finally(() => {
+                fetchInvalidFiltersInProgress = null;
+            });
+        }
+        await fetchInvalidFiltersInProgress;
+        return invalidFilters;
+    };
     return async function processZip(zip, errors) {
         const meta = {
             requests: 0,
@@ -50,10 +76,13 @@ function getFilterFetcherProcessor(db) {
             return meta;
         }
         try {
-            const properties = await getProperties(zip);
+            const [properties, invalidFilters] = await Promise.all([
+                getProperties(zip),
+                getInvalidFilters(),
+            ]);
             meta.requests += 1;
             meta.properties += properties.length;
-            const filters = (0, calc_filter_count_1.calculateFilterCount)(properties);
+            const filters = (0, calc_filter_count_1.calculateFilterCount)(properties, invalidFilters);
             await deleteZipFilter(zip);
             meta.requests += 1;
             await addZipFilters({

package/dist/utils/utils.d.ts

@@ -243,3 +243,6 @@ export declare const convertStringToDate: (props: Property[], propName: keyof Pr
     location: string;
     _id: import("bson").ObjectID;
 }[];
+export declare function FilterNameValidator(filtersToIgnore: string[], unknownCharacter: string): {
+    isValidFilterName(filterName: string, checkIgnoredFilters?: boolean): boolean;
+};

package/dist/utils/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertStringToDate = exports.convertToZipString = exports.convertObjectToArray = exports.extractUniqueFilterNames = exports.isEmptyField = exports.isNotFullProperty = exports.UNKNOWN = exports.SEPARATOR_CHARACTER = void 0;
+exports.FilterNameValidator = exports.convertStringToDate = exports.convertToZipString = exports.convertObjectToArray = exports.extractUniqueFilterNames = exports.isEmptyField = exports.isNotFullProperty = exports.UNKNOWN = exports.SEPARATOR_CHARACTER = void 0;
 exports.SEPARATOR_CHARACTER = '___';
 exports.UNKNOWN = 'unknown';
 const isNotFullProperty = (property) => {
@@ -78,3 +78,12 @@ const convertStringToDate = (props, propName) => {
         .map(p => ({ ...p, [propName]: new Date(p[propName]) }));
 };
 exports.convertStringToDate = convertStringToDate;
+function FilterNameValidator(filtersToIgnore, unknownCharacter) {
+    return {
+        isValidFilterName(filterName, checkIgnoredFilters = true) {
+            const isValidFilter = !checkIgnoredFilters || !filtersToIgnore.includes(filterName);
+            return filterName !== unknownCharacter && isValidFilter;
+        },
+    };
+}
+exports.FilterNameValidator = FilterNameValidator;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@servicetitan/acquisition-functions",
-    "version": "0.6.1",
+    "version": "0.8.0",
     "description": "",
     "main": "./dist/index.js",
     "typings": "./dist/index.d.ts",
@@ -28,5 +28,5 @@
     "cli": {
         "webpack": false
     },
-    "gitHead": "722e4224af6b19d0a4a410bdcfa071557e2b3af7"
+    "gitHead": "04c06c606f59be9507544c0ac0a9e0a19538dbf0"
 }