agrs-sequelize-sdk 1.1.54 → 1.1.56

package/models/RSOCFeedCampaign.js

@@ -11,7 +11,7 @@ module.exports = (sequelize, DataTypes) => {
       AGRSAID: {
         type: DataTypes.STRING,
         allowNull: false,
-        comment: "Foreign key referencing Article.AGRSAID",
+        comment: "ID referencing Article.AGRSAID",
       },
       articleName: {
         type: DataTypes.STRING,
@@ -21,7 +21,7 @@ module.exports = (sequelize, DataTypes) => {
       channelId: {
         type: DataTypes.STRING,
         allowNull: false,
-        comment: "Foreign key referencing Channel.channelId",
+        comment: "ID referencing Channel.channelId",
       },
       styleId: {
         type: DataTypes.STRING,
@@ -134,88 +134,157 @@ module.exports = (sequelize, DataTypes) => {
     {
       tableName: "rsoc_feed_campaigns",
       timestamps: true,
+      // Entirely disable automatic foreign key creation
+      references: false,
     }
   );
 
-  RSOCFeedCampaign.associate = (models) => {
-    RSOCFeedCampaign.belongsTo(models.Article, {
-      foreignKey: "AGRSAID",
-      targetKey: "AGRSAID",
-      as: "Article",
-      constraints: false,
-    });
+  // Override the standard associate method to use non-constraint associations
+  RSOCFeedCampaign.associate = function (models) {
+    // Define associations without foreign key constraints
+    const queryOptions = { constraints: false };
 
-    RSOCFeedCampaign.belongsTo(models.Channel, {
-      foreignKey: "channelId",
-      targetKey: "channelId",
-      as: "Channel",
-      constraints: false,
-    });
+    // Associate with Article model
+    if (models.Article) {
+      RSOCFeedCampaign.belongsTo(models.Article, {
+        foreignKey: "AGRSAID",
+        targetKey: "AGRSAID",
+        as: "Article",
+        ...queryOptions,
+      });
+    }
+
+    // Associate with Channel model
+    if (models.Channel) {
+      RSOCFeedCampaign.belongsTo(models.Channel, {
+        foreignKey: "channelId",
+        targetKey: "channelId",
+        as: "Channel",
+        ...queryOptions,
+      });
+    }
   };
 
-  RSOCFeedCampaign.beforeCreate(async (campaign) => {
+  RSOCFeedCampaign.beforeCreate(async (campaign, options) => {
     // Set redirectLink to null as requested
     campaign.setDataValue("redirectLink", null);
 
-    const channel = await sequelize.models.Channel.findOne({
-      where: { channelId: campaign.channelId },
-    });
-    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,
+    // 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,
+          },
         });
-        await channel.update({ status: "used", connectedCampaigns });
+
+        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 }
+            );
+          }
+        }
+      } catch (error) {
+        console.error(
+          "Error updating channel in beforeCreate hook:",
+          error.message
+        );
+        // Continue with campaign creation even if channel update fails
       }
     }
   });
 
-  RSOCFeedCampaign.beforeUpdate(async (campaign) => {
+  RSOCFeedCampaign.beforeUpdate(async (campaign, options) => {
     // Ensure redirectLink remains null
     campaign.setDataValue("redirectLink", null);
 
-    if (campaign.changed("channelId")) {
-      const oldChannelId = campaign.previous("channelId");
-      const newChannelId = campaign.channelId;
+    // Only update the channels if not in the middle of a sync operation
+    if (
+      !options.silent &&
+      (campaign.changed("channelId") || campaign.changed("styleId"))
+    ) {
+      try {
+        const oldChannelId = campaign.previous("channelId");
+        const oldStyleId = campaign.previous("styleId");
+        const newChannelId = campaign.channelId;
+        const newStyleId = campaign.styleId;
 
-      if (oldChannelId) {
-        const oldChannel = await sequelize.models.Channel.findOne({
-          where: { channelId: oldChannelId },
-        });
-        if (oldChannel) {
-          const connectedCampaigns = oldChannel.connectedCampaigns || [];
-          const updatedCampaigns = connectedCampaigns
-            .map((c) =>
-              c.campaignId === campaign.AGRS_CID
-                ? { ...c, releasedAt: new Date() }
-                : c
-            )
-            .filter((c) => c.releasedAt === null);
-          await oldChannel.update({
-            connectedCampaigns: updatedCampaigns,
-            status: updatedCampaigns.length > 0 ? "used" : "free",
+        // Update old channel if exists
+        if (oldChannelId) {
+          const oldChannel = await sequelize.models.Channel.findOne({
+            where: {
+              channelId: oldChannelId,
+              styleId: oldStyleId,
+            },
           });
+
+          if (oldChannel) {
+            const connectedCampaigns = oldChannel.connectedCampaigns || [];
+            const updatedCampaigns = connectedCampaigns
+              .map((c) =>
+                c.campaignId === campaign.AGRS_CID
+                  ? { ...c, releasedAt: new Date() }
+                  : c
+              )
+              .filter((c) => c.releasedAt === null);
+
+            await oldChannel.update(
+              {
+                connectedCampaigns: updatedCampaigns,
+                status: updatedCampaigns.length > 0 ? "used" : "free",
+              },
+              { silent: true }
+            );
+          }
         }
-      }
 
-      const newChannel = await sequelize.models.Channel.findOne({
-        where: { channelId: newChannelId },
-      });
-      if (newChannel) {
-        const connectedCampaigns = newChannel.connectedCampaigns || [];
-        if (
-          !connectedCampaigns.some((c) => c.campaignId === campaign.AGRS_CID)
-        ) {
-          connectedCampaigns.push({
-            campaignId: campaign.AGRS_CID,
-            assignedAt: new Date(),
-            releasedAt: null,
-          });
-          await newChannel.update({ status: "used", connectedCampaigns });
+        // Update new channel if exists
+        const newChannel = await sequelize.models.Channel.findOne({
+          where: {
+            channelId: newChannelId,
+            styleId: newStyleId,
+          },
+        });
+
+        if (newChannel) {
+          const connectedCampaigns = newChannel.connectedCampaigns || [];
+          if (
+            !connectedCampaigns.some((c) => c.campaignId === campaign.AGRS_CID)
+          ) {
+            connectedCampaigns.push({
+              campaignId: campaign.AGRS_CID,
+              assignedAt: new Date(),
+              releasedAt: null,
+            });
+            await newChannel.update(
+              {
+                status: "used",
+                connectedCampaigns,
+              },
+              { silent: true }
+            );
+          }
         }
+      } catch (error) {
+        console.error(
+          "Error updating channels in beforeUpdate hook:",
+          error.message
+        );
+        // Continue with campaign update even if channel updates fail
       }
     }
   });

package/package.json

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