@felloh-org/lambda-wrapper 1.0.26 → 1.0.29

package/.concourse/pipeline.yml

@@ -0,0 +1,129 @@
+# --------------------------------------------------------------------------------------------------
+# Resource Types
+# --------------------------------------------------------------------------------------------------
+resource_types:
+
+  - name: pull-request
+    type: docker-image
+    source:
+      repository: teliaoss/github-pr-resource
+
+  - name: slack-notification
+    type: docker-image
+    source:
+      repository: mockersf/concourse-slack-notifier
+      tag: latest
+
+# --------------------------------------------------------------------------------------------------
+# Resources
+# --------------------------------------------------------------------------------------------------
+resources:
+
+  - name: concourse-scripts
+    type: git
+    source:
+      uri: git@github.com:felloh-org/concourse-scripts.git
+      branch: main
+      depth: 0
+      private_key: ((git.private_key))
+
+  - name: lambda-wrapper
+    type: git
+    source:
+      uri: git@github.com:felloh-org/lambda-wrapper.git
+      branch: main
+      depth: 0
+      private_key: ((git.private_key))
+
+  - name: slack-alert-deploy
+    type: slack-notification
+    source:
+      url: ((slack.channels.engineering-deployments))
+
+# --------------------------------------------------------------------------------------------------
+# Jobs
+# --------------------------------------------------------------------------------------------------
+jobs:
+  - name: 'migrations.staging'
+    serial: true
+    plan:
+      - in_parallel:
+          - get: lambda-wrapper
+            trigger: true
+          - get: concourse-scripts
+      - task: 'schema.create'
+        file: concourse-scripts/scripts/pulumi_npm_run/npm_run.yml
+        input_mapping:
+          repository: lambda-wrapper
+        params:
+          NPM_COMMAND: 'orm:schema:create'
+          AWS_ACCESS_KEY_ID: ((aws.keys.access))
+          AWS_SECRET_ACCESS_KEY: ((aws.keys.secret))
+          AWS_REGION: ((aws.region.primary))
+          WAREHOUSE_ARN: ((aws.rds.warehouse_arn.staging))
+          WAREHOUSE_SECRET_ARN: ((aws.secret_manager.warehouse_secret_arn.staging))
+          WAREHOUSE_DATABASE: 'felloh'
+          WAREHOUSE_SCHEMA: 'user'
+      - task: 'migrations.run'
+        file: concourse-scripts/scripts/pulumi_npm_run/npm_run.yml
+        input_mapping:
+          repository: lambda-wrapper
+        params:
+          NPM_COMMAND: 'orm:migration:run'
+          AWS_ACCESS_KEY_ID: ((aws.keys.access))
+          AWS_SECRET_ACCESS_KEY: ((aws.keys.secret))
+          AWS_REGION: ((aws.region.primary))
+          WAREHOUSE_ARN: ((aws.rds.warehouse_arn.staging))
+          WAREHOUSE_SECRET_ARN: ((aws.secret_manager.warehouse_secret_arn.staging))
+          WAREHOUSE_DATABASE: 'felloh'
+          WAREHOUSE_SCHEMA: 'user'
+    on_failure:
+      put: slack-alert-deploy
+      params:
+        alert_type: 'failed'
+        message: Staging deployment failed
+
+  - name: 'migrations.production'
+    serial: true
+    plan:
+      - in_parallel:
+          - get: lambda-wrapper
+            passed: ['migrations.staging']
+            trigger: true
+          - get: concourse-scripts
+      - task: 'schema.create'
+        file: concourse-scripts/scripts/pulumi_npm_run/npm_run.yml
+        input_mapping:
+          repository: lambda-wrapper
+        params:
+          NPM_COMMAND: 'orm:schema:create'
+          AWS_ACCESS_KEY_ID: ((aws.keys.access))
+          AWS_SECRET_ACCESS_KEY: ((aws.keys.secret))
+          AWS_REGION: ((aws.region.primary))
+          WAREHOUSE_ARN: ((aws.rds.warehouse_arn.production))
+          WAREHOUSE_SECRET_ARN: ((aws.secret_manager.warehouse_secret_arn.production))
+          WAREHOUSE_DATABASE: 'felloh'
+          WAREHOUSE_SCHEMA: 'user'
+      - task: 'migrations.run'
+        file: concourse-scripts/scripts/pulumi_npm_run/npm_run.yml
+        input_mapping:
+          repository: lambda-wrapper
+        params:
+          NPM_COMMAND: 'orm:migration:run'
+          AWS_ACCESS_KEY_ID: ((aws.keys.access))
+          AWS_SECRET_ACCESS_KEY: ((aws.keys.secret))
+          AWS_REGION: ((aws.region.primary))
+          WAREHOUSE_ARN: ((aws.rds.warehouse_arn.production))
+          WAREHOUSE_SECRET_ARN: ((aws.secret_manager.warehouse_secret_arn.production))
+          WAREHOUSE_DATABASE: 'felloh'
+          WAREHOUSE_SCHEMA: 'user'
+    on_success:
+      put: slack-alert-deploy
+      params:
+        alert_type: 'success'
+        message: Migrations deployment succeeded
+    on_failure:
+      put: slack-alert-deploy
+      params:
+        alert_type: 'failed'
+        message: Migrations deployment failed

package/.gitattributes

@@ -0,0 +1 @@
+.concourse/private.yml filter=git-crypt diff=git-crypt

package/dist/entity/trust-payments/chargeback/index.js

@@ -39,7 +39,8 @@ let Chargeback = (_dec = (0, _typeorm.Entity)({
 }), _dec8 = (0, _typeorm.Column)({
   type: "int"
 }), _dec9 = (0, _typeorm.Column)({
-  type: "date"
+  type: "date",
+  nullable: true
 }), _dec10 = (0, _typeorm.Column)({
   type: "date"
 }), _dec11 = (0, _typeorm.Column)({

package/dist/entity/trust-payments/index.js

@@ -13,8 +13,10 @@ var _transaction = _interopRequireDefault(require("./transaction"));
 
 var _chargeback = _interopRequireDefault(require("./chargeback"));
 
+var _ingestedData = _interopRequireDefault(require("./ingested-data"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const ENTITIES = [_batch.default, _merchant.default, _transaction.default, _chargeback.default];
+const ENTITIES = [_batch.default, _merchant.default, _transaction.default, _chargeback.default, _ingestedData.default];
 var _default = ENTITIES;
 exports.default = _default;

package/dist/entity/trust-payments/ingested-data/index.js

@@ -0,0 +1,57 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _typeorm = require("typeorm");
+
+var _batch = _interopRequireDefault(require("../batch"));
+
+var _merchant = _interopRequireDefault(require("../merchant"));
+
+var _dec, _dec2, _dec3, _dec4, _class, _class2, _descriptor, _descriptor2, _descriptor3;
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _initializerDefineProperty(target, property, descriptor, context) { if (!descriptor) return; Object.defineProperty(target, property, { enumerable: descriptor.enumerable, configurable: descriptor.configurable, writable: descriptor.writable, value: descriptor.initializer ? descriptor.initializer.call(context) : void 0 }); }
+
+function _applyDecoratedDescriptor(target, property, decorators, descriptor, context) { var desc = {}; Object.keys(descriptor).forEach(function (key) { desc[key] = descriptor[key]; }); desc.enumerable = !!desc.enumerable; desc.configurable = !!desc.configurable; if ('value' in desc || desc.initializer) { desc.writable = true; } desc = decorators.slice().reverse().reduce(function (desc, decorator) { return decorator(target, property, desc) || desc; }, desc); if (context && desc.initializer !== void 0) { desc.value = desc.initializer ? desc.initializer.call(context) : void 0; desc.initializer = undefined; } if (desc.initializer === void 0) { Object.defineProperty(target, property, desc); desc = null; } return desc; }
+
+function _initializerWarningHelper(descriptor, context) { throw new Error('Decorating class property failed. Please ensure that ' + 'proposal-class-properties is enabled and runs after the decorators transform.'); }
+
+let Transaction = (_dec = (0, _typeorm.Entity)({
+  name: 'ingested_data',
+  schema: 'trust_payments'
+}), _dec2 = (0, _typeorm.PrimaryColumn)("varchar"), _dec3 = (0, _typeorm.Column)({
+  type: "varchar",
+  length: 10
+}), _dec4 = (0, _typeorm.CreateDateColumn)(), _dec(_class = (_class2 = class Transaction {
+  constructor() {
+    _initializerDefineProperty(this, "id", _descriptor, this);
+
+    _initializerDefineProperty(this, "type", _descriptor2, this);
+
+    _initializerDefineProperty(this, "created_at", _descriptor3, this);
+  }
+
+}, (_descriptor = _applyDecoratedDescriptor(_class2.prototype, "id", [_dec2], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: function () {
+    return undefined;
+  }
+}), _descriptor2 = _applyDecoratedDescriptor(_class2.prototype, "type", [_dec3], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor3 = _applyDecoratedDescriptor(_class2.prototype, "created_at", [_dec4], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+})), _class2)) || _class);
+exports.default = Transaction;

package/dist/index.js

@@ -225,6 +225,12 @@ Object.defineProperty(exports, "TPChargebackEntity", {
     return _chargeback.default;
   }
 });
+Object.defineProperty(exports, "TPIngestedData", {
+  enumerable: true,
+  get: function () {
+    return _ingestedData.default;
+  }
+});
 Object.defineProperty(exports, "TPMerchantEntity", {
   enumerable: true,
   get: function () {
@@ -408,6 +414,8 @@ var _transaction4 = _interopRequireDefault(require("./entity/trust-payments/tran
 
 var _chargeback = _interopRequireDefault(require("./entity/trust-payments/chargeback"));
 
+var _ingestedData = _interopRequireDefault(require("./entity/trust-payments/ingested-data"));
+
 var _organisation = _interopRequireDefault(require("./entity/user/organisation"));
 
 var _role = _interopRequireDefault(require("./entity/user/role"));

package/dist/migration/trust-payments/1648137333608-trust_chargeback_due.js

@@ -0,0 +1,13 @@
+const { MigrationInterface, QueryRunner } = require("typeorm");
+
+module.exports = class trustChargebackDue1648137333608 {
+    name = 'trustChargebackDue1648137333608'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "trust_payments"."chargeback" ALTER COLUMN "due_date" DROP NOT NULL`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "trust_payments"."chargeback" ALTER COLUMN "due_date" SET NOT NULL`);
+    }
+}

package/dist/migration/trust-payments/1648204597084-trust_ftp_log.js

@@ -0,0 +1,13 @@
+const { MigrationInterface, QueryRunner } = require("typeorm");
+
+module.exports = class trustFtpLog1648204597084 {
+    name = 'trustFtpLog1648204597084'
+
+    async up(queryRunner) {
+        await queryRunner.query(`CREATE TABLE "trust_payments"."ingested_data" ("id" character varying NOT NULL, "type" character varying(10) NOT NULL, "created_at" TIMESTAMP NOT NULL DEFAULT now(), CONSTRAINT "PK_95ecbf759d16d46c0d1b08fb7e0" PRIMARY KEY ("id"))`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`DROP TABLE "trust_payments"."ingested_data"`);
+    }
+}

package/dist/service/warehouse.js

@@ -26,13 +26,15 @@ class Warehouse extends _dependencyAware.default {
     this.connection = null;
   }
   /**
-   *
-   * @returns {Promise<Connection>}
+   * Connect to the warehouse
+   * @param database
+   * @param cache
+   * @returns {Promise<null>}
    */
 
 
-  async connect() {
-    if (this.connection) {
+  async connect(database = null, cache = true) {
+    if (this.connection && cache === true) {
       return this.connection;
     }
 
@@ -41,7 +43,7 @@ class Warehouse extends _dependencyAware.default {
     } catch (error) {
       this.connection = await (0, _typeorm.createConnection)({
         type: 'aurora-data-api-pg',
-        database: process.env.WAREHOUSE_DATABASE,
+        database: database !== null ? database : process.env.WAREHOUSE_DATABASE,
         schema: process.env.WAREHOUSE_SCHEMA,
         secretArn: process.env.WAREHOUSE_SECRET_ARN,
         resourceArn: process.env.WAREHOUSE_ARN,

package/package.json

@@ -1,11 +1,14 @@
 {
   "name": "@felloh-org/lambda-wrapper",
-  "version": "1.0.26",
+  "version": "1.0.29",
   "description": "Lambda wrapper for all Felloh Serverless Projects",
   "main": "dist/index.js",
   "scripts": {
     "build": "./node_modules/.bin/babel src --out-dir dist --copy-files --ignore src/migration",
     "build:orm": "./node_modules/.bin/babel src --out-dir dist --copy-files --ignore src/migration",
+    "concourse:deploy": "fly -t felloh-cicd set-pipeline -p lambda-wrapper -c .concourse/pipeline.yml -l .concourse/private.yml",
+    "concourse:login": "fly --target felloh-cicd login --insecure --concourse-url https://ci.services.felloh.org --team-name libraries",
+    "concourse:sync": "sudo fly -t ci sync",
     "lint": "./node_modules/.bin/eslint ./src",
     "orm:migration:generate": "rm -rf dist && yarn build:orm && ./node_modules/.bin/typeorm migration:generate -o -n",
     "orm:migration:run": "rm -rf dist && yarn build:orm && ./node_modules/.bin/typeorm migration:run",
@@ -34,7 +37,6 @@
     "babel-jest": "^26.3.3",
     "babel-plugin-module-resolver": "^4.1.0",
     "babel-plugin-transform-class-properties": "^6.24.1",
-    "dotenv": "^11.0.0",
     "eslint": "^8.6.0",
     "eslint-plugin-flowtype": "^8.0.3",
     "eslint-plugin-import": "^2.25.3",
@@ -52,6 +54,7 @@
     "alai": "1.0.3",
     "async": "^3.2.0",
     "axios": "^0.21.1",
+    "dotenv": "^11.0.0",
     "epsagon": "^1.104.2",
     "typeorm": "^0.2.41",
     "typeorm-aurora-data-api-driver": "^2.3.5",