@cumulus/db 9.2.0 → 9.2.4

package/dist/index.d.ts

@@ -19,6 +19,7 @@ export { translateApiProviderToPostgresProvider, } from './translate/providers';
 export { translateApiRuleToPostgresRule } from './translate/rules';
 export { translateApiExecutionToPostgresExecution } from './translate/executions';
 export { translateApiGranuleToPostgresGranule } from './translate/granules';
+export { translateApiPdrToPostgresPdr } from './translate/pdrs';
 export { upsertGranuleWithExecutionJoinRecord, } from './lib/granule';
 export { AsyncOperationPgModel } from './models/async_operation';
 export { BasePgModel } from './models/base';

package/dist/index.js

@@ -38,6 +38,8 @@ var executions_1 = require("./translate/executions");
 Object.defineProperty(exports, "translateApiExecutionToPostgresExecution", { enumerable: true, get: function () { return executions_1.translateApiExecutionToPostgresExecution; } });
 var granules_1 = require("./translate/granules");
 Object.defineProperty(exports, "translateApiGranuleToPostgresGranule", { enumerable: true, get: function () { return granules_1.translateApiGranuleToPostgresGranule; } });
+var pdrs_1 = require("./translate/pdrs");
+Object.defineProperty(exports, "translateApiPdrToPostgresPdr", { enumerable: true, get: function () { return pdrs_1.translateApiPdrToPostgresPdr; } });
 var granule_1 = require("./lib/granule");
 Object.defineProperty(exports, "upsertGranuleWithExecutionJoinRecord", { enumerable: true, get: function () { return granule_1.upsertGranuleWithExecutionJoinRecord; } });
 var async_operation_1 = require("./models/async_operation");

package/dist/test-utils.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.fakePdrRecordFactory = exports.fakeAsyncOperationRecordFactory = exports.fakeFileRecordFactory = exports.fakeGranuleRecordFactory = exports.fakeProviderRecordFactory = exports.fakeExecutionRecordFactory = exports.fakeCollectionRecordFactory = exports.fakeRuleRecordFactory = exports.destroyLocalTestDb = exports.generateLocalTestDb = exports.deleteTestDatabase = exports.createTestDatabase = void 0;
 const crypto_random_string_1 = __importDefault(require("crypto-random-string"));
 const uuid_1 = require("uuid");
+const Executions_1 = require("@cumulus/message/Executions");
 const connection_1 = require("./connection");
 const config_1 = require("./config");
 exports.createTestDatabase = async (knex, dbName, dbUser) => {
@@ -53,14 +54,19 @@ exports.fakeCollectionRecordFactory = (params) => ({
         }]),
     ...params,
 });
-exports.fakeExecutionRecordFactory = (params) => ({
-    arn: crypto_random_string_1.default({ length: 10 }),
-    status: 'running',
-    created_at: new Date(),
-    updated_at: new Date(),
-    timestamp: new Date(),
-    ...params,
-});
+exports.fakeExecutionRecordFactory = (params) => {
+    const executionId = uuid_1.v4();
+    const executionARN = `arn:aws:states:us-east-1:12345:execution:test-TestExecution:${executionId}`;
+    return {
+        arn: executionARN,
+        url: Executions_1.getExecutionUrlFromArn(executionARN),
+        status: 'running',
+        created_at: new Date(),
+        updated_at: new Date(),
+        timestamp: new Date(),
+        ...params,
+    };
+};
 exports.fakeProviderRecordFactory = (params) => ({
     name: `provider${crypto_random_string_1.default({ length: 5 })}`,
     host: 'test-bucket',

package/dist/translate/granules.d.ts

@@ -4,7 +4,7 @@ import { PdrPgModel } from '../models/pdr';
 import { PostgresGranule } from '../types/granule';
 import { ProviderPgModel } from '../models/provider';
 /**
- * Generate a Postgres rule record from a DynamoDB record.
+ * Generate a Postgres granule record from a DynamoDB record.
  *
  * @param {AWS.DynamoDB.DocumentClient.AttributeMap} dynamoRecord
  *   Record from DynamoDB

package/dist/translate/granules.js

@@ -6,7 +6,7 @@ const pdr_1 = require("../models/pdr");
 const provider_1 = require("../models/provider");
 const { deconstructCollectionId } = require('../../../api/lib/utils');
 /**
- * Generate a Postgres rule record from a DynamoDB record.
+ * Generate a Postgres granule record from a DynamoDB record.
  *
  * @param {AWS.DynamoDB.DocumentClient.AttributeMap} dynamoRecord
  *   Record from DynamoDB

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,43 @@
+"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
+ */
+exports.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;
+};
+//# sourceMappingURL=pdrs.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/db",
-  "version": "9.2.0",
+  "version": "9.2.4",
   "description": "Utilities for working with the Cumulus DB",
   "license": "Apache-2.0",
   "main": "./dist/index.js",
@@ -29,11 +29,12 @@
     "node": ">=12.18.0"
   },
   "dependencies": {
-    "@cumulus/aws-client": "9.2.0",
-    "@cumulus/common": "9.2.0",
-    "@cumulus/errors": "9.2.0",
-    "@cumulus/logger": "9.2.0",
-    "@cumulus/types": "9.2.0",
+    "@cumulus/aws-client": "9.2.4",
+    "@cumulus/common": "9.2.4",
+    "@cumulus/errors": "9.2.4",
+    "@cumulus/logger": "9.2.4",
+    "@cumulus/message": "9.2.4",
+    "@cumulus/types": "9.2.4",
     "is-valid-hostname": "0.0.1",
     "knex": "0.21.13",
     "lodash": "^4.17.20",
@@ -42,7 +43,8 @@
     "uuid": "8.3.1"
   },
   "devDependencies": {
+    "@cumulus/message": "9.2.4",
     "@types/uuid": "^8.0.0"
   },
-  "gitHead": "6f2f43bd50c0fba4fedebbace55ddf7e4ae35a1c"
+  "gitHead": "5e5890eaefaecdcb54c382dbb2300c794378c593"
 }