@itleanchatbot/shared-models-js-postgres 2.8.12 → 2.8.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itleanchatbot/shared-models-js-postgres",
-  "version": "2.8.12",
+  "version": "2.8.14",
   "description": "Shared Models JS Postgres",
   "main": "index.js",
   "license": "ISC",

package/src/migrations/20211119123119-CreateApiPreRequest.js

@@ -1,66 +1,66 @@
-'use strict';
-
-module.exports = {
-  up: async (queryInterface, Sequelize) => {
-    await queryInterface.createTable('ApiPreRequests', {
-      id: {
-        allowNull: false,
-        defaultValue: Sequelize.literal('uuid_generate_v4()'),
-        primaryKey: true,
-        type: Sequelize.UUID,
-      },
-      ApiId: {
-        allowNull: true,
-        defaultValue: null,
-        type: Sequelize.UUID,
-        references: {
-          model: 'Apis',
-          key: 'id',
-        },
-        onDelete: 'SET NULL',
-        onUpdate: 'CASCADE',
-      },
-      ApiResourceId: {
-        allowNull: true,
-        defaultValue: null,
-        type: Sequelize.UUID,
-        references: {
-          model: 'ApiResources',
-          key: 'id',
-        },
-        onDelete: 'SET NULL',
-        onUpdate: 'CASCADE',
-      },
-      PreApiResourceId: {
-        allowNull: false,
-        type: Sequelize.UUID,
-        references: {
-          model: 'ApiResources',
-          key: 'id',
-        },
-        onDelete: 'SET NULL',
-        onUpdate: 'CASCADE',
-      },
-      result: {
-        allowNull: false,
-        type: Sequelize.STRING,
-      },
-      delayForNewRequest: {
-        allowNull: false,
-        type: Sequelize.STRING,
-      },
-      createdAt: {
-        allowNull: false,
-        type: Sequelize.DATE,
-      },
-      updatedAt: {
-        allowNull: false,
-        type: Sequelize.DATE,
-      },
-    })
-  },
-
-  down: async (queryInterface) => {
-    await queryInterface.dropTable('ApiPreRequests')
-  }
-};
+'use strict';
+
+module.exports = {
+  up: async (queryInterface, Sequelize) => {
+    await queryInterface.createTable('ApiPreRequests', {
+      id: {
+        allowNull: false,
+        defaultValue: Sequelize.literal('uuid_generate_v4()'),
+        primaryKey: true,
+        type: Sequelize.UUID,
+      },
+      ApiId: {
+        allowNull: true,
+        defaultValue: null,
+        type: Sequelize.UUID,
+        references: {
+          model: 'Apis',
+          key: 'id',
+        },
+        onDelete: 'SET NULL',
+        onUpdate: 'CASCADE',
+      },
+      ApiResourceId: {
+        allowNull: true,
+        defaultValue: null,
+        type: Sequelize.UUID,
+        references: {
+          model: 'ApiResources',
+          key: 'id',
+        },
+        onDelete: 'SET NULL',
+        onUpdate: 'CASCADE',
+      },
+      PreApiResourceId: {
+        allowNull: false,
+        type: Sequelize.UUID,
+        references: {
+          model: 'ApiResources',
+          key: 'id',
+        },
+        onDelete: 'SET NULL',
+        onUpdate: 'CASCADE',
+      },
+      result: {
+        allowNull: false,
+        type: Sequelize.STRING,
+      },
+      delayForNewRequest: {
+        allowNull: false,
+        type: Sequelize.STRING,
+      },
+      createdAt: {
+        allowNull: false,
+        type: Sequelize.DATE,
+      },
+      updatedAt: {
+        allowNull: false,
+        type: Sequelize.DATE,
+      },
+    })
+  },
+
+  down: async (queryInterface) => {
+    await queryInterface.dropTable('ApiPreRequests')
+  }
+};

package/src/migrations/20220118131507-alter-table-SystemUsers-isActive.js

@@ -1,20 +1,20 @@
-'use strict';
-
-module.exports = {
-  up: async (queryInterface, Sequelize) => {
-    await queryInterface.addColumn('SystemUsers', 'isActive', {
-        type: Sequelize.BOOLEAN,
-        defaultValue: true,
-        allowNull: false
-    })
-    await queryInterface.addColumn('SystemUsers', 'disabledAt', {
-      type: Sequelize.DATE,
-      allowNull: true
-    })
-  },
-
-  down: async (queryInterface) => {
-    await queryInterface.removeColumn('SystemUsers', 'isActive')
-    await queryInterface.removeColumn('SystemUsers', 'disabledAt')
-  }
-};
+'use strict';
+
+module.exports = {
+  up: async (queryInterface, Sequelize) => {
+    await queryInterface.addColumn('SystemUsers', 'isActive', {
+        type: Sequelize.BOOLEAN,
+        defaultValue: true,
+        allowNull: false
+    })
+    await queryInterface.addColumn('SystemUsers', 'disabledAt', {
+      type: Sequelize.DATE,
+      allowNull: true
+    })
+  },
+
+  down: async (queryInterface) => {
+    await queryInterface.removeColumn('SystemUsers', 'isActive')
+    await queryInterface.removeColumn('SystemUsers', 'disabledAt')
+  }
+};

package/src/migrations/20220121145703-alter-table-botiterable.js

@@ -1,28 +1,28 @@
-'use strict';
-
-const datesColumns = [
-  'processedAt', 'enqueuedAt', 'failedAt', 'readAt', 'sentAt', 'deliveredAt'
-]
-module.exports = {
-  async up (queryInterface, Sequelize) {
-
-    await queryInterface.addColumn('BotIterables', 'brokerMessageStatus', {
-      type: Sequelize.STRING(100),
-      allowNull: true
-  })
-
-    for (const columnName of datesColumns) {
-      await queryInterface.addColumn('BotIterables', columnName, {
-        type: Sequelize.DATE,
-        allowNull: true
-      })
-    }
-  },
-
-  async down (queryInterface) {
-    await queryInterface.removeColumn('BotIterables', 'brokerStatus')
-    for(const columnName of datesColumns) {
-      await queryInterface.removeColumn('BotIterables', columnName)
-    }
-  }
-};
+'use strict';
+
+const datesColumns = [
+  'processedAt', 'enqueuedAt', 'failedAt', 'readAt', 'sentAt', 'deliveredAt'
+]
+module.exports = {
+  async up (queryInterface, Sequelize) {
+
+    await queryInterface.addColumn('BotIterables', 'brokerMessageStatus', {
+      type: Sequelize.STRING(100),
+      allowNull: true
+  })
+
+    for (const columnName of datesColumns) {
+      await queryInterface.addColumn('BotIterables', columnName, {
+        type: Sequelize.DATE,
+        allowNull: true
+      })
+    }
+  },
+
+  async down (queryInterface) {
+    await queryInterface.removeColumn('BotIterables', 'brokerStatus')
+    for(const columnName of datesColumns) {
+      await queryInterface.removeColumn('BotIterables', columnName)
+    }
+  }
+};

package/src/migrations/20220126141248-alter-table-sessions-session-start.js

@@ -1,14 +1,14 @@
-'use strict';
-
-module.exports = {
-  async up (queryInterface, Sequelize) {
-    await queryInterface.addColumn('Sessions', 'startedSessionAt', {
-      type: Sequelize.DATE,
-      allowNull: true
-    })
-  },
-
-  async down (queryInterface) {
-    await queryInterface.removeColumn('Sessions', 'startedSessionAt')
-  }
-};
+'use strict';
+
+module.exports = {
+  async up (queryInterface, Sequelize) {
+    await queryInterface.addColumn('Sessions', 'startedSessionAt', {
+      type: Sequelize.DATE,
+      allowNull: true
+    })
+  },
+
+  async down (queryInterface) {
+    await queryInterface.removeColumn('Sessions', 'startedSessionAt')
+  }
+};

package/src/migrations/20220215123711-alter-table-conversation-sessions.js

@@ -1,15 +1,15 @@
-'use strict';
-
-module.exports = {
-  up: async (queryInterface, Sequelize) => {
-    await queryInterface.addColumn('ConversationSessions', 'isHsm', {
-      allowNull: false,
-      defaultValue: false,
-      type: Sequelize.BOOLEAN,
-    })
-  },
-
-  down: async (queryInterface) => {
-    await queryInterface.removeColumn('ConversationSessions', 'isHsm')
-  }
-};
+'use strict';
+
+module.exports = {
+  up: async (queryInterface, Sequelize) => {
+    await queryInterface.addColumn('ConversationSessions', 'isHsm', {
+      allowNull: false,
+      defaultValue: false,
+      type: Sequelize.BOOLEAN,
+    })
+  },
+
+  down: async (queryInterface) => {
+    await queryInterface.removeColumn('ConversationSessions', 'isHsm')
+  }
+};

package/src/migrations/20220308145105-alter-table-transhipConversation-mimetype.js

@@ -1,16 +1,16 @@
-'use strict';
-module.exports = {
-  async up (queryInterface, Sequelize) {
-    await queryInterface.changeColumn('TranshipConversations', 'mimetype', {
-      type: Sequelize.STRING(255),
-      allowNull: true,
-    })  
-  },
-
-  async down (queryInterface, Sequelize) {
-    await queryInterface.changeColumn('TranshipConversations', 'mimetype', {
-      type: Sequelize.STRING(50),
-      allowNull: true,
-    })
-  }
-};
+'use strict';
+module.exports = {
+  async up (queryInterface, Sequelize) {
+    await queryInterface.changeColumn('TranshipConversations', 'mimetype', {
+      type: Sequelize.STRING(255),
+      allowNull: true,
+    })  
+  },
+
+  async down (queryInterface, Sequelize) {
+    await queryInterface.changeColumn('TranshipConversations', 'mimetype', {
+      type: Sequelize.STRING(50),
+      allowNull: true,
+    })
+  }
+};

package/src/migrations/20220309145730-create-function.js

@@ -0,0 +1,116 @@
+'use strict'
+
+module.exports = {
+  up: async (queryInterface, Sequelize) => {
+
+    await queryInterface.sequelize.query(
+      `
+      create or replace function _build_sessions_pre_reports(minDate timestamp, maxDate timestamp)
+      returns INT AS $$
+      declare r RECORD;
+      declare "preReportId" UUID;
+      declare counter INT := 0;
+      declare "rSessions" INT;
+      declare "rClosedSessions" INT;
+      declare "rClientMessages" INT;
+      declare "rBotMessages" INT;
+      declare "rTotalSessionTime" BIGINT;
+      BEGIN
+      
+          DELETE FROM "SessionsPreReports" 
+          WHERE "date" BETWEEN cast(minDate as timestamp) AND cast(maxDate as timestamp);
+      
+          FOR r IN (
+              select *
+              from "Sessions"
+                  inner join "Channels"
+                  on "Channels"."id" = "Sessions"."ChannelId"
+                  inner join "Skills"
+                  on "Skills"."id" = "Channels"."SkillId"
+              where "Sessions"."createdAt" between minDate and maxDate
+          ) LOOP
+          
+              "rClientMessages" := (
+                  SELECT COUNT(*)
+                  FROM "BotIterables"
+                  WHERE "SessionId" = r."id"
+                      AND "action" = 'client'
+              );
+                  
+              "rBotMessages" := (
+                  SELECT COUNT(*)
+                  FROM "BotIterables"
+                  WHERE "SessionId" = r."id"
+                      AND "action" = 'bot'
+              );
+              
+              IF (r."status" = 'closed') THEN
+                  "rClosedSessions" := 1;
+                  "rTotalSessionTime" := (extract(epoch from age(r."endOfSession", r."createdAt"))) * 1000;
+              ELSE
+                  "rClosedSessions" := 0;
+                  "rTotalSessionTime" := 0;
+              END IF;
+          
+              "preReportId" := (
+                  SELECT "id"
+                  FROM "SessionsPreReports"
+                  WHERE "date" = cast(r."createdAt" as date)
+                      AND "ChannelId" = r."ChannelId"
+                      AND "SkillId" = r."SkillId"
+              );
+              
+              IF ("preReportId" IS NULL) THEN
+                      
+                      INSERT INTO "SessionsPreReports" (
+                          "date", 
+                          "ChannelId", 
+                          "SkillId", 
+                          "sessions", 
+                          "closedSessions", 
+                          "clientMessages", 
+                          "botMessages",
+                          "totalSessionTime",
+                          "createdAt",
+                          "updatedAt"
+                      ) VALUES (
+                          cast(r."createdAt" as date),
+                          r."ChannelId",
+                          r."SkillId",
+                          1,
+                          "rClosedSessions",
+                          "rClientMessages",
+                          "rBotMessages",
+                          "rTotalSessionTime",
+                          current_timestamp,
+                          current_timestamp
+                      ) RETURNING "id" INTO "preReportId";
+              
+              ELSE
+                  
+                  UPDATE "SessionsPreReports"
+                  SET "sessions" = "sessions" + 1,
+                      "closedSessions" = "closedSessions" + "rClosedSessions",
+                      "clientMessages" = "clientMessages" + "rClientMessages",
+                      "botMessages" = "botMessages" + "rBotMessages",
+                      "totalSessionTime" = "totalSessionTime" + "rTotalSessionTime"
+                  WHERE "id" = "preReportId";
+                  
+              END IF;
+              
+              UPDATE "Sessions" SET "SessionsPreReportId" = "preReportId" WHERE "id" = r."id";
+              
+              counter := counter + 1;
+              
+          END LOOP;
+          RETURN counter;
+      END;
+      $$ LANGUAGE plpgsql;
+        `
+    )
+  },
+
+  down: async (queryInterface, Sequelize) => {
+    await queryInterface.sequelize.query('DROP FUNCTION _build_sessions_pre_reports(minDate timestamp, maxDate timestamp)')
+  },
+}

package/src/migrations/20220310125603-alter-table-conversationSessions-SkillId.js

@@ -0,0 +1,20 @@
+'use strict';
+
+module.exports = {
+  async up (queryInterface, Sequelize) {
+    await queryInterface.addColumn('ConversationSessions', 'SkillId', {
+      allowNull: true,
+      type: Sequelize.UUID,
+      references: {
+        model: 'Skills',
+        key: 'id',
+      },
+      onDelete: 'SET NULL',
+      onUpdate: 'CASCADE',
+    })
+  },
+
+  async down (queryInterface) {
+    await queryInterface.removeColumn('ConversationSessions', 'SkillId')
+  }
+};

package/src/models/conversationSessions.js

@@ -29,6 +29,15 @@ exports.model = (sequelize, DataType) => {
       onDelete: 'RESTRICT',
       onUpdate: 'CASCADE',
     },
+    SkillId: {
+      type: DataType.UUID,
+      references: {
+        model: 'Skill',
+        key: 'id',
+      },
+      allowNull: true,
+      onDelete: 'SET NULL',
+    },
     isHsm: {
       allowNull: false,
       defaultValue: false,
@@ -39,6 +48,7 @@ exports.model = (sequelize, DataType) => {
   ConversationSessions.associate = (models) => {
     ConversationSessions.belongsTo(models.Sessions, { onDelete: 'SET NULL' })
     ConversationSessions.belongsTo(models.Client, { onDelete: 'SET NULL' })
+    ConversationSessions.belongsTo(models.Skill, { onDelete: 'SET NULL' })
     ConversationSessions.belongsTo(models.ChannelTypes)
   }
 

package/src/models/faqQuestions.js

@@ -1,31 +1,31 @@
-exports.model = (sequelize, Sequelize) => {
-  const OpenFAQs = sequelize.define('FaqQuestions', {
-    name: {
-      type: Sequelize.STRING(255),
-      allowNull: false,
-      validate: {
-        notEmpty: true,
-      },
-    },
-    OpenFAQId: {
-      type: Sequelize.UUID,
-      allowNull: false,
-      references: {
-        model: 'OpenFAQs',
-        key: 'id',
-      },
-      onDelete: 'CASCADE',
-      onUpdate: 'CASCADE',
-      foreignKeyConstraint: true,
-      validate: {
-        notEmpty: true,
-      },
-    },
-  })
-
-  OpenFAQs.associate = (models) => {
-    OpenFAQs.belongsTo(models.OpenFAQs)
-  }
-
-  return OpenFAQs
-}
+exports.model = (sequelize, Sequelize) => {
+  const OpenFAQs = sequelize.define('FaqQuestions', {
+    name: {
+      type: Sequelize.STRING(255),
+      allowNull: false,
+      validate: {
+        notEmpty: true,
+      },
+    },
+    OpenFAQId: {
+      type: Sequelize.UUID,
+      allowNull: false,
+      references: {
+        model: 'OpenFAQs',
+        key: 'id',
+      },
+      onDelete: 'CASCADE',
+      onUpdate: 'CASCADE',
+      foreignKeyConstraint: true,
+      validate: {
+        notEmpty: true,
+      },
+    },
+  })
+
+  OpenFAQs.associate = (models) => {
+    OpenFAQs.belongsTo(models.OpenFAQs)
+  }
+
+  return OpenFAQs
+}

package/src/models/openFaqs.js

@@ -1,33 +1,33 @@
-exports.model = (sequelize, Sequelize) => {
-  const OpenFAQs = sequelize.define('OpenFAQs', {
-    name: {
-      allowNull: false,
-      type: Sequelize.TEXT,
-      unique: false,
-    },
-    SkillId: {
-      allowNull: false,
-      type: Sequelize.UUID,
-      references: {
-        model: 'Skill',
-        key: 'id',
-      },
-      onDelete: 'RESTRICT',
-      onUpdate: 'CASCADE',
-    },
-    answers: {
-      allowNull: false,
-      type: Sequelize.JSON,
-      validate: {
-        notEmpty: true,
-      },
-    },
-  })
-
-  OpenFAQs.associate = (models) => {
-    OpenFAQs.belongsTo(models.Skill)
-    OpenFAQs.hasMany(models.FaqQuestions)
-  }
-
-  return OpenFAQs
-}
+exports.model = (sequelize, Sequelize) => {
+  const OpenFAQs = sequelize.define('OpenFAQs', {
+    name: {
+      allowNull: false,
+      type: Sequelize.TEXT,
+      unique: false,
+    },
+    SkillId: {
+      allowNull: false,
+      type: Sequelize.UUID,
+      references: {
+        model: 'Skill',
+        key: 'id',
+      },
+      onDelete: 'RESTRICT',
+      onUpdate: 'CASCADE',
+    },
+    answers: {
+      allowNull: false,
+      type: Sequelize.JSON,
+      validate: {
+        notEmpty: true,
+      },
+    },
+  })
+
+  OpenFAQs.associate = (models) => {
+    OpenFAQs.belongsTo(models.Skill)
+    OpenFAQs.hasMany(models.FaqQuestions)
+  }
+
+  return OpenFAQs
+}