agrs-sequelize-sdk 1.0.92 → 1.0.94

package/models/AdSet.js

@@ -31,18 +31,18 @@ module.exports = (sequelize, DataTypes) => {
         allowNull: true,
       },
       promotedObject: {
-        type: DataTypes.JSONB,
+        type: DataTypes.JSONB, // Storing promoted object as a JSON object
         allowNull: true,
       },
       BillingEvent: {
         type: DataTypes.STRING,
         allowNull: false,
-        defaultValue: "impressions",
+        defaultValue: "impressions", // Default value for BillingEvent
       },
       OptimizationGoal: {
         type: DataTypes.STRING,
         allowNull: false,
-        defaultValue: "offsite_conversions",
+        defaultValue: "offsite_conversions", // Default value for OptimizationGoal
       },
       Draft: {
         type: DataTypes.BOOLEAN,
@@ -70,6 +70,7 @@ module.exports = (sequelize, DataTypes) => {
         type: DataTypes.STRING,
         allowNull: true,
       },
+      // add issues_info field
       issuesInfo: {
         type: DataTypes.JSONB,
         allowNull: true,
@@ -78,6 +79,7 @@ module.exports = (sequelize, DataTypes) => {
         type: DataTypes.STRING,
         allowNull: true,
       },
+      // bid amount
       bid_amount: {
         type: DataTypes.INTEGER,
         allowNull: true,
@@ -87,7 +89,7 @@ module.exports = (sequelize, DataTypes) => {
       tableName: "AdSet",
       indexes: [
         {
-          fields: ["CampaignID"],
+          fields: ["CampaignID"], // Index on CampaignID for faster join
         },
       ],
     }
@@ -98,64 +100,53 @@ module.exports = (sequelize, DataTypes) => {
     AdSet.hasMany(models.Ad, { foreignKey: "AdSetID" });
   };
 
-  // Consolidated beforeUpdate hook
   AdSet.addHook("beforeUpdate", async (adSet, options) => {
-    const transaction = options.transaction || await sequelize.transaction();
-
-    try {
-      // Check if AdSetID is about to change
-      if (adSet.changed("AdSetID")) {
-        const oldAdSetID = adSet.previous("AdSetID");
-        const newAdSetID = adSet.AdSetID;
-
+    if (adSet.changed("AdSetID")) {
+      const oldAdSetID = adSet.previous("AdSetID");
+      const newAdSetID = adSet.AdSetID;  
+      try {
         // Update associated Ads to the new AdSetID
         await sequelize.models.Ad.update(
-          { AdSetID: newAdSetID },
-          { where: { AdSetID: oldAdSetID }, transaction }
+          { AdSetID: newAdSetID }, // Set new AdSetID
+          { where: { AdSetID: oldAdSetID } }
         );
+      } catch (error) {
+        throw error; // Propagate the error
       }
+    }
+    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
+        });
 
-      // Handle 'publish' changes
-      if (adSet.changed("publish")) {
-        if (adSet.previous("publish") === true && adSet.publish === false) {
-          await sequelize.models.AdSetHistory.create({
-            AdSetID: adSet.AdSetID,
-            DataSnapshot: adSet._previousDataValues,
-          });
-        } else if (
-          adSet.previous("publish") === false &&
-          adSet.publish === true
-        ) {
-          const latestHistory = await sequelize.models.AdSetHistory.findOne({
-            where: { AdSetID: adSet.AdSetID },
-            order: [["timestamp", "DESC"]],
-          });
-
-          if (latestHistory) {
-            await latestHistory.destroy();
-          }
+        if (latestHistory) {
+          await latestHistory.destroy();
         }
       }
-
-      if (!options.transaction) {
-        await transaction.commit();
-      }
-    } catch (error) {
-      if (!options.transaction) {
-        await transaction.rollback();
-      }
-      throw error;
     }
   });
 
   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(),
+        DataSnapshot: adSet.toJSON(), // Save the full AdSet data as JSON
       });
     }
   });
-
+  
   return AdSet;
 };

package/models/Campaign.js

@@ -93,6 +93,20 @@ module.exports = (sequelize, DataTypes) => {
 
   // Combined beforeUpdate hook
   Campaign.addHook("beforeUpdate", async (campaign, options) => {
+    if (campaign.changed("CampaignID")) {
+      const oldCampaignID = campaign.previous("CampaignID");
+      const newCampaignID = campaign.CampaignID;
+    
+      try {
+        // Update all associated AdSets to the new CampaignID
+        await sequelize.models.AdSet.update(
+          { CampaignID: newCampaignID }, // Set new CampaignID
+          { where: { CampaignID: oldCampaignID } }
+        );
+      } catch (error) {
+        throw error; // Propagate the error
+      }
+    }
     if (campaign.changed("publish")) {
       if (campaign.previous("publish") === true && campaign.publish === false) {
         // Save current state to CampaignHistory
@@ -126,35 +140,3 @@ module.exports = (sequelize, DataTypes) => {
       });
     }
   });
-  
-  
-  Campaign.addHook("beforeUpdate", async (campaign, options) => {
-    // Check if CampaignID is about to change
-    if (campaign.changed("CampaignID")) {
-      const oldCampaignID = campaign.previous("CampaignID");
-      const newCampaignID = campaign.CampaignID;
-  
-      // Use existing transaction or create a new one
-      const transaction = options.transaction || await sequelize.transaction();
-  
-      try {
-        // Update all associated AdSets to the new CampaignID
-        await sequelize.models.AdSet.update(
-          { CampaignID: newCampaignID }, // Set new CampaignID
-          { where: { CampaignID: oldCampaignID }, transaction }
-        );
-  
-        // Commit transaction if this is a new transaction
-        if (!options.transaction) {
-          await transaction.commit();
-        }
-      } catch (error) {
-        // Rollback on failure
-        if (!options.transaction) {
-          await transaction.rollback();
-        }
-        throw error; // Propagate the error
-      }
-    }
-  });
-  

package/package.json

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