abstract Sets index name and type to env vars

justincorrigible · justincorrigible · commit be26f75e52e9 · 2024-11-06T18:14:59.000-05:00
bonus: remove broken husky
diff --git a/modules/components/package.json b/modules/components/package.json
@@ -137,10 +137,5 @@
 		"testEnvironmentOptions": {
 			"url": "http://localhost/"
 		}
-	},
-	"husky": {
-		"hooks": {
-			"pre-commit": "pretty-quick --staged"
-		}
 	}
 }
diff --git a/modules/server/package.json b/modules/server/package.json
@@ -97,10 +97,5 @@
 			]
 		},
 		"verbose": true
-	},
-	"husky": {
-		"hooks": {
-			"pre-commit": "pretty-quick --staged"
-		}
 	}
 }
diff --git a/modules/server/src/app.js b/modules/server/src/app.js
@@ -1,16 +1,16 @@
-import express, { json, urlencoded } from 'express';
 import cors from 'cors';
+import express, { json, urlencoded } from 'express';
 
 import { ENV_CONFIG } from './config';
-import Arranger from './server';
+import arranger from './server';
 
 const app = express();
 app.use(cors());
 
 export default async function (rootPath = '') {
 	global.__basedir = rootPath;
 
-	return Arranger({ enableAdmin: ENV_CONFIG.ENABLE_ADMIN }).then((router) => {
+	return arranger({ enableAdmin: ENV_CONFIG.ENABLE_ADMIN }).then((router) => {
 		app.use(router);
 
 		app.use(urlencoded({ extended: false, limit: '50mb' }));
diff --git a/modules/server/src/config/constants.ts b/modules/server/src/config/constants.ts
@@ -10,6 +10,8 @@ export const DOWNLOAD_STREAM_BUFFER_SIZE =
 	stringToNumber(process.env.DOWNLOAD_STREAM_BUFFER_SIZE) || 2000;
 export const ENABLE_ADMIN = stringToBool(process.env.ENABLE_ADMIN);
 export const ENABLE_LOGS = stringToBool(process.env.ENABLE_LOGS);
+export const ES_ARRANGER_SET_INDEX = process.env.ES_ARRANGER_SET_INDEX || 'arranger-sets';
+export const ES_ARRANGER_SET_TYPE = process.env.ES_ARRANGER_SET_TYPE || 'arranger-sets';
 export const ES_HOST = process.env.ES_HOST || 'http://127.0.0.1:9200';
 export const ES_INDEX = process.env.ES_INDEX || '';
 export const ES_LOG = process.env.ES_LOG?.split?.(',') || 'error';
diff --git a/modules/server/src/config/utils/index.ts b/modules/server/src/config/utils/index.ts
@@ -2,18 +2,17 @@ import { Client } from '@elastic/elasticsearch';
 
 import { ENV_CONFIG } from '@/config/';
 import { ConfigObject, ConfigProperties } from '@/config/types';
-import { CONSTANTS } from '@/middleware';
 import { setsMapping } from '@/schema';
 
 export const initializeSets = async ({ esClient }: { esClient: Client }): Promise<void> => {
 	ENV_CONFIG.DEBUG_MODE &&
-		console.log(`Attempting to create Sets index "${CONSTANTS.ES_ARRANGER_SET_INDEX}"...`);
+		console.log(`Attempting to create Sets index "${ENV_CONFIG.ES_ARRANGER_SET_INDEX}"...`);
 
 	if (
-		(await esClient.indices.exists({ index: CONSTANTS.ES_ARRANGER_SET_INDEX }))?.statusCode === 404
+		(await esClient.indices.exists({ index: ENV_CONFIG.ES_ARRANGER_SET_INDEX }))?.statusCode === 404
 	) {
 		const setsIndex = await esClient.indices.create({
-			index: CONSTANTS.ES_ARRANGER_SET_INDEX,
+			index: ENV_CONFIG.ES_ARRANGER_SET_INDEX,
 			body: {
 				mappings: {
 					properties: setsMapping,
@@ -26,7 +25,7 @@ export const initializeSets = async ({ esClient }: { esClient: Client }): Promis
 			return;
 		}
 
-		throw new Error(`Problem creating ${CONSTANTS.ES_ARRANGER_SET_INDEX} index`);
+		throw new Error(`Problem creating ${ENV_CONFIG.ES_ARRANGER_SET_INDEX} index`);
 	} else {
 		ENV_CONFIG.DEBUG_MODE && console.log(`  This index already exists. Moving on!\n`);
 	}
diff --git a/modules/server/src/mapping/hackyTemporaryEsSetResolution.js b/modules/server/src/mapping/hackyTemporaryEsSetResolution.js
@@ -6,60 +6,61 @@
 
 import { flattenDeep, isArray, zipObject } from 'lodash';
 
-import { CONSTANTS } from '../middleware';
+import { ENV_CONFIG } from '@/config';
+
 import esSearch from './utils/esSearch';
 
 const resolveSetIdsFromEs = (esClient) => (setId) =>
-  esSearch(esClient)({
-    index: CONSTANTS.ES_ARRANGER_SET_INDEX,
-    body: {
-      query: {
-        bool: {
-          must: { match: { setId } },
-        },
-      },
-    },
-  }).then(({ hits: { hits } }) => flattenDeep(hits.map(({ _source: { ids } }) => ids)));
+	esSearch(esClient)({
+		index: ENV_CONFIG.ES_ARRANGER_SET_INDEX,
+		body: {
+			query: {
+				bool: {
+					must: { match: { setId } },
+				},
+			},
+		},
+	}).then(({ hits: { hits } }) => flattenDeep(hits.map(({ _source: { ids } }) => ids)));
 
 const getSetIdsFromSqon = ({ content } = {}, collection = []) =>
-  (isArray(content)
-    ? flattenDeep(
-        content.reduce(
-          (acc, subSqon) => [...acc, ...getSetIdsFromSqon(subSqon, collection)],
-          collection,
-        ),
-      )
-    : isArray(content?.value)
-    ? content?.value.filter((value) => String(value).indexOf('set_id:') === 0)
-    : [...(String(content?.value).indexOf?.('set_id:') === 0 ? [content.value] : [])]
-  ).map((setId) => setId.replace('set_id:', ''));
+	(isArray(content)
+		? flattenDeep(
+				content.reduce(
+					(acc, subSqon) => [...acc, ...getSetIdsFromSqon(subSqon, collection)],
+					collection,
+				),
+		  )
+		: isArray(content?.value)
+		? content?.value.filter((value) => String(value).indexOf('set_id:') === 0)
+		: [...(String(content?.value).indexOf?.('set_id:') === 0 ? [content.value] : [])]
+	).map((setId) => setId.replace('set_id:', ''));
 
 const injectIdsIntoSqon = ({ sqon, setIdsToValueMap }) => ({
-  ...sqon,
-  content: sqon.content.map((op) => ({
-    ...op,
-    content: !isArray(op.content)
-      ? {
-          ...op.content,
-          value: isArray(op.content.value)
-            ? flattenDeep(
-                op.content.value.map((value) => setIdsToValueMap[value] || op.content.value),
-              )
-            : setIdsToValueMap[op.content.value] || op.content.value,
-        }
-      : injectIdsIntoSqon({ sqon: op, setIdsToValueMap }).content,
-  })),
+	...sqon,
+	content: sqon.content.map((op) => ({
+		...op,
+		content: !isArray(op.content)
+			? {
+					...op.content,
+					value: isArray(op.content.value)
+						? flattenDeep(
+								op.content.value.map((value) => setIdsToValueMap[value] || op.content.value),
+						  )
+						: setIdsToValueMap[op.content.value] || op.content.value,
+			  }
+			: injectIdsIntoSqon({ sqon: op, setIdsToValueMap }).content,
+	})),
 });
 
 export const resolveSetsInSqon = ({ sqon, esClient }) => {
-  const setIds = getSetIdsFromSqon(sqon || {});
-  return setIds.length
-    ? Promise.all(setIds.map(resolveSetIdsFromEs(esClient))).then((searchResult) => {
-        const setIdsToValueMap = zipObject(
-          setIds.map((id) => `set_id:${id}`),
-          searchResult,
-        );
-        return injectIdsIntoSqon({ sqon, setIdsToValueMap });
-      })
-    : sqon;
+	const setIds = getSetIdsFromSqon(sqon || {});
+	return setIds.length
+		? Promise.all(setIds.map(resolveSetIdsFromEs(esClient))).then((searchResult) => {
+				const setIdsToValueMap = zipObject(
+					setIds.map((id) => `set_id:${id}`),
+					searchResult,
+				);
+				return injectIdsIntoSqon({ sqon, setIdsToValueMap });
+		  })
+		: sqon;
 };
diff --git a/modules/server/src/mapping/resolveSets.js b/modules/server/src/mapping/resolveSets.js
@@ -1,10 +1,11 @@
 import { get, isEmpty, uniq } from 'lodash';
 import { v4 as uuid } from 'uuid';
 
-import { CONSTANTS, buildQuery } from '../middleware';
+import { ENV_CONFIG } from '@/config';
+import { buildQuery } from '@/middleware';
 
-import esSearch from './utils/esSearch';
 import compileFilter from './utils/compileFilter';
+import esSearch from './utils/esSearch';
 
 const retrieveSetIds = async ({
 	esClient,
@@ -85,7 +86,7 @@ export const saveSet =
 		};
 
 		await esClient.index({
-			index: CONSTANTS.ES_ARRANGER_SET_INDEX,
+			index: ENV_CONFIG.ES_ARRANGER_SET_INDEX,
 			id: body.setId,
 			refresh: refresh.toLowerCase(),
 			body,
diff --git a/modules/server/src/middleware/__tests__/buildQuery/buildQuerySetId.test.js b/modules/server/src/middleware/__tests__/buildQuery/buildQuerySetId.test.js
@@ -1,5 +1,5 @@
-import buildQuery from '../../buildQuery';
-import { ES_ARRANGER_SET_INDEX, ES_ARRANGER_SET_TYPE } from '../../constants';
+import { ENV_CONFIG } from '@/config/';
+import buildQuery from '@/middleware/buildQuery';
 
 test('1.buildQuery sets', () => {
 	const nestedFieldNames = ['files', 'files.foo'];
@@ -16,8 +16,8 @@ test('1.buildQuery sets', () => {
 			output: {
 				terms: {
 					case_id: {
-						index: ES_ARRANGER_SET_INDEX,
-						type: ES_ARRANGER_SET_TYPE,
+						index: ENV_CONFIG.ES_ARRANGER_SET_INDEX,
+						type: ENV_CONFIG.ES_ARRANGER_SET_TYPE,
 						id: 'aaa',
 						path: 'ids',
 					},
@@ -36,8 +36,8 @@ test('1.buildQuery sets', () => {
 			output: {
 				terms: {
 					'ssms.ssm_id': {
-						index: ES_ARRANGER_SET_INDEX,
-						type: ES_ARRANGER_SET_TYPE,
+						index: ENV_CONFIG.ES_ARRANGER_SET_INDEX,
+						type: ENV_CONFIG.ES_ARRANGER_SET_TYPE,
 						id: 'aaa',
 						path: 'ids',
 					},
@@ -62,8 +62,8 @@ test('1.buildQuery sets', () => {
 								{
 									terms: {
 										'files.file_id': {
-											index: ES_ARRANGER_SET_INDEX,
-											type: ES_ARRANGER_SET_TYPE,
+											index: ENV_CONFIG.ES_ARRANGER_SET_INDEX,
+											type: ENV_CONFIG.ES_ARRANGER_SET_TYPE,
 											id: 'aaa',
 											path: 'ids',
 										},
diff --git a/modules/server/src/middleware/buildQuery/index.js b/modules/server/src/middleware/buildQuery/index.js
@@ -1,41 +1,41 @@
 import _ from 'lodash';
 
+import { ENV_CONFIG } from '@/config/';
+
 import {
+	ALL_OP,
+	AND_OP,
+	BETWEEN_OP,
+	ES_BOOL,
+	ES_MUST,
+	ES_MUST_NOT,
 	ES_NESTED,
 	ES_QUERY,
-	ES_BOOL,
-	BETWEEN_OP,
-	GT_OP,
+	ES_SHOULD,
+	ES_WILDCARD,
+	FILTER_OP,
 	GTE_OP,
-	LT_OP,
-	LTE_OP,
+	GT_OP,
 	IN_OP,
+	LTE_OP,
+	LT_OP,
+	MISSING,
 	NOT_IN_OP,
-	SOME_NOT_IN_OP,
-	ES_MUST,
-	ES_MUST_NOT,
-	ES_ARRANGER_SET_INDEX,
-	ES_ARRANGER_SET_TYPE,
-	OR_OP,
-	AND_OP,
-	FILTER_OP,
 	NOT_OP,
+	OR_OP,
 	REGEX,
 	SET_ID,
-	MISSING,
-	ALL_OP,
-	ES_SHOULD,
-	ES_WILDCARD,
+	SOME_NOT_IN_OP,
 } from '../constants';
 import {
 	isNested,
+	mergePath,
 	readPath,
+	toEsRangeValue,
+	wrapMust,
 	wrapMustNot,
 	wrapNested,
-	mergePath,
 	wrapShould,
-	wrapMust,
-	toEsRangeValue,
 } from '../utils/esFilter';
 
 import normalizeFilters from './normalizeFilters';
@@ -217,8 +217,8 @@ function getSetFilter({ nestedFieldNames, filter, filter: { content, op } }) {
 			terms: {
 				boost: 0,
 				[content.fieldName]: {
-					index: ES_ARRANGER_SET_INDEX,
-					type: ES_ARRANGER_SET_TYPE,
+					index: ENV_CONFIG.ES_ARRANGER_SET_INDEX,
+					type: ENV_CONFIG.ES_ARRANGER_SET_TYPE,
 					id: _.flatMap([content.value])[0].replace('set_id:', ''),
 					path: 'ids',
 				},
diff --git a/modules/server/src/middleware/constants.js b/modules/server/src/middleware/constants.js
@@ -20,12 +20,12 @@ export const SET_ID = 'set_id:';
 
 // sqon op aliases
 export const OP_ALIASES = {
-  '>': GT_OP,
-  '<': LT_OP,
-  '>=': GTE_OP,
-  '<=': LTE_OP,
-  '=': IN_OP,
-  '!=': NOT_IN_OP,
+	'>': GT_OP,
+	'<': LT_OP,
+	'>=': GTE_OP,
+	'<=': LTE_OP,
+	'=': IN_OP,
+	'!=': NOT_IN_OP,
 };
 export const DATE_FORMAT = 'yyyy-MM-dd';
 
@@ -47,8 +47,6 @@ export const ES_TYPE = 'type';
 export const ES_PHRASE_PREFIX = 'phrase_prefix';
 export const ES_DATE_FORMAT = 'yyyy-MM-dd HH:mm:ss.SSSSSS';
 export const ES_MAX_LONG = `-9223372036854775808`;
-export const ES_ARRANGER_SET_INDEX = 'arranger-sets';
-export const ES_ARRANGER_SET_TYPE = 'arranger-sets';
 
 export const BUCKETS = 'buckets';
 export const STATS = 'stats';
diff --git a/modules/server/src/schema/index.js b/modules/server/src/schema/index.js
@@ -2,9 +2,9 @@ import { addMocksToSchema } from '@graphql-tools/mock';
 import { makeExecutableSchema } from '@graphql-tools/schema';
 import { applyMiddleware } from 'graphql-middleware';
 
-import { CONSTANTS } from '../middleware';
+import { ENV_CONFIG } from '@/config';
 
-import { typeDefs as generateTypeDefs, resolvers as generateResolvers } from './Root';
+import { resolvers as generateResolvers, typeDefs as generateTypeDefs } from './Root';
 
 export const setsMapping = {
 	userId: { type: 'keyword' },
@@ -31,7 +31,7 @@ const makeSchema = ({
 		[
 			'sets',
 			{
-				index: CONSTANTS.ES_ARRANGER_SET_TYPE,
+				index: ENV_CONFIG.ES_ARRANGER_SET_TYPE,
 				name: 'sets',
 				createState: false,
 				nestedFieldNames: [],
diff --git a/modules/server/src/server.ts b/modules/server/src/server.ts
diff --git a/package.json b/package.json

Original file line number	Diff line number	Diff line change
`@@ -137,10 +137,5 @@`
`137`	`137`	`"testEnvironmentOptions": {`
`138`	`138`	`"url": "http://localhost/"`
`139`	`139`	`}`
`140`		`- },`
`141`		`- "husky": {`
`142`		`- "hooks": {`
`143`		`- "pre-commit": "pretty-quick --staged"`
`144`		`- }`
`145`	`140`	`}`
`146`	`141`	`}`
Original file line number	Diff line number	Diff line change
`@@ -97,10 +97,5 @@`
`97`	`97`	`]`
`98`	`98`	`},`
`99`	`99`	`"verbose": true`
`100`		`- },`
`101`		`- "husky": {`
`102`		`- "hooks": {`
`103`		`- "pre-commit": "pretty-quick --staged"`
`104`		`- }`
`105`	`100`	`}`
`106`	`101`	`}`