@servicetitan/acquisition-functions 0.5.0 → 0.6.0

package/dist/__tests__/filter-fetcher.test.js

@@ -10,15 +10,9 @@ describe('property-assessorlastsaledate-converter', () => {
         const client = await (0, setup_1.openConnection)();
         base = client.db('test');
         await (0, setup_1.setupProperties)(base);
-        const { filterFetcher } = (0, index_1.configureProcessor)({
+        const { filterFetcher, propertyUseGroupProcessor } = (0, index_1.configureProcessor)({
             workers: 10,
             mongoDb: base,
-            fetchProperties: (0, setup_1.getFetchPropertiesForFilters)(base),
-        });
-        const { propertyUseGroupProcessor } = (0, index_1.configureProcessor)({
-            workers: 10,
-            mongoDb: base,
-            fetchProperties: (0, setup_1.getFetchPropertiesForFix)(base),
         });
         await propertyUseGroupProcessor.start(['90001', '90002']);
         metadata = await filterFetcher.start(['90001', '90002']);

package/dist/__tests__/property-fix-use-group.test.js

@@ -17,7 +17,6 @@ describe('property-use-group-converter', () => {
             processor = (0, index_1.configureProcessor)({
                 workers: 1,
                 mongoDb: base,
-                fetchProperties: (0, setup_1.getFetchPropertiesForFix)(base),
             });
             const { propertyUseGroupProcessor } = processor;
             metadata = await propertyUseGroupProcessor.start('90001');

package/dist/__tests__/setup.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFetchPropertiesForFix = exports.getFetchPropertiesForFilters = exports.closeConnection = exports.openConnection = exports.setupProperties = void 0;
+exports.closeConnection = exports.openConnection = exports.setupProperties = void 0;
 const mongodb_1 = require("mongodb");
 const mock_1 = require("./mock");
 async function setupProperties(base) {
@@ -39,32 +39,3 @@ const openConnection = async () => {
 exports.openConnection = openConnection;
 const closeConnection = () => connectedMongoClient?.close();
 exports.closeConnection = closeConnection;
-const getFetchPropertiesForFilters = (base) => async (zip) => {
-    return base
-        .collection('properties')
-        .find({ zipcode: zip }, {
-        projection: {
-            zipcode: 1,
-            propertyusegroup: 1,
-            propertyusestandardized: 1,
-            hvaccoolingdetail: 1,
-            hvacheatingdetail: 1,
-            utilitieswatersource: 1,
-            flooringmaterialprimary: 1,
-            _id: 0, // eslint-disable-line
-        },
-    })
-        .toArray();
-};
-exports.getFetchPropertiesForFilters = getFetchPropertiesForFilters;
-const getFetchPropertiesForFix = (base) => async (zip) => {
-    return base
-        .collection('properties')
-        .find({ zipcode: zip }, {
-        projection: {
-            propertyusegroup: 1,
-        },
-    })
-        .toArray();
-};
-exports.getFetchPropertiesForFix = getFetchPropertiesForFix;

package/dist/filter-fetcher/index.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFilterFetcherProcessor = void 0;
 const calc_filter_count_1 = require("./calc-filter-count");
-function getFilterFetcherProcessor({ mongoDb: db, fetchProperties }) {
+function getFilterFetcherProcessor(db) {
     const getFiltersCollection = async () => {
         return db.collection('filters');
     };
@@ -22,6 +22,23 @@ function getFilterFetcherProcessor({ mongoDb: db, fetchProperties }) {
             flooringmaterialprimary: flooringmaterialprimaryCounts,
         });
     };
+    const getProperties = (zip) => {
+        return db
+            .collection('properties')
+            .find({ zipcode: zip }, {
+            projection: {
+                zipcode: 1,
+                propertyusegroup: 1,
+                propertyusestandardized: 1,
+                hvaccoolingdetail: 1,
+                hvacheatingdetail: 1,
+                utilitieswatersource: 1,
+                flooringmaterialprimary: 1,
+                _id: 0, // eslint-disable-line
+            },
+        })
+            .toArray();
+    };
     return async function processZip(zip, errors) {
         const meta = {
             requests: 0,
@@ -33,7 +50,7 @@ function getFilterFetcherProcessor({ mongoDb: db, fetchProperties }) {
             return meta;
         }
         try {
-            const properties = await fetchProperties(zip);
+            const properties = await getProperties(zip);
             meta.requests += 1;
             meta.properties += properties.length;
             const filters = (0, calc_filter_count_1.calculateFilterCount)(properties);
@@ -50,6 +67,7 @@ function getFilterFetcherProcessor({ mongoDb: db, fetchProperties }) {
             console.error(e);
             errors.add(zip);
             meta.errors += 1;
+            throw e;
         }
         return meta;
     };

package/dist/fix-property-use/index.js

@@ -8,7 +8,7 @@ const getPropertiesCollection = async (db) => {
 function fixPropertyName(propertyName) {
     return propertyName ? propertyName.toUpperCase() : '';
 }
-function getPropertyUseGroupProcessor({ mongoDb: db, fetchProperties }) {
+function getPropertyUseGroupProcessor(db) {
     function fixPropertyNames(properties) {
         return properties
             .filter(p => p.propertyusegroup &&
@@ -32,6 +32,16 @@ function getPropertyUseGroupProcessor({ mongoDb: db, fetchProperties }) {
         }));
         return collection.bulkWrite(propQuery, { ordered: true, w: 1 });
     };
+    const getProperties = (zip) => {
+        return db
+            .collection('properties')
+            .find({ zipcode: zip }, {
+            projection: {
+                propertyusegroup: 1,
+            },
+        })
+            .toArray();
+    };
     return async function processZip(zip, errors) {
         const meta = {
             requests: 0,
@@ -42,7 +52,7 @@ function getPropertyUseGroupProcessor({ mongoDb: db, fetchProperties }) {
             return meta;
         }
         try {
-            const properties = await fetchProperties(zip);
+            const properties = await getProperties(zip);
             meta.requests += 1;
             if (!properties?.length) {
                 return meta;
@@ -59,6 +69,7 @@ function getPropertyUseGroupProcessor({ mongoDb: db, fetchProperties }) {
             console.error(e);
             errors.add(zip);
             meta.errors += 1;
+            throw e;
         }
         return meta;
     };

package/dist/index.js

@@ -1,18 +1,31 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.propertiesAssessorLastSaleDateAggregate = exports.propertyUseGroupProcessorAggregate = exports.configureProcessor = void 0;
+exports.configureProcessor = void 0;
 const filter_fetcher_1 = require("./filter-fetcher");
 const fix_property_use_1 = require("./fix-property-use");
 const property_assessorlastsaledate_converter_1 = require("./property-assessorlastsaledate-converter");
 const zip_processor_1 = require("./zip-processor");
 function configureProcessor(config) {
-    const filterFetcher = (0, zip_processor_1.zipProcessor)(config, (0, filter_fetcher_1.getFilterFetcherProcessor)(config));
-    const assessorLastSaleDateProcessor = (0, zip_processor_1.zipProcessor)(config, (0, property_assessorlastsaledate_converter_1.getAssessorLastSaleDateProcessor)(config.mongoDb));
-    const propertyUseGroupProcessor = (0, zip_processor_1.zipProcessor)(config, (0, fix_property_use_1.getPropertyUseGroupProcessor)(config));
+    const filterFetcher = (0, zip_processor_1.zipProcessor)(config.workers, (0, filter_fetcher_1.getFilterFetcherProcessor)(config.mongoDb));
+    const assessorLastSaleDateProcessor = (0, zip_processor_1.zipProcessor)(config.workers, (0, property_assessorlastsaledate_converter_1.getAssessorLastSaleDateProcessor)(config.mongoDb));
+    const propertyUseGroupProcessor = (0, zip_processor_1.zipProcessor)(config.workers, (0, fix_property_use_1.getPropertyUseGroupProcessor)(config.mongoDb));
     return { filterFetcher, assessorLastSaleDateProcessor, propertyUseGroupProcessor };
 }
 exports.configureProcessor = configureProcessor;
-var fix_property_use_2 = require("./fix-property-use");
-Object.defineProperty(exports, "propertyUseGroupProcessorAggregate", { enumerable: true, get: function () { return fix_property_use_2.propertyUseGroupProcessorAggregate; } });
-var property_assessorlastsaledate_converter_2 = require("./property-assessorlastsaledate-converter");
-Object.defineProperty(exports, "propertiesAssessorLastSaleDateAggregate", { enumerable: true, get: function () { return property_assessorlastsaledate_converter_2.propertiesAssessorLastSaleDateAggregate; } });
+__exportStar(require("./fix-property-use"), exports);
+__exportStar(require("./property-assessorlastsaledate-converter"), exports);
+__exportStar(require("./filter-fetcher"), exports);

package/dist/property-assessorlastsaledate-converter/index.js

@@ -60,6 +60,7 @@ function getAssessorLastSaleDateProcessor(db) {
             console.error(e);
             meta.errors += 1;
             errors.add(zip);
+            throw e;
         }
         return meta;
     };

package/dist/zip-processor.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.zipProcessor = void 0;
 const utils_1 = require("./utils/utils");
-function zipProcessor(config, processorFn) {
+function zipProcessor(workers, processorFn) {
     let processor = null;
     let erroredZips = new Set();
     async function* processZips(zips) {
@@ -18,7 +18,7 @@ function zipProcessor(config, processorFn) {
             }
             for (let zipNum = startZipNum; zipNum <= endZipNum;) {
                 const processes = [];
-                const processZipEnd = zipNum + config.workers - 1;
+                const processZipEnd = zipNum + workers - 1;
                 for (; zipNum <= endZipNum && zipNum <= processZipEnd; zipNum++) {
                     const zip = (0, utils_1.convertToZipString)(zipNum);
                     processes.push(processorFn(zip, erroredZips));

package/package.json

@@ -1,11 +1,12 @@
 {
     "name": "@servicetitan/acquisition-functions",
-    "version": "0.5.0",
+    "version": "0.6.0",
     "description": "",
     "main": "./dist/index.js",
     "typings": "./dist/index.d.ts",
     "scripts": {
         "build": "tsc -p .",
+        "build-test": "tsc -p tsconfig.test.json",
         "test": "jest --runInBand"
     },
     "files": [
@@ -13,7 +14,6 @@
     ],
     "devDependencies": {
         "@jest/globals": "29.1.2",
-        "@tsconfig/node16": "^1.0.3",
         "@types/jest": "^29.1.0",
         "@types/mongodb": "^3.6.20",
         "@types/node": "^18.6.3",
@@ -28,5 +28,5 @@
     "cli": {
         "webpack": false
     },
-    "gitHead": "b84931ee346bdbc12af2e5597b5fb7637fd45c25"
+    "gitHead": "8fcc659c203e83d450a38df825ffac26c16e960f"
 }