agrs-sequelize-sdk 1.1.94 → 1.1.97

package/models/Ad.js

@@ -21,10 +21,6 @@ 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,
@@ -44,27 +40,27 @@ module.exports = (sequelize, DataTypes) => {
         defaultValue: "SINGLE",
       },
       imageHashes: {
-        type: DataTypes.ARRAY(DataTypes.STRING), // Array of image hashes
+        type: DataTypes.ARRAY(DataTypes.STRING),
         allowNull: true,
       },
       videoIds: {
-        type: DataTypes.ARRAY(DataTypes.STRING), // Array of video IDs
+        type: DataTypes.ARRAY(DataTypes.STRING),
         allowNull: true,
       },
       messages: {
-        type: DataTypes.ARRAY(DataTypes.TEXT), // Array of primary text messages
+        type: DataTypes.ARRAY(DataTypes.TEXT),
         allowNull: true,
       },
       headlines: {
-        type: DataTypes.ARRAY(DataTypes.TEXT), // Array of headlines
+        type: DataTypes.ARRAY(DataTypes.TEXT),
         allowNull: true,
       },
       websiteUrl: {
-        type: DataTypes.TEXT, // Increase limit for longer URLs
+        type: DataTypes.TEXT,
         allowNull: true,
       },
       pageId: {
-        type: DataTypes.STRING(256), // Increase limit for longer URLs
+        type: DataTypes.STRING(256),
         allowNull: true,
       },
       actionTypes: {
@@ -98,17 +94,14 @@ 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,
@@ -122,44 +115,27 @@ module.exports = (sequelize, DataTypes) => {
       tableName: "Ad",
       indexes: [
         {
-          fields: ["AdSetID"], // Index on AdSetID for faster join
+          fields: ["AdSetID"],
         },
       ],
     }
   );
 
-  // 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, // Disable FK constraint
+      constraints: false,
     });
 
     Ad.belongsTo(models.RSOCFeedCampaign, {
       foreignKey: "AGRS_CID",
       targetKey: "AGRS_CID",
       as: "RSOCFeedCampaign",
-      constraints: false, // Disable FK constraint
+      constraints: false,
     });
 
     Ad.hasMany(models.AdPerformance, {
@@ -167,46 +143,6 @@ 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;
 

package/models/AdSet.js

@@ -1,147 +1,3 @@
-// module.exports = (sequelize, DataTypes) => {
-//   const AdSet = sequelize.define(
-//     "AdSet",
-//     {
-//       AdSetID: {
-//         type: DataTypes.STRING,
-//         primaryKey: true,
-//       },
-//       AdSetName: {
-//         type: DataTypes.STRING,
-//         allowNull: true,
-//       },
-//       Status: {
-//         type: DataTypes.STRING,
-//         allowNull: true,
-//       },
-//       daily_budget: {
-//         type: DataTypes.INTEGER,
-//         allowNull: true,
-//       },
-//       start_time: {
-//         type: DataTypes.DATE,
-//         allowNull: true,
-//       },
-//       end_time: {
-//         type: DataTypes.DATE,
-//         allowNull: true,
-//       },
-//       targeting: {
-//         type: DataTypes.JSONB,
-//         allowNull: true,
-//       },
-//       promotedObject: {
-//         type: DataTypes.JSONB, // Storing promoted object as a JSON object
-//         allowNull: true,
-//       },
-//       BillingEvent: {
-//         type: DataTypes.STRING,
-//         allowNull: false,
-//         defaultValue: "impressions", // Default value for BillingEvent
-//       },
-//       OptimizationGoal: {
-//         type: DataTypes.STRING,
-//         allowNull: false,
-//         defaultValue: "offsite_conversions", // Default value for OptimizationGoal
-//       },
-//       Draft: {
-//         type: DataTypes.BOOLEAN,
-//         allowNull: true,
-//         defaultValue: false,
-//       },
-//       UserCreated: {
-//         type: DataTypes.STRING,
-//         allowNull: true,
-//       },
-//       publish: {
-//         type: DataTypes.BOOLEAN,
-//         allowNull: true,
-//         defaultValue: true,
-//       },
-//       CampaignID: {
-//         type: DataTypes.STRING,
-//         allowNull: false,
-//         references: {
-//           model: "Campaign",
-//           key: "CampaignID",
-//         },
-//       },
-//       effectiveStatus: {
-//         type: DataTypes.STRING,
-//         allowNull: true,
-//       },
-//       // add issues_info field
-//       issuesInfo: {
-//         type: DataTypes.JSONB,
-//         allowNull: true,
-//       },
-//       bid_strategy: {
-//         type: DataTypes.STRING,
-//         allowNull: true,
-//       },
-//       // bid amount
-//       bid_amount: {
-//         type: DataTypes.INTEGER,
-//         allowNull: true,
-//       },
-//       waiting: {
-//         type: DataTypes.BOOLEAN,
-//         defaultValue: false,
-//       },
-//     },
-//     {
-//       tableName: "AdSet",
-//       indexes: [
-//         {
-//           fields: ["CampaignID"], // Index on CampaignID for faster join
-//         },
-//       ],
-//     }
-//   );
-
-//   AdSet.associate = (models) => {
-//     AdSet.belongsTo(models.Campaign, { foreignKey: "CampaignID" });
-//     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._previousDataValues, // 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();
-//         }
-//       }
-//     }
-//   });
-
-//   AdSet.addHook("afterCreate", async (adSet, options) => {
-//     if (adSet.publish === false) {
-//       // If publish is false on creation, save a snapshot to AdSetHistory
-//       await sequelize.models.AdSetHistory.create({
-//         AdSetID: adSet.AdSetID,
-//         DataSnapshot: adSet.toJSON(), // Save the full AdSet data as JSON
-//       });
-//     }
-//   });
-
-//   return AdSet;
-// };
-
 module.exports = (sequelize, DataTypes) => {
   const AdSet = sequelize.define(
     "AdSet",

package/models/RSOCFeedCampaign.js

@@ -158,6 +158,15 @@ module.exports = (sequelize, DataTypes) => {
         constraints: false,
       });
     }
+
+    if (models.Ad) {
+      RSOCFeedCampaign.hasMany(models.Ad, {
+        foreignKey: "AGRS_CID",
+        sourceKey: "AGRS_CID",
+        as: "Ads",
+        constraints: false,
+      });
+    }
   };
 
   // BeforeCreate hook: Update Channel status and connectedCampaigns
@@ -281,7 +290,7 @@ module.exports = (sequelize, DataTypes) => {
         }
       } else {
         console.warn(
-          `New channel not found for channelId: ${newChannelId}, styleId: ${newStyleId}`
+          `Channel not found for channelId: ${newChannelId}, styleId: ${newStyleId}`
         );
       }
     } catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agrs-sequelize-sdk",
-  "version": "1.1.94",
+  "version": "1.1.97",
   "main": "index.js",
   "scripts": {
     "start": "node index.js",

package/agrs-sequelize/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2024 Agressive Scale LTD
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

package/agrs-sequelize/README.md

@@ -1,179 +0,0 @@
-# agrs-sequelize SDK
-
-The `agrs-sequelize` SDK provides a structured way to manage your database models using Sequelize ORM. It allows you to easily add, update, and manage models, with support for publishing updates to NPM and pushing changes to GitHub.
-
-## Table of Contents
-
-- [Prerequisites](#prerequisites)
-- [Installation](#installation)
-- [Usage](#usage)
-  - [Adding or Modifying Models](#adding-or-modifying-models)
-  - [Model Loading](#model-loading)
-- [Publishing Changes](#publishing-changes)
-  - [Using PowerShell (Windows)](#using-powershell-windows)
-  - [Using Bash (Linux/macOS)](#using-bash-linuxmacos)
-- [Script Details](#script-details)
-  - [run.ps1 (PowerShell Script for Windows)](#runps1-powershell-script-for-windows)
-  - [run.sh (Bash Script for Linux/macOS)](#runsh-bash-script-for-linuxmacos)
-- [Example Model File](#example-model-file)
-- [Versioning](#versioning)
-- [Troubleshooting](#troubleshooting)
-- [License](#license)
-
-## Prerequisites
-
-Ensure the following dependencies are installed on your system:
-
-- **Node.js**: [Download Node.js](https://nodejs.org/)
-- **Sequelize**: Used for database interaction.
-- **Git**: Required for version control and publishing changes to GitHub.
-- **npm**: For managing and publishing packages.
-- **PowerShell** (Windows) or **Bash** (Linux/macOS): For running automation scripts.
-
-## Installation
-
-1. **Clone the Repository:**
-
-   ```bash
-   git clone https://github.com/your-repo/agrs-sequelize.git
-   cd agrs-sequelize
-    ```
-
-2. **Install Dependencies:**
-
-   ```bash
-        npm install
-    ```
-
-
-# Usage
-
-## Adding or Modifying Models
-To add or modify models in the agrs-sequelize SDK:
-
-1. **Create or Edit a Model:**
-
-    - Add a new model file inside the models directory or edit an existing one.
-    - Each model file should export a function that initializes the model with Sequelize.
-
-```javascript
-// models/YourModel.js
-module.exports = (sequelize, DataTypes) => {
-  const YourModel = sequelize.define('YourModel', {
-    fieldName: {
-      type: DataTypes.STRING,
-      allowNull: false,
-    },
-  });
-
-  // Define associations (optional)
-  YourModel.associate = (models) => {
-    YourModel.hasMany(models.OtherModel);
-  };
-
-  return YourModel;
-}; 
-```
-
-2. **Define Associations (if required):**
-
-    Use the associate method to define relationships with other models.
-    Associations like hasMany, belongsTo, etc., are supported.
-### Model Loading
-    Models are automatically loaded when initializing Sequelize.
-    The index.js file ensures all models in the models directory are properly loaded and associated.
-
-## Publishing Changes
- After modifying or adding models, publish the changes to NPM and GitHub.
-
-### Using PowerShell (Windows)
-Open PowerShell as Administrator.
-
-Run the Script:
-
-```powershell
-./run.ps1
-```
-The script will:
-
-- Check for jq installation.
-- Bump the version in package.json.
-- Publish to NPM.
-- Commit and push changes to GitHub.
-
-### Using Bash (Linux/macOS)
-Open a Bash Terminal.
-
-Run the Script:
-
-```bash
-./run.sh
-```
-The script performs the same tasks as the PowerShell script, tailored for Bash environments.
-
-## Script Details
-### run.ps1 (PowerShell Script for Windows)
-Automates the publishing process:
-
-- Ensures jq is installed.
-- Increments the version in package.json.
-- Publishes the package to NPM.
-- Commits and pushes changes to GitHub.
-
-### run.sh (Bash Script for Linux/macOS)
-Provides similar functionality:
-
-- Checks for jq installation.
-- Bumps the package version.
-= Publishes to NPM.
-= Commits and pushes to GitHub.
-
-## Example Model File
-```javascript
-Copy code
-// models/YourModel.js
-module.exports = (sequelize, DataTypes) => {
-  const YourModel = sequelize.define('YourModel', {
-    name: {
-      type: DataTypes.STRING,
-      allowNull: false,
-    },
-  });
-
-  // Define associations (optional)
-  YourModel.associate = (models) => {
-    YourModel.hasMany(models.OtherModel);
-  };
-
-  return YourModel;
-};
-```
-In this example:
-
-YourModel has a name field.
-It has a hasMany association with OtherModel.
-## Versioning
-Versioning is handled automatically:
-
-- The scripts increment the version in package.json.
-- Follows semantic versioning (major, minor, patch).
-- Updated versions are published to NPM and committed to the repository.
-
-## Troubleshooting
-- ### Permission Issues:
-
-   - Linux/macOS: Ensure scripts have execute permissions (chmod +x run.sh).
-- ### NPM Login Errors:
-
-   - The script will prompt for NPM login if not already logged in.
-   - Verify NPM account credentials.
-
-- ### Missing Dependencies:
-
-   - The script checks for jq and installs it if missing.
-## License
-This project is licensed under the MIT License. See the LICENSE file for details.
-
-
-
-