Merge branch 'main' into 7-add-computed-standard-metadata-and-lookupmap

RESOStandards · Nov 9, 2023 · c1ccec0 · c1ccec0
2 parents 987d3e9 + acfa71c
commit c1ccec0
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 99 deletions.
diff --git a/.gitignore b/.gitignore
@@ -102,4 +102,5 @@ dist
 
 # TernJS port file
 .tern-port
+
 .DS_Store
diff --git a/lib/common.js b/lib/common.js
@@ -128,8 +128,9 @@ const getStandardMetadata = (version = CURRENT_DD_VERSION) => {
  * @type function(string): string[]
  */
 const getStandardResources = version => {
-  const { resources = [] } = getMetadata(version);
-  return resources?.map(resource => resource?.resourceName);
+  const metadata = getMetadata(version);
+  const resources = [...new Set(metadata.fields.map(f => f.resourceName))];
+  return resources;
 };
 
 const getFieldDetails = async (fieldName, resourceName) => {

diff --git a/lib/references/dd-1.7/metadata-report.json b/lib/references/dd-1.7/metadata-report.json
diff --git a/lib/references/dd-2.0/metadata-report.json b/lib/references/dd-2.0/metadata-report.json
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -12,6 +12,9 @@
     "url": "https://github.com/RESOStandards/reso-certification-etl/issues"
   },
   "homepage": "https://github.com/RESOStandards/reso-certification-etl#readme",
+  "engines": {
+    "node": ">=18.0.0"
+  },
   "devDependencies": {
     "mocha": "^10.0.0"
   }

diff --git a/test/data-availability.js b/test/data-availability.js
@@ -5,7 +5,7 @@ const {
 } = require('..');
 const assert = require('assert');
 
-describe('process-metadata', function () {
+describe('processDataAvailability', function () {
   it('should match the expected data', async () => {
     const processedReport = await processDataAvailability(daReport);
     assert.deepStrictEqual(JSON.parse(JSON.stringify(processedReport)), expectedReport);

diff --git a/test/data-dictionary.js b/test/data-dictionary.js
@@ -5,7 +5,7 @@ const {
 } = require('..');
 const assert = require('assert');
 
-describe('process-metadata', function () {
+describe('processMetadata', function () {
   it('should match the expected data', () => {
     const processedReport = processMetadataReport(metadataReport);
     assert.deepStrictEqual(JSON.parse(JSON.stringify(processedReport)), expectedReport);

diff --git a/test/sample-data-availability-reports/expected-availability-report.json b/test/sample-data-availability-reports/expected-availability-report.json
@@ -8,61 +8,31 @@
       "resourceName": "Office",
       "fieldName": "OfficeStateOrProvince",
       "frequency": 1000,
-      "availability": 1,
-      "eqZero": false,
-      "gtZero": true,
-      "gte25": true,
-      "gte50": true,
-      "gte75": true,
-      "eq100": true
+      "availability": 1
     },
     {
       "resourceName": "Property",
       "fieldName": "AccessibilityFeatures",
       "frequency": 2000,
-      "availability": 2,
-      "eqZero": false,
-      "gtZero": true,
-      "gte25": true,
-      "gte50": true,
-      "gte75": true,
-      "eq100": false
+      "availability": 2
     },
     {
       "resourceName": "Property",
       "fieldName": "StandardStatus",
       "frequency": 1000,
-      "availability": 1,
-      "eqZero": false,
-      "gtZero": true,
-      "gte25": true,
-      "gte50": true,
-      "gte75": true,
-      "eq100": true
+      "availability": 1
     },
     {
       "resourceName": "Property",
       "fieldName": "ListPrice",
       "frequency": 999,
-      "availability": 0.999,
-      "eqZero": false,
-      "gtZero": true,
-      "gte25": true,
-      "gte50": true,
-      "gte75": true,
-      "eq100": false
+      "availability": 0.999
     },
     {
       "resourceName": "Property",
       "fieldName": "CustomLookupField123",
       "frequency": 500,
-      "availability": 0.5,
-      "eqZero": false,
-      "gtZero": true,
-      "gte25": true,
-      "gte50": true,
-      "gte75": false,
-      "eq100": false
+      "availability": 0.5
     }
   ],
   "lookups": [
@@ -77,91 +47,49 @@
       "fieldName": "OfficeStateOrProvince",
       "lookupValue": "CA",
       "frequency": 900,
-      "availability": 0.9,
-      "eqZero": false,
-      "gtZero": true,
-      "gte25": true,
-      "gte50": true,
-      "gte75": true,
-      "eq100": false
+      "availability": 0.9
     },
     {
       "resourceName": "Office",
       "fieldName": "OfficeStateOrProvince",
       "lookupValue": "HI",
       "frequency": 100,
-      "availability": 0.1,
-      "eqZero": false,
-      "gtZero": true,
-      "gte25": false,
-      "gte50": false,
-      "gte75": false,
-      "eq100": false
+      "availability": 0.1
     },
     {
       "resourceName": "Property",
       "fieldName": "AccessibilityFeatures",
       "lookupValue": "Accessible Approach with Ramp",
       "frequency": 100,
-      "availability": 0.1,
-      "eqZero": false,
-      "gtZero": true,
-      "gte25": false,
-      "gte50": false,
-      "gte75": false,
-      "eq100": false
+      "availability": 0.1
     },
     {
       "resourceName": "Property",
       "fieldName": "AccessibilityFeatures",
       "lookupValue": "ReinforcedFloors",
       "frequency": 100,
-      "availability": 0.1,
-      "eqZero": false,
-      "gtZero": true,
-      "gte25": false,
-      "gte50": false,
-      "gte75": false,
-      "eq100": false
+      "availability": 0.1
     },
     {
       "resourceName": "Property",
       "fieldName": "StandardStatus",
       "lookupValue": "Active Under Contract",
       "frequency": 900,
-      "availability": 0.9,
-      "eqZero": false,
-      "gtZero": true,
-      "gte25": true,
-      "gte50": true,
-      "gte75": true,
-      "eq100": false
+      "availability": 0.9
     },
     {
       "resourceName": "Property",
       "fieldName": "StandardStatus",
       "lookupValue": "Pending",
       "frequency": 100,
-      "availability": 0.1,
-      "eqZero": false,
-      "gtZero": true,
-      "gte25": false,
-      "gte50": false,
-      "gte75": false,
-      "eq100": false
+      "availability": 0.1
     },
     {
       "resourceName": "Property",
       "fieldName": "CustomLookupField123",
       "lookupValue": "PENDING",
       "frequency": 10,
-      "availability": 0.01,
-      "eqZero": false,
-      "gtZero": true,
-      "gte25": false,
-      "gte50": false,
-      "gte75": false,
-      "eq100": false
+      "availability": 0.01
     }
   ],
   "resources": [

diff --git a/test/sample-data-dictionary-reports/expected-metadata-report.json b/test/sample-data-dictionary-reports/expected-metadata-report.json
@@ -56,10 +56,9 @@
     },
     {
       "lookupName": "PropertyEnums.AccessibilityFeatures",
-      "lookupValue": "Accessible Approach with Ramp",
+      "lookupValue": "_23923049",
       "type": "Edm.Int32",
-      "standardRESO": true,
-      "standardDisplayName": "Accessible Approach with Ramp"
+      "standardRESO": false
     },
     {
       "lookupName": "PropertyEnums.AccessibilityFeatures",
@@ -83,10 +82,9 @@
     },
     {
       "lookupName": "PropertyEnums.Statuses",
-      "lookupValue": "Active Under Contract",
+      "lookupValue": "ACTIVE_UC",
       "type": "Edm.Int32",
-      "standardRESO": true,
-      "standardDisplayName": "Active Under Contract"
+      "standardRESO": false
     },
     {
       "lookupName": "CustomLookups.LookupField123",
@@ -101,8 +99,8 @@
   "standardResourcesCount": 2,
   "localResourcesCount": 0,
   "totalResourcesCount": 2,
-  "standardLookupsCount": 6,
-  "localLookupsCount": 2,
+  "standardLookupsCount": 4,
+  "localLookupsCount": 4,
   "totalLookupsCount": 8,
   "iDXFieldsCount": 4,
   "iDXResourcesCount": 2,
@@ -114,7 +112,7 @@
     },
     "Property": {
       "fields": { "total": 4, "reso": 3, "idx": 3, "local": 1 },
-      "lookups": { "total": 6, "reso": 4, "idx": 2, "local": 2 }
+      "lookups": { "total": 6, "reso": 2, "idx": 1, "local": 4 }
     }
   }
 }