@b2y/ecommerce-common 1.1.9 → 1.2.1

package/controller/SubscriptionAbstractController.js

@@ -1,7 +1,7 @@
 const StatusMessage = require('../constants/StatusMessageConstants');
 const AppUtil = require('../utility/AppUtil');
 const LocationUtility = require('../utility/LocationUtility');
-
+const EntityTypeEnum = require('../enum/EntityTypeEnum');
 // getAllSubscriptionPlans
 const getAllSubscriptionPlans = (
   SubscriptionPlan,
@@ -60,6 +60,9 @@ const getTenantSubscription = (
   Tenant,
   TenantSubscription,
   SubscriptionPlan,
+  TenantSettings,
+  Document,
+  getPublicUrl,
   logger,
 ) => {
   return async (req, res) => {
@@ -69,6 +72,11 @@ const getTenantSubscription = (
       const tenant = await Tenant.findOne({
         where: { TenantID: id },
         include: [
+          {
+            model: TenantSettings,
+            as: 'TenantSettings',
+            attributes: ['TenantSettingID']
+          },
           {
             model: TenantSubscription,
             as: "CurrentSubscription",
@@ -102,7 +110,21 @@ const getTenantSubscription = (
           res,
         );
       }
-
+      const documents = await Document.findAll({
+        where: {
+          EntityType: EntityTypeEnum.TENANT_SETTINGS,
+          EntityID: tenant.TenantSettings.TenantSettingID
+        },
+        order: [["SortOrder", "ASC"]]
+      });
+  
+      const logo = await Promise.all(
+        documents.map(async (doc) => ({
+          documentId: doc.DocumentID,
+          sortOrder: doc.SortOrder,
+          documentUrl: await getPublicUrl(doc, logger)
+        }))
+      );
       const { countryName, stateName } =
         await LocationUtility.resolveCountryAndState(
           tenant.CountryCode,
@@ -127,6 +149,7 @@ const getTenantSubscription = (
         CountryCode: tenant.CountryCode,
         CountryName: countryName,
         Zipcode: tenant.Zipcode,
+        TenantLogo: logo,
         SubscriptionPlanID: tenant.CurrentSubscription?.SubscriptionPlan?.SubscriptionPlanID,
         PlanName: tenant.CurrentSubscription?.SubscriptionPlan?.PlanName,
         TenantSubscriptionStatus: tenant.CurrentSubscription?.Status,

package/dbconnection/Connect.js

@@ -427,6 +427,16 @@ const initializeModels = (sequelize) => {
     foreignKey: 'ProductImportID',
     as: 'ProductImport'
   })
+
+  //Tenant Settings
+  Tenant.hasOne(TenantSettings, {
+    foreignKey: 'TenantID',
+    as: 'TenantSettings'
+  });
+  TenantSettings.belongsTo(Tenant, {
+    foreignKey: 'TenantID',
+    as: 'Tenant'
+  });
   return { ...models };
 };
 module.exports = initializeModels;

package/model/SubscriptionFeature.js

@@ -10,6 +10,10 @@ module.exports = (sequelize) => {
         allowNull: false,
         defaultValue: DataTypes.UUIDV4,
       },
+      Module: {
+        type: DataTypes.STRING(255),
+        allowNull: false
+      },
       FeatureName: {
         type: DataTypes.STRING(100),
         allowNull: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@b2y/ecommerce-common",
-  "version": "1.1.9",
+  "version": "1.2.1",
   "description": "E-commerce common library",
   "main": "index.js",
   "scripts": {