agrs-sequelize-sdk 1.1.98 → 1.1.99

package/models/AdPerformance.js

@@ -1,84 +1,84 @@
-module.exports = (sequelize, DataTypes) => {
-  const AdPerformance = sequelize.define(
-    "AdPerformance",
-    {
-      Date: {
-        type: DataTypes.DATEONLY,
-        primaryKey: true,
-      },
-      AdID: {
-        type: DataTypes.STRING,
-        allowNull: false,
-        primaryKey: true,
-      },
-      AmountSpent: {
-        type: DataTypes.FLOAT,
-        allowNull: true,
-      },
-      Impressions: {
-        type: DataTypes.INTEGER,
-        allowNull: true,
-      },
-      LinkClicks: {
-        type: DataTypes.INTEGER,
-        allowNull: true,
-      },
-      Revenue: {
-        type: DataTypes.FLOAT,
-        allowNull: true,
-      },
-      AdClicks: {
-        type: DataTypes.INTEGER,
-        allowNull: true,
-      },
-      Sessions: {
-        type: DataTypes.INTEGER,
-        allowNull: true,
-      },
-      ViewContent: {
-        // New field
-        type: DataTypes.INTEGER,
-        allowNull: true,
-      },
-      Search: {
-        // New field
-        type: DataTypes.INTEGER,
-        allowNull: true,
-      },
-      Purchase: {
-        // New field
-        type: DataTypes.INTEGER,
-        allowNull: true,
-      },
-      originalSpend: {
-        type: DataTypes.FLOAT,
-        allowNull: true,
-      },
-      originRevenue: {
-        type: DataTypes.FLOAT,
-        allowNull: true,
-      },
-    },
-    {
-      tableName: "AdPerformance",
-      indexes: [
-        {
-          unique: true,
-          fields: ["AdID", "Date"], // Composite unique index
-        },
-        {
-          fields: ["Date"], // Index on Date for faster range queries
-        },
-        {
-          fields: ["AdID"], // Index on AdID for faster join
-        },
-      ],
-    }
-  );
-
-  AdPerformance.associate = (models) => {
-    AdPerformance.belongsTo(models.Ad, { foreignKey: "AdID" });
-  };
-
-  return AdPerformance;
-};
+module.exports = (sequelize, DataTypes) => {
+  const AdPerformance = sequelize.define(
+    "AdPerformance",
+    {
+      Date: {
+        type: DataTypes.DATEONLY,
+        primaryKey: true,
+      },
+      AdID: {
+        type: DataTypes.STRING,
+        allowNull: false,
+        primaryKey: true,
+      },
+      AmountSpent: {
+        type: DataTypes.FLOAT,
+        allowNull: true,
+      },
+      Impressions: {
+        type: DataTypes.INTEGER,
+        allowNull: true,
+      },
+      LinkClicks: {
+        type: DataTypes.INTEGER,
+        allowNull: true,
+      },
+      Revenue: {
+        type: DataTypes.FLOAT,
+        allowNull: true,
+      },
+      AdClicks: {
+        type: DataTypes.INTEGER,
+        allowNull: true,
+      },
+      Sessions: {
+        type: DataTypes.INTEGER,
+        allowNull: true,
+      },
+      ViewContent: {
+        // New field
+        type: DataTypes.INTEGER,
+        allowNull: true,
+      },
+      Search: {
+        // New field
+        type: DataTypes.INTEGER,
+        allowNull: true,
+      },
+      Purchase: {
+        // New field
+        type: DataTypes.INTEGER,
+        allowNull: true,
+      },
+      originalSpend: {
+        type: DataTypes.FLOAT,
+        allowNull: true,
+      },
+      originRevenue: {
+        type: DataTypes.FLOAT,
+        allowNull: true,
+      },
+    },
+    {
+      tableName: "AdPerformance",
+      indexes: [
+        {
+          unique: true,
+          fields: ["AdID", "Date"], // Composite unique index
+        },
+        {
+          fields: ["Date"], // Index on Date for faster range queries
+        },
+        {
+          fields: ["AdID"], // Index on AdID for faster join
+        },
+      ],
+    }
+  );
+
+  AdPerformance.associate = (models) => {
+    AdPerformance.belongsTo(models.Ad, { foreignKey: "AdID" });
+  };
+
+  return AdPerformance;
+};

package/models/AdSet.js

@@ -1,3 +1,147 @@
+// 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/Campaign.js

@@ -1,136 +1,135 @@
-module.exports = (sequelize, DataTypes) => {
-  const Campaign = sequelize.define(
-    "Campaign",
-    {
-      CampaignID: {
-        type: DataTypes.STRING,
-        primaryKey: true,
-      },
-      CampaignName: {
-        type: DataTypes.STRING,
-        allowNull: true,
-      },
-      pixelId: {
-        type: DataTypes.STRING,
-        allowNull: true,
-      },
-      customEventType: {
-        type: DataTypes.STRING,
-        allowNull: false,
-        defaultValue: "PURCHASE",
-      },
-      objective: {
-        type: DataTypes.STRING,
-        allowNull: false,
-        defaultValue: "OUTCOME_SALES",
-      },
-      status: {
-        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: true,
-      },
-      DailyBudget: {
-        type: DataTypes.INTEGER,
-        allowNull: true,
-      },
-      Draft: {
-        type: DataTypes.BOOLEAN,
-        allowNull: true,
-        defaultValue: false,
-      },
-      publish: {
-        type: DataTypes.BOOLEAN,
-        allowNull: true,
-        defaultValue: true,
-      },
-      UserCreated: {
-        type: DataTypes.STRING,
-        allowNull: true,
-      },
-      special_ad_categories: {
-        type: DataTypes.ARRAY(DataTypes.STRING),
-        allowNull: true,
-      },
-      effectiveStatus: {
-        type: DataTypes.STRING,
-        allowNull: true,
-      },
-      issuesInfo: {
-        type: DataTypes.JSONB,
-        allowNull: true,
-      },
-      waiting: {
-        type: DataTypes.BOOLEAN,
-        defaultValue: false,
-      },
-    },
-    {
-      tableName: "Campaign",
-      indexes: [
-        {
-          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._previousDataValues, // 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
-        }
-      }
-    }
-  });
-
-  Campaign.addHook("afterCreate", async (campaign, options) => {
-    if (campaign.publish === false) {
-      // If publish is false on creation, save a snapshot to CampaignHistory
-      await sequelize.models.CampaignHistory.create({
-        CampaignID: campaign.CampaignID,
-        DataSnapshot: campaign.toJSON(), // Save current state
-      });
-    }
-  });
-  
-
-  return Campaign;
-};
+module.exports = (sequelize, DataTypes) => {
+  const Campaign = sequelize.define(
+    "Campaign",
+    {
+      CampaignID: {
+        type: DataTypes.STRING,
+        primaryKey: true,
+      },
+      CampaignName: {
+        type: DataTypes.STRING,
+        allowNull: true,
+      },
+      pixelId: {
+        type: DataTypes.STRING,
+        allowNull: true,
+      },
+      customEventType: {
+        type: DataTypes.STRING,
+        allowNull: false,
+        defaultValue: "PURCHASE",
+      },
+      objective: {
+        type: DataTypes.STRING,
+        allowNull: false,
+        defaultValue: "OUTCOME_SALES",
+      },
+      status: {
+        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: true,
+      },
+      DailyBudget: {
+        type: DataTypes.INTEGER,
+        allowNull: true,
+      },
+      Draft: {
+        type: DataTypes.BOOLEAN,
+        allowNull: true,
+        defaultValue: false,
+      },
+      publish: {
+        type: DataTypes.BOOLEAN,
+        allowNull: true,
+        defaultValue: true,
+      },
+      UserCreated: {
+        type: DataTypes.STRING,
+        allowNull: true,
+      },
+      special_ad_categories: {
+        type: DataTypes.ARRAY(DataTypes.STRING),
+        allowNull: true,
+      },
+      effectiveStatus: {
+        type: DataTypes.STRING,
+        allowNull: true,
+      },
+      issuesInfo: {
+        type: DataTypes.JSONB,
+        allowNull: true,
+      },
+      waiting: {
+        type: DataTypes.BOOLEAN,
+        defaultValue: false,
+      },
+    },
+    {
+      tableName: "Campaign",
+      indexes: [
+        {
+          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._previousDataValues, // 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
+        }
+      }
+    }
+  });
+
+  Campaign.addHook("afterCreate", async (campaign, options) => {
+    if (campaign.publish === false) {
+      // If publish is false on creation, save a snapshot to CampaignHistory
+      await sequelize.models.CampaignHistory.create({
+        CampaignID: campaign.CampaignID,
+        DataSnapshot: campaign.toJSON(), // Save current state
+      });
+    }
+  });
+
+  return Campaign;
+};

package/models/RSOCFeedCampaign.js

@@ -158,15 +158,6 @@ 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
@@ -290,7 +281,7 @@ module.exports = (sequelize, DataTypes) => {
         }
       } else {
         console.warn(
-          `Channel not found for channelId: ${newChannelId}, styleId: ${newStyleId}`
+          `New channel not found for channelId: ${newChannelId}, styleId: ${newStyleId}`
         );
       }
     } catch (error) {

package/models/pixel.js

@@ -7,6 +7,10 @@ module.exports = (sequelize) => {
       allowNull: false,
       primaryKey: true,
     },
+    name: {
+      type: DataTypes.STRING,
+      allowNull: false,
+    },
     platform: {
       type: DataTypes.STRING,
       allowNull: false,
@@ -30,4 +34,4 @@ module.exports = (sequelize) => {
   });
 
   return Pixel;
-};
+};

package/package.json

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