agrs-sequelize-sdk 1.0.91 → 1.0.92

package/models/AdSet.js

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

package/package.json

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