Merge pull request nasa-gcn#2530 from lpsinger/unmarshallTrigger

Refactor duplicate function unmarshallTrigger

app/table-streams/circulars/index.ts

@@ -6,17 +6,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { tables } from '@architect/functions'
-import type { AttributeValue } from '@aws-sdk/client-dynamodb'
 import { paginateQuery, paginateScan } from '@aws-sdk/lib-dynamodb'
 import type { DynamoDBDocument } from '@aws-sdk/lib-dynamodb'
-import { unmarshall } from '@aws-sdk/util-dynamodb'
 import { search as getSearchClient } from '@nasa-gcn/architect-functions-search'
 import { errors } from '@opensearch-project/opensearch'
-import type {
-  DynamoDBRecord,
-  AttributeValue as LambdaTriggerAttributeValue,
-} from 'aws-lambda'
+import type { DynamoDBRecord } from 'aws-lambda'
 
+import { unmarshallTrigger } from '../utils'
 import { sendEmailBulk } from '~/lib/email.server'
 import { origin } from '~/lib/env.server'
 import { send as sendKafka } from '~/lib/kafka.server'
@@ -29,10 +25,6 @@ import { $id as circularsJsonSchemaId } from '@nasa-gcn/schema/gcn/circulars.sch
 const index = 'circulars'
 const fromName = 'GCN Circulars'
 
-function unmarshallTrigger(item?: Record<string, LambdaTriggerAttributeValue>) {
-  return unmarshall(item as Record<string, AttributeValue>)
-}
-
 async function removeIndex(id: number) {
   const client = await getSearchClient()
   try {

app/table-streams/synonyms/index.ts

@@ -5,24 +5,16 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-import type { AttributeValue } from '@aws-sdk/client-dynamodb'
-import { unmarshall } from '@aws-sdk/util-dynamodb'
 import { search as getSearchClient } from '@nasa-gcn/architect-functions-search'
 import { errors } from '@opensearch-project/opensearch'
-import type {
-  DynamoDBRecord,
-  AttributeValue as LambdaTriggerAttributeValue,
-} from 'aws-lambda'
+import type { DynamoDBRecord } from 'aws-lambda'
 
+import { unmarshallTrigger } from '../utils'
 import { createTriggerHandler } from '~/lib/lambdaTrigger.server'
 import type { Synonym } from '~/routes/synonyms/synonyms.lib'
 
 const index = 'synonyms'
 
-function unmarshallTrigger(item?: Record<string, LambdaTriggerAttributeValue>) {
-  return unmarshall(item as Record<string, AttributeValue>)
-}
-
 async function removeIndex(id: string) {
   const client = await getSearchClient()
   try {

app/table-streams/utils.ts

@@ -0,0 +1,16 @@
+/*!
+ * Copyright © 2023 United States Government as represented by the
+ * Administrator of the National Aeronautics and Space Administration.
+ * All Rights Reserved.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { AttributeValue } from '@aws-sdk/client-dynamodb'
+import { unmarshall } from '@aws-sdk/util-dynamodb'
+import type { AttributeValue as LambdaTriggerAttributeValue } from 'aws-lambda'
+
+export function unmarshallTrigger(
+  item?: Record<string, LambdaTriggerAttributeValue>
+) {
+  return unmarshall(item as Record<string, AttributeValue>)
+}