agrs-sequelize-sdk 1.0.32 → 1.0.34

package/models/Ad.js

@@ -72,7 +72,10 @@ module.exports = (sequelize, DataTypes) => {
         type: DataTypes.STRING,
         allowNull: true,
       },
-
+      publish:{
+        type: DataTypes.BOOLEAN,
+        allowNull: true,
+      },
       createdTime: {
         type: DataTypes.DATE,
         allowNull: true,
@@ -84,7 +87,11 @@ module.exports = (sequelize, DataTypes) => {
       Draft: {
         type: DataTypes.BOOLEAN,
         allowNull: true,
-      }
+      },
+      UserCreated: {
+        type: DataTypes.STRING,
+        allowNull: true,
+      },
     },
     {
       tableName: "Ad",
@@ -139,6 +146,27 @@ module.exports = (sequelize, DataTypes) => {
 
     return null;
   };
-
+  Ad.addHook('beforeUpdate', async (ad, options) => {
+    if (ad.changed('publish')) {
+      if (ad.previous('publish') === true && ad.publish === false) {
+        // Save current state to AdHistory
+        await sequelize.models.AdHistory.create({
+          AdID: ad.AdID,
+          DataSnapshot: ad.get(), // Save the full Ad data as JSON
+        });
+      } else if (ad.previous('publish') === false && ad.publish === true) {
+        // Delete the latest history entry
+        const latestHistory = await sequelize.models.AdHistory.findOne({
+          where: { AdID: ad.AdID },
+          order: [['timestamp', 'DESC']], // Get the latest history entry
+        });
+  
+        if (latestHistory) {
+          await latestHistory.destroy();
+        }
+      }
+    }
+  });
+  
   return Ad;
 };

package/models/AdCreative.js

@@ -45,7 +45,11 @@ module.exports = (sequelize, DataTypes) => {
     Draft: {
       type: DataTypes.BOOLEAN,
       allowNull: true,
-    }
+    },
+    UserCreated: {
+      type: DataTypes.STRING,
+      allowNull: true,
+    },
   });
 
   // Define associations

package/models/AdHistory.js

@@ -0,0 +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;
+};

package/models/AdSet.js

@@ -10,6 +10,10 @@ module.exports = (sequelize, DataTypes) => {
         type: DataTypes.STRING,
         allowNull: true,
       },
+      Status: {
+        type: DataTypes.STRING,
+        allowNull: true,
+      },
       daily_budget: {
         type: DataTypes.INTEGER,
         allowNull: true,
@@ -44,6 +48,14 @@ module.exports = (sequelize, DataTypes) => {
         type: DataTypes.BOOLEAN,
         allowNull: true,
       },
+      UserCreated: {
+        type: DataTypes.STRING,
+        allowNull: true,
+      },
+      publish:{
+        type: DataTypes.BOOLEAN,
+        allowNull: true,
+      },
       CampaignID: {
         type: DataTypes.STRING,
         allowNull: false,
@@ -68,5 +80,27 @@ module.exports = (sequelize, DataTypes) => {
     AdSet.hasMany(models.Ad, { foreignKey: "AdSetID" });
   };
 
+  AdSet.addHook('beforeUpdate', async (adSet, options) => {
+    if (adSet.changed('publish')) {
+      if (adSet.previous('publish') === true && adSet.publish === false) {
+        // Save current state to AdSetHistory
+        await sequelize.models.AdSetHistory.create({
+          AdSetID: adSet.AdSetID,
+          DataSnapshot: adSet.get(), // Save the full AdSet data as JSON
+        });
+      } else if (adSet.previous('publish') === false && adSet.publish === true) {
+        // Delete the latest history entry
+        const latestHistory = await sequelize.models.AdSetHistory.findOne({
+          where: { AdSetID: adSet.AdSetID },
+          order: [['timestamp', 'DESC']], // Get the latest history entry
+        });
+  
+        if (latestHistory) {
+          await latestHistory.destroy();
+        }
+      }
+    }
+  });
+  
   return AdSet;
 };

package/models/AdSetHistory.js

@@ -0,0 +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;
+};

package/models/Campaign.js

@@ -1,45 +1,3 @@
-// module.exports = (sequelize, DataTypes) => {
-//   const Campaign = sequelize.define(
-//     "Campaign",
-//     {
-//       CampaignID: {
-//         type: DataTypes.STRING,
-//         primaryKey: true,
-//       },
-//       CampaignName: {
-//         type: DataTypes.STRING,
-//         allowNull: true,
-//       },
-//       AdAccountID: {
-//         type: DataTypes.STRING,
-//         allowNull: false,
-//         references: {
-//           model: "AdAccount",
-//           key: "AdAccountID",
-//         },
-//       },
-//       CreatedTime: {
-//         type: DataTypes.DATE,
-//         allowNull: false,
-//       },
-//       CampaignDelivery: {
-//         type: DataTypes.STRING,
-//         allowNull: false,
-//       },
-//     },
-//     {
-//       tableName: "Campaign",
-//     }
-//   );
-
-//   Campaign.associate = (models) => {
-//     Campaign.belongsTo(models.AdAccount, { foreignKey: "AdAccountID" });
-//     Campaign.hasMany(models.AdSet, { foreignKey: "CampaignID" }); // Association to AdSet
-//   };
-
-//   return Campaign;
-// };
-
 module.exports = (sequelize, DataTypes) => {
   const Campaign = sequelize.define(
     "Campaign",
@@ -48,7 +6,6 @@ module.exports = (sequelize, DataTypes) => {
         type: DataTypes.STRING,
         primaryKey: true,
       },
-
       CampaignName: {
         type: DataTypes.STRING,
         allowNull: true,
@@ -60,18 +17,17 @@ module.exports = (sequelize, DataTypes) => {
       customEventType: {
         type: DataTypes.STRING,
         allowNull: false,
-        defaultValue: "PURCHASE", // Default value is 'PURCHASE'
+        defaultValue: "PURCHASE",
       },
       objective: {
         type: DataTypes.STRING,
         allowNull: false,
-        defaultValue: "OUTCOME_SALES", // Default value is 'OUTCOME_SALES'
+        defaultValue: "OUTCOME_SALES",
       },
       status: {
         type: DataTypes.STRING,
         allowNull: true,
       },
-
       AdAccountID: {
         type: DataTypes.STRING,
         allowNull: false,
@@ -95,22 +51,58 @@ module.exports = (sequelize, DataTypes) => {
       Draft: {
         type: DataTypes.BOOLEAN,
         allowNull: true,
-      }
+      },
+      publish: {
+        type: DataTypes.BOOLEAN,
+        allowNull: true,
+      },
+      UserCreated: {
+        type: DataTypes.STRING,
+        allowNull: true,
+      },
+      special_ad_categories: {
+        type: DataTypes.ARRAY(DataTypes.STRING),
+        allowNull: true,
+      },
     },
     {
       tableName: "Campaign",
       indexes: [
         {
-          fields: ["AdAccountID"], // Index on AdAccountID for faster join
+          fields: ["AdAccountID"], // Index on AdAccountID for faster joins
         },
       ],
     }
   );
 
+  // Define associations
   Campaign.associate = (models) => {
     Campaign.belongsTo(models.AdAccount, { foreignKey: "AdAccountID" });
     Campaign.hasMany(models.AdSet, { foreignKey: "CampaignID" });
   };
 
+  // Combined beforeUpdate hook
+  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.get(), // Store current state as JSON
+        });
+      } 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
+        });
+
+        if (latestHistory) {
+          await latestHistory.destroy(); // Delete the latest history entry
+        }
+      }
+    }
+  });
+
   return Campaign;
 };

package/models/CampaignHistory.js

@@ -0,0 +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;
+};

package/package.json

@@ -1,19 +1,21 @@
-{
-  "name": "agrs-sequelize-sdk",
-  "version": "1.0.32",
-  "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"
-  }
-}
+{
+    "name":  "agrs-sequelize-sdk",
+    "version":  "1.0.34",
+    "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"
+                     }
+}

package/run.sh

@@ -1,91 +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: 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!"