agrs-sequelize-sdk 1.4.54 → 1.4.57

package/models/CampaignTagAssignment.js

@@ -1,48 +1,48 @@
-module.exports = (sequelize, DataTypes) => {
-  const CampaignTagAssignment = sequelize.define(
-    "CampaignTagAssignment",
-    {
-      id: {
-        type: DataTypes.UUID,
-        defaultValue: DataTypes.UUIDV4,
-        primaryKey: true,
-      },
-      tag_id: {
-        type: DataTypes.UUID,
-        allowNull: false,
-        field: "tag_id",
-        references: { model: "campaign_tags", key: "id" },
-      },
-      campaign_id: {
-        type: DataTypes.STRING,
-        allowNull: false,
-        field: "campaign_id",
-        references: { model: "Campaign", key: "CampaignID" },
-        comment: "Campaign.CampaignID (fb/tt/snp)",
-      },
-    },
-    {
-      tableName: "campaign_tag_assignments",
-      underscored: true,
-      indexes: [
-        { unique: true, fields: ["tag_id", "campaign_id"] },
-        { fields: ["campaign_id"] },
-        { fields: ["tag_id"] },
-      ],
-    }
-  );
-
-  CampaignTagAssignment.associate = (models) => {
-    CampaignTagAssignment.belongsTo(models.CampaignTag, {
-      foreignKey: "tag_id",
-      as: "tag",
-    });
-    CampaignTagAssignment.belongsTo(models.Campaign, {
-      foreignKey: "campaign_id",
-      targetKey: "CampaignID",
-      as: "campaign",
-    });
-  };
-
-  return CampaignTagAssignment;
-};
+module.exports = (sequelize, DataTypes) => {
+  const CampaignTagAssignment = sequelize.define(
+    "CampaignTagAssignment",
+    {
+      id: {
+        type: DataTypes.UUID,
+        defaultValue: DataTypes.UUIDV4,
+        primaryKey: true,
+      },
+      tag_id: {
+        type: DataTypes.UUID,
+        allowNull: false,
+        field: "tag_id",
+        references: { model: "campaign_tags", key: "id" },
+      },
+      campaign_id: {
+        type: DataTypes.STRING,
+        allowNull: false,
+        field: "campaign_id",
+        references: { model: "Campaign", key: "CampaignID" },
+        comment: "Campaign.CampaignID (fb/tt/snp)",
+      },
+    },
+    {
+      tableName: "campaign_tag_assignments",
+      underscored: true,
+      indexes: [
+        { unique: true, fields: ["tag_id", "campaign_id"] },
+        { fields: ["campaign_id"] },
+        { fields: ["tag_id"] },
+      ],
+    }
+  );
+
+  CampaignTagAssignment.associate = (models) => {
+    CampaignTagAssignment.belongsTo(models.CampaignTag, {
+      foreignKey: "tag_id",
+      as: "tag",
+    });
+    CampaignTagAssignment.belongsTo(models.Campaign, {
+      foreignKey: "campaign_id",
+      targetKey: "CampaignID",
+      as: "campaign",
+    });
+  };
+
+  return CampaignTagAssignment;
+};

package/models/MineBrandBlocklist.js

@@ -10,9 +10,25 @@ module.exports = (sequelize, DataTypes) => {
       keyword: {
         type: DataTypes.STRING(255),
         allowNull: false,
-        unique: true,
+        // R7.1: attribute-level `unique` removed — Task 2 drops the single-column
+        // UNIQUE(keyword) and replaces it with composite UNIQUE(feed_id, keyword).
         comment: "Lowercase normalized keyword",
       },
+      feed_id: {
+        type: DataTypes.TEXT,
+        allowNull: false,
+        defaultValue: "mine-rsoc",
+      },
+      match_type: {
+        type: DataTypes.TEXT,
+        allowNull: false,
+        defaultValue: "contains", // R5: prod default
+      },
+      category: {
+        type: DataTypes.TEXT,
+        allowNull: false,
+        defaultValue: "Other", // R5: prod NOT NULL DEFAULT 'Other'
+      },
       is_blocked: {
         type: DataTypes.BOOLEAN,
         allowNull: false,

package/models/MineBrandConfig.js

@@ -0,0 +1,26 @@
+// agrs-sequelize/models/MineBrandConfig.js
+const { DataTypes } = require('sequelize');
+
+module.exports = (sequelize) => {
+  return sequelize.define('MineBrandConfig', {
+    // R5: verified prod columns are EXACTLY: key (PK), value (NOT NULL),
+    // updated_at (DEFAULT now()) — there is NO id column. Declaring an
+    // autoIncrement id makes every SELECT emit "id" → column does not exist.
+    feed_id: { type: DataTypes.TEXT, allowNull: false, primaryKey: true },
+    key: { type: DataTypes.TEXT, allowNull: false, primaryKey: true },
+    value: { type: DataTypes.TEXT, allowNull: false },
+    updated_at: { type: DataTypes.DATE },
+  }, {
+    tableName: 'mine_brand_config',
+    underscored: true,
+    // R4-K: the real table has updated_at but NO created_at (raw SQL manages
+    // updated_at manually). Sequelize defaults to timestamps:true which would
+    // add created_at to every SELECT → "column created_at does not exist".
+    timestamps: false,
+    // R5: NO `indexes` declaration — sync() would create a duplicate of the
+    // migration-managed uq_mine_brand_config_feed_key. Composite PK above is
+    // the end-state (after Task 2 Visit 2); during the interim window the DB PK
+    // is still (key) — model-based reads (findOne/findAll with where) are
+    // unaffected; mine_brand_config writes stay raw SQL throughout this plan.
+  });
+};

package/models/MineChannel.js

@@ -20,6 +20,11 @@ module.exports = (sequelize, DataTypes) => {
           allowNull: false,
           defaultValue: [],
         },
+        feed_id: {
+          type: DataTypes.TEXT,
+          allowNull: false,
+          defaultValue: "mine-rsoc",
+        },
       },
       {
         tableName: "mine_channels",

package/models/MineRedirectDomain.js

@@ -10,9 +10,15 @@ module.exports = (sequelize, DataTypes) => {
       domain: {
         type: DataTypes.STRING(255),
         allowNull: false,
-        unique: true,
+        // R7.1: attribute-level `unique` removed — Task 2 drops the single-column
+        // UNIQUE(domain) and replaces it with composite UNIQUE(feed_id, domain).
         comment: "Redirect domain, e.g. searchitallday.com",
       },
+      feed_id: {
+        type: DataTypes.TEXT,
+        allowNull: false,
+        defaultValue: "mine-rsoc",
+      },
       weight: {
         type: DataTypes.INTEGER,
         allowNull: false,

package/models/RSOCFeedConfig.js

@@ -0,0 +1,46 @@
+// agrs-sequelize/models/RSOCFeedConfig.js
+const { DataTypes } = require('sequelize');
+
+module.exports = (sequelize) => {
+  const RSOCFeedConfig = sequelize.define('RSOCFeedConfig', {
+    id: { type: DataTypes.UUID, primaryKey: true, defaultValue: DataTypes.UUIDV4 },
+    feed_id: { type: DataTypes.TEXT, unique: true, allowNull: false },
+    feed_name: { type: DataTypes.TEXT, allowNull: false },
+    aliases: { type: DataTypes.ARRAY(DataTypes.TEXT), allowNull: false, defaultValue: [] },  // R7: rename-safety — historical/alternate spellings
+    feed_code: { type: DataTypes.TEXT, allowNull: false },
+    agrs_cid_prefix: { type: DataTypes.TEXT, allowNull: false },
+    campaign_name_pattern: { type: DataTypes.TEXT, allowNull: false },
+    partner_id: { type: DataTypes.TEXT, allowNull: false },
+    partner_token: { type: DataTypes.TEXT, allowNull: false },
+    campaign_partner_token: { type: DataTypes.TEXT },  // R5: campaign webhook token (differs from partner_token for Mine 1)
+    article_api_base_url: { type: DataTypes.TEXT, allowNull: false },
+    campaign_api_base_url: { type: DataTypes.TEXT, allowNull: false },
+    perf_api_base_url: { type: DataTypes.TEXT, allowNull: false },
+    pixel_id: { type: DataTypes.TEXT },
+    ts_value: { type: DataTypes.TEXT },
+    event_name: { type: DataTypes.TEXT },
+    utm_medium: { type: DataTypes.TEXT },
+    default_style: { type: DataTypes.TEXT },
+    min_keyword_words: { type: DataTypes.INTEGER, defaultValue: 4 },
+    default_domain: { type: DataTypes.TEXT },
+    fallback_redirect_domain: { type: DataTypes.TEXT },
+    channel_range_min: { type: DataTypes.INTEGER, allowNull: false },
+    channel_range_max: { type: DataTypes.INTEGER, allowNull: false },
+    rac_mode: { type: DataTypes.TEXT },
+    always_redirect: { type: DataTypes.BOOLEAN, allowNull: false, defaultValue: false },  // Tsuf-confirmed: Mine 2 = everything through redirect
+    is_active: { type: DataTypes.BOOLEAN, defaultValue: true },
+  }, {
+    tableName: 'rsoc_feed_configs',
+    underscored: true,
+  });
+
+  RSOCFeedConfig.associate = (models) => {
+    RSOCFeedConfig.hasMany(models.RSOCRedirectWsCode, { foreignKey: 'feed_id', sourceKey: 'feed_id' });
+    RSOCFeedConfig.hasMany(models.MineChannel, { foreignKey: 'feed_id', sourceKey: 'feed_id' });
+    RSOCFeedConfig.hasMany(models.MineRedirectDomain, { foreignKey: 'feed_id', sourceKey: 'feed_id' });
+    RSOCFeedConfig.hasMany(models.MineBrandBlocklist, { foreignKey: 'feed_id', sourceKey: 'feed_id' });
+    RSOCFeedConfig.hasMany(models.MineBrandConfig, { foreignKey: 'feed_id', sourceKey: 'feed_id' });
+  };
+
+  return RSOCFeedConfig;
+};

package/models/RSOCRedirectWsCode.js

@@ -0,0 +1,22 @@
+// agrs-sequelize/models/RSOCRedirectWsCode.js
+const { DataTypes } = require('sequelize');
+
+module.exports = (sequelize) => {
+  return sequelize.define('RSOCRedirectWsCode', {
+    id: { type: DataTypes.UUID, primaryKey: true, defaultValue: DataTypes.UUIDV4 },
+    feed_id: { type: DataTypes.TEXT, allowNull: false },
+    domain: { type: DataTypes.TEXT, allowNull: false },
+    ws_code: { type: DataTypes.TEXT, allowNull: false },
+    is_active: { type: DataTypes.BOOLEAN, defaultValue: true },
+  }, {
+    tableName: 'rsoc_redirect_ws_codes',
+    underscored: true,
+    // R5: the Task 1 DDL for this table has NO created_at/updated_at columns.
+    // Without timestamps:false, Sequelize adds them to every SELECT/INSERT →
+    // "column created_at does not exist" on the brand-redirect hot path.
+    timestamps: false,
+    // R5: NO `indexes` declaration — sequelize.sync() creates missing declared
+    // indexes even with alter:false, and the auto-generated name would duplicate
+    // the DDL's UNIQUE constraint index. Constraints are migration-managed only.
+  });
+};

package/models/Team.js

@@ -0,0 +1,43 @@
+module.exports = (sequelize, DataTypes) => {
+  const Team = sequelize.define(
+    "Team",
+    {
+      id: {
+        type: DataTypes.UUID,
+        defaultValue: DataTypes.UUIDV4,
+        primaryKey: true,
+      },
+      name: {
+        type: DataTypes.STRING(255),
+        allowNull: false,
+        comment: "Display name for the team",
+      },
+      created_by: {
+        type: DataTypes.UUID,
+        allowNull: true,
+        field: "created_by",
+        references: { model: "Users", key: "id" },
+        comment: "Users.id of creator when known",
+      },
+    },
+    {
+      tableName: "teams",
+      underscored: true,
+      timestamps: true,
+      indexes: [{ fields: ["name"] }, { fields: ["created_by"] }],
+    }
+  );
+
+  Team.associate = (models) => {
+    Team.belongsTo(models.Users, {
+      foreignKey: "created_by",
+      as: "creator",
+    });
+    Team.hasMany(models.Users, {
+      foreignKey: "team_id",
+      as: "members",
+    });
+  };
+
+  return Team;
+};

package/models/Users.js

@@ -157,6 +157,15 @@ module.exports = (sequelize, DataTypes) => {
           key: "id",
         },
       },
+      team_id: {
+        type: DataTypes.UUID,
+        allowNull: true,
+        references: {
+          model: "teams",
+          key: "id",
+        },
+        comment: "Optional single team this user belongs to",
+      },
     },
     {
       tableName: "Users",
@@ -184,6 +193,11 @@ module.exports = (sequelize, DataTypes) => {
       foreignKey: "created_by",
       as: "createdCampaignTags",
     });
+
+    Users.belongsTo(models.Team, {
+      foreignKey: "team_id",
+      as: "team",
+    });
   };
 
   return Users;

package/package.json

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