agrs-sequelize-sdk 1.0.46 → 1.0.47

package/models/AdAccountValues.js

@@ -1,26 +1,26 @@
-module.exports = (sequelize, DataTypes) => {
-    const AdAccountValues = sequelize.define(
-      "AdAccountValues",
-      {
-        id: {
-          type: DataTypes.UUID,
-          defaultValue: DataTypes.UUIDV4,
-          primaryKey: true,
-        },
-        name: {
-          type: DataTypes.STRING,
-          allowNull: false,
-        },
-        code: {
-          type: DataTypes.STRING,
-          allowNull: false,
-          unique: true, 
-        },
-      },
-      {
-        tableName: "AdAccountValues",
-      }
-    );
-  
-    return AdAccountValues;
+module.exports = (sequelize, DataTypes) => {
+    const AdAccountValues = sequelize.define(
+      "AdAccountValues",
+      {
+        id: {
+          type: DataTypes.UUID,
+          defaultValue: DataTypes.UUIDV4,
+          primaryKey: true,
+        },
+        name: {
+          type: DataTypes.STRING,
+          allowNull: false,
+        },
+        code: {
+          type: DataTypes.STRING,
+          allowNull: false,
+          unique: true, 
+        },
+      },
+      {
+        tableName: "AdAccountValues",
+      }
+    );
+  
+    return AdAccountValues;
   };

package/models/AdHistory.js

@@ -1,30 +1,30 @@
-module.exports = (sequelize, DataTypes) => {
-  const AdHistory = sequelize.define(
-    "AdHistory",
-    {
-      HistoryID: {
-        type: DataTypes.UUID,
-        defaultValue: DataTypes.UUIDV4,
-        primaryKey: true,
-      },
-      AdID: {
-        type: DataTypes.STRING,
-        allowNull: false,
-      },
-      DataSnapshot: {
-        type: DataTypes.JSONB, // Store the full Ad row as a JSON object
-        allowNull: false,
-      },
-      timestamp: {
-        type: DataTypes.DATE,
-        defaultValue: DataTypes.NOW,
-      },
-    },
-    {
-      tableName: "AdHistory",
-      timestamps: false, // Disable Sequelize timestamps
-    }
-  );
-
-  return AdHistory;
-};
+module.exports = (sequelize, DataTypes) => {
+  const AdHistory = sequelize.define(
+    "AdHistory",
+    {
+      HistoryID: {
+        type: DataTypes.UUID,
+        defaultValue: DataTypes.UUIDV4,
+        primaryKey: true,
+      },
+      AdID: {
+        type: DataTypes.STRING,
+        allowNull: false,
+      },
+      DataSnapshot: {
+        type: DataTypes.JSONB, // Store the full Ad row as a JSON object
+        allowNull: false,
+      },
+      timestamp: {
+        type: DataTypes.DATE,
+        defaultValue: DataTypes.NOW,
+      },
+    },
+    {
+      tableName: "AdHistory",
+      timestamps: false, // Disable Sequelize timestamps
+    }
+  );
+
+  return AdHistory;
+};

package/models/AdSetHistory.js

@@ -1,30 +1,30 @@
-module.exports = (sequelize, DataTypes) => {
-  const AdSetHistory = sequelize.define(
-    "AdSetHistory",
-    {
-      HistoryID: {
-        type: DataTypes.UUID,
-        defaultValue: DataTypes.UUIDV4,
-        primaryKey: true,
-      },
-      AdSetID: {
-        type: DataTypes.STRING,
-        allowNull: false,
-      },
-      DataSnapshot: {
-        type: DataTypes.JSONB, // Store the full AdSet row as a JSON object
-        allowNull: false,
-      },
-      timestamp: {
-        type: DataTypes.DATE,
-        defaultValue: DataTypes.NOW,
-      },
-    },
-    {
-      tableName: "AdSetHistory",
-      timestamps: false,
-    }
-  );
-
-  return AdSetHistory;
-};
+module.exports = (sequelize, DataTypes) => {
+  const AdSetHistory = sequelize.define(
+    "AdSetHistory",
+    {
+      HistoryID: {
+        type: DataTypes.UUID,
+        defaultValue: DataTypes.UUIDV4,
+        primaryKey: true,
+      },
+      AdSetID: {
+        type: DataTypes.STRING,
+        allowNull: false,
+      },
+      DataSnapshot: {
+        type: DataTypes.JSONB, // Store the full AdSet row as a JSON object
+        allowNull: false,
+      },
+      timestamp: {
+        type: DataTypes.DATE,
+        defaultValue: DataTypes.NOW,
+      },
+    },
+    {
+      tableName: "AdSetHistory",
+      timestamps: false,
+    }
+  );
+
+  return AdSetHistory;
+};

package/models/Buyers.js

@@ -1,26 +1,26 @@
-module.exports = (sequelize, DataTypes) => {
-    const Buyers = sequelize.define(
-      "Buyers",
-      {
-        id: {
-          type: DataTypes.UUID,
-          defaultValue: DataTypes.UUIDV4,
-          primaryKey: true,
-        },
-        name: {
-          type: DataTypes.STRING,
-          allowNull: false,
-        },
-        code: {
-            type: DataTypes.STRING,
-            allowNull: false,
-            unique: true, 
-        },
-      },
-      {
-        tableName: "Buyers",
-      }
-    );
-  
-    return Buyers;
+module.exports = (sequelize, DataTypes) => {
+    const Buyers = sequelize.define(
+      "Buyers",
+      {
+        id: {
+          type: DataTypes.UUID,
+          defaultValue: DataTypes.UUIDV4,
+          primaryKey: true,
+        },
+        name: {
+          type: DataTypes.STRING,
+          allowNull: false,
+        },
+        code: {
+            type: DataTypes.STRING,
+            allowNull: false,
+            unique: true, 
+        },
+      },
+      {
+        tableName: "Buyers",
+      }
+    );
+  
+    return Buyers;
   };

package/models/Campaign.js

@@ -40,10 +40,10 @@ module.exports = (sequelize, DataTypes) => {
         type: DataTypes.DATE,
         allowNull: false,
       },
-      CampaignDelivery: {
-        type: DataTypes.STRING,
-        allowNull: false,
-      },
+      // CampaignDelivery: {
+      //   type: DataTypes.STRING,
+      //   allowNull: false,
+      // },
       DailyBudget: {
         type: DataTypes.INTEGER,
         allowNull: true,
@@ -84,19 +84,22 @@ module.exports = (sequelize, DataTypes) => {
   };
 
   // Combined beforeUpdate hook
-  Campaign.addHook('beforeUpdate', async (campaign, options) => {
-    if (campaign.changed('publish')) {
-      if (campaign.previous('publish') === true && campaign.publish === false) {
+  Campaign.addHook("beforeUpdate", async (campaign, options) => {
+    if (campaign.changed("publish")) {
+      if (campaign.previous("publish") === true && campaign.publish === false) {
         // Save current state to CampaignHistory
         await sequelize.models.CampaignHistory.create({
           CampaignID: campaign.CampaignID,
           DataSnapshot: campaign._previousDataValues, // Store current state as JSON
         });
-      } else if (campaign.previous('publish') === false && campaign.publish === true) {
+      } else if (
+        campaign.previous("publish") === false &&
+        campaign.publish === true
+      ) {
         // Delete the latest history entry
         const latestHistory = await sequelize.models.CampaignHistory.findOne({
           where: { CampaignID: campaign.CampaignID },
-          order: [['timestamp', 'DESC']], // Get the latest history entry
+          order: [["timestamp", "DESC"]], // Get the latest history entry
         });
 
         if (latestHistory) {

package/models/CampaignHistory.js

@@ -1,33 +1,33 @@
-module.exports = (sequelize, DataTypes) => {
-  const CampaignHistory = sequelize.define(
-    "CampaignHistory",
-    {
-      HistoryID: {
-        type: DataTypes.UUID,
-        defaultValue: DataTypes.UUIDV4,
-        primaryKey: true,
-      },
-      CampaignID: {
-        type: DataTypes.STRING,
-        allowNull: false,
-      },
-      TableName: {
-        type: DataTypes.STRING, // Useful for multi-table history tracking
-        defaultValue: "Campaign",
-      },
-      DataSnapshot: {
-        type: DataTypes.JSONB, // Store the entire row as JSON
-        allowNull: false,
-      },
-      timestamp: {
-        type: DataTypes.DATE,
-        defaultValue: DataTypes.NOW,
-      },
-    },
-    {
-      tableName: "CampaignHistory",
-    }
-  );
-
-  return CampaignHistory;
-};
+module.exports = (sequelize, DataTypes) => {
+  const CampaignHistory = sequelize.define(
+    "CampaignHistory",
+    {
+      HistoryID: {
+        type: DataTypes.UUID,
+        defaultValue: DataTypes.UUIDV4,
+        primaryKey: true,
+      },
+      CampaignID: {
+        type: DataTypes.STRING,
+        allowNull: false,
+      },
+      TableName: {
+        type: DataTypes.STRING, // Useful for multi-table history tracking
+        defaultValue: "Campaign",
+      },
+      DataSnapshot: {
+        type: DataTypes.JSONB, // Store the entire row as JSON
+        allowNull: false,
+      },
+      timestamp: {
+        type: DataTypes.DATE,
+        defaultValue: DataTypes.NOW,
+      },
+    },
+    {
+      tableName: "CampaignHistory",
+    }
+  );
+
+  return CampaignHistory;
+};

package/models/CodefuelCampaign.js

@@ -96,7 +96,7 @@ module.exports = (sequelize, DataTypes) => {
   };
 
   CodefuelCampaign.beforeCreate(async (campaign, options) => {
-    // Logic to set RedirectLink when AGRSCID is initially set
+    // Ensure RedirectLink is set when AGRSCID is defined during creation
     const AGRSCID = campaign.getDataValue("AGRSCID");
     if (AGRSCID) {
       const redirectLink = `https://ktwrjqdfv.com/${AGRSCID}?campaign_name={{campaign.name}}&adset_name={{adset.name}}&ad_name={{ad.name}}&campaign_id={{campaign.id}}&adset_id={{adset.id}}&ad_id={{ad.id}}_${AGRSCID}&placement={{placement}}&site_source_name={{site_source}}&fbclid={{fbclid}}`;
@@ -104,7 +104,6 @@ module.exports = (sequelize, DataTypes) => {
     }
   });
 
-  // Hook to save the previous KW version to history before updating
   CodefuelCampaign.beforeUpdate(async (campaign, options) => {
     if (campaign.changed("KW")) {
       const previousKW = campaign.previous("KW");
@@ -123,9 +122,20 @@ module.exports = (sequelize, DataTypes) => {
       });
     }
 
-    // Logic to update RedirectLink if AGRSCID is updated
+    // Update RedirectLink when AGRSCID is changed
     if (campaign.changed("AGRSCID")) {
       const AGRSCID = campaign.getDataValue("AGRSCID");
+      if (AGRSCID) {
+        const redirectLink = `https://ktwrjqdfv.com/${AGRSCID}?campaign_name={{campaign.name}}&adset_name={{adset.name}}&ad_name={{ad.name}}&campaign_id={{campaign.id}}&adset_id={{adset.id}}&ad_id={{ad.id}}_${AGRSCID}&placement={{placement}}&site_source_name={{site_source}}&fbclid={{fbclid}}`;
+        campaign.setDataValue("RedirectLink", redirectLink);
+      }
+    }
+  });
+
+  CodefuelCampaign.beforeSave(async (campaign, options) => {
+    // Catch-all logic to set RedirectLink if AGRSCID is set during save
+    const AGRSCID = campaign.getDataValue("AGRSCID");
+    if (AGRSCID && !campaign.getDataValue("RedirectLink")) {
       const redirectLink = `https://ktwrjqdfv.com/${AGRSCID}?campaign_name={{campaign.name}}&adset_name={{adset.name}}&ad_name={{ad.name}}&campaign_id={{campaign.id}}&adset_id={{adset.id}}&ad_id={{ad.id}}_${AGRSCID}&placement={{placement}}&site_source_name={{site_source}}&fbclid={{fbclid}}`;
       campaign.setDataValue("RedirectLink", redirectLink);
     }

package/models/Domain.js

@@ -1,26 +1,26 @@
-module.exports = (sequelize, DataTypes) => {
-    const Domain = sequelize.define(
-      "Domain",
-      {
-        id: {
-          type: DataTypes.UUID,
-          defaultValue: DataTypes.UUIDV4,
-          primaryKey: true,
-        },
-        name: {
-          type: DataTypes.STRING,
-          allowNull: false,
-        },
-        code: {
-          type: DataTypes.STRING,
-          allowNull: false,
-          unique: true, 
-        },
-      },
-      {
-        tableName: "Domain",
-      }
-    );
-  
-    return Domain;
+module.exports = (sequelize, DataTypes) => {
+    const Domain = sequelize.define(
+      "Domain",
+      {
+        id: {
+          type: DataTypes.UUID,
+          defaultValue: DataTypes.UUIDV4,
+          primaryKey: true,
+        },
+        name: {
+          type: DataTypes.STRING,
+          allowNull: false,
+        },
+        code: {
+          type: DataTypes.STRING,
+          allowNull: false,
+          unique: true, 
+        },
+      },
+      {
+        tableName: "Domain",
+      }
+    );
+  
+    return Domain;
   };

package/models/Feed.js

@@ -1,34 +1,34 @@
-module.exports = (sequelize, DataTypes) => {
-    const Feed = sequelize.define(
-      "Feed",
-      {
-        id: {
-          type: DataTypes.UUID,
-          defaultValue: DataTypes.UUIDV4,
-          primaryKey: true,
-        },
-        label: {
-          type: DataTypes.STRING,
-          allowNull: false,
-        },
-        code: {
-          type: DataTypes.STRING,
-          allowNull: false,
-          unique: true,
-        },
-        sheet: {
-          type: DataTypes.STRING,
-          allowNull: false,
-        },
-        feedProvider: {
-          type: DataTypes.STRING,
-          allowNull: false,
-        },
-      },
-      {
-        tableName: "Feed",
-      }
-    );
-  
-    return Feed;
+module.exports = (sequelize, DataTypes) => {
+    const Feed = sequelize.define(
+      "Feed",
+      {
+        id: {
+          type: DataTypes.UUID,
+          defaultValue: DataTypes.UUIDV4,
+          primaryKey: true,
+        },
+        label: {
+          type: DataTypes.STRING,
+          allowNull: false,
+        },
+        code: {
+          type: DataTypes.STRING,
+          allowNull: false,
+          unique: true,
+        },
+        sheet: {
+          type: DataTypes.STRING,
+          allowNull: false,
+        },
+        feedProvider: {
+          type: DataTypes.STRING,
+          allowNull: false,
+        },
+      },
+      {
+        tableName: "Feed",
+      }
+    );
+  
+    return Feed;
   };

package/models/Pages.js

@@ -1,31 +1,31 @@
-module.exports = (sequelize, DataTypes) => {
-    const Pages = sequelize.define(
-      "Pages",
-      {
-        id: {
-          type: DataTypes.UUID,
-          defaultValue: DataTypes.UUIDV4,
-          primaryKey: true,
-        },
-        name: {
-          type: DataTypes.STRING,
-          allowNull: false,
-        },
-        code: {
-          type: DataTypes.STRING,
-          allowNull: false,
-          unique: true, 
-        },
-        feedProvider: {
-          type: DataTypes.ARRAY(DataTypes.STRING), 
-          allowNull: false,
-          defaultValue: [], // Default value is an empty array
-        },
-      },
-      {
-        tableName: "Pages",
-      }
-    );
-  
-    return Pages;
+module.exports = (sequelize, DataTypes) => {
+    const Pages = sequelize.define(
+      "Pages",
+      {
+        id: {
+          type: DataTypes.UUID,
+          defaultValue: DataTypes.UUIDV4,
+          primaryKey: true,
+        },
+        name: {
+          type: DataTypes.STRING,
+          allowNull: false,
+        },
+        code: {
+          type: DataTypes.STRING,
+          allowNull: false,
+          unique: true, 
+        },
+        feedProvider: {
+          type: DataTypes.ARRAY(DataTypes.STRING), 
+          allowNull: false,
+          defaultValue: [], // Default value is an empty array
+        },
+      },
+      {
+        tableName: "Pages",
+      }
+    );
+  
+    return Pages;
   };

package/models/RulesValues.js

@@ -1,31 +1,31 @@
-module.exports = (sequelize, DataTypes) => {
-    const RulesValues = sequelize.define(
-      "RulesValues",
-      {
-        id: {
-          type: DataTypes.UUID,
-          defaultValue: DataTypes.UUIDV4,
-          primaryKey: true,
-        },
-        name: {
-          type: DataTypes.STRING,
-          allowNull: false,
-        },
-        code: {
-          type: DataTypes.STRING,
-          allowNull: false,
-          unique: true, 
-        },
-        permissions: {
-          type: DataTypes.ARRAY(DataTypes.STRING), 
-          allowNull: false,
-          defaultValue: [], // Default value is an empty array
-        },
-      },
-      {
-        tableName: "RulesValues",
-      }
-    );
-  
-    return RulesValues;
+module.exports = (sequelize, DataTypes) => {
+    const RulesValues = sequelize.define(
+      "RulesValues",
+      {
+        id: {
+          type: DataTypes.UUID,
+          defaultValue: DataTypes.UUIDV4,
+          primaryKey: true,
+        },
+        name: {
+          type: DataTypes.STRING,
+          allowNull: false,
+        },
+        code: {
+          type: DataTypes.STRING,
+          allowNull: false,
+          unique: true, 
+        },
+        permissions: {
+          type: DataTypes.ARRAY(DataTypes.STRING), 
+          allowNull: false,
+          defaultValue: [], // Default value is an empty array
+        },
+      },
+      {
+        tableName: "RulesValues",
+      }
+    );
+  
+    return RulesValues;
   };

package/models/Vertical.js

@@ -1,26 +1,26 @@
-module.exports = (sequelize, DataTypes) => {
-    const Vertical = sequelize.define(
-      "Vertical",
-      {
-        id: {
-          type: DataTypes.UUID,
-          defaultValue: DataTypes.UUIDV4,
-          primaryKey: true,
-        },
-        name: {
-          type: DataTypes.STRING,
-          allowNull: false,
-        },
-        code: {
-          type: DataTypes.STRING,
-          allowNull: false,
-          unique: true, 
-        },
-      },
-      {
-        tableName: "Vertical",
-      }
-    );
-  
-    return Vertical;
+module.exports = (sequelize, DataTypes) => {
+    const Vertical = sequelize.define(
+      "Vertical",
+      {
+        id: {
+          type: DataTypes.UUID,
+          defaultValue: DataTypes.UUIDV4,
+          primaryKey: true,
+        },
+        name: {
+          type: DataTypes.STRING,
+          allowNull: false,
+        },
+        code: {
+          type: DataTypes.STRING,
+          allowNull: false,
+          unique: true, 
+        },
+      },
+      {
+        tableName: "Vertical",
+      }
+    );
+  
+    return Vertical;
   };

package/package.json

@@ -1,21 +1,19 @@
-{
-    "name":  "agrs-sequelize-sdk",
-    "version":  "1.0.46",
-    "main":  "index.js",
-    "scripts":  {
-                    "start":  "node index.js",
-                    "sync":  "node services/sequelizeService.js",
-                    "test":  "echo \"Error: no test specified\" \u0026\u0026 exit 1"
-                },
-    "keywords":  [
-
-                 ],
-    "author":  "",
-    "license":  "ISC",
-    "description":  "",
-    "dependencies":  {
-                         "pg":  "^8.13.0",
-                         "pg-hstore":  "^2.3.4",
-                         "sequelize":  "^6.37.4"
-                     }
-}
+{
+  "name": "agrs-sequelize-sdk",
+  "version": "1.0.47",
+  "main": "index.js",
+  "scripts": {
+    "start": "node index.js",
+    "sync": "node services/sequelizeService.js",
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "description": "",
+  "dependencies": {
+    "pg": "^8.13.0",
+    "pg-hstore": "^2.3.4",
+    "sequelize": "^6.37.4"
+  }
+}

package/run.sh

@@ -1,214 +1,214 @@
-# #!/bin/bash
-
-# # Check if root is only required for jq installation
-# require_root_for_jq=0
-
-# # Check if jq is installed
-# if ! command -v jq &> /dev/null; then
-#     echo "jq not found. Installing jq..."
-#     require_root_for_jq=1
-#     if command -v apt-get &> /dev/null; then
-#         sudo apt-get update && sudo apt-get install -y jq
-#     elif command -v brew &> /dev/null; then
-#         brew install jq
-#     else
-#         echo "Please install jq manually."
-#         exit 1
-#     fi
-# fi
-
-# # Only require root if jq installation was needed
-# if [[ $require_root_for_jq -eq 1 && $EUID -ne 0 ]]; then
-#     echo "This script must be run as root for jq installation. Please use sudo."
-#     exit 1
-# fi
-
-# # Step 1: Check if logged in to NPM
-# npmUsername=$(npm whoami 2>&1)
-# if [[ $npmUsername == *"ERR"* ]]; then
-#     echo "Not logged in. Please log in to NPM."
-#     npm login
-#     if [[ $? -ne 0 ]]; then
-#         echo "NPM login failed. Exiting..."
-#         exit 1
-#     fi
-# else
-#     echo "Already logged in to NPM as $npmUsername"
-# fi
-
-# # Step 2: Increment version in package.json
-# if [[ ! -f package.json ]]; then
-#     echo "package.json not found. Exiting..."
-#     exit 1
-# fi
-
-# currentVersion=$(jq -r '.version' package.json)
-
-# if [[ -z "$currentVersion" ]]; then
-#     echo "Could not find version in package.json"
-#     exit 1
-# fi
-
-# # Split version into major, minor, patch
-# IFS='.' read -r major minor patch <<< "$currentVersion"
-
-# # Increment version numbers with three-digit logic
-# if [[ $patch -eq 99 ]]; then
-#     patch=0
-#     if [[ $minor -eq 99 ]]; then
-#         minor=0
-#         ((major++))
-#     else
-#         ((minor++))
-#     fi
-# else
-#     ((patch++))
-# fi
-
-# newVersion="$major.$minor.$patch"
-
-# # Update the version in package.json while maintaining formatting
-# jq --arg version "$newVersion" '.version = $version' package.json > tmp.json && mv tmp.json package.json
-# echo "Version updated from $currentVersion to $newVersion"
-
-# # Step 3: Publish the package to NPM
-# npm publish
-# if [[ $? -ne 0 ]]; then
-#     echo "NPM publish failed. Exiting..."
-#     exit 1
-# fi
-
-# # Step 4: Commit the changes and push to GitHub
-# git add .
-# git commit -m "Bump version to $newVersion"
-# git push origin main
-
-# if [[ $? -ne 0 ]]; then
-#     echo "Failed to push changes to GitHub. Exiting..."
-#     exit 1
-# fi
-
-# echo "Version $newVersion published and changes pushed to GitHub successfully!"
-
-
-#!/bin/bash
-
-# Check if root is only required for jq installation
-require_root_for_jq=0
-
-# Check if jq is installed
-if ! command -v jq &> /dev/null; then
-    echo "jq not found. Installing jq..."
-    require_root_for_jq=1
-    if command -v apt-get &> /dev/null; then
-        sudo apt-get update && sudo apt-get install -y jq
-    elif command -v brew &> /dev/null; then
-        brew install jq
-    else
-        echo "Please install jq manually."
-        exit 1
-    fi
-fi
-
-# Only require root if jq installation was needed
-if [[ $require_root_for_jq -eq 1 && $EUID -ne 0 ]]; then
-    echo "This script must be run as root for jq installation. Please use sudo."
-    exit 1
-fi
-
-# Step 1: Check if logged in to NPM
-npmUsername=$(npm whoami 2>&1)
-if [[ $npmUsername == *"ERR"* ]]; then
-    echo "Not logged in. Please log in to NPM."
-    npm login
-    if [[ $? -ne 0 ]]; then
-        echo "NPM login failed. Exiting..."
-        exit 1
-    fi
-else
-    echo "Already logged in to NPM as $npmUsername"
-fi
-
-# Step 2: Check the latest published version from NPM
-packageName=$(jq -r '.name' package.json)
-if [[ -z "$packageName" ]]; then
-    echo "Could not find package name in package.json"
-    exit 1
-fi
-
-latestPublishedVersion=$(npm view "$packageName" version)
-if [[ $? -ne 0 ]]; then
-    echo "Failed to fetch the latest published version. Exiting..."
-    exit 1
-fi
-
-echo "Latest published version on NPM: $latestPublishedVersion"
-
-# Step 3: Increment version in package.json
-if [[ ! -f package.json ]]; then
-    echo "package.json not found. Exiting..."
-    exit 1
-fi
-
-currentVersion=$(jq -r '.version' package.json)
-
-if [[ -z "$currentVersion" ]]; then
-    echo "Could not find version in package.json"
-    exit 1
-fi
-
-# Split version into major, minor, patch
-IFS='.' read -r major minor patch <<< "$currentVersion"
-
-# Increment version numbers with three-digit logic
-if [[ $patch -eq 99 ]]; then
-    patch=0
-    if [[ $minor -eq 99 ]]; then
-        minor=0
-        ((major++))
-    else
-        ((minor++))
-    fi
-else
-    ((patch++))
-fi
-
-newVersion="$major.$minor.$patch"
-
-# Ensure the new version is greater than the latest published version
-if [[ "$(printf '%s\n' "$newVersion" "$latestPublishedVersion" | sort -V | tail -1)" != "$newVersion" ]]; then
-    echo "Error: New version ($newVersion) is not greater than the latest published version ($latestPublishedVersion)."
-    echo "Please manually update the version in package.json or adjust the script logic."
-    exit 1
-fi
-
-# Update the version in package.json while maintaining formatting
-jq --arg version "$newVersion" '.version = $version' package.json > tmp.json && mv tmp.json package.json
-echo "Version updated from $currentVersion to $newVersion"
-
-# Step 4: Publish the package to NPM
-npm publish
-if [[ $? -ne 0 ]]; then
-    echo "NPM publish failed. Exiting..."
-    exit 1
-fi
-
-# Step 5: Commit the changes and push to GitHub
-git add .
-git commit -m "Bump version to $newVersion"
-
-# Pull latest changes to ensure there are no conflicts
-git pull origin main --rebase
-if [[ $? -ne 0 ]]; then
-    echo "Git pull failed. Please resolve conflicts manually. Exiting..."
-    exit 1
-fi
-
-# Push changes to remote
-git push origin main
-if [[ $? -ne 0 ]]; then
-    echo "Failed to push changes to GitHub. Exiting..."
-    exit 1
-fi
-
-echo "Version $newVersion published and changes pushed to GitHub successfully!"
+# #!/bin/bash
+
+# # Check if root is only required for jq installation
+# require_root_for_jq=0
+
+# # Check if jq is installed
+# if ! command -v jq &> /dev/null; then
+#     echo "jq not found. Installing jq..."
+#     require_root_for_jq=1
+#     if command -v apt-get &> /dev/null; then
+#         sudo apt-get update && sudo apt-get install -y jq
+#     elif command -v brew &> /dev/null; then
+#         brew install jq
+#     else
+#         echo "Please install jq manually."
+#         exit 1
+#     fi
+# fi
+
+# # Only require root if jq installation was needed
+# if [[ $require_root_for_jq -eq 1 && $EUID -ne 0 ]]; then
+#     echo "This script must be run as root for jq installation. Please use sudo."
+#     exit 1
+# fi
+
+# # Step 1: Check if logged in to NPM
+# npmUsername=$(npm whoami 2>&1)
+# if [[ $npmUsername == *"ERR"* ]]; then
+#     echo "Not logged in. Please log in to NPM."
+#     npm login
+#     if [[ $? -ne 0 ]]; then
+#         echo "NPM login failed. Exiting..."
+#         exit 1
+#     fi
+# else
+#     echo "Already logged in to NPM as $npmUsername"
+# fi
+
+# # Step 2: Increment version in package.json
+# if [[ ! -f package.json ]]; then
+#     echo "package.json not found. Exiting..."
+#     exit 1
+# fi
+
+# currentVersion=$(jq -r '.version' package.json)
+
+# if [[ -z "$currentVersion" ]]; then
+#     echo "Could not find version in package.json"
+#     exit 1
+# fi
+
+# # Split version into major, minor, patch
+# IFS='.' read -r major minor patch <<< "$currentVersion"
+
+# # Increment version numbers with three-digit logic
+# if [[ $patch -eq 99 ]]; then
+#     patch=0
+#     if [[ $minor -eq 99 ]]; then
+#         minor=0
+#         ((major++))
+#     else
+#         ((minor++))
+#     fi
+# else
+#     ((patch++))
+# fi
+
+# newVersion="$major.$minor.$patch"
+
+# # Update the version in package.json while maintaining formatting
+# jq --arg version "$newVersion" '.version = $version' package.json > tmp.json && mv tmp.json package.json
+# echo "Version updated from $currentVersion to $newVersion"
+
+# # Step 3: Publish the package to NPM
+# npm publish
+# if [[ $? -ne 0 ]]; then
+#     echo "NPM publish failed. Exiting..."
+#     exit 1
+# fi
+
+# # Step 4: Commit the changes and push to GitHub
+# git add .
+# git commit -m "Bump version to $newVersion"
+# git push origin main
+
+# if [[ $? -ne 0 ]]; then
+#     echo "Failed to push changes to GitHub. Exiting..."
+#     exit 1
+# fi
+
+# echo "Version $newVersion published and changes pushed to GitHub successfully!"
+
+
+#!/bin/bash
+
+# Check if root is only required for jq installation
+require_root_for_jq=0
+
+# Check if jq is installed
+if ! command -v jq &> /dev/null; then
+    echo "jq not found. Installing jq..."
+    require_root_for_jq=1
+    if command -v apt-get &> /dev/null; then
+        sudo apt-get update && sudo apt-get install -y jq
+    elif command -v brew &> /dev/null; then
+        brew install jq
+    else
+        echo "Please install jq manually."
+        exit 1
+    fi
+fi
+
+# Only require root if jq installation was needed
+if [[ $require_root_for_jq -eq 1 && $EUID -ne 0 ]]; then
+    echo "This script must be run as root for jq installation. Please use sudo."
+    exit 1
+fi
+
+# Step 1: Check if logged in to NPM
+npmUsername=$(npm whoami 2>&1)
+if [[ $npmUsername == *"ERR"* ]]; then
+    echo "Not logged in. Please log in to NPM."
+    npm login
+    if [[ $? -ne 0 ]]; then
+        echo "NPM login failed. Exiting..."
+        exit 1
+    fi
+else
+    echo "Already logged in to NPM as $npmUsername"
+fi
+
+# Step 2: Check the latest published version from NPM
+packageName=$(jq -r '.name' package.json)
+if [[ -z "$packageName" ]]; then
+    echo "Could not find package name in package.json"
+    exit 1
+fi
+
+latestPublishedVersion=$(npm view "$packageName" version)
+if [[ $? -ne 0 ]]; then
+    echo "Failed to fetch the latest published version. Exiting..."
+    exit 1
+fi
+
+echo "Latest published version on NPM: $latestPublishedVersion"
+
+# Step 3: Increment version in package.json
+if [[ ! -f package.json ]]; then
+    echo "package.json not found. Exiting..."
+    exit 1
+fi
+
+currentVersion=$(jq -r '.version' package.json)
+
+if [[ -z "$currentVersion" ]]; then
+    echo "Could not find version in package.json"
+    exit 1
+fi
+
+# Split version into major, minor, patch
+IFS='.' read -r major minor patch <<< "$currentVersion"
+
+# Increment version numbers with three-digit logic
+if [[ $patch -eq 99 ]]; then
+    patch=0
+    if [[ $minor -eq 99 ]]; then
+        minor=0
+        ((major++))
+    else
+        ((minor++))
+    fi
+else
+    ((patch++))
+fi
+
+newVersion="$major.$minor.$patch"
+
+# Ensure the new version is greater than the latest published version
+if [[ "$(printf '%s\n' "$newVersion" "$latestPublishedVersion" | sort -V | tail -1)" != "$newVersion" ]]; then
+    echo "Error: New version ($newVersion) is not greater than the latest published version ($latestPublishedVersion)."
+    echo "Please manually update the version in package.json or adjust the script logic."
+    exit 1
+fi
+
+# Update the version in package.json while maintaining formatting
+jq --arg version "$newVersion" '.version = $version' package.json > tmp.json && mv tmp.json package.json
+echo "Version updated from $currentVersion to $newVersion"
+
+# Step 4: Publish the package to NPM
+npm publish
+if [[ $? -ne 0 ]]; then
+    echo "NPM publish failed. Exiting..."
+    exit 1
+fi
+
+# Step 5: Commit the changes and push to GitHub
+git add .
+git commit -m "Bump version to $newVersion"
+
+# Pull latest changes to ensure there are no conflicts
+git pull origin main --rebase
+if [[ $? -ne 0 ]]; then
+    echo "Git pull failed. Please resolve conflicts manually. Exiting..."
+    exit 1
+fi
+
+# Push changes to remote
+git push origin main
+if [[ $? -ne 0 ]]; then
+    echo "Failed to push changes to GitHub. Exiting..."
+    exit 1
+fi
+
+echo "Version $newVersion published and changes pushed to GitHub successfully!"