@cumulus/db 10.1.1-alpha.0 → 10.1.3

package/LICENSE

@@ -0,0 +1,60 @@
+Copyright © 2020 United States Government as represented by the Administrator of the National Aeronautics and Space Administration. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICE NSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+
+---
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
+
+"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
+
+    You must give any other recipients of the Work or Derivative Works a copy of this License; and
+    You must cause any modified files to carry prominent notices stating that You changed the files; and
+    You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
+    If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
+
+    You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS

package/dist/config.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import AWS from 'aws-sdk';
 import { Knex } from 'knex';
 export declare const localStackConnectionEnv: {
@@ -8,6 +9,7 @@ export declare const localStackConnectionEnv: {
     PG_DATABASE: string;
     PG_PORT: string;
 };
+export declare const isKnexDebugEnabled: (env?: NodeJS.ProcessEnv) => boolean;
 export declare const getSecretConnectionConfig: (SecretId: string, secretsManager: AWS.SecretsManager) => Promise<Knex.PgConnectionConfig>;
 export declare const getConnectionConfigEnv: (env: NodeJS.ProcessEnv) => Knex.PgConnectionConfig;
 /**

package/dist/config.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getKnexConfig = exports.getConnectionConfig = exports.getConnectionConfigEnv = exports.getSecretConnectionConfig = exports.localStackConnectionEnv = void 0;
+exports.getKnexConfig = exports.getConnectionConfig = exports.getConnectionConfigEnv = exports.getSecretConnectionConfig = exports.isKnexDebugEnabled = exports.localStackConnectionEnv = void 0;
 const aws_sdk_1 = __importDefault(require("aws-sdk"));
 const common_1 = require("@cumulus/common");
 exports.localStackConnectionEnv = {
@@ -13,6 +13,8 @@ exports.localStackConnectionEnv = {
     PG_DATABASE: 'postgres',
     PG_PORT: '5432',
 };
+const isKnexDebugEnabled = (env = {}) => env.KNEX_DEBUG === 'true';
+exports.isKnexDebugEnabled = isKnexDebugEnabled;
 const getSecretConnectionConfig = async (SecretId, secretsManager) => {
     var _a;
     const response = await secretsManager.getSecretValue({ SecretId }).promise();
@@ -110,7 +112,7 @@ const getKnexConfig = async ({ env = process.env, secretsManager = new aws_sdk_1
     const knexConfig = {
         client: 'pg',
         connection: await (0, exports.getConnectionConfig)({ env, secretsManager }),
-        debug: env.KNEX_DEBUG === 'true',
+        debug: (0, exports.isKnexDebugEnabled)(env),
         asyncStackTraces: env.KNEX_ASYNC_STACK_TRACES === 'true',
         pool: {
             min: 0,

package/dist/connection.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import AWS from 'aws-sdk';
 import { Knex } from 'knex';
 import Logger from '@cumulus/logger';

package/dist/connection.js

@@ -44,16 +44,37 @@ const log = new logger_1.default({ sender: '@cumulus/db/connection' });
  * @returns {Promise<Knex>} a Knex configuration object that has returned at least one query
  */
 const getKnexClient = async ({ env = process.env, secretsManager = new aws_sdk_1.default.SecretsManager(), knexLogger = log, } = {}) => {
+    if ((0, config_1.isKnexDebugEnabled)(env)) {
+        knexLogger.info('Initializing connection pool...');
+    }
     const knexConfig = await (0, config_1.getKnexConfig)({ env, secretsManager });
     const knexClient = (0, knex_1.knex)(knexConfig);
-    //@ts-ignore
-    // context is an internal object that isn't typed
-    // this is needed to force tarn to log per-retry failures
-    // and allow propagateCreateError to be set `false`
-    knexClient.context.client.pool.on('createFail', (_, error) => {
-        knexLogger.warn('knex failed on attempted connection', error);
-        throw error;
-    });
+    if ((0, config_1.isKnexDebugEnabled)(env)) {
+        //@ts-ignore
+        // context is an internal object that isn't typed
+        // this is needed to force tarn to log per-retry failures
+        // and allow propagateCreateError to be set `false`
+        knexClient.context.client.pool.on('createFail', (_, error) => {
+            knexLogger.warn('knex failed on attempted connection', error);
+            throw error;
+        });
+        //@ts-ignore
+        knexClient.context.client.pool.on('createSuccess', (_, resource) => {
+            knexLogger.info(`added connection to pool: ${JSON.stringify(resource)}`);
+        });
+        //@ts-ignore
+        knexClient.context.client.pool.on('acquireSuccess', (_, resource) => {
+            knexLogger.info(`acquired connection from pool: ${JSON.stringify(resource)}`);
+        });
+        //@ts-ignore
+        knexClient.context.client.pool.on('release', (resource) => {
+            knexLogger.info(`released connection from pool: ${JSON.stringify(resource)}`);
+        });
+        //@ts-ignore
+        knexClient.context.client.pool.on('poolDestroySuccess', () => {
+            knexLogger.info('pool is destroyed');
+        });
+    }
     return knexClient;
 };
 exports.getKnexClient = getKnexClient;

package/dist/index.d.ts

@@ -1,13 +1,11 @@
 export { Knex } from 'knex';
 export { createTestDatabase, deleteTestDatabase, destroyLocalTestDb, fakeAsyncOperationRecordFactory, fakeCollectionRecordFactory, fakeExecutionRecordFactory, fakeFileRecordFactory, fakeGranuleRecordFactory, fakePdrRecordFactory, fakeProviderRecordFactory, fakeRuleRecordFactory, generateLocalTestDb, } from './test-utils';
-export { isCollisionError } from './lib/errors';
 export { getKnexClient } from './connection';
 export { getKnexConfig, localStackConnectionEnv } from './config';
 export { createRejectableTransaction } from './database';
 export { TableNames } from './tables';
 export declare const migrationDir: string;
 export { validateProviderHost, nullifyUndefinedProviderValues, } from './provider';
-export { BaseRecord, } from './types/base';
 export { PostgresAsyncOperation, PostgresAsyncOperationRecord, } from './types/async_operation';
 export { PostgresCollection, PostgresCollectionRecord, } from './types/collection';
 export { PostgresExecution, PostgresExecutionRecord, } from './types/execution';
@@ -16,19 +14,16 @@ export { PostgresRule, PostgresRuleRecord, } from './types/rule';
 export { PostgresGranule, PostgresGranuleRecord, } from './types/granule';
 export { PostgresPdr, PostgresPdrRecord, } from './types/pdr';
 export { PostgresFile, PostgresFileRecord, } from './types/file';
-export { translateApiAsyncOperationToPostgresAsyncOperation, translatePostgresAsyncOperationToApiAsyncOperation, } from './translate/async_operations';
+export { translateApiAsyncOperationToPostgresAsyncOperation } from './translate/async_operations';
 export { translateApiFiletoPostgresFile, translatePostgresFileToApiFile, } from './translate/file';
-export { translateApiCollectionToPostgresCollection, translatePostgresCollectionToApiCollection, } from './translate/collections';
-export { translateApiProviderToPostgresProvider, translatePostgresProviderToApiProvider, } from './translate/providers';
-export { translateApiRuleToPostgresRule, translatePostgresRuleToApiRule, } from './translate/rules';
+export { translateApiCollectionToPostgresCollection } from './translate/collections';
+export { translateApiProviderToPostgresProvider, } from './translate/providers';
+export { translateApiRuleToPostgresRule, translateApiRuleToPostgresRuleRaw, } from './translate/rules';
 export { translateApiExecutionToPostgresExecution, translatePostgresExecutionToApiExecution, } from './translate/executions';
-export { translateApiGranuleToPostgresGranule, translatePostgresGranuleToApiGranule, translatePostgresGranuleResultToApiGranule, } from './translate/granules';
-export { translateApiPdrToPostgresPdr, translatePostgresPdrToApiPdr, } from './translate/pdr';
-export { getCollectionsByGranuleIds, } from './lib/collection';
-export { executionArnsFromGranuleIdsAndWorkflowNames, newestExecutionArnFromGranuleIdWorkflowName, getWorkflowNameIntersectFromGranuleIds, getApiExecutionCumulusIds, getApiGranuleExecutionCumulusIdsByExecution, getExecutionInfoByGranuleCumulusId, } from './lib/execution';
-export { getFilesAndGranuleInfoQuery, } from './lib/file';
-export { getApiGranuleCumulusIds, getApiGranuleExecutionCumulusIds, getGranuleCollectionId, getUniqueGranuleByGranuleId, upsertGranuleWithExecutionJoinRecord, getGranulesByApiPropertiesQuery, } from './lib/granule';
-export { QuerySearchClient, } from './lib/QuerySearchClient';
+export { translateApiGranuleToPostgresGranule, translatePostgresGranuleToApiGranule, } from './translate/granules';
+export { translateApiPdrToPostgresPdr } from './translate/pdrs';
+export { executionArnsFromGranuleIdsAndWorkflowNames, newestExecutionArnFromGranuleIdWorkflowName, getWorkflowNameIntersectFromGranuleIds, getApiExecutionCumulusIds, getApiGranuleExecutionCumulusIdsByExecution, getExecutionArnsByGranuleCumulusId, } from './lib/execution';
+export { getApiGranuleCumulusIds, getApiGranuleExecutionCumulusIds, upsertGranuleWithExecutionJoinRecord, } from './lib/granule';
 export { AsyncOperationPgModel } from './models/async_operation';
 export { BasePgModel } from './models/base';
 export { CollectionPgModel } from './models/collection';

package/dist/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -19,8 +23,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getGranuleCollectionId = exports.getApiGranuleExecutionCumulusIds = exports.getApiGranuleCumulusIds = exports.getFilesAndGranuleInfoQuery = exports.getExecutionInfoByGranuleCumulusId = exports.getApiGranuleExecutionCumulusIdsByExecution = exports.getApiExecutionCumulusIds = exports.getWorkflowNameIntersectFromGranuleIds = exports.newestExecutionArnFromGranuleIdWorkflowName = exports.executionArnsFromGranuleIdsAndWorkflowNames = exports.getCollectionsByGranuleIds = exports.translatePostgresPdrToApiPdr = exports.translateApiPdrToPostgresPdr = exports.translatePostgresGranuleResultToApiGranule = exports.translatePostgresGranuleToApiGranule = exports.translateApiGranuleToPostgresGranule = exports.translatePostgresExecutionToApiExecution = exports.translateApiExecutionToPostgresExecution = exports.translatePostgresRuleToApiRule = exports.translateApiRuleToPostgresRule = exports.translatePostgresProviderToApiProvider = exports.translateApiProviderToPostgresProvider = exports.translatePostgresCollectionToApiCollection = exports.translateApiCollectionToPostgresCollection = exports.translatePostgresFileToApiFile = exports.translateApiFiletoPostgresFile = exports.translatePostgresAsyncOperationToApiAsyncOperation = exports.translateApiAsyncOperationToPostgresAsyncOperation = exports.nullifyUndefinedProviderValues = exports.validateProviderHost = exports.migrationDir = exports.TableNames = exports.createRejectableTransaction = exports.localStackConnectionEnv = exports.getKnexConfig = exports.getKnexClient = exports.isCollisionError = exports.generateLocalTestDb = exports.fakeRuleRecordFactory = exports.fakeProviderRecordFactory = exports.fakePdrRecordFactory = exports.fakeGranuleRecordFactory = exports.fakeFileRecordFactory = exports.fakeExecutionRecordFactory = exports.fakeCollectionRecordFactory = exports.fakeAsyncOperationRecordFactory = exports.destroyLocalTestDb = exports.deleteTestDatabase = exports.createTestDatabase = exports.Knex = void 0;
-exports.RulePgModel = exports.ProviderPgModel = exports.PdrPgModel = exports.GranulesExecutionsPgModel = exports.GranulePgModel = exports.FilePgModel = exports.ExecutionPgModel = exports.CollectionPgModel = exports.BasePgModel = exports.AsyncOperationPgModel = exports.QuerySearchClient = exports.getGranulesByApiPropertiesQuery = exports.upsertGranuleWithExecutionJoinRecord = exports.getUniqueGranuleByGranuleId = void 0;
+exports.PdrPgModel = exports.GranulesExecutionsPgModel = exports.GranulePgModel = exports.FilePgModel = exports.ExecutionPgModel = exports.CollectionPgModel = exports.BasePgModel = exports.AsyncOperationPgModel = exports.upsertGranuleWithExecutionJoinRecord = exports.getApiGranuleExecutionCumulusIds = exports.getApiGranuleCumulusIds = exports.getExecutionArnsByGranuleCumulusId = exports.getApiGranuleExecutionCumulusIdsByExecution = exports.getApiExecutionCumulusIds = exports.getWorkflowNameIntersectFromGranuleIds = exports.newestExecutionArnFromGranuleIdWorkflowName = exports.executionArnsFromGranuleIdsAndWorkflowNames = exports.translateApiPdrToPostgresPdr = exports.translatePostgresGranuleToApiGranule = exports.translateApiGranuleToPostgresGranule = exports.translatePostgresExecutionToApiExecution = exports.translateApiExecutionToPostgresExecution = exports.translateApiRuleToPostgresRuleRaw = exports.translateApiRuleToPostgresRule = exports.translateApiProviderToPostgresProvider = exports.translateApiCollectionToPostgresCollection = exports.translatePostgresFileToApiFile = exports.translateApiFiletoPostgresFile = exports.translateApiAsyncOperationToPostgresAsyncOperation = exports.nullifyUndefinedProviderValues = exports.validateProviderHost = exports.migrationDir = exports.TableNames = exports.createRejectableTransaction = exports.localStackConnectionEnv = exports.getKnexConfig = exports.getKnexClient = exports.generateLocalTestDb = exports.fakeRuleRecordFactory = exports.fakeProviderRecordFactory = exports.fakePdrRecordFactory = exports.fakeGranuleRecordFactory = exports.fakeFileRecordFactory = exports.fakeExecutionRecordFactory = exports.fakeCollectionRecordFactory = exports.fakeAsyncOperationRecordFactory = exports.destroyLocalTestDb = exports.deleteTestDatabase = exports.createTestDatabase = exports.Knex = void 0;
+exports.RulePgModel = exports.ProviderPgModel = void 0;
 const path = __importStar(require("path"));
 var knex_1 = require("knex");
 Object.defineProperty(exports, "Knex", { enumerable: true, get: function () { return knex_1.Knex; } });
@@ -37,8 +41,6 @@ Object.defineProperty(exports, "fakePdrRecordFactory", { enumerable: true, get:
 Object.defineProperty(exports, "fakeProviderRecordFactory", { enumerable: true, get: function () { return test_utils_1.fakeProviderRecordFactory; } });
 Object.defineProperty(exports, "fakeRuleRecordFactory", { enumerable: true, get: function () { return test_utils_1.fakeRuleRecordFactory; } });
 Object.defineProperty(exports, "generateLocalTestDb", { enumerable: true, get: function () { return test_utils_1.generateLocalTestDb; } });
-var errors_1 = require("./lib/errors");
-Object.defineProperty(exports, "isCollisionError", { enumerable: true, get: function () { return errors_1.isCollisionError; } });
 var connection_1 = require("./connection");
 Object.defineProperty(exports, "getKnexClient", { enumerable: true, get: function () { return connection_1.getKnexClient; } });
 var config_1 = require("./config");
@@ -54,65 +56,51 @@ Object.defineProperty(exports, "validateProviderHost", { enumerable: true, get:
 Object.defineProperty(exports, "nullifyUndefinedProviderValues", { enumerable: true, get: function () { return provider_1.nullifyUndefinedProviderValues; } });
 var async_operations_1 = require("./translate/async_operations");
 Object.defineProperty(exports, "translateApiAsyncOperationToPostgresAsyncOperation", { enumerable: true, get: function () { return async_operations_1.translateApiAsyncOperationToPostgresAsyncOperation; } });
-Object.defineProperty(exports, "translatePostgresAsyncOperationToApiAsyncOperation", { enumerable: true, get: function () { return async_operations_1.translatePostgresAsyncOperationToApiAsyncOperation; } });
 var file_1 = require("./translate/file");
 Object.defineProperty(exports, "translateApiFiletoPostgresFile", { enumerable: true, get: function () { return file_1.translateApiFiletoPostgresFile; } });
 Object.defineProperty(exports, "translatePostgresFileToApiFile", { enumerable: true, get: function () { return file_1.translatePostgresFileToApiFile; } });
 var collections_1 = require("./translate/collections");
 Object.defineProperty(exports, "translateApiCollectionToPostgresCollection", { enumerable: true, get: function () { return collections_1.translateApiCollectionToPostgresCollection; } });
-Object.defineProperty(exports, "translatePostgresCollectionToApiCollection", { enumerable: true, get: function () { return collections_1.translatePostgresCollectionToApiCollection; } });
 var providers_1 = require("./translate/providers");
 Object.defineProperty(exports, "translateApiProviderToPostgresProvider", { enumerable: true, get: function () { return providers_1.translateApiProviderToPostgresProvider; } });
-Object.defineProperty(exports, "translatePostgresProviderToApiProvider", { enumerable: true, get: function () { return providers_1.translatePostgresProviderToApiProvider; } });
 var rules_1 = require("./translate/rules");
 Object.defineProperty(exports, "translateApiRuleToPostgresRule", { enumerable: true, get: function () { return rules_1.translateApiRuleToPostgresRule; } });
-Object.defineProperty(exports, "translatePostgresRuleToApiRule", { enumerable: true, get: function () { return rules_1.translatePostgresRuleToApiRule; } });
+Object.defineProperty(exports, "translateApiRuleToPostgresRuleRaw", { enumerable: true, get: function () { return rules_1.translateApiRuleToPostgresRuleRaw; } });
 var executions_1 = require("./translate/executions");
 Object.defineProperty(exports, "translateApiExecutionToPostgresExecution", { enumerable: true, get: function () { return executions_1.translateApiExecutionToPostgresExecution; } });
 Object.defineProperty(exports, "translatePostgresExecutionToApiExecution", { enumerable: true, get: function () { return executions_1.translatePostgresExecutionToApiExecution; } });
 var granules_1 = require("./translate/granules");
 Object.defineProperty(exports, "translateApiGranuleToPostgresGranule", { enumerable: true, get: function () { return granules_1.translateApiGranuleToPostgresGranule; } });
 Object.defineProperty(exports, "translatePostgresGranuleToApiGranule", { enumerable: true, get: function () { return granules_1.translatePostgresGranuleToApiGranule; } });
-Object.defineProperty(exports, "translatePostgresGranuleResultToApiGranule", { enumerable: true, get: function () { return granules_1.translatePostgresGranuleResultToApiGranule; } });
-var pdr_1 = require("./translate/pdr");
-Object.defineProperty(exports, "translateApiPdrToPostgresPdr", { enumerable: true, get: function () { return pdr_1.translateApiPdrToPostgresPdr; } });
-Object.defineProperty(exports, "translatePostgresPdrToApiPdr", { enumerable: true, get: function () { return pdr_1.translatePostgresPdrToApiPdr; } });
-var collection_1 = require("./lib/collection");
-Object.defineProperty(exports, "getCollectionsByGranuleIds", { enumerable: true, get: function () { return collection_1.getCollectionsByGranuleIds; } });
+var pdrs_1 = require("./translate/pdrs");
+Object.defineProperty(exports, "translateApiPdrToPostgresPdr", { enumerable: true, get: function () { return pdrs_1.translateApiPdrToPostgresPdr; } });
 var execution_1 = require("./lib/execution");
 Object.defineProperty(exports, "executionArnsFromGranuleIdsAndWorkflowNames", { enumerable: true, get: function () { return execution_1.executionArnsFromGranuleIdsAndWorkflowNames; } });
 Object.defineProperty(exports, "newestExecutionArnFromGranuleIdWorkflowName", { enumerable: true, get: function () { return execution_1.newestExecutionArnFromGranuleIdWorkflowName; } });
 Object.defineProperty(exports, "getWorkflowNameIntersectFromGranuleIds", { enumerable: true, get: function () { return execution_1.getWorkflowNameIntersectFromGranuleIds; } });
 Object.defineProperty(exports, "getApiExecutionCumulusIds", { enumerable: true, get: function () { return execution_1.getApiExecutionCumulusIds; } });
 Object.defineProperty(exports, "getApiGranuleExecutionCumulusIdsByExecution", { enumerable: true, get: function () { return execution_1.getApiGranuleExecutionCumulusIdsByExecution; } });
-Object.defineProperty(exports, "getExecutionInfoByGranuleCumulusId", { enumerable: true, get: function () { return execution_1.getExecutionInfoByGranuleCumulusId; } });
-var file_2 = require("./lib/file");
-Object.defineProperty(exports, "getFilesAndGranuleInfoQuery", { enumerable: true, get: function () { return file_2.getFilesAndGranuleInfoQuery; } });
+Object.defineProperty(exports, "getExecutionArnsByGranuleCumulusId", { enumerable: true, get: function () { return execution_1.getExecutionArnsByGranuleCumulusId; } });
 var granule_1 = require("./lib/granule");
 Object.defineProperty(exports, "getApiGranuleCumulusIds", { enumerable: true, get: function () { return granule_1.getApiGranuleCumulusIds; } });
 Object.defineProperty(exports, "getApiGranuleExecutionCumulusIds", { enumerable: true, get: function () { return granule_1.getApiGranuleExecutionCumulusIds; } });
-Object.defineProperty(exports, "getGranuleCollectionId", { enumerable: true, get: function () { return granule_1.getGranuleCollectionId; } });
-Object.defineProperty(exports, "getUniqueGranuleByGranuleId", { enumerable: true, get: function () { return granule_1.getUniqueGranuleByGranuleId; } });
 Object.defineProperty(exports, "upsertGranuleWithExecutionJoinRecord", { enumerable: true, get: function () { return granule_1.upsertGranuleWithExecutionJoinRecord; } });
-Object.defineProperty(exports, "getGranulesByApiPropertiesQuery", { enumerable: true, get: function () { return granule_1.getGranulesByApiPropertiesQuery; } });
-var QuerySearchClient_1 = require("./lib/QuerySearchClient");
-Object.defineProperty(exports, "QuerySearchClient", { enumerable: true, get: function () { return QuerySearchClient_1.QuerySearchClient; } });
 var async_operation_1 = require("./models/async_operation");
 Object.defineProperty(exports, "AsyncOperationPgModel", { enumerable: true, get: function () { return async_operation_1.AsyncOperationPgModel; } });
 var base_1 = require("./models/base");
 Object.defineProperty(exports, "BasePgModel", { enumerable: true, get: function () { return base_1.BasePgModel; } });
-var collection_2 = require("./models/collection");
-Object.defineProperty(exports, "CollectionPgModel", { enumerable: true, get: function () { return collection_2.CollectionPgModel; } });
+var collection_1 = require("./models/collection");
+Object.defineProperty(exports, "CollectionPgModel", { enumerable: true, get: function () { return collection_1.CollectionPgModel; } });
 var execution_2 = require("./models/execution");
 Object.defineProperty(exports, "ExecutionPgModel", { enumerable: true, get: function () { return execution_2.ExecutionPgModel; } });
-var file_3 = require("./models/file");
-Object.defineProperty(exports, "FilePgModel", { enumerable: true, get: function () { return file_3.FilePgModel; } });
+var file_2 = require("./models/file");
+Object.defineProperty(exports, "FilePgModel", { enumerable: true, get: function () { return file_2.FilePgModel; } });
 var granule_2 = require("./models/granule");
 Object.defineProperty(exports, "GranulePgModel", { enumerable: true, get: function () { return granule_2.GranulePgModel; } });
 var granules_executions_1 = require("./models/granules-executions");
 Object.defineProperty(exports, "GranulesExecutionsPgModel", { enumerable: true, get: function () { return granules_executions_1.GranulesExecutionsPgModel; } });
-var pdr_2 = require("./models/pdr");
-Object.defineProperty(exports, "PdrPgModel", { enumerable: true, get: function () { return pdr_2.PdrPgModel; } });
+var pdr_1 = require("./models/pdr");
+Object.defineProperty(exports, "PdrPgModel", { enumerable: true, get: function () { return pdr_1.PdrPgModel; } });
 var provider_2 = require("./models/provider");
 Object.defineProperty(exports, "ProviderPgModel", { enumerable: true, get: function () { return provider_2.ProviderPgModel; } });
 var rule_1 = require("./models/rule");

package/dist/lib/execution.d.ts

@@ -1,29 +1,9 @@
 import { Knex } from 'knex';
 import { ExecutionPgModel } from '../models/execution';
 import { GranulesExecutionsPgModel } from '../models/granules-executions';
-import { PostgresExecutionRecord } from '../types/execution';
 export interface ArnRecord {
     arn: string;
 }
-/**
- * Returns execution info sorted by most recent first for an input
- * Granule Cumulus ID.
- *
- * @param {Object} params
- * @param {Knex | Knex.Transaction} params.knexOrTransaction
- *   Knex client for reading from RDS database
- * @param {Array<string>} params.executionColumns - Columns to return from executions table
- * @param {number} params.granuleCumulusId - The primary ID for a Granule
- * @param {number} [params.limit] - limit to number of executions to query
- * @returns {Promise<Partial<PostgresExecutionRecord>[]>}
- *   Array of arn objects with the most recent first.
- */
-export declare const getExecutionInfoByGranuleCumulusId: ({ knexOrTransaction, granuleCumulusId, executionColumns, limit, }: {
-    knexOrTransaction: Knex | Knex.Transaction;
-    granuleCumulusId: number;
-    executionColumns: string[];
-    limit?: number | undefined;
-}) => Promise<Partial<PostgresExecutionRecord>[]>;
 /**
  * Returns a list of executionArns sorted by most recent first, for an input
  * Granule Cumulus ID.
@@ -34,7 +14,7 @@ export declare const getExecutionInfoByGranuleCumulusId: ({ knexOrTransaction, g
  * @param {number} limit - limit to number of executions to query
  * @returns {Promise<ArnRecord[]>} - Array of arn objects with the most recent first.
  */
-export declare const getExecutionArnsByGranuleCumulusId: (knexOrTransaction: Knex | Knex.Transaction, granuleCumulusId: Number, limit?: number | undefined) => Promise<ArnRecord[]>;
+export declare const getExecutionArnsByGranuleCumulusId: (knexOrTransaction: Knex | Knex.Transaction, granuleCumulusId: Number, limit?: number) => Promise<ArnRecord[]>;
 /**
  * Returns a list of executionArns sorted by most recent first, for an input
  * list of granuleIds and workflowNames.
@@ -51,7 +31,6 @@ export declare const executionArnsFromGranuleIdsAndWorkflowNames: (knex: Knex, g
  *
  * @param {string} granuleId -  granuleIds
  * @param {string} workflowName - workflow name
- * @param {Knex} testKnex - knex for testing
  * @returns {Promise<string>} - most recent exectutionArn for input parameters.
  * @throws {RecordNotFound}
  */

package/dist/lib/execution.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getApiGranuleExecutionCumulusIdsByExecution = exports.getApiExecutionCumulusIds = exports.getWorkflowNameIntersectFromGranuleIds = exports.newestExecutionArnFromGranuleIdWorkflowName = exports.executionArnsFromGranuleIdsAndWorkflowNames = exports.getExecutionArnsByGranuleCumulusId = exports.getExecutionInfoByGranuleCumulusId = void 0;
+exports.getApiGranuleExecutionCumulusIdsByExecution = exports.getApiExecutionCumulusIds = exports.getWorkflowNameIntersectFromGranuleIds = exports.newestExecutionArnFromGranuleIdWorkflowName = exports.executionArnsFromGranuleIdsAndWorkflowNames = exports.getExecutionArnsByGranuleCumulusId = void 0;
 const errors_1 = require("@cumulus/errors");
 const execution_1 = require("../models/execution");
 const granules_executions_1 = require("../models/granules-executions");
@@ -8,32 +8,6 @@ const tables_1 = require("../tables");
 const Logger = require('@cumulus/logger');
 const { getKnexClient } = require('../connection');
 const log = new Logger({ sender: '@cumulus/db/lib/execution' });
-/**
- * Returns execution info sorted by most recent first for an input
- * Granule Cumulus ID.
- *
- * @param {Object} params
- * @param {Knex | Knex.Transaction} params.knexOrTransaction
- *   Knex client for reading from RDS database
- * @param {Array<string>} params.executionColumns - Columns to return from executions table
- * @param {number} params.granuleCumulusId - The primary ID for a Granule
- * @param {number} [params.limit] - limit to number of executions to query
- * @returns {Promise<Partial<PostgresExecutionRecord>[]>}
- *   Array of arn objects with the most recent first.
- */
-const getExecutionInfoByGranuleCumulusId = async ({ knexOrTransaction, granuleCumulusId, executionColumns = ['arn'], limit, }) => {
-    const knexQuery = knexOrTransaction(tables_1.TableNames.executions)
-        .column(executionColumns.map((column) => `${tables_1.TableNames.executions}.${column}`))
-        .where(`${tables_1.TableNames.granules}.cumulus_id`, granuleCumulusId)
-        .join(tables_1.TableNames.granulesExecutions, `${tables_1.TableNames.executions}.cumulus_id`, `${tables_1.TableNames.granulesExecutions}.execution_cumulus_id`)
-        .join(tables_1.TableNames.granules, `${tables_1.TableNames.granules}.cumulus_id`, `${tables_1.TableNames.granulesExecutions}.granule_cumulus_id`)
-        .orderBy(`${tables_1.TableNames.executions}.timestamp`, 'desc');
-    if (limit) {
-        knexQuery.limit(limit);
-    }
-    return await knexQuery;
-};
-exports.getExecutionInfoByGranuleCumulusId = getExecutionInfoByGranuleCumulusId;
 /**
  * Returns a list of executionArns sorted by most recent first, for an input
  * Granule Cumulus ID.
@@ -81,7 +55,6 @@ exports.executionArnsFromGranuleIdsAndWorkflowNames = executionArnsFromGranuleId
  *
  * @param {string} granuleId -  granuleIds
  * @param {string} workflowName - workflow name
- * @param {Knex} testKnex - knex for testing
  * @returns {Promise<string>} - most recent exectutionArn for input parameters.
  * @throws {RecordNotFound}
  */

package/dist/lib/granule.d.ts

@@ -1,10 +1,8 @@
 import { Knex } from 'knex';
+import { PostgresGranule } from '../types/granule';
 import { CollectionPgModel } from '../models/collection';
 import { GranulePgModel } from '../models/granule';
 import { GranulesExecutionsPgModel } from '../models/granules-executions';
-import { PostgresGranule, PostgresGranuleRecord } from '../types/granule';
-import { UpdatedAtRange } from '../types/record';
-export declare const getGranuleCollectionId: (knexOrTransaction: Knex | Knex.Transaction, granule: PostgresGranule) => Promise<string>;
 /**
  * Upsert a granule and a record in the granules/executions join table.
  *
@@ -14,9 +12,9 @@ export declare const getGranuleCollectionId: (knexOrTransaction: Knex | Knex.Tra
  * @param {Object} [granulePgModel] - Granule PG model class instance
  * @param {Object} [granulesExecutionsPgModel]
  *   Granules/executions PG model class instance
- * @returns {Promise<PostgresGranuleRecord[]>}
+ * @returns {Promise<number[]>}
  */
-export declare const upsertGranuleWithExecutionJoinRecord: (knexTransaction: Knex.Transaction, granule: PostgresGranule, executionCumulusId?: number | undefined, granulePgModel?: GranulePgModel, granulesExecutionsPgModel?: GranulesExecutionsPgModel) => Promise<PostgresGranuleRecord[]>;
+export declare const upsertGranuleWithExecutionJoinRecord: (knexTransaction: Knex.Transaction, granule: PostgresGranule, executionCumulusId?: number, granulePgModel?: GranulePgModel, granulesExecutionsPgModel?: GranulesExecutionsPgModel) => Promise<number[]>;
 /**
  * Get cumulus IDs for list of granules
  *
@@ -31,16 +29,6 @@ export declare const getApiGranuleCumulusIds: (knexOrTransaction: Knex | Knex.Tr
     collectionId: string;
     granuleId: string;
 }>, collectionPgModel?: CollectionPgModel, granulePgModel?: GranulePgModel) => Promise<number[]>;
-/**
- * Get one Granule for a granule_id. If more than one or none are found, throw an error
- *
- * @param {Knex | Knex.Transaction} knexOrTransaction -
- *  DB client or transaction
- * @param {string} granuleId - a Granule ID
- * @param {GranulePgModel} granulePgModel - Granule PG model class instance
- * @returns {Promise<PostgresGranuleRecord>}
- */
-export declare const getUniqueGranuleByGranuleId: (knexOrTransaction: Knex | Knex.Transaction, granuleId: string, granulePgModel?: GranulePgModel) => Promise<PostgresGranuleRecord>;
 /**
  * Get cumulus IDs for all executions associated to a set of granules
  *
@@ -57,24 +45,4 @@ export declare const getApiGranuleExecutionCumulusIds: (knexOrTransaction: Knex
     collectionId: string;
     granuleId: string;
 }>, collectionPgModel?: CollectionPgModel, granulePgModel?: GranulePgModel, granulesExecutionsPgModel?: GranulesExecutionsPgModel) => Promise<Array<number>>;
-/**
- * Helper to build a query to search granules by various API granule record properties.
- *
- * @param {Knex} knex - DB client
- * @param {Object} searchParams
- * @param {string | Array<string>} [searchParams.collectionIds] - Collection ID
- * @param {string | Array<string>} [searchParams.granuleIds] - array of granule IDs
- * @param {string} [searchParams.providerName] - Provider name
- * @param {UpdatedAtRange} [searchParams.updatedAtRange] - Date range for updated_at column
- * @param {string} [searchParams.status] - Granule status to search by
- * @param {string | Array<string>} [sortByFields] - Field(s) to sort by
- * @returns {Knex.QueryBuilder}
- */
-export declare const getGranulesByApiPropertiesQuery: (knex: Knex, { collectionIds, granuleIds, providerNames, updatedAtRange, status, }: {
-    collectionIds?: string | string[] | undefined;
-    granuleIds?: string | string[] | undefined;
-    providerNames?: string[] | undefined;
-    updatedAtRange?: UpdatedAtRange | undefined;
-    status?: string | undefined;
-}, sortByFields?: string | string[] | undefined) => Knex.QueryBuilder;
 //# sourceMappingURL=granule.d.ts.map