agrs-sequelize-sdk 1.1.56 → 1.1.57

package/models/RSOCFeedCampaign.js

@@ -116,10 +116,12 @@ module.exports = (sequelize, DataTypes) => {
       },
       createdAt: {
         type: DataTypes.DATE,
+        allowNull: false,
         defaultValue: DataTypes.NOW,
       },
       updatedAt: {
         type: DataTypes.DATE,
+        allowNull: false,
         defaultValue: DataTypes.NOW,
       },
       platform: {
@@ -133,97 +135,84 @@ module.exports = (sequelize, DataTypes) => {
     },
     {
       tableName: "rsoc_feed_campaigns",
-      timestamps: true,
-      // Entirely disable automatic foreign key creation
-      references: false,
+      timestamps: true, // Enable Sequelize-managed timestamps
     }
   );
 
-  // Override the standard associate method to use non-constraint associations
-  RSOCFeedCampaign.associate = function (models) {
-    // Define associations without foreign key constraints
-    const queryOptions = { constraints: false };
-
-    // Associate with Article model
+  // Define associations without enforcing foreign key constraints
+  RSOCFeedCampaign.associate = (models) => {
     if (models.Article) {
       RSOCFeedCampaign.belongsTo(models.Article, {
         foreignKey: "AGRSAID",
         targetKey: "AGRSAID",
         as: "Article",
-        ...queryOptions,
+        constraints: false, // Disable FK constraint
       });
     }
 
-    // Associate with Channel model
     if (models.Channel) {
       RSOCFeedCampaign.belongsTo(models.Channel, {
         foreignKey: "channelId",
         targetKey: "channelId",
         as: "Channel",
-        ...queryOptions,
+        constraints: false, // Disable FK constraint
       });
     }
   };
 
+  // BeforeCreate hook: Update Channel status and connectedCampaigns
   RSOCFeedCampaign.beforeCreate(async (campaign, options) => {
-    // Set redirectLink to null as requested
-    campaign.setDataValue("redirectLink", null);
+    campaign.setDataValue("redirectLink", null); // Ensure redirectLink is null
 
-    // Only update the channel if not in the middle of a sync operation
-    if (!options.silent) {
-      try {
-        const channel = await sequelize.models.Channel.findOne({
-          where: {
-            channelId: campaign.channelId,
-            styleId: campaign.styleId,
-          },
-        });
+    try {
+      const channel = await sequelize.models.Channel.findOne({
+        where: {
+          channelId: campaign.channelId,
+          styleId: campaign.styleId || null, // Handle null styleId
+        },
+      });
 
-        if (channel) {
-          const connectedCampaigns = channel.connectedCampaigns || [];
-          if (
-            !connectedCampaigns.some((c) => c.campaignId === campaign.AGRS_CID)
-          ) {
-            connectedCampaigns.push({
-              campaignId: campaign.AGRS_CID,
-              assignedAt: new Date(),
-              releasedAt: null,
-            });
-            await channel.update(
-              {
-                status: "used",
-                connectedCampaigns,
-              },
-              { silent: true }
-            );
-          }
+      if (channel) {
+        const connectedCampaigns = channel.connectedCampaigns || [];
+        if (
+          !connectedCampaigns.some((c) => c.campaignId === campaign.AGRS_CID)
+        ) {
+          connectedCampaigns.push({
+            campaignId: campaign.AGRS_CID,
+            assignedAt: new Date(),
+            releasedAt: null,
+          });
+          await channel.update(
+            {
+              status: "used",
+              connectedCampaigns,
+            },
+            { silent: true } // Prevent infinite loops
+          );
         }
-      } catch (error) {
-        console.error(
-          "Error updating channel in beforeCreate hook:",
-          error.message
+      } else {
+        console.warn(
+          `Channel not found for channelId: ${campaign.channelId}, styleId: ${campaign.styleId}`
         );
-        // Continue with campaign creation even if channel update fails
       }
+    } catch (error) {
+      console.error("Error in beforeCreate hook:", error.message);
+      // Log error but don't throw to allow campaign creation to proceed
     }
   });
 
+  // BeforeUpdate hook: Handle channel reassignment
   RSOCFeedCampaign.beforeUpdate(async (campaign, options) => {
-    // Ensure redirectLink remains null
-    campaign.setDataValue("redirectLink", null);
+    campaign.setDataValue("redirectLink", null); // Ensure redirectLink remains null
 
-    // Only update the channels if not in the middle of a sync operation
-    if (
-      !options.silent &&
-      (campaign.changed("channelId") || campaign.changed("styleId"))
-    ) {
+    if (campaign.changed("channelId") || campaign.changed("styleId")) {
       try {
         const oldChannelId = campaign.previous("channelId");
-        const oldStyleId = campaign.previous("styleId");
+        const oldStyleId = campaign.previous("styleId") || null;
         const newChannelId = campaign.channelId;
-        const newStyleId = campaign.styleId;
+        const newStyleId = campaign.styleId || null;
 
-        // Update old channel if exists
+        // Release old channel
         if (oldChannelId) {
           const oldChannel = await sequelize.models.Channel.findOne({
             where: {
@@ -240,7 +229,7 @@ module.exports = (sequelize, DataTypes) => {
                   ? { ...c, releasedAt: new Date() }
                   : c
               )
-              .filter((c) => c.releasedAt === null);
+              .filter((c) => !c.releasedAt); // Remove released campaigns
 
             await oldChannel.update(
               {
@@ -252,7 +241,7 @@ module.exports = (sequelize, DataTypes) => {
           }
         }
 
-        // Update new channel if exists
+        // Assign new channel
         const newChannel = await sequelize.models.Channel.findOne({
           where: {
             channelId: newChannelId,
@@ -278,13 +267,14 @@ module.exports = (sequelize, DataTypes) => {
               { silent: true }
             );
           }
+        } else {
+          console.warn(
+            `New channel not found for channelId: ${newChannelId}, styleId: ${newStyleId}`
+          );
         }
       } catch (error) {
-        console.error(
-          "Error updating channels in beforeUpdate hook:",
-          error.message
-        );
-        // Continue with campaign update even if channel updates fail
+        console.error("Error in beforeUpdate hook:", error.message);
+        // Log error but don't throw to allow update to proceed
       }
     }
   });

package/package.json

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