fintalk-pkg 2.8.2 → 3.0.1

package/index.js

@@ -1,16 +1,37 @@
-module.exports = {
-    
-    //EXTERNALS
-    Dynamoose: require("dynamoose"),
+const dynamoose = require("dynamoose");
+const { DynamoDB } = require('@aws-sdk/client-dynamodb');
+const { DynamoDBDocument } = require('@aws-sdk/lib-dynamodb');
+
+const marshallOptions = {
+    removeUndefinedValues: true,
+    convertClassInstanceToMap: true
+};
+const dynamodb = DynamoDBDocument.from(new DynamoDB(), { marshallOptions });
+dynamoose.aws.ddb.set(dynamodb);
 
-    //SCHEMAS
-    CustomerSchema : require("./model/Customer"),
-    TransactionSchema : require("./model/Transaction"),
-    AuxSchema: require("./model/AuxStructure"),
+const { marshall, unmarshall } = require('@aws-sdk/util-dynamodb');
+dynamoose.aws.converter = () => ({
+    marshall: (obj) => marshall(obj, marshallOptions),
+    unmarshall: (obj) => unmarshall(obj),
+    convertToAttr: (obj) => marshall(obj, marshallOptions),
+    convertToNative: (obj) => unmarshall(obj)
+});
 
-    BaseController : require("./base/BaseController"),
-    FlowControl : require("./base/FlowControl"),
-    Logger : require("./base/Logger")
+const CustomerSchema = require("./model/Customer");
+const TransactionSchema = require("./model/Transaction");
+const AuxSchema = require("./model/AuxStructure");
+const BaseController = require("./base/BaseController");
+const FlowControl = require("./base/FlowControl");
+const Logger = require("./base/Logger");
+
+module.exports = {
+    Dynamoose: dynamoose,
+    CustomerSchema,
+    TransactionSchema,
+    AuxSchema,
+    BaseController,
+    FlowControl,
+    Logger,
 };
 
 console.info("Lib Exported!");

package/model/AudioCache.js

@@ -1,5 +1,15 @@
 const dynamoose = require("dynamoose");
-dynamoose.model.defaults.set({ create: false, waitForActive: false });
+const { DynamoDB } = require('@aws-sdk/client-dynamodb');
+const { DynamoDBDocument } = require('@aws-sdk/lib-dynamodb');
+
+const marshallOptions = {
+    removeUndefinedValues: true,
+    convertClassInstanceToMap: true
+};
+const translateConfig = { marshallOptions };
+const dynamodb = DynamoDBDocument.from(new DynamoDB(), translateConfig);
+dynamoose.aws.ddb.set(dynamodb);
+
 var Schema = dynamoose.Schema;
 
 var AudioCacheSchema = new Schema({
@@ -9,4 +19,4 @@ var AudioCacheSchema = new Schema({
     timestamps: true
 });
 
-module.exports = dynamoose.model("fintalk-orchestrator-audio-cache", AudioCacheSchema, {"expires": {"ttl": (72 * (60 * 60)), "attribute": "ttl" }});
+module.exports = dynamoose.model("fintalk-orchestrator-audio-cache", AudioCacheSchema, { create: false, waitForActive: false, "expires": {"ttl": (72 * (60 * 60)), "attribute": "ttl" }});

package/model/AuxStructure.js

@@ -1,6 +1,15 @@
 const dynamoose = require("dynamoose");
+const { DynamoDB } = require('@aws-sdk/client-dynamodb');
+const { DynamoDBDocument } = require('@aws-sdk/lib-dynamodb');
+
+const marshallOptions = {
+    removeUndefinedValues: true,
+    convertClassInstanceToMap: true
+};
+const translateConfig = { marshallOptions };
+const dynamodb = DynamoDBDocument.from(new DynamoDB(), translateConfig);
+dynamoose.aws.ddb.set(dynamodb);
 
-dynamoose.model.defaults.set({ create: false, waitForActive: false });
 const Schema = dynamoose.Schema;
 
 const AuxStructureSchema = new Schema(
@@ -20,4 +29,4 @@ const AuxStructureSchema = new Schema(
 },
 );
 
-module.exports = dynamoose.model("fintalk-orchestrator-aux-structure", AuxStructureSchema);
+module.exports = dynamoose.model("fintalk-orchestrator-aux-structure", AuxStructureSchema, { create: false, waitForActive: false });

package/model/Conversation.js

@@ -1,5 +1,15 @@
 const dynamoose = require("dynamoose");
-dynamoose.model.defaults.set({ create: false, waitForActive: false });
+const { DynamoDB } = require('@aws-sdk/client-dynamodb');
+const { DynamoDBDocument } = require('@aws-sdk/lib-dynamodb');
+
+const marshallOptions = {
+    removeUndefinedValues: true,
+    convertClassInstanceToMap: true
+};
+const translateConfig = { marshallOptions };
+const dynamodb = DynamoDBDocument.from(new DynamoDB(), translateConfig);
+dynamoose.aws.ddb.set(dynamodb);
+
 var Schema = dynamoose.Schema;
 
 var ConversationSchema = new Schema({
@@ -33,4 +43,4 @@ var ConversationSchema = new Schema({
     timestamps: true
 });
 
-module.exports = dynamoose.model("fintalk-orchestrator-conversations", ConversationSchema, {"expires": {"ttl": 2592000000, "attribute": "expires" }});
+module.exports = dynamoose.model("fintalk-orchestrator-conversations", ConversationSchema, { create: false, waitForActive: false, "expires": {"ttl": 2592000000, "attribute": "expires" }});

package/model/Customer.js

@@ -1,6 +1,14 @@
 const dynamoose = require("dynamoose");
+const { DynamoDB } = require('@aws-sdk/client-dynamodb');
+const { DynamoDBDocument } = require('@aws-sdk/lib-dynamodb');
 
-dynamoose.model.defaults.set({ create: false, waitForActive: false });
+const marshallOptions = {
+    removeUndefinedValues: true,
+    convertClassInstanceToMap: true
+};
+const translateConfig = { marshallOptions };
+const dynamodb = DynamoDBDocument.from(new DynamoDB(), translateConfig);
+dynamoose.aws.ddb.set(dynamodb);
 
 var Schema = dynamoose.Schema;
 
@@ -138,7 +146,7 @@ var CustomerSchema = new Schema({
 }, 
 {
     timestamps: true,
-    saveUnknown: ['postbackHeaders.**']
+    saveUnknown: ["postbackHeaders.**"]
 });
 
 /*    creditCards:  [{ type: mongoose.Schema.Types.ObjectId, ref: "CreditCard" }],*/

package/model/Transaction.js

@@ -1,5 +1,15 @@
 const dynamoose = require("dynamoose");
-dynamoose.model.defaults.set({ create: false, waitForActive: false });
+const { DynamoDB } = require('@aws-sdk/client-dynamodb');
+const { DynamoDBDocument } = require('@aws-sdk/lib-dynamodb');
+
+const marshallOptions = {
+    removeUndefinedValues: true,
+    convertClassInstanceToMap: true
+};
+const translateConfig = { marshallOptions };
+const dynamodb = DynamoDBDocument.from(new DynamoDB(), translateConfig);
+dynamoose.aws.ddb.set(dynamodb);
+
 var Schema = dynamoose.Schema;
 
 const TransactionStatus = {
@@ -41,6 +51,6 @@ var TransactionSchema = new Schema({
     saveUnknown: true
 });
 
-const Transaction = dynamoose.model(`payment-get-data-${process.env.STAGE}-transaction`, TransactionSchema, {"expires": {"ttl": 3600000 }});
+const Transaction = dynamoose.model(`payment-get-data-${process.env.STAGE}-transaction`, TransactionSchema, { create: false, waitForActive: false, "expires": {"ttl": 3600000 }});
 
 module.exports = { Transaction, TransactionStatus };

package/model/Vars.js

@@ -1,5 +1,15 @@
 const dynamoose = require("dynamoose");
-dynamoose.model.defaults.set({ create: false, waitForActive: false });
+const { DynamoDB } = require('@aws-sdk/client-dynamodb');
+const { DynamoDBDocument } = require('@aws-sdk/lib-dynamodb');
+
+const marshallOptions = {
+    removeUndefinedValues: true,
+    convertClassInstanceToMap: true
+};
+const translateConfig = { marshallOptions };
+const dynamodb = DynamoDBDocument.from(new DynamoDB(), translateConfig);
+dynamoose.aws.ddb.set(dynamodb);
+
 var Schema = dynamoose.Schema;
 
 var VarsSchema = new Schema({
@@ -9,4 +19,4 @@ var VarsSchema = new Schema({
     timestamps: false
 });
 
-module.exports = dynamoose.model(`fintalk-orchestrator-${process.env.BOT}-vars`, VarsSchema);
+module.exports = dynamoose.model(`fintalk-orchestrator-${process.env.BOT}-vars`, VarsSchema, { create: false, waitForActive: false });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fintalk-pkg",
-  "version": "2.8.2",
+  "version": "3.0.1",
   "description": "Common code between projects",
   "main": "index.js",
   "scripts": {
@@ -24,7 +24,7 @@
     "uuid": "^8.0.0"
   },
   "dependencies": {
-    "dynamoose": "~2.8.8",
+    "dynamoose": "~4.0.4",
     "fintalk-logger": "~1.1.3"
   }
 }

package/.github/workflows/sonarqube.yml

@@ -1,33 +0,0 @@
-name: Sonarqube Checks
-
-on:
-  push:
-    branches:
-      - '*'
-  pull_request:
-    types: [opened, synchronize, reopened]
-
-jobs:
-  build:
-    name: Build
-    runs-on: self-hosted
-    permissions: read-all
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-      - uses: sonarsource/sonarqube-scan-action@master
-        with:
-          args: >
-            -Dsonar.projectKey=fintalk-ai_${{ github.event.repository.name }}
-        env:
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-          SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }}
-      # If you wish to fail your job when the Quality Gate is red, uncomment the
-      # following lines. This would typically be used to fail a deployment.
-      # We do not recommend to use this in a pull request. Prefer using pull request
-      # decoration instead.
-      # - uses: sonarsource/sonarqube-quality-gate-action@master
-      #   timeout-minutes: 5
-      #   env:
-      #     SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}