agrs-sequelize-sdk 1.0.31 → 1.0.33

package/models/CodefuelCampaign.js

@@ -112,6 +112,14 @@ module.exports = (sequelize, DataTypes) => {
         version: nextVersion,
       });
     }
+
+    // Logic to update RedirectLink if AGRSCID is updated
+    if (campaign.changed("AGRSCID")) {
+      const AGRSCID = campaign.getDataValue("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);
+    }
   });
+
   return CodefuelCampaign;
 };

package/package.json

@@ -1,21 +1,19 @@
-{
-    "name":  "agrs-sequelize-sdk",
-    "version":  "1.0.31",
-    "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.33",
+  "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,3 +1,96 @@
+# #!/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
@@ -36,7 +129,22 @@ else
     echo "Already logged in to NPM as $npmUsername"
 fi
 
-# Step 2: Increment version in package.json
+# 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
@@ -67,22 +175,37 @@ 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 3: Publish the package to NPM
+# Step 4: 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
+# Step 5: Commit the changes and push to GitHub
 git add .
 git commit -m "Bump version to $newVersion"
-git push origin main
 
+# 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