CHI-3500: Make address values for USCH into filterable paths

resources-domain/lambdas/s3-importer/src/uschMappings.ts

@@ -24,6 +24,69 @@ import type { AccountSID } from '@tech-matters/types';
 import type { FlatResource } from '@tech-matters/resources-types';
 import { parse } from 'date-fns';
 
+// https://gist.github.com/mshafrir/2646763
+const US_STATE_CODE_MAPPING = {
+  AL: 'Alabama',
+  AK: 'Alaska',
+  AS: 'American Samoa',
+  AZ: 'Arizona',
+  AR: 'Arkansas',
+  CA: 'California',
+  CO: 'Colorado',
+  CT: 'Connecticut',
+  DE: 'Delaware',
+  DC: 'District Of Columbia',
+  FM: 'Federated States Of Micronesia',
+  FL: 'Florida',
+  GA: 'Georgia',
+  GU: 'Guam',
+  HI: 'Hawaii',
+  ID: 'Idaho',
+  IL: 'Illinois',
+  IN: 'Indiana',
+  IA: 'Iowa',
+  KS: 'Kansas',
+  KY: 'Kentucky',
+  LA: 'Louisiana',
+  ME: 'Maine',
+  MH: 'Marshall Islands',
+  MD: 'Maryland',
+  MA: 'Massachusetts',
+  MI: 'Michigan',
+  MN: 'Minnesota',
+  MS: 'Mississippi',
+  MO: 'Missouri',
+  MT: 'Montana',
+  NE: 'Nebraska',
+  NV: 'Nevada',
+  NH: 'New Hampshire',
+  NJ: 'New Jersey',
+  NM: 'New Mexico',
+  NY: 'New York',
+  NC: 'North Carolina',
+  ND: 'North Dakota',
+  MP: 'Northern Mariana Islands',
+  OH: 'Ohio',
+  OK: 'Oklahoma',
+  OR: 'Oregon',
+  PW: 'Palau',
+  PA: 'Pennsylvania',
+  PR: 'Puerto Rico',
+  RI: 'Rhode Island',
+  SC: 'South Carolina',
+  SD: 'South Dakota',
+  TN: 'Tennessee',
+  TX: 'Texas',
+  UT: 'Utah',
+  VT: 'Vermont',
+  VI: 'Virgin Islands',
+  VA: 'Virginia',
+  WA: 'Washington',
+  WV: 'West Virginia',
+  WI: 'Wisconsin',
+  WY: 'Wyoming',
+} as Record<string, string>;
+
 /*
  * This defines all the mapping logic to convert Childhelp resource to an Aselo resource.
  * The mapping is defined as a tree of nodes.
@@ -93,6 +156,20 @@ export type UschExpandedResource = Partial<
   }
 >;
 
+const lookupUsStateNameFromCode = ({
+  Country: country,
+  StateProvince: stateProvince,
+}: UschExpandedResource): string | undefined => {
+  if (
+    ['us', 'usa', 'unitedstates'].includes(
+      (country ?? '').toLowerCase().replace(/[.\s]/, ''),
+    )
+  ) {
+    return US_STATE_CODE_MAPPING[stateProvince ?? ''] ?? stateProvince;
+  }
+  return stateProvince;
+};
+
 export const expandCsvLine = (csv: UschCsvResource): UschExpandedResource => {
   const expanded = {
     ...csv,
@@ -113,8 +190,27 @@ export const USCH_MAPPING_NODE: MappingNode = {
   Name: resourceFieldMapping('name'),
   AlternateName: translatableAttributeMapping('alternateName', { language: 'en' }),
   Address: attributeMapping('stringAttributes', 'address/street'),
-  City: attributeMapping('stringAttributes', 'address/city'),
-  StateProvince: attributeMapping('stringAttributes', 'address/province'),
+  City: attributeMapping('stringAttributes', 'address/city', {
+    value: ({ currentValue, rootResource }) =>
+      [
+        (rootResource as UschExpandedResource).Country,
+        (rootResource as UschExpandedResource).StateProvince,
+        currentValue,
+      ].join('/'),
+    info: ({ currentValue, rootResource }) => ({
+      country: (rootResource as UschExpandedResource).Country,
+      stateProvince: lookupUsStateNameFromCode(rootResource as UschExpandedResource),
+      name: currentValue,
+    }),
+  }),
+  StateProvince: attributeMapping('stringAttributes', 'address/province', {
+    value: ({ currentValue, rootResource }) =>
+      `${(rootResource as UschExpandedResource).Country}/${currentValue}`,
+    info: ({ rootResource }) => ({
+      country: (rootResource as UschExpandedResource).Country,
+      name: lookupUsStateNameFromCode(rootResource as UschExpandedResource),
+    }),
+  }),
   PostalCode: attributeMapping('stringAttributes', 'address/postalCode'),
   Country: attributeMapping('stringAttributes', 'address/country'),
   HoursOfOperation: translatableAttributeMapping('hoursOfOperation'),
@@ -189,7 +285,16 @@ export const USCH_MAPPING_NODE: MappingNode = {
   Coverage: {
     children: {
       '{coverageIndex}': translatableAttributeMapping('coverage/{coverageIndex}', {
-        value: ({ currentValue }) => currentValue,
+        value: ({ currentValue }) =>
+          `United States/${currentValue.replace(/\s+-\s+/, '/')}`,
+        info: ({ currentValue }) => {
+          const [stateProvince, city] = currentValue.toString().split(/\s+-\s+/);
+          return {
+            country: 'United States',
+            stateProvince,
+            city,
+          };
+        },
         language: 'en',
       }),
     },

resources-domain/resources-service/package.json

@@ -32,7 +32,7 @@
     "test:service": "cross-env POSTGRES_PORT=5433 RDS_USERNAME=hrm RDS_PASSWORD=postgres RESOURCES_PASSWORD=resources-password run-s -c docker:compose:test:up db:create:schema test:service:ci:migrate test:service:ci:run docker:compose:test:down",
     "test:service:ci": "RDS_USERNAME=rdsadmin RDS_PASSWORD=postgres RESOURCES_PASSWORD=resources-password run-s db:create:schema test:service:ci:migrate test:service:ci:run",
     "test:service:ci:migrate": "node ./db-migrate",
-    "test:service:ci:run": "cross-env AWS_REGION=us-east-1 CI=true TWILIO_ACCOUNT_SID=ACxxx TWILIO_AUTH_TOKEN=xxxxxx SSM_ENDPOINT=http://mock-ssm/ jest --verbose --maxWorkers=1 --forceExit --coverage tests/service/adminSearch.test.ts",
+    "test:service:ci:run": "cross-env AWS_REGION=us-east-1 CI=true TWILIO_ACCOUNT_SID=ACxxx TWILIO_AUTH_TOKEN=xxxxxx SSM_ENDPOINT=http://mock-ssm/ jest --verbose --maxWorkers=1 --forceExit --coverage tests/service",
     "test:coverage": "run-s docker:compose:test:up test:service:migrate test:coverage:run docker:compose:test:down",
     "test:coverage:run": "cross-env POSTGRES_PORT=5433 AWS_REGION=us-east-1 jest --verbose --maxWorkers=1 --coverage",
     "test:migrate": "run-s test:service:migrate",

resources-domain/resources-service/src/referenceAttributes/referenceAttributeRoutesV0.ts

@@ -22,9 +22,9 @@ const referenceAttributeRoutes = () => {
   const router: IRouter = Router();
   const { getResourceReferenceAttributeList } = referenceAttributeService();
 
-  router.get('/:list', async (req, res) => {
+  router.get('/*', async (req, res) => {
     const { valueStartsWith, language } = req.query;
-    const { list } = req.params;
+    const list = (req as any).params[0];
     const result = await getResourceReferenceAttributeList(
       req.hrmAccountId as AccountSID,
       list,

resources-domain/resources-service/src/resource/resourceDataAccess.ts

@@ -56,12 +56,14 @@ export const getDistinctStringAttributes = async (
   accountSid: AccountSID,
   key: string,
   language: string | undefined,
+  valueStartsWith: string | undefined,
 ): Promise<string[]> => {
   const res = await db.task(async t =>
     t.manyOrNone(SELECT_DISTINCT_RESOURCE_STRING_ATTRIBUTES_SQL, {
       accountSid,
       key,
       language: language || undefined, // Ensure any falsy value is converted to undefined so to be NULL for the query
+      valueLikePattern: valueStartsWith ? `${valueStartsWith}%` : undefined,
     }),
   );
   console.debug(

resources-domain/resources-service/src/resource/resourceRoutesV0.ts

@@ -63,8 +63,10 @@ const resourceRoutes = () => {
     res.json(suggestions);
   });
 
-  router.get('/list-string-attributes', async (req, res) => {
-    const { key, language } = req.query;
+  const listStringAttributesHandler = async (req: any, res: any) => {
+    const { key: queryKey, language, valueStartsWith } = req.query;
+    console.debug('PATH PARAMS', req.params);
+    const key = req.params[0] || queryKey;
 
     if (!key || typeof key !== 'string') {
       res.status(400).json({
@@ -84,10 +86,14 @@ const resourceRoutes = () => {
       <AccountSID>req.hrmAccountId,
       key,
       language,
+      valueStartsWith,
     );
 
     res.json(attributes);
-  });
+  };
+
+  router.get('/list-string-attributes/*', listStringAttributesHandler);
+  router.get('/list-string-attributes', listStringAttributesHandler);
 
   return router;
 };

resources-domain/resources-service/src/resource/resourceService.ts

@@ -220,7 +220,8 @@ export const resourceService = () => {
     getDistinctResourceStringAttributes: async (
       accountSid: AccountSID,
       key: string,
-      language: string,
-    ) => getDistinctStringAttributes(accountSid, key, language),
+      language: string | undefined,
+      valueStartsWith: string | undefined,
+    ) => getDistinctStringAttributes(accountSid, key, language, valueStartsWith),
   };
 };

resources-domain/resources-service/src/resource/sql/resourceGetSql.ts

@@ -78,7 +78,8 @@ WHERE r."accountSid" = $<accountSid> AND r."id" IN ($<resourceIds:csv>) AND r."d
 `;
 
 export const SELECT_DISTINCT_RESOURCE_STRING_ATTRIBUTES_SQL = `
-  SELECT DISTINCT("value") FROM "ResourceStringAttributes" 
+  SELECT DISTINCT "value", "info" FROM "ResourceStringAttributes" 
   WHERE "accountSid" = $<accountSid> AND 
   "key" = $<key> AND 
-  ($<language> IS NULL OR "language"=$<language>)`;
+  ($<language> IS NULL OR "language"=$<language>) AND
+  ($<valueLikePattern> IS NULL OR "value" LIKE $<valueLikePattern>)`;

resources-domain/resources-service/tests/service/clearDb.ts

@@ -0,0 +1,29 @@
+/**
+ * Copyright (C) 2021-2025 Technology Matters
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see https://www.gnu.org/licenses/.
+ */
+
+import { db } from '../../src/connection-pool';
+
+export const clearDb = async () => {
+  await db.none(`
+     TRUNCATE resources."ResourceReferenceStringAttributeValues" CASCADE;
+      `);
+  await db.none(`
+     TRUNCATE resources."Resources" CASCADE;
+      `);
+  await db.none(`
+     TRUNCATE resources."Accounts";
+      `);
+};

resources-domain/resources-service/tests/service/import.test.ts

@@ -20,7 +20,7 @@ import { db } from '../../src/connection-pool';
 import range from './range';
 import { parseISO, addHours, subHours, addSeconds, subSeconds } from 'date-fns';
 import { AccountSID } from '@tech-matters/types';
-import type {
+import {
   FlatResource,
   ImportBatch,
   ImportProgress,