agrs-sequelize-sdk 1.1.57 → 1.1.59

package/models/AdPerformance.js

@@ -35,6 +35,21 @@ module.exports = (sequelize, DataTypes) => {
         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,

package/models/AdPerformanceHourly.js

@@ -27,6 +27,21 @@ module.exports = (sequelize, DataTypes) => {
         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,

package/models/Channel.js

@@ -1,230 +1,55 @@
 module.exports = (sequelize, DataTypes) => {
-  const RSOCFeedCampaign = sequelize.define(
-    "RSOCFeedCampaign",
+  const Channel = sequelize.define(
+    "Channel",
     {
-      AGRS_CID: {
-        type: DataTypes.STRING,
-        allowNull: false,
-        unique: true,
-        primaryKey: true,
-      },
-      AGRSAID: {
-        type: DataTypes.STRING,
-        allowNull: false,
-        comment: "Foreign key referencing Article.AGRSAID",
-      },
-      articleName: {
-        type: DataTypes.STRING,
-        allowNull: false,
-        comment: "Name of the associated article",
-      },
       channelId: {
         type: DataTypes.STRING,
         allowNull: false,
-        comment: "Foreign key referencing Channel.channelId",
+        // Not setting as primary key or unique since duplicates are allowed
       },
       styleId: {
-        type: DataTypes.STRING,
-        allowNull: true,
-        comment: "Style ID (stid) inherited from Channel",
-      },
-      assignee: {
         type: DataTypes.STRING,
         allowNull: false,
       },
       status: {
         type: DataTypes.STRING,
         allowNull: false,
-        defaultValue: "active",
+        defaultValue: "free",
         validate: {
-          isIn: [["active", "inactive", "archived"]],
+          isIn: [["free", "used", "archived"]],
         },
       },
-      country: {
-        type: DataTypes.STRING,
-        allowNull: false,
-      },
-      vertical: {
-        type: DataTypes.STRING,
-        allowNull: false,
-        comment: "Maps to Article.category for dynamic selection",
-      },
-      freeText: {
-        type: DataTypes.TEXT,
-        allowNull: true,
-      },
-      campaignName: {
-        type: DataTypes.STRING,
-        allowNull: false,
-      },
-      campaignId: {
-        type: DataTypes.STRING,
-        allowNull: true,
-      },
-      keywords: {
-        type: DataTypes.ARRAY(DataTypes.STRING),
-        allowNull: true,
-      },
-      link: {
-        type: DataTypes.STRING(1024),
-        allowNull: true,
-        comment: "Campaign-specific URL based on article URL with parameters",
-      },
-      redirectLink: {
-        type: DataTypes.STRING(1024),
-        allowNull: true,
-      },
-      pixelId: {
-        type: DataTypes.STRING(1024),
-        allowNull: true,
-      },
-      token: {
-        type: DataTypes.STRING(1024),
-        allowNull: true,
-      },
-      accountId: {
-        type: DataTypes.STRING,
-        allowNull: false,
-      },
-      feedName: {
-        type: DataTypes.STRING,
-        allowNull: true,
-        defaultValue: "RSOC",
-      },
-      adTitle: {
-        type: DataTypes.STRING,
-        allowNull: true,
-      },
-      domain: {
-        type: DataTypes.STRING,
-        allowNull: true,
-      },
-      feedProvider: {
-        type: DataTypes.STRING,
-        allowNull: false,
-        defaultValue: "RSOC",
-      },
-      createdCampaignAt: {
-        type: DataTypes.DATE,
-        allowNull: true,
-        defaultValue: DataTypes.NOW,
-      },
-      draft: {
-        type: DataTypes.BOOLEAN,
-        allowNull: true,
-        defaultValue: false,
-      },
-      createdAt: {
-        type: DataTypes.DATE,
-        defaultValue: DataTypes.NOW,
-      },
-      updatedAt: {
-        type: DataTypes.DATE,
-        defaultValue: DataTypes.NOW,
-      },
-      platform: {
-        type: DataTypes.STRING,
+      connectedCampaigns: {
+        type: DataTypes.JSONB, // Use JSONB for better querying capabilities
         allowNull: false,
-      },
-      mediaBuyer: {
-        type: DataTypes.STRING,
-        allowNull: true,
+        defaultValue: [],
       },
     },
     {
-      tableName: "rsoc_feed_campaigns",
+      tableName: "channels",
       timestamps: true,
+      indexes: [
+        // Add a composite unique index on channelId and styleId if needed
+        {
+          unique: true,
+          fields: ["channelId", "styleId"],
+          name: "unique_channel_style",
+        },
+      ],
     }
   );
 
-  RSOCFeedCampaign.associate = (models) => {
-    RSOCFeedCampaign.belongsTo(models.Article, {
-      foreignKey: "AGRSAID",
-      targetKey: "AGRSAID",
-      as: "Article",
-      constraints: false, // Disable foreign key constraint
-    });
-
-    RSOCFeedCampaign.belongsTo(models.Channel, {
-      foreignKey: "channelId",
-      targetKey: "channelId",
-      as: "Channel",
-      constraints: false, // Disable foreign key constraint
-    });
-  };
-
-  RSOCFeedCampaign.beforeCreate(async (campaign) => {
-    // Set redirectLink to null as requested
-    campaign.setDataValue("redirectLink", null);
-
-    const channel = await sequelize.models.Channel.findOne({
-      where: { channelId: campaign.channelId, styleId: campaign.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 });
-      }
-    }
-  });
-
-  RSOCFeedCampaign.beforeUpdate(async (campaign) => {
-    // Ensure redirectLink remains null
-    campaign.setDataValue("redirectLink", null);
-
-    if (campaign.changed("channelId") || campaign.changed("styleId")) {
-      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, 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",
-          });
-        }
-      }
-
-      const newChannel = await sequelize.models.Channel.findOne({
-        where: { channelId: newChannelId, styleId: newStyleId },
+  // Define associations without enforcing constraints
+  Channel.associate = (models) => {
+    if (models.RSOCFeedCampaign) {
+      Channel.hasMany(models.RSOCFeedCampaign, {
+        foreignKey: "channelId",
+        sourceKey: "channelId",
+        as: "RSOCFeedCampaigns",
+        constraints: false, // Disable FK constraint
       });
-
-      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 });
-        }
-      }
     }
-  });
+  };
 
-  return RSOCFeedCampaign;
+  return Channel;
 };

package/models/RSOCFeedCampaign.js

@@ -135,7 +135,7 @@ module.exports = (sequelize, DataTypes) => {
     },
     {
       tableName: "rsoc_feed_campaigns",
-      timestamps: true, // Enable Sequelize-managed timestamps
+      timestamps: true,
     }
   );
 
@@ -146,7 +146,7 @@ module.exports = (sequelize, DataTypes) => {
         foreignKey: "AGRSAID",
         targetKey: "AGRSAID",
         as: "Article",
-        constraints: false, // Disable FK constraint
+        constraints: false,
       });
     }
 
@@ -155,20 +155,23 @@ module.exports = (sequelize, DataTypes) => {
         foreignKey: "channelId",
         targetKey: "channelId",
         as: "Channel",
-        constraints: false, // Disable FK constraint
+        constraints: false,
       });
     }
   };
 
   // BeforeCreate hook: Update Channel status and connectedCampaigns
   RSOCFeedCampaign.beforeCreate(async (campaign, options) => {
-    campaign.setDataValue("redirectLink", null); // Ensure redirectLink is null
+    campaign.setDataValue("redirectLink", null);
+
+    // Skip channel update if in a silent operation (e.g., during sync)
+    if (options.silent) return;
 
     try {
       const channel = await sequelize.models.Channel.findOne({
         where: {
           channelId: campaign.channelId,
-          styleId: campaign.styleId || null, // Handle null styleId
+          styleId: campaign.styleId || null,
         },
       });
 
@@ -187,7 +190,7 @@ module.exports = (sequelize, DataTypes) => {
               status: "used",
               connectedCampaigns,
             },
-            { silent: true } // Prevent infinite loops
+            { silent: true }
           );
         }
       } else {
@@ -197,85 +200,92 @@ module.exports = (sequelize, DataTypes) => {
       }
     } 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) => {
-    campaign.setDataValue("redirectLink", null); // Ensure redirectLink remains null
-
-    if (campaign.changed("channelId") || campaign.changed("styleId")) {
-      try {
-        const oldChannelId = campaign.previous("channelId");
-        const oldStyleId = campaign.previous("styleId") || null;
-        const newChannelId = campaign.channelId;
-        const newStyleId = campaign.styleId || null;
-
-        // Release old channel
-        if (oldChannelId) {
-          const oldChannel = await sequelize.models.Channel.findOne({
-            where: {
-              channelId: oldChannelId,
-              styleId: oldStyleId,
-            },
-          });
+    campaign.setDataValue("redirectLink", null);
 
-          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); // Remove released campaigns
+    // Skip channel update if in a silent operation or no relevant changes
+    if (
+      options.silent ||
+      (!campaign.changed("channelId") && !campaign.changed("styleId"))
+    ) {
+      return;
+    }
 
-            await oldChannel.update(
-              {
-                connectedCampaigns: updatedCampaigns,
-                status: updatedCampaigns.length > 0 ? "used" : "free",
-              },
-              { silent: true }
-            );
-          }
-        }
+    try {
+      const oldChannelId = campaign.previous("channelId");
+      const oldStyleId = campaign.previous("styleId") || null;
+      const newChannelId = campaign.channelId;
+      const newStyleId = campaign.styleId || null;
 
-        // Assign new channel
-        const newChannel = await sequelize.models.Channel.findOne({
+      // Release old channel
+      if (
+        oldChannelId &&
+        (oldChannelId !== newChannelId || oldStyleId !== newStyleId)
+      ) {
+        const oldChannel = await sequelize.models.Channel.findOne({
           where: {
-            channelId: newChannelId,
-            styleId: newStyleId,
+            channelId: oldChannelId,
+            styleId: oldStyleId,
           },
         });
 
-        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 }
-            );
-          }
-        } else {
-          console.warn(
-            `New channel not found for channelId: ${newChannelId}, styleId: ${newStyleId}`
+        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);
+
+          await oldChannel.update(
+            {
+              connectedCampaigns: updatedCampaigns,
+              status: updatedCampaigns.length > 0 ? "used" : "free",
+            },
+            { silent: true }
           );
         }
-      } catch (error) {
-        console.error("Error in beforeUpdate hook:", error.message);
-        // Log error but don't throw to allow update to proceed
       }
+
+      // Assign new channel
+      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 }
+          );
+        }
+      } else {
+        console.warn(
+          `New channel not found for channelId: ${newChannelId}, styleId: ${newStyleId}`
+        );
+      }
+    } catch (error) {
+      console.error("Error in beforeUpdate hook:", error.message);
     }
   });
 

package/package.json

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