@b2y/ecommerce-common 1.2.2 → 1.2.4

package/controller/SubscriptionAbstractController.js

@@ -1,6 +1,5 @@
 const StatusMessage = require('../constants/StatusMessageConstants');
 const AppUtil = require('../utility/AppUtil');
-const LocationUtility = require('../utility/LocationUtility');
 
 // getAllSubscriptionPlans
 const getAllSubscriptionPlans = (

package/controller/TenantAbstractController.js

@@ -418,24 +418,23 @@ const getTenantById = (
           res,
         );
       }
-      let logo = [];
+      let logo = null;;
       if(tenant.TenantSettings) {
-      const documents = await Document.findAll({
-        where: {
-          EntityType: EntityTypeEnum.TENANT_SETTINGS,
-          EntityID: tenant.TenantSettings.TenantSettingID
-        },
-        order: [["SortOrder", "ASC"]]
-      });
-  
-       logo = await Promise.all(
-        documents.map(async (doc) => ({
-          documentId: doc.DocumentID,
-          sortOrder: doc.SortOrder,
-          documentUrl: await getPublicUrl(doc, logger)
-        }))
-      );
-    }
+        const document = await Document.findOne({
+          where: {
+            EntityType: EntityTypeEnum.TENANT_SETTINGS,
+            EntityID: tenant.TenantSettings.TenantSettingID,
+          },
+          order: [["SortOrder", "ASC"]],
+        });
+        if (document) {
+          logo = {
+            documentId: document.DocumentID,
+            sortOrder: document.SortOrder,
+            documentUrl: await getPublicUrl(document, logger),
+          };
+        }
+      }
       const { countryName, stateName } =
         await LocationUtility.resolveCountryAndState(
           tenant.CountryCode,

package/controller/TenantSettingsAbstractController.js

@@ -3,6 +3,34 @@ const StatusMessage = require('../constants/StatusMessageConstants');
 const AppUtil = require('../utility/AppUtil');
 const AppConstants = require('../constants/AppConstants')
 
+const tenantSettingsDocumentValidation = async (
+  file,
+  documentMetadata,
+  FileUploadUtil,
+  FILE_PATHS,
+  logger
+) => {
+  if (documentMetadata !== undefined) {
+    if (
+      typeof documentMetadata !== AppConstants.OBJECT ||
+      Array.isArray(documentMetadata)
+    ) {
+      logger.warn(
+        "Validation Failed: documentMetadata must be a single object for this operation.",
+      );
+      throw new Error(StatusMessage.TENANT_SETTINGS_SINGLE_LOGO_ALLOWED);
+    }
+    logger.info("Uploading new files to storage before transaction");
+    const uploadResult = await FileUploadUtil.uploadFilesToStorage(
+      documentMetadata,
+      file,
+      FILE_PATHS.IMAGE_DIR,
+    );
+  return uploadResult
+  }
+  return [];
+};
+
 const getTenantSettingsById = (TenantSettings, Document, getPublicUrl, logger) => {
 return async (req, res) => {
     try {
@@ -24,22 +52,21 @@ return async (req, res) => {
           res
         );
       }
-  
-      const documents = await Document.findAll({
+      let logo = null;
+      const document = await Document.findOne({
         where: {
           EntityType: EntityTypeEnum.TENANT_SETTINGS,
           EntityID: settings.TenantSettingID
         },
         order: [["SortOrder", "ASC"]]
       });
-  
-      const logo = await Promise.all(
-        documents.map(async (doc) => ({
-          documentId: doc.DocumentID,
-          sortOrder: doc.SortOrder,
-          documentUrl: await getPublicUrl(doc, logger)
-        }))
-      );
+      if(document) {
+        logo = {
+          documentId: document.DocumentID,
+          sortOrder: document.SortOrder,
+          documentUrl: await getPublicUrl(document, logger)
+        }
+      }
       const formattedSettings = {
         TenantSettingID: settings.TenantSettingID,
         TenantID: settings.TenantID,
@@ -133,30 +160,9 @@ return async (req, res) => {
             }
 
             // Upload new file to storage before starting transaction
-            let uploadResult = [];
-            if (documentMetadata !== undefined) {
-              if (
-                typeof documentMetadata !== AppConstants.OBJECT ||
-                Array.isArray(documentMetadata)
-              ) {
-                logger.warn(
-                  "Validation Failed: documentMetadata must be a single object for this operation.",
-                );
-                return AppUtil.generateResponse(
-                  400,
-                  StatusMessage.FAILURE,
-                  StatusMessage.TENANT_SETTINGS_SINGLE_LOGO_ALLOWED, 
-                  null,
-                  res,
-                );
-              }
-                logger.info('Uploading new files to storage before transaction');
-                uploadResult = await FileUploadUtil.uploadFilesToStorage(
-                    documentMetadata,
-                    req.files,
-                    FILE_PATHS.IMAGE_DIR
-                );
-                uploadedFilePath = uploadResult.map(r => r.path);
+            const uploadResult = await tenantSettingsDocumentValidation(req.files, documentMetadata, FileUploadUtil, FILE_PATHS, logger)
+            if(uploadResult.length > 0) {
+              uploadedFilePath = uploadResult.map(result => result.path)
             }
 
             // Start database transaction
@@ -165,7 +171,12 @@ return async (req, res) => {
             // Update tenant settings
             const updatePayload = {};
             if (ThemeColour !== undefined) updatePayload.ThemeColour = ThemeColour;
-            updatePayload.UpdatedBy = UpdatedBy;
+            if(UpdatedBy) {
+             updatePayload.UpdatedBy = UpdatedBy;
+            }
+            else {
+             updatePayload.UpdatedBy = req.user.UserID
+            }
             updatePayload.UpdatedAt = new Date();
 
             await existingSettings.update(updatePayload, { transaction });
@@ -203,16 +214,15 @@ return async (req, res) => {
                 logger.info('Cleaning up uploaded files due to error');
                 await FileUploadUtil.cleanupFiles(uploadedFilePath);
             }
-
+            const errorMessages = [
+              StatusMessage.INVALID_SORT_ORDER,
+              StatusMessage.FILE_NOT_FOUND,
+              StatusMessage.INVALID_FILE_UPLOAD_INPUT,
+              StatusMessage.TENANT_SETTINGS_SINGLE_LOGO_ALLOWED,
+            ];
             // Error handling
-            if (error.message === StatusMessage.INVALID_SORT_ORDER) {
-                return AppUtil.generateResponse(400, StatusMessage.FAILURE, StatusMessage.INVALID_SORT_ORDER, null, res);
-            }
-            if (error.message === StatusMessage.FILE_NOT_FOUND) {
-                return AppUtil.generateResponse(400, StatusMessage.FAILURE, StatusMessage.FILE_NOT_FOUND, null, res);
-            }
-            if(error.message === StatusMessage.INVALID_FILE_UPLOAD_INPUT) {
-                return AppUtil.generateResponse(400, StatusMessage.FAILURE, StatusMessage.INVALID_FILE_UPLOAD_INPUT, null, res);
+            if (errorMessages.includes(error.message)) {
+                return AppUtil.generateResponse(400, StatusMessage.FAILURE, error.message, null, res);
             }
             if (error.name === 'SequelizeUniqueConstraintError') {
                 return AppUtil.generateResponse(400, StatusMessage.FAILURE, StatusMessage.TENANT_SETTINGS_ALREADY_EXISTS, null, res);
@@ -228,5 +238,5 @@ return async (req, res) => {
     });
 };
   }
-  module.exports = {getTenantSettingsById, updateTenantSettings};
+  module.exports = {getTenantSettingsById, updateTenantSettings, tenantSettingsDocumentValidation};
   

package/dbconnection/Connect.js

@@ -193,10 +193,6 @@ const initializeModels = (sequelize) => {
     as: "Customer",
   });
 
-  Order.belongsTo(Address, {
-    foreignKey: "AddressID",
-    as: "Address",
-  });
 
   Order.hasMany(OrderItem, {
     foreignKey: "OrderID",

package/index.js

@@ -5,7 +5,8 @@ const SubscriptionAbstractController = require('./controller/SubscriptionAbstrac
 const TenantAbstractController = require('./controller/TenantAbstractController');
 const TenantSettingsAbstractController = require('./controller/TenantSettingsAbstractController');
 const LocationController = require('./controller/LocationController');
-const PermissionAbstractController = require('./controller/PermissionAbstractController');
+const CommonAppConstants = require('./constants/AppConstants');
+const CommonStatusMessage = require('./constants/StatusMessageConstants');
 const enums = {};
 const enumDir = path.join(__dirname, 'enum');
 fs.readdirSync(enumDir).forEach((file) => {
@@ -23,4 +24,4 @@ fs.readdirSync(utilDir).forEach((file) => {
   }
 })
 
-module.exports = {initializeModels, enums, utils, SubscriptionAbstractController, TenantAbstractController, TenantSettingsAbstractController, LocationController, PermissionAbstractController};
+module.exports = {initializeModels, enums, utils, CommonAppConstants, CommonStatusMessage, SubscriptionAbstractController, TenantAbstractController, TenantSettingsAbstractController, LocationController};

package/model/Order.js

@@ -37,16 +37,6 @@ module.exports = (sequelize) => {
       type: DataTypes.DATE,
       allowNull: false
     },
-    AddressID: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      references: {
-        model: 'Address',
-        key: 'AddressID'
-      },
-      onDelete: 'RESTRICT',
-      onUpdate: 'CASCADE'
-    },
     TotalAmount: {
       type: DataTypes.DECIMAL(10, 2),
       allowNull: false

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@b2y/ecommerce-common",
-  "version": "1.2.2",
+  "version": "1.2.4",
   "description": "E-commerce common library",
   "main": "index.js",
   "scripts": {
@@ -21,6 +21,7 @@
   "homepage": "https://github.com/yuvakrishna29/ecommerce-common#readme",
   "peerDependencies": {
     "@countrystatecity/countries": "^1.0.4",
+    "@b2y/document-module": "^1.0.4",
     "exceljs": "^4.4.0",
     "luxon": "^3.7.2",
     "puppeteer": "^24.35.0",

package/controller/PermissionAbstractController.js

@@ -1,35 +0,0 @@
-const AppUtil = require('../utility/AppUtil');
-const StatusMessage = require('../constants/StatusMessageConstants');
-
-getAllPermissions = (Permission, logger) => {
-  return async (req, res) => {
-    const { pageNumber, pageSize } = req.query;
-    try {
-      const { limit, offset } = AppUtil.getPagination(pageNumber, pageSize);
-
-      const { rows, count } = await Permission.findAndCountAll({
-        attributes: ["PermissionID", "Module", "Name", "IsChecked"],
-        limit,
-        offset,
-      });
-      return AppUtil.generateResponse(
-        200,
-        StatusMessage.SUCCESS,
-        null,
-        { rows, count, pageNumber, limit },
-        res,
-      );
-    } catch (error) {
-      logger.error("Error fetching permissions:", error);
-      return AppUtil.generateResponse(
-        500,
-        StatusMessage.FAILURE,
-        StatusMessage.SERVER_ERROR,
-        null,
-        res,
-      );
-    }
-  };
-};
-
-module.exports = {getAllPermissions}