@cumulus/db 10.1.1-alpha.0 → 10.1.1

package/dist/translate/async_operations.js

@@ -1,41 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.translatePostgresAsyncOperationToApiAsyncOperation = exports.translateApiAsyncOperationToPostgresAsyncOperation = void 0;
+exports.translateApiAsyncOperationToPostgresAsyncOperation = void 0;
 const snake_camel_1 = require("snake-camel");
-const logger_1 = __importDefault(require("@cumulus/logger"));
-const log = new logger_1.default({ sender: '@cumulus/db/translate/async-operations' });
-/**
- *  Convert async operation output field to object
- * @param {string} output - Record output
- * @returns {Object}
- */
-const convertOutputToObject = (output) => {
-    let convertedOutput;
-    try {
-        // First case is intended for an output that is a JSON stringified object
-        convertedOutput = JSON.parse(output);
-        // Second case is intended for an output that is a JSON stringified string or an array
-        if (typeof convertedOutput === 'string' || Array.isArray(convertedOutput)) {
-            log.info(`Converting JSON string ${output} to object to conform to PostgreSQL schema`);
-            convertedOutput = { output: convertedOutput };
-        }
-    }
-    catch (error) {
-        // Third case is for an output that is a string
-        log.error('Converting string to object to conform to PostgreSQL schema', error);
-        convertedOutput = { output };
-    }
-    return convertedOutput;
-};
-/**
- * Generate a PostgreSQL Async Operation record from an API record.
- *
- * @param {Object} record - An API Async Operation record
- * @returns {Object} A PostgreSQL Async Operation record
- */
 const translateApiAsyncOperationToPostgresAsyncOperation = (record) => {
     // fix for old implementation of async-operation output assignment
     const translatedRecord = (0, snake_camel_1.toSnake)(record);
@@ -43,7 +9,7 @@ const translateApiAsyncOperationToPostgresAsyncOperation = (record) => {
         delete translatedRecord.output;
     }
     else if (record.output !== undefined) {
-        translatedRecord.output = convertOutputToObject(record.output);
+        translatedRecord.output = JSON.parse(JSON.stringify(record.output));
     }
     if (record.createdAt !== undefined) {
         translatedRecord.created_at = new Date(record.createdAt);
@@ -54,24 +20,4 @@ const translateApiAsyncOperationToPostgresAsyncOperation = (record) => {
     return translatedRecord;
 };
 exports.translateApiAsyncOperationToPostgresAsyncOperation = translateApiAsyncOperationToPostgresAsyncOperation;
-/**
- * Generate an API Async Operation record from a PostgreSQL record.
- *
- * @param {Object} pgAsyncOperation - A PostgreSQL async operation record
- * @returns {Object} An Async Operation API record
- */
-const translatePostgresAsyncOperationToApiAsyncOperation = (pgAsyncOperation) => {
-    const apiAsyncOperation = {
-        id: pgAsyncOperation.id,
-        description: pgAsyncOperation.description,
-        operationType: pgAsyncOperation.operation_type,
-        status: pgAsyncOperation.status,
-        output: pgAsyncOperation.output ? JSON.stringify(pgAsyncOperation.output) : undefined,
-        taskArn: pgAsyncOperation.task_arn,
-        createdAt: pgAsyncOperation.created_at ? pgAsyncOperation.created_at.getTime() : undefined,
-        updatedAt: pgAsyncOperation.updated_at ? pgAsyncOperation.updated_at.getTime() : undefined,
-    };
-    return apiAsyncOperation;
-};
-exports.translatePostgresAsyncOperationToApiAsyncOperation = translatePostgresAsyncOperationToApiAsyncOperation;
 //# sourceMappingURL=async_operations.js.map

package/dist/translate/collections.d.ts

@@ -1,15 +1,4 @@
-import { NewCollectionRecord, CollectionRecord } from '@cumulus/types/api/collections';
-import { PostgresCollection, PostgresCollectionRecord } from '../types/collection';
-/**
-* Translates a PostgresCollectionRecord object to a `CollectionRecord` API collection object
-* @param {PostgresCollectionRecord} collectionRecord - PostgreSQL collection record to translate
-* @returns {CollectionRecord} - Translated record
-*/
-export declare const translatePostgresCollectionToApiCollection: (collectionRecord: PostgresCollectionRecord) => CollectionRecord;
-/**
-* Translates a NewCollectionRecord API collection object to a `PostgresCollectionRecord` object
-* @param {NewCollectionRecord} record - API collection record to translate
-* @returns {PostgresCollectionRecord} - Translated record
-*/
+import { NewCollectionRecord } from '@cumulus/types/api/collections';
+import { PostgresCollection } from '../types/collection';
 export declare const translateApiCollectionToPostgresCollection: (record: NewCollectionRecord) => PostgresCollection;
 //# sourceMappingURL=collections.d.ts.map

package/dist/translate/collections.js

@@ -1,35 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.translateApiCollectionToPostgresCollection = exports.translatePostgresCollectionToApiCollection = void 0;
-const { removeNilProperties } = require('@cumulus/common/util');
-/**
-* Translates a PostgresCollectionRecord object to a `CollectionRecord` API collection object
-* @param {PostgresCollectionRecord} collectionRecord - PostgreSQL collection record to translate
-* @returns {CollectionRecord} - Translated record
-*/
-const translatePostgresCollectionToApiCollection = (collectionRecord) => removeNilProperties(({
-    createdAt: collectionRecord.created_at.getTime(),
-    updatedAt: collectionRecord.updated_at.getTime(),
-    name: collectionRecord.name,
-    version: collectionRecord.version,
-    process: collectionRecord.process,
-    url_path: collectionRecord.url_path,
-    duplicateHandling: collectionRecord.duplicate_handling,
-    granuleId: collectionRecord.granule_id_validation_regex,
-    granuleIdExtraction: collectionRecord.granule_id_extraction_regex,
-    files: collectionRecord.files,
-    reportToEms: collectionRecord.report_to_ems,
-    sampleFileName: collectionRecord.sample_file_name,
-    ignoreFilesConfigForDiscovery: collectionRecord.ignore_files_config_for_discovery,
-    meta: collectionRecord.meta,
-    tags: collectionRecord.tags,
-}));
-exports.translatePostgresCollectionToApiCollection = translatePostgresCollectionToApiCollection;
-/**
-* Translates a NewCollectionRecord API collection object to a `PostgresCollectionRecord` object
-* @param {NewCollectionRecord} record - API collection record to translate
-* @returns {PostgresCollectionRecord} - Translated record
-*/
+exports.translateApiCollectionToPostgresCollection = void 0;
 const translateApiCollectionToPostgresCollection = (record) => {
     // Map old record to new schema.
     const translatedRecord = {
@@ -45,7 +16,7 @@ const translateApiCollectionToPostgresCollection = (record) => {
         report_to_ems: record.reportToEms,
         sample_file_name: record.sampleFileName,
         ignore_files_config_for_discovery: record.ignoreFilesConfigForDiscovery,
-        meta: record.meta,
+        meta: (record.meta ? JSON.stringify(record.meta) : undefined),
         // have to stringify on an array of values
         tags: (record.tags ? JSON.stringify(record.tags) : undefined),
     };

package/dist/translate/executions.js

@@ -95,8 +95,8 @@ const translateApiExecutionToPostgresExecution = async (dynamoRecord, knex, coll
         updated_at: dynamoRecord.updatedAt ? new Date(dynamoRecord.updatedAt) : undefined,
     };
     if (dynamoRecord.collectionId !== undefined) {
-        const collectionNameVersionArray = dynamoRecord.collectionId.split('___');
-        translatedRecord.collection_cumulus_id = await collectionPgModel.getRecordCumulusId(knex, { name: collectionNameVersionArray[0], version: collectionNameVersionArray[1] });
+        const { name, version } = (0, Collections_1.deconstructCollectionId)(dynamoRecord.collectionId);
+        translatedRecord.collection_cumulus_id = await collectionPgModel.getRecordCumulusId(knex, { name, version });
     }
     // If we have a parentArn, try a lookup in Postgres. If there's a match, set the parent_cumulus_id
     if (dynamoRecord.parentArn !== undefined) {

package/dist/translate/file.js

@@ -23,9 +23,8 @@ const translatePostgresFileToApiFile = (filePgRecord) => removeNilProperties({
     checksumType: filePgRecord.checksum_type,
     fileName: filePgRecord.file_name,
     key: filePgRecord.key,
-    size: filePgRecord.file_size ? Number.parseInt(filePgRecord.file_size, 10) : undefined,
+    size: filePgRecord.file_size ? filePgRecord.file_size : undefined,
     source: filePgRecord.source,
-    type: filePgRecord.type,
 });
 exports.translatePostgresFileToApiFile = translatePostgresFileToApiFile;
 const translateApiFiletoPostgresFile = (file) => {
@@ -40,7 +39,6 @@ const translateApiFiletoPostgresFile = (file) => {
         file_size: file.size,
         path: file.path,
         source: file.source,
-        type: file.type,
     };
 };
 exports.translateApiFiletoPostgresFile = translateApiFiletoPostgresFile;

package/dist/translate/granules.d.ts

@@ -2,18 +2,16 @@ import { Knex } from 'knex';
 import { ApiGranule } from '@cumulus/types/api/granules';
 import { CollectionPgModel } from '../models/collection';
 import { PdrPgModel } from '../models/pdr';
+import { PostgresGranule, PostgresGranuleRecord } from '../types/granule';
 import { ProviderPgModel } from '../models/provider';
 import { FilePgModel } from '../models/file';
 import { PostgresCollectionRecord } from '../types/collection';
-import { PostgresGranule, PostgresGranuleRecord } from '../types/granule';
-import { GranuleWithProviderAndCollectionInfo } from '../types/query';
-import { PostgresProviderRecord } from '../types/provider';
 /**
  * Generate an API Granule object from a Postgres Granule with associated Files.
  *
  * @param {Object} params
  * @param {PostgresGranuleRecord} params.granulePgRecord - Granule from Postgres
- * @param {PostgresCollectionRecord} [params.collectionPgRecord] - Optional Collection from Postgres
+ * @param {PostgresCollectionRecord} params.collectionPgRecord - Collection from Postgres
  * @param {Knex | Knex.Transaction} params.knexOrTransaction
  *   Knex client for reading from RDS database
  * @param {Object} [params.collectionPgModel] - Instance of the collection database model
@@ -22,11 +20,10 @@ import { PostgresProviderRecord } from '../types/provider';
  * @param {Object} [params.filePgModel] - Instance of the file database model
  * @returns {Object} An API Granule with associated Files
  */
-export declare const translatePostgresGranuleToApiGranule: ({ granulePgRecord, collectionPgRecord, knexOrTransaction, providerPgRecord, collectionPgModel, pdrPgModel, providerPgModel, filePgModel, }: {
+export declare const translatePostgresGranuleToApiGranule: ({ granulePgRecord, collectionPgRecord, knexOrTransaction, collectionPgModel, pdrPgModel, providerPgModel, filePgModel, }: {
     granulePgRecord: PostgresGranuleRecord;
+    collectionPgRecord: PostgresCollectionRecord;
     knexOrTransaction: Knex | Knex.Transaction;
-    collectionPgRecord?: Pick<PostgresCollectionRecord, "name" | "version" | "cumulus_id"> | undefined;
-    providerPgRecord?: Pick<PostgresProviderRecord, "name"> | undefined;
     collectionPgModel?: CollectionPgModel | undefined;
     pdrPgModel?: PdrPgModel | undefined;
     providerPgModel?: ProviderPgModel | undefined;
@@ -45,12 +42,4 @@ export declare const translatePostgresGranuleToApiGranule: ({ granulePgRecord, c
  * @returns {Object} A granule PG record
  */
 export declare const translateApiGranuleToPostgresGranule: (dynamoRecord: AWS.DynamoDB.DocumentClient.AttributeMap, knexOrTransaction: Knex | Knex.Transaction, collectionPgModel?: CollectionPgModel, pdrPgModel?: PdrPgModel, providerPgModel?: ProviderPgModel) => Promise<PostgresGranule>;
-/**
- * Translate a custom database result into an API granule
- *
- * @param {Knex | Knex.Transaction} knex
- *   Knex client for reading from RDS database
- * @param {GranuleWithProviderAndCollectionInfo} dbResult - Custom database result
- */
-export declare const translatePostgresGranuleResultToApiGranule: (knex: Knex, dbResult: GranuleWithProviderAndCollectionInfo) => Promise<ApiGranule>;
 //# sourceMappingURL=granules.d.ts.map

package/dist/translate/granules.js

@@ -1,21 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.translatePostgresGranuleResultToApiGranule = exports.translateApiGranuleToPostgresGranule = exports.translatePostgresGranuleToApiGranule = void 0;
+exports.translateApiGranuleToPostgresGranule = exports.translatePostgresGranuleToApiGranule = void 0;
 const Collections_1 = require("@cumulus/message/Collections");
+const Executions_1 = require("@cumulus/message/Executions");
 const util_1 = require("@cumulus/common/util");
 const errors_1 = require("@cumulus/errors");
 const collection_1 = require("../models/collection");
 const pdr_1 = require("../models/pdr");
 const provider_1 = require("../models/provider");
 const file_1 = require("../models/file");
-const execution_1 = require("../lib/execution");
 const file_2 = require("./file");
+const execution_1 = require("../lib/execution");
 /**
  * Generate an API Granule object from a Postgres Granule with associated Files.
  *
  * @param {Object} params
  * @param {PostgresGranuleRecord} params.granulePgRecord - Granule from Postgres
- * @param {PostgresCollectionRecord} [params.collectionPgRecord] - Optional Collection from Postgres
+ * @param {PostgresCollectionRecord} params.collectionPgRecord - Collection from Postgres
  * @param {Knex | Knex.Transaction} params.knexOrTransaction
  *   Knex client for reading from RDS database
  * @param {Object} [params.collectionPgModel] - Instance of the collection database model
@@ -24,28 +25,20 @@ const file_2 = require("./file");
  * @param {Object} [params.filePgModel] - Instance of the file database model
  * @returns {Object} An API Granule with associated Files
  */
-const translatePostgresGranuleToApiGranule = async ({ granulePgRecord, collectionPgRecord, knexOrTransaction, providerPgRecord, collectionPgModel = new collection_1.CollectionPgModel(), pdrPgModel = new pdr_1.PdrPgModel(), providerPgModel = new provider_1.ProviderPgModel(), filePgModel = new file_1.FilePgModel(), }) => {
+const translatePostgresGranuleToApiGranule = async ({ granulePgRecord, collectionPgRecord, knexOrTransaction, collectionPgModel = new collection_1.CollectionPgModel(), pdrPgModel = new pdr_1.PdrPgModel(), providerPgModel = new provider_1.ProviderPgModel(), filePgModel = new file_1.FilePgModel(), }) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     const collection = collectionPgRecord || await collectionPgModel.get(knexOrTransaction, { cumulus_id: granulePgRecord.collection_cumulus_id });
     if (granulePgRecord.collection_cumulus_id !== collection.cumulus_id) {
-        throw new errors_1.ValidationError(`Input collection.cumulus_id: ${collection.cumulus_id} does not match the granule PG record collection_cumulus_id: ${granulePgRecord.collection_cumulus_id}`);
+        throw new errors_1.ValidationError(`Collection ${collection.cumulus_id} does not match the Granule's Collection ${granulePgRecord.collection_cumulus_id}`);
     }
     const files = await filePgModel.search(knexOrTransaction, { granule_cumulus_id: granulePgRecord.cumulus_id });
-    const executionUrls = await (0, execution_1.getExecutionInfoByGranuleCumulusId)({
-        knexOrTransaction,
-        granuleCumulusId: granulePgRecord.cumulus_id,
-        executionColumns: ['url'],
-        limit: 1,
-    });
+    const executionArns = await (0, execution_1.getExecutionArnsByGranuleCumulusId)(knexOrTransaction, granulePgRecord.cumulus_id, 1);
     let pdr;
     if (granulePgRecord.pdr_cumulus_id) {
         pdr = await pdrPgModel.get(knexOrTransaction, { cumulus_id: granulePgRecord.pdr_cumulus_id });
     }
     let provider;
-    if (providerPgRecord) {
-        provider = providerPgRecord;
-    }
-    else if (granulePgRecord.provider_cumulus_id) {
+    if (granulePgRecord.provider_cumulus_id) {
         provider = await providerPgModel.get(knexOrTransaction, { cumulus_id: granulePgRecord.provider_cumulus_id });
     }
     const apiGranule = (0, util_1.removeNilProperties)({
@@ -56,15 +49,18 @@ const translatePostgresGranuleToApiGranule = async ({ granulePgRecord, collectio
         duration: granulePgRecord.duration,
         endingDateTime: (_c = granulePgRecord.ending_date_time) === null || _c === void 0 ? void 0 : _c.toISOString(),
         error: granulePgRecord.error,
-        execution: executionUrls[0] ? executionUrls[0].url : undefined,
-        files: files.length > 0 ? files.map((file) => (0, file_2.translatePostgresFileToApiFile)(file)) : undefined,
+        execution: executionArns[0] ? (0, Executions_1.getExecutionUrlFromArn)(executionArns[0].arn) : undefined,
+        files: files.map((file) => ({
+            ...(0, file_2.translatePostgresFileToApiFile)(file),
+        })),
         granuleId: granulePgRecord.granule_id,
         lastUpdateDateTime: (_d = granulePgRecord.last_update_date_time) === null || _d === void 0 ? void 0 : _d.toISOString(),
         pdrName: pdr ? pdr.name : undefined,
         processingEndDateTime: (_e = granulePgRecord.processing_end_date_time) === null || _e === void 0 ? void 0 : _e.toISOString(),
         processingStartDateTime: (_f = granulePgRecord.processing_start_date_time) === null || _f === void 0 ? void 0 : _f.toISOString(),
         productionDateTime: (_g = granulePgRecord.production_date_time) === null || _g === void 0 ? void 0 : _g.toISOString(),
-        productVolume: granulePgRecord.product_volume,
+        productVolume: granulePgRecord.product_volume
+            ? granulePgRecord.product_volume : undefined,
         provider: provider ? provider.name : undefined,
         published: granulePgRecord.published,
         queryFields: granulePgRecord.query_fields,
@@ -127,24 +123,4 @@ const translateApiGranuleToPostgresGranule = async (dynamoRecord, knexOrTransact
     return granuleRecord;
 };
 exports.translateApiGranuleToPostgresGranule = translateApiGranuleToPostgresGranule;
-/**
- * Translate a custom database result into an API granule
- *
- * @param {Knex | Knex.Transaction} knex
- *   Knex client for reading from RDS database
- * @param {GranuleWithProviderAndCollectionInfo} dbResult - Custom database result
- */
-const translatePostgresGranuleResultToApiGranule = async (knex, dbResult) => await (0, exports.translatePostgresGranuleToApiGranule)({
-    knexOrTransaction: knex,
-    granulePgRecord: dbResult,
-    collectionPgRecord: {
-        cumulus_id: dbResult.collection_cumulus_id,
-        name: dbResult.collectionName,
-        version: dbResult.collectionVersion,
-    },
-    providerPgRecord: {
-        name: dbResult.providerName,
-    },
-});
-exports.translatePostgresGranuleResultToApiGranule = translatePostgresGranuleResultToApiGranule;
 //# sourceMappingURL=granules.js.map

package/dist/translate/pdrs.d.ts

@@ -0,0 +1,19 @@
+import { Knex } from 'knex';
+import { CollectionPgModel } from '../models/collection';
+import { ExecutionPgModel } from '../models/execution';
+import { ProviderPgModel } from '../models/provider';
+import { PostgresPdr } from '../types/pdr';
+/**
+ * Generate a Postgres PDR record from a DynamoDB record.
+ *
+ * @param {AWS.DynamoDB.DocumentClient.AttributeMap} dynamoRecord
+ *   Record from DynamoDB
+ * @param {Knex | Knex.Transaction} knexOrTransaction
+ *   Knex client for reading from RDS database
+ * @param {Object} collectionPgModel - Instance of the collection database model
+ * @param {Object} providerPgModel   - Instance of the provider database model
+ * @param {Object} executionPgModel  - Instance of the execution database model
+ * @returns {PostgresPdr} A PDR PG record
+ */
+export declare const translateApiPdrToPostgresPdr: (dynamoRecord: AWS.DynamoDB.DocumentClient.AttributeMap, knexOrTransaction: Knex | Knex.Transaction, collectionPgModel?: CollectionPgModel, providerPgModel?: ProviderPgModel, executionPgModel?: ExecutionPgModel) => Promise<PostgresPdr>;
+//# sourceMappingURL=pdrs.d.ts.map

package/dist/translate/pdrs.js

@@ -0,0 +1,44 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.translateApiPdrToPostgresPdr = void 0;
+const collection_1 = require("../models/collection");
+const execution_1 = require("../models/execution");
+const provider_1 = require("../models/provider");
+const { deconstructCollectionId } = require('@cumulus/message/Collections');
+/**
+ * Generate a Postgres PDR record from a DynamoDB record.
+ *
+ * @param {AWS.DynamoDB.DocumentClient.AttributeMap} dynamoRecord
+ *   Record from DynamoDB
+ * @param {Knex | Knex.Transaction} knexOrTransaction
+ *   Knex client for reading from RDS database
+ * @param {Object} collectionPgModel - Instance of the collection database model
+ * @param {Object} providerPgModel   - Instance of the provider database model
+ * @param {Object} executionPgModel  - Instance of the execution database model
+ * @returns {PostgresPdr} A PDR PG record
+ */
+const translateApiPdrToPostgresPdr = async (dynamoRecord, knexOrTransaction, collectionPgModel = new collection_1.CollectionPgModel(), providerPgModel = new provider_1.ProviderPgModel(), executionPgModel = new execution_1.ExecutionPgModel()) => {
+    const { name, version } = deconstructCollectionId(dynamoRecord.collectionId);
+    const pdrRecord = {
+        name: dynamoRecord.pdrName,
+        provider_cumulus_id: await providerPgModel.getRecordCumulusId(knexOrTransaction, { name: dynamoRecord.provider }),
+        collection_cumulus_id: await collectionPgModel.getRecordCumulusId(knexOrTransaction, { name, version }),
+        execution_cumulus_id: dynamoRecord.execution
+            ? await executionPgModel.getRecordCumulusId(knexOrTransaction, { url: dynamoRecord.execution })
+            : undefined,
+        status: dynamoRecord.status,
+        progress: dynamoRecord.progress,
+        pan_sent: dynamoRecord.PANSent,
+        pan_message: dynamoRecord.PANmessage,
+        stats: dynamoRecord.stats,
+        address: dynamoRecord.address,
+        original_url: dynamoRecord.originalUrl,
+        timestamp: dynamoRecord.timestamp ? new Date(dynamoRecord.timestamp) : undefined,
+        duration: dynamoRecord.duration,
+        created_at: new Date(dynamoRecord.createdAt),
+        updated_at: dynamoRecord.updatedAt ? new Date(dynamoRecord.updatedAt) : undefined,
+    };
+    return pdrRecord;
+};
+exports.translateApiPdrToPostgresPdr = translateApiPdrToPostgresPdr;
+//# sourceMappingURL=pdrs.js.map

package/dist/translate/providers.d.ts

@@ -1,7 +1,6 @@
 import { ApiProvider } from '@cumulus/types';
-import { PostgresProvider, PostgresProviderRecord } from '../types/provider';
+import { PostgresProvider } from '../types/provider';
 export declare const encryptValueWithKMS: (value: string, encryptFunction?: Function) => Promise<string>;
-export declare const translatePostgresProviderToApiProvider: (record: PostgresProviderRecord) => ApiProvider;
 /**
 * Translates API Provider record to Postgres Provider record
 *

package/dist/translate/providers.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.translateApiProviderToPostgresProvider = exports.translatePostgresProviderToApiProvider = exports.encryptValueWithKMS = void 0;
-const util_1 = require("@cumulus/common/util");
+exports.translateApiProviderToPostgresProvider = exports.encryptValueWithKMS = void 0;
 const common_1 = require("@cumulus/common");
 const aws_client_1 = require("@cumulus/aws-client");
 const encryptValueWithKMS = (value, encryptFunction = aws_client_1.KMS.encrypt) => {
@@ -9,28 +8,6 @@ const encryptValueWithKMS = (value, encryptFunction = aws_client_1.KMS.encrypt)
     return encryptFunction(providerKmsKeyId, value);
 };
 exports.encryptValueWithKMS = encryptValueWithKMS;
-const translatePostgresProviderToApiProvider = (record) => {
-    const apiProvider = {
-        id: record.name,
-        cmKeyId: record.cm_key_id,
-        certificateUri: record.certificate_uri,
-        privateKey: record.private_key,
-        globalConnectionLimit: record.global_connection_limit,
-        port: record.port,
-        host: record.host,
-        protocol: record.protocol,
-        createdAt: record.created_at.getTime(),
-        updatedAt: record.updated_at.getTime(),
-        username: record.username,
-        password: record.username,
-        allowedRedirects: record.allowed_redirects,
-    };
-    if (record.username || record.password) {
-        apiProvider.encrypted = true;
-    }
-    return (0, util_1.removeNilProperties)(apiProvider);
-};
-exports.translatePostgresProviderToApiProvider = translatePostgresProviderToApiProvider;
 /**
 * Translates API Provider record to Postgres Provider record
 *

package/dist/translate/rules.d.ts

@@ -2,8 +2,7 @@ import { Knex } from 'knex';
 import { RuleRecord } from '@cumulus/types/api/rules';
 import { CollectionPgModel } from '../models/collection';
 import { ProviderPgModel } from '../models/provider';
-import { PostgresRule, PostgresRuleRecord } from '../types/rule';
-export declare const translatePostgresRuleToApiRule: (pgRule: PostgresRuleRecord, knex: Knex | Knex.Transaction, collectionPgModel?: CollectionPgModel, providerPgModel?: ProviderPgModel) => Promise<RuleRecord>;
+import { PostgresRule } from '../types/rule';
 /**
  * Generate a Postgres rule record from a DynamoDB record.
  *
@@ -13,5 +12,15 @@ export declare const translatePostgresRuleToApiRule: (pgRule: PostgresRuleRecord
  * @param {Object} providerPgModel - Instance of the provider database model
  * @returns {Object} A rule record
  */
+export declare const translateApiRuleToPostgresRuleRaw: (record: RuleRecord, dbClient: Knex, collectionPgModel?: CollectionPgModel, providerPgModel?: ProviderPgModel) => Promise<PostgresRule>;
+/**
+ * Generate a Postgres rule record from a DynamoDB record and remove nil properties.
+ *
+ * @param {Object} record - A rule
+ * @param {Object} dbClient - Knex client for reading from RDS database
+ * @param {Object} collectionPgModel - Instance of the collection database model
+ * @param {Object} providerPgModel - Instance of the provider database model
+ * @returns {Object} A rule record
+ */
 export declare const translateApiRuleToPostgresRule: (record: RuleRecord, dbClient: Knex, collectionPgModel?: CollectionPgModel, providerPgModel?: ProviderPgModel) => Promise<PostgresRule>;
 //# sourceMappingURL=rules.d.ts.map

package/dist/translate/rules.js

@@ -1,42 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.translateApiRuleToPostgresRule = exports.translatePostgresRuleToApiRule = void 0;
+exports.translateApiRuleToPostgresRule = exports.translateApiRuleToPostgresRuleRaw = void 0;
 const util_1 = require("@cumulus/common/util");
 const collection_1 = require("../models/collection");
 const provider_1 = require("../models/provider");
-const translatePostgresRuleToApiRule = async (pgRule, knex, collectionPgModel = new collection_1.CollectionPgModel(), providerPgModel = new provider_1.ProviderPgModel()) => {
-    const provider = pgRule.provider_cumulus_id
-        ? await providerPgModel.get(knex, { cumulus_id: pgRule.provider_cumulus_id })
-        : undefined;
-    const collection = pgRule.collection_cumulus_id
-        ? await collectionPgModel.get(knex, { cumulus_id: pgRule.collection_cumulus_id })
-        : undefined;
-    const apiRule = {
-        name: pgRule.name,
-        workflow: pgRule.workflow,
-        provider: provider ? provider.name : undefined,
-        collection: collection ? {
-            name: collection.name,
-            version: collection.version,
-        } : undefined,
-        rule: (0, util_1.removeNilProperties)({
-            type: pgRule.type,
-            arn: pgRule.arn,
-            logEventArn: pgRule.log_event_arn,
-            value: pgRule.value,
-        }),
-        state: pgRule.enabled ? 'ENABLED' : 'DISABLED',
-        meta: pgRule.meta,
-        payload: pgRule.payload,
-        executionNamePrefix: pgRule.execution_name_prefix,
-        queueUrl: pgRule.queue_url,
-        tags: pgRule.tags ? JSON.parse(pgRule.tags) : undefined,
-        createdAt: pgRule.created_at.getTime(),
-        updatedAt: pgRule.updated_at.getTime(),
-    };
-    return (0, util_1.removeNilProperties)(apiRule);
-};
-exports.translatePostgresRuleToApiRule = translatePostgresRuleToApiRule;
 /**
  * Generate a Postgres rule record from a DynamoDB record.
  *
@@ -46,25 +13,36 @@ exports.translatePostgresRuleToApiRule = translatePostgresRuleToApiRule;
  * @param {Object} providerPgModel - Instance of the provider database model
  * @returns {Object} A rule record
  */
+const translateApiRuleToPostgresRuleRaw = async (record, dbClient, collectionPgModel = new collection_1.CollectionPgModel(), providerPgModel = new provider_1.ProviderPgModel()) => ({
+    name: record.name,
+    workflow: record.workflow,
+    provider_cumulus_id: record.provider ? await providerPgModel.getRecordCumulusId(dbClient, { name: record.provider }) : undefined,
+    collection_cumulus_id: record.collection ? await collectionPgModel.getRecordCumulusId(dbClient, { name: record.collection.name, version: record.collection.version }) : undefined,
+    meta: record.meta,
+    payload: record.payload,
+    queue_url: record.queueUrl,
+    arn: record.rule.arn,
+    type: record.rule.type,
+    value: record.rule.value,
+    log_event_arn: record.rule.logEventArn,
+    enabled: (record.state === undefined) || (record.state === 'ENABLED'),
+    tags: (record.tags ? JSON.stringify(record.tags) : undefined),
+    execution_name_prefix: record.executionNamePrefix,
+    created_at: (record.createdAt ? new Date(record.createdAt) : undefined),
+    updated_at: (record.updatedAt ? new Date(record.updatedAt) : undefined),
+});
+exports.translateApiRuleToPostgresRuleRaw = translateApiRuleToPostgresRuleRaw;
+/**
+ * Generate a Postgres rule record from a DynamoDB record and remove nil properties.
+ *
+ * @param {Object} record - A rule
+ * @param {Object} dbClient - Knex client for reading from RDS database
+ * @param {Object} collectionPgModel - Instance of the collection database model
+ * @param {Object} providerPgModel - Instance of the provider database model
+ * @returns {Object} A rule record
+ */
 const translateApiRuleToPostgresRule = async (record, dbClient, collectionPgModel = new collection_1.CollectionPgModel(), providerPgModel = new provider_1.ProviderPgModel()) => {
-    const ruleRecord = {
-        name: record.name,
-        workflow: record.workflow,
-        provider_cumulus_id: record.provider ? await providerPgModel.getRecordCumulusId(dbClient, { name: record.provider }) : undefined,
-        collection_cumulus_id: record.collection ? await collectionPgModel.getRecordCumulusId(dbClient, { name: record.collection.name, version: record.collection.version }) : undefined,
-        meta: record.meta,
-        payload: record.payload,
-        queue_url: record.queueUrl,
-        arn: record.rule.arn,
-        type: record.rule.type,
-        value: record.rule.value,
-        log_event_arn: record.rule.logEventArn,
-        enabled: (record.state === undefined) || (record.state === 'ENABLED'),
-        tags: (record.tags ? JSON.stringify(record.tags) : undefined),
-        execution_name_prefix: record.executionNamePrefix,
-        created_at: (record.createdAt ? new Date(record.createdAt) : undefined),
-        updated_at: (record.updatedAt ? new Date(record.updatedAt) : undefined),
-    };
+    const ruleRecord = await (0, exports.translateApiRuleToPostgresRuleRaw)(record, dbClient, collectionPgModel, providerPgModel);
     return (0, util_1.removeNilProperties)(ruleRecord);
 };
 exports.translateApiRuleToPostgresRule = translateApiRuleToPostgresRule;

package/dist/types/collection.d.ts

@@ -1,4 +1,3 @@
-import { DuplicateHandling } from '@cumulus/types';
 export interface PostgresCollection {
     name: string;
     version: string;
@@ -6,20 +5,19 @@ export interface PostgresCollection {
     granule_id_extraction_regex: string;
     files: string;
     process?: string;
-    duplicate_handling?: DuplicateHandling;
+    duplicate_handling?: string;
     report_to_ems?: boolean;
-    sample_file_name: string;
+    sample_file_name?: string;
     url_path?: string;
     ignore_files_config_for_discovery?: boolean;
-    meta?: object;
+    meta?: string;
     tags?: string;
     created_at?: Date;
     updated_at?: Date;
 }
-export interface PostgresCollectionRecord extends Omit<PostgresCollection, 'tags'> {
+export interface PostgresCollectionRecord extends PostgresCollection {
     cumulus_id: number;
     created_at: Date;
     updated_at: Date;
-    tags: string[];
 }
 //# sourceMappingURL=collection.d.ts.map

package/dist/types/file.d.ts

@@ -8,13 +8,11 @@ export interface PostgresFile {
     file_size?: number;
     path?: string;
     source?: string;
-    type?: string;
 }
-export interface PostgresFileRecord extends Omit<PostgresFile, 'file_size'> {
+export interface PostgresFileRecord extends PostgresFile {
     bucket: string;
     key: string;
     cumulus_id: number;
-    file_size?: string;
     created_at: Date;
     updated_at: Date;
 }

package/dist/types/granule.d.ts

@@ -24,9 +24,8 @@ export interface PostgresGranule extends PostgresGranuleUniqueColumns {
     processing_end_date_time?: Date;
     query_fields?: unknown;
 }
-export interface PostgresGranuleRecord extends Omit<PostgresGranule, 'product_volume'> {
+export interface PostgresGranuleRecord extends PostgresGranule {
     cumulus_id: number;
-    product_volume?: string;
     created_at: Date;
     updated_at: Date;
 }

package/dist/types/pdr.d.ts

@@ -1,6 +1,5 @@
-import { PdrStatus } from '@cumulus/types/api/pdrs';
 export interface PostgresPdr {
-    status: PdrStatus;
+    status: string;
     name: string;
     collection_cumulus_id: number;
     provider_cumulus_id: number;

package/dist/types/provider.d.ts

@@ -27,7 +27,7 @@ export interface PostgresProvider {
  * postgres for reading.  It differs from the PostgresProvider interface in that it types
  * the autogenerated/required fields in the Postgres database as required
  */
-export interface PostgresProviderRecord extends PostgresProvider {
+export interface PostgresProviderRecord extends Omit<PostgresProvider, 'allowed_redirects'> {
     cumulus_id: number;
     created_at: Date;
     updated_at: Date;