agrs-sequelize-sdk 1.1.98 → 1.2.0

package/agrs-sequelize/package.json

@@ -0,0 +1,19 @@
+{
+  "name": "agrs-sequelize-sdk",
+  "version": "1.1.98",
+  "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/agrs-sequelize/run.ps1

@@ -0,0 +1,98 @@
+# Ensure the script is run as an Administrator
+#If (-Not ([Security.Principal.WindowsPrincipal] [Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole] "Administrator")) {
+#    Write-Host "This script must be run as an administrator." -ForegroundColor Red
+#    Write-Host "Right-click on the script and select 'Run as Administrator'."
+#    Exit 1
+#}
+
+# Check if jq is installed
+$jqPath = Get-Command jq -ErrorAction SilentlyContinue
+
+if (-not $jqPath) {
+    Write-Host "jq not found. Downloading jq manually..."
+    $jqUrl = "https://github.com/stedolan/jq/releases/download/jq-1.6/jq-win64.exe"
+    $jqDestination = "$env:TEMP\jq.exe"
+
+    try {
+        Invoke-WebRequest -Uri $jqUrl -OutFile $jqDestination
+        Move-Item -Path $jqDestination -Destination "$env:SystemRoot\System32\jq.exe" -Force
+        Write-Host "jq installed manually."
+    } catch {
+        Write-Host "Failed to download or move jq. Please ensure you have the necessary permissions."
+        Exit 1
+    }
+}
+
+# Step 1: Check if logged in to NPM
+try {
+    $npmUsername = npm whoami 2>&1
+    if ($npmUsername -match "ERR") {
+        Write-Host "Not logged in. Please log in to NPM."
+        npm login
+        if ($LASTEXITCODE -ne 0) {
+            Write-Host "NPM login failed. Exiting..."
+            Exit 1
+        }
+    } else {
+        Write-Host "Already logged in to NPM as $npmUsername"
+    }
+} catch {
+    Write-Host "Error while checking NPM login status."
+    Exit 1
+}
+
+# Step 2: Increment version in package.json
+$packageJson = Get-Content -Raw -Path "package.json" | ConvertFrom-Json
+$currentVersion = $packageJson.version
+
+if (-not $currentVersion) {
+    Write-Host "Could not find version in package.json"
+    Exit 1
+}
+
+# Split version into major, minor, patch
+$versionParts = $currentVersion -split '\.'
+
+$major = [int]$versionParts[0]
+$minor = [int]$versionParts[1]
+$patch = [int]$versionParts[2]
+
+# Increment version numbers with three-digit logic
+if ($patch -eq 99) {
+    $patch = 0
+    if ($minor -eq 99) {
+        $minor = 0
+        $major++
+    } else {
+        $minor++
+    }
+} else {
+    $patch++
+}
+
+$newVersion = "$major.$minor.$patch"
+
+# Update the version in package.json while maintaining indentation
+$packageJson.version = $newVersion
+$packageJson | ConvertTo-Json -Depth 100 | Set-Content -Path "package.json"
+
+Write-Host "Version updated from $currentVersion to $newVersion"
+
+# Step 3: Publish the package to NPM
+npm publish
+if ($LASTEXITCODE -ne 0) {
+    Write-Host "NPM publish failed. Exiting..."
+    Exit 1
+}
+
+# Step 4: Commit the changes and push to GitHub
+git add .
+git commit -m "Bump version to $newVersion"
+git push origin main
+
+if ($LASTEXITCODE -ne 0) {
+    Write-Host "Failed to push changes to GitHub. Exiting..."
+    Exit 1
+}
+
+Write-Host "Version $newVersion published and changes pushed to GitHub successfully!"

package/agrs-sequelize/run.sh

@@ -0,0 +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!"

package/migrations/20240321000000-add-performance-indexes.js

@@ -0,0 +1,73 @@
+"use strict";
+
+module.exports = {
+  up: async (queryInterface, Sequelize) => {
+    // Add indexes for AdPerformance table
+    await queryInterface.addIndex("AdPerformance", ["Date", "AdID"], {
+      name: "ad_performance_date_adid_idx",
+      unique: true,
+    });
+
+    await queryInterface.addIndex("AdPerformance", ["Date"], {
+      name: "ad_performance_date_idx",
+    });
+
+    // Add indexes for Ad table
+    await queryInterface.addIndex("Ad", ["AdSetID"], {
+      name: "ad_adsetid_idx",
+    });
+
+    await queryInterface.addIndex("Ad", ["AGRS_CID"], {
+      name: "ad_agrs_cid_idx",
+    });
+
+    await queryInterface.addIndex("Ad", ["Status"], {
+      name: "ad_status_idx",
+    });
+
+    // Add indexes for AdSet table
+    await queryInterface.addIndex("AdSet", ["CampaignID"], {
+      name: "adset_campaignid_idx",
+    });
+
+    await queryInterface.addIndex("AdSet", ["Status"], {
+      name: "adset_status_idx",
+    });
+
+    // Add indexes for Campaign table
+    await queryInterface.addIndex("Campaign", ["AdAccountID"], {
+      name: "campaign_adaccountid_idx",
+    });
+
+    await queryInterface.addIndex("Campaign", ["Status"], {
+      name: "campaign_status_idx",
+    });
+
+    await queryInterface.addIndex("Campaign", ["CreatedTime"], {
+      name: "campaign_createdtime_idx",
+    });
+  },
+
+  down: async (queryInterface, Sequelize) => {
+    // Remove indexes in reverse order
+    await queryInterface.removeIndex("Campaign", "campaign_createdtime_idx");
+    await queryInterface.removeIndex("Campaign", "campaign_status_idx");
+    await queryInterface.removeIndex("Campaign", "campaign_adaccountid_idx");
+
+    await queryInterface.removeIndex("AdSet", "adset_status_idx");
+    await queryInterface.removeIndex("AdSet", "adset_campaignid_idx");
+
+    await queryInterface.removeIndex("Ad", "ad_status_idx");
+    await queryInterface.removeIndex("Ad", "ad_agrs_cid_idx");
+    await queryInterface.removeIndex("Ad", "ad_adsetid_idx");
+
+    await queryInterface.removeIndex(
+      "AdPerformance",
+      "ad_performance_date_idx"
+    );
+    await queryInterface.removeIndex(
+      "AdPerformance",
+      "ad_performance_date_adid_idx"
+    );
+  },
+};

package/models/Ad.js

@@ -21,6 +21,10 @@ module.exports = (sequelize, DataTypes) => {
       creativeId: {
         type: DataTypes.STRING,
         allowNull: true,
+        // references: {
+        //   model: "AdCreatives", // Assuming you have an AdCreative model
+        //   key: "id",
+        // },
       },
       pixelId: {
         type: DataTypes.STRING,
@@ -40,27 +44,27 @@ module.exports = (sequelize, DataTypes) => {
         defaultValue: "SINGLE",
       },
       imageHashes: {
-        type: DataTypes.ARRAY(DataTypes.STRING),
+        type: DataTypes.ARRAY(DataTypes.STRING), // Array of image hashes
         allowNull: true,
       },
       videoIds: {
-        type: DataTypes.ARRAY(DataTypes.STRING),
+        type: DataTypes.ARRAY(DataTypes.STRING), // Array of video IDs
         allowNull: true,
       },
       messages: {
-        type: DataTypes.ARRAY(DataTypes.TEXT),
+        type: DataTypes.ARRAY(DataTypes.TEXT), // Array of primary text messages
         allowNull: true,
       },
       headlines: {
-        type: DataTypes.ARRAY(DataTypes.TEXT),
+        type: DataTypes.ARRAY(DataTypes.TEXT), // Array of headlines
         allowNull: true,
       },
       websiteUrl: {
-        type: DataTypes.TEXT,
+        type: DataTypes.TEXT, // Increase limit for longer URLs
         allowNull: true,
       },
       pageId: {
-        type: DataTypes.STRING(256),
+        type: DataTypes.STRING(256), // Increase limit for longer URLs
         allowNull: true,
       },
       actionTypes: {
@@ -94,14 +98,17 @@ module.exports = (sequelize, DataTypes) => {
         type: DataTypes.STRING,
         allowNull: true,
       },
+      // add effective_status field
       effectiveStatus: {
         type: DataTypes.STRING,
         allowNull: true,
       },
+      // add issues_info field
       issuesInfo: {
         type: DataTypes.JSONB,
         allowNull: true,
       },
+      // add ad_review_feedback
       adReviewFeedback: {
         type: DataTypes.JSONB,
         allowNull: true,
@@ -115,27 +122,44 @@ module.exports = (sequelize, DataTypes) => {
       tableName: "Ad",
       indexes: [
         {
-          fields: ["AdSetID"],
+          fields: ["AdSetID"], // Index on AdSetID for faster join
         },
       ],
     }
   );
 
+  // Ad.associate = (models) => {
+  //   Ad.belongsTo(models.AdSet, { foreignKey: "AdSetID" });
+
+  //   // Association with CodefuelCampaign using AGRS_CID
+  //   Ad.belongsTo(models.CodefuelCampaign, {
+  //     foreignKey: "AGRS_CID",
+  //     targetKey: "AGRSCID",
+  //     as: "CodefuelCampaign",
+  //     constraints: false, // Disable FK constraint at the DB level
+  //   });
+
+  //   Ad.hasMany(models.AdPerformance, {
+  //     foreignKey: "AdID",
+  //   });
+  // };
+
   Ad.associate = (models) => {
     Ad.belongsTo(models.AdSet, { foreignKey: "AdSetID" });
 
+    // Add dynamic relations to either CodefuelCampaign or RSOCFeedCampaign
     Ad.belongsTo(models.CodefuelCampaign, {
       foreignKey: "AGRS_CID",
       targetKey: "AGRSCID",
       as: "CodefuelCampaign",
-      constraints: false,
+      constraints: false, // Disable FK constraint
     });
 
     Ad.belongsTo(models.RSOCFeedCampaign, {
       foreignKey: "AGRS_CID",
       targetKey: "AGRS_CID",
       as: "RSOCFeedCampaign",
-      constraints: false,
+      constraints: false, // Disable FK constraint
     });
 
     Ad.hasMany(models.AdPerformance, {
@@ -143,6 +167,46 @@ module.exports = (sequelize, DataTypes) => {
     });
   };
 
+  // // Method to dynamically fetch related campaign
+  // Ad.prototype.getRelatedCampaign = async function () {
+  //   if (!this.AGRS_CID) return null;
+
+  //   const codefuelCampaign = await sequelize.models.CodefuelCampaign.findOne({
+  //     where: { AGRSCID: this.AGRS_CID },
+  //   });
+
+  //   if (codefuelCampaign) {
+  //     return {
+  //       type: "CodefuelCampaign",
+  //       data: codefuelCampaign,
+  //     };
+  //   }
+
+  //   const tonicCampaign = await sequelize.models.TonicCampaign.findOne({
+  //     where: { AGRSCID: this.AGRS_CID },
+  //   });
+
+  //   if (tonicCampaign) {
+  //     return {
+  //       type: "TonicCampaign",
+  //       data: tonicCampaign,
+  //     };
+  //   }
+
+  //   // do the same with RSOCFeedCampaign
+  //   const rsocFeedCampaign = await sequelize.models.RSOCFeedCampaign.findOne({
+  //     where: { AGRS_CID: this.AGRS_CID },
+  //   });
+
+  //   if (rsocFeedCampaign) {
+  //     return {
+  //       type: "RSOCFeedCampaign",
+  //       data: rsocFeedCampaign,
+  //     };
+  //   }
+  //   return null;
+  // };
+
   Ad.prototype.getRelatedCampaign = async function () {
     if (!this.AGRS_CID) return null;