codebase-models 3.1.9 → 3.2.0

package/dist/src/models/Audience.d.ts

@@ -23,14 +23,31 @@
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
 import mongoose, { Document } from "mongoose";
+export interface IAudienceCondition extends Document {
+    iid: string;
+    name: string;
+    conditionType: string;
+    conditionGroupLabel: string;
+    conditions: IAudienceConditionItem[];
+}
+export interface IAudienceConditionItem extends Document {
+    iid: string;
+    rules_js: string;
+    rules_label: string;
+    conditionGroupLabel: string;
+    rules_value: string;
+}
 export interface IAudience extends Document {
     iid: string;
     organizationId?: mongoose.Schema.Types.ObjectId;
+    newSchema: boolean;
     name: string;
     rules_js?: string;
     generic: boolean;
     client?: mongoose.Schema.Types.ObjectId;
     createdBy?: mongoose.Schema.Types.ObjectId;
+    conditions: IAudienceConditionItem[];
+    api_name: string;
 }
 declare const Audience: mongoose.Model<any, {}, {}, {}, any, any>;
 export default Audience;

package/dist/src/models/Audience.js

@@ -34,6 +34,52 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 const mongoose_1 = __importStar(require("mongoose"));
 const constant_1 = require("../constant");
+const conditionItemSchema = new mongoose_1.Schema({
+    iid: {
+        type: String,
+        trim: true,
+        default: () => (0, constant_1.generateRandomIID)(),
+        unique: true,
+    },
+    rules_js: {
+        type: String,
+        default: "",
+        trim: true,
+    },
+    rules_label: {
+        type: String,
+        default: "",
+        trim: true,
+    },
+    rules_value: {
+        type: String,
+        default: "Group",
+        trim: true,
+    },
+    conditionGroupLabel: {
+        type: String,
+        default: "advanced",
+        trim: true,
+        enum: ["advanced", "custom", "common"],
+        get: (value) => value.toLowerCase(),
+        set: (value) => value.toLowerCase(),
+    },
+});
+conditionItemSchema.index({ iid: 1 }, { unique: true });
+const AudienceConditionSchema = new mongoose_1.Schema({
+    iid: {
+        type: String,
+        trim: true,
+        default: () => (0, constant_1.generateRandomIID)(),
+        unique: true,
+    },
+    name: {
+        type: String,
+        required: true,
+        trim: true,
+    },
+    conditions: [conditionItemSchema],
+});
 const AudienceSchema = new mongoose_1.Schema({
     iid: {
         type: String,
@@ -44,6 +90,10 @@ const AudienceSchema = new mongoose_1.Schema({
         ref: "organization",
         default: null,
     },
+    newSchema: {
+        type: Boolean,
+        default: false,
+    },
     name: {
         type: String,
         required: true,
@@ -55,6 +105,14 @@ const AudienceSchema = new mongoose_1.Schema({
         type: Boolean,
         default: false,
     },
+    api_name: {
+        type: String,
+        slug: ["name"],
+        slugPaddingSize: 4,
+        unique: true,
+        trim: true,
+    },
+    conditions: AudienceConditionSchema,
     client: {
         type: mongoose_1.default.Schema.Types.ObjectId,
         ref: "client",

package/dist/src/models/Page.d.ts

@@ -29,9 +29,17 @@ export interface IUrltargetings extends Document {
     url: string;
     url_type: string;
 }
+export interface IConditionItem extends Document {
+    iid: string;
+    name: string;
+    url?: string;
+    url_type?: string;
+    matchType?: string;
+}
 export interface IPage extends Document {
     iid: string;
     name: string;
+    newSchema: boolean;
     client?: mongoose.Schema.Types.ObjectId;
     organizationId?: mongoose.Schema.Types.ObjectId;
     trigger: string;
@@ -41,6 +49,7 @@ export interface IPage extends Document {
     deactivation_mode: string;
     rules_js: string;
     urltargetings: IUrltargetings[];
+    conditions: IConditionItem[];
     generic: boolean;
     isActive?: boolean;
     createdBy?: mongoose.Schema.Types.ObjectId;

package/dist/src/models/Page.js

@@ -39,6 +39,53 @@ const mongoose_1 = __importStar(require("mongoose"));
 const mongoose_slug_updater_1 = __importDefault(require("mongoose-slug-updater"));
 const constant_1 = require("../constant");
 mongoose_1.default.plugin(mongoose_slug_updater_1.default);
+const ConditionItemSchema = new mongoose_1.Schema({
+    iid: {
+        type: String,
+        trim: true,
+        default: () => (0, constant_1.generateRandomIID)(),
+        unique: true,
+    },
+    url: {
+        type: String,
+        required: true,
+        trim: true,
+    },
+    url_type: {
+        type: String,
+        required: true,
+        trim: true,
+    },
+    matchType: {
+        type: String,
+        required: true,
+        trim: true,
+        enum: ["include", "exclude"],
+        get: (value) => value.toLowerCase(),
+        set: (value) => value.toLowerCase(),
+    }
+});
+const ConditionsSchema = new mongoose_1.Schema([
+    {
+        iid: {
+            type: String,
+            trim: true,
+            default: () => (0, constant_1.generateRandomIID)(),
+            unique: true,
+        },
+        name: {
+            type: String,
+            required: true,
+            trim: true,
+        },
+        conditionType: {
+            type: String,
+            required: true,
+            trim: true,
+        },
+        conditions: [ConditionItemSchema],
+    }
+]);
 const UrltargetingsSchema = new mongoose_1.Schema({
     iid: {
         type: String,
@@ -65,6 +112,10 @@ const PageSchema = new mongoose_1.Schema({
         type: String,
         trim: true,
     },
+    newSchema: {
+        type: Boolean,
+        default: false,
+    },
     name: {
         type: String,
         required: true,
@@ -104,6 +155,9 @@ const PageSchema = new mongoose_1.Schema({
         type: String,
         default: "reset",
         trim: true,
+        // enum: ["reset", "deactivate"],
+        get: (value) => value.toLowerCase(),
+        set: (value) => value.toLowerCase(),
     },
     rules_js: {
         type: String,
@@ -111,6 +165,7 @@ const PageSchema = new mongoose_1.Schema({
         trim: true,
     },
     urltargetings: [UrltargetingsSchema],
+    conditions: [ConditionsSchema],
     generic: {
         type: Boolean,
         default: false,

package/dist/src/models/Test.d.ts

@@ -46,6 +46,9 @@ export interface ITest extends Document {
     traffic_allocation_type: string;
     traffic_allocation: number;
     audiences_match_type: string;
+    pages_match_type: string;
+    page_targeting?: mongoose.Schema.Types.ObjectId;
+    audience_targeting?: mongoose.Schema.Types.ObjectId;
     metadata_1: mongoose.Schema.Types.Mixed;
     metadata_2: mongoose.Schema.Types.Mixed;
     metadata_3: mongoose.Schema.Types.Mixed;

package/dist/src/models/Test.js

@@ -35,7 +35,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const mongoose_1 = __importStar(require("mongoose"));
 const constant_1 = require("../constant");
 const VariationsSchema = new mongoose_1.Schema({
-    iid: { type: String,
+    iid: {
+        type: String,
         trim: true,
         unique: true,
     },
@@ -62,12 +63,16 @@ const TestSchema = new mongoose_1.Schema({
     status: {
         type: String,
         default: "draft",
-        enum: ["live", "draft", "ended", "paused", "preview", "running", "archive"]
+        enum: ["live", "draft", "ended", "paused", "preview", "running", "archive"],
+        transform: (value) => value.toLowerCase(),
     },
     name: { type: String, required: true },
     traffic_allocation_type: { type: String, default: "manual", enum: ["manual", "multi-armed", "contextual"] },
     traffic_allocation: { type: Number, default: 100 },
-    audiences_match_type: { type: String, default: "all" },
+    audiences_match_type: { type: String, default: "AND", enum: ["AND", "OR", "any", "all"] },
+    pages_match_type: { type: String, default: "AND", enum: ["AND", "OR", "any", "all"] },
+    page_targeting: { type: mongoose_1.default.Schema.Types.ObjectId, ref: "page", default: null },
+    audience_targeting: { type: mongoose_1.default.Schema.Types.ObjectId, ref: "audience", default: null },
     // Metadata fields
     metadata_1: { type: mongoose_1.default.Schema.Types.Mixed, default: null },
     metadata_2: { type: mongoose_1.default.Schema.Types.Mixed, default: null },
@@ -146,7 +151,9 @@ const TestSchema = new mongoose_1.Schema({
     pageNotContains: { type: String, default: null },
     eventparameter: { type: String, default: null },
     testid: { type: String, default: null },
-    testtool: { type: String, default: "" },
+    testtool: { type: String, default: "",
+        transform: (value) => (value === null || value === void 0 ? void 0 : value.toLowerCase()) || "",
+    },
     personalization: { type: Boolean, default: false },
     qaMode: { type: Boolean, default: false },
     dnt: { type: Boolean, default: false },
@@ -201,7 +208,6 @@ TestSchema.index({ iid: 1 });
 TestSchema.index({ client: 1, status: 1 });
 TestSchema.index({ client: 1, status: 1, livedate: 1 });
 TestSchema.index({ client: 1, status: 1, enddate: 1 });
-TestSchema.index({ client: 1, testtool: 1, status: 1 });
 TestSchema.index({ name: 1 }, { collation: { locale: 'en', strength: 2 } }); // Case-insensitive search
 TestSchema.index({ "variations._id": 1 });
 TestSchema.index({ status: 1, livedate: 1 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codebase-models",
-  "version": "3.1.9",
+  "version": "3.2.0",
   "description": "Common models for codebase",
   "main": "dist/index.js",
   "scripts": {

package/src/models/Audience.ts

@@ -1,16 +1,89 @@
 import mongoose, { Document, Schema, model } from "mongoose";
 import { generateRandomIID } from "../constant";
 
+export interface IAudienceCondition extends Document {
+  iid: string;
+  name: string;
+  conditionType: string;
+  conditionGroupLabel: string;
+  conditions: IAudienceConditionItem[];
+}
+
+export interface IAudienceConditionItem extends Document {
+  iid: string;
+  rules_js: string;
+  rules_label: string;
+  conditionGroupLabel: string;
+  rules_value: string;
+}
+
 export interface IAudience extends Document {
   iid: string;
   organizationId?: mongoose.Schema.Types.ObjectId;
+  newSchema: boolean;
   name: string;
   rules_js?: string;
   generic: boolean;
   client?: mongoose.Schema.Types.ObjectId;
   createdBy?: mongoose.Schema.Types.ObjectId;
+  conditions: IAudienceConditionItem[];
+  api_name: string;
 }
 
+
+const conditionItemSchema = new Schema<IAudienceConditionItem>(
+  {
+    iid: {
+      type: String,
+      trim: true,
+      default: () => generateRandomIID(),
+      unique: true,
+    },
+    rules_js: {
+      type: String,
+      default: "",
+      trim: true,
+    },
+    rules_label: {
+      type: String,
+      default: "",
+      trim: true,
+    },
+    rules_value: {
+      type: String,
+      default: "Group",
+      trim: true,
+    },
+    conditionGroupLabel: {
+      type: String,
+      default: "advanced",
+      trim: true,
+      enum: ["advanced", "custom","common"],
+      get: (value: string) => value.toLowerCase(),
+      set: (value: string) => value.toLowerCase(),
+    },
+  },
+);
+
+conditionItemSchema.index({ iid: 1 }, { unique: true });
+
+const AudienceConditionSchema = new Schema<IAudienceCondition>(
+  {
+    iid: {
+      type: String,
+      trim: true,
+      default: () => generateRandomIID(),
+      unique: true,
+    },
+    name: {
+      type: String,
+      required: true,
+      trim: true,
+    },
+    conditions: [conditionItemSchema],
+  }
+);
+
 const AudienceSchema = new Schema<IAudience>(
   {
     iid: {
@@ -22,6 +95,10 @@ const AudienceSchema = new Schema<IAudience>(
       ref: "organization",
       default: null,
     },
+    newSchema: {
+      type: Boolean,
+      default: false,
+    },
     name: {
       type: String,
       required: true,
@@ -33,6 +110,14 @@ const AudienceSchema = new Schema<IAudience>(
       type: Boolean,
       default: false,
     },
+    api_name: {
+      type: String,
+      slug: ["name"],
+      slugPaddingSize: 4,
+      unique: true,
+      trim: true,
+    },
+    conditions: AudienceConditionSchema,
     client: {
       type: mongoose.Schema.Types.ObjectId,
       ref: "client",

package/src/models/Page.ts

@@ -13,9 +13,18 @@ export interface IUrltargetings extends Document {
   url_type: string;
 }
 
+export interface IConditionItem extends Document {
+  iid: string;
+  name: string;
+  url?: string;
+  url_type?: string;
+  matchType?: string;
+}
+
 export interface IPage extends Document {
   iid: string;
   name: string;
+  newSchema: boolean;
   client?: mongoose.Schema.Types.ObjectId;
   organizationId?: mongoose.Schema.Types.ObjectId;
   trigger: string;
@@ -25,11 +34,61 @@ export interface IPage extends Document {
   deactivation_mode: string;
   rules_js: string;
   urltargetings: IUrltargetings[];
+  conditions: IConditionItem[];
   generic: boolean;
   isActive?: boolean;
   createdBy?: mongoose.Schema.Types.ObjectId;
 }
 
+const ConditionItemSchema = new Schema<IConditionItem>({
+  iid: {
+    type: String,
+    trim: true,
+    default: () => generateRandomIID(),
+    unique: true,
+  },
+  url: {
+    type: String,
+    required: true,
+    trim: true,
+  },
+  url_type: {
+    type: String,
+    required: true,
+    trim: true,
+  },
+  matchType: {
+    type: String,
+    required: true,
+    trim: true,
+    enum: ["include", "exclude"],
+    get: (value: string) => value.toLowerCase(),
+    set: (value: string) => value.toLowerCase(),
+  }
+});
+
+const ConditionsSchema = new Schema<IConditionItem[]>([
+  {
+    iid: {
+      type: String,
+      trim: true,
+      default: () => generateRandomIID(),
+      unique: true,
+    },
+    name: {
+      type: String,
+      required: true,
+      trim: true,
+    },
+    conditionType: {
+      type: String,
+      required: true,
+      trim: true,
+    },
+    conditions: [ConditionItemSchema],
+  }
+]);
+
 const UrltargetingsSchema = new Schema<IUrltargetings>({
   iid: {
     type: String,
@@ -57,6 +116,10 @@ const PageSchema = new Schema<IPage>({
     type: String,
     trim: true,
   },
+  newSchema: {
+    type: Boolean,
+    default: false,
+  },
   name: {
     type: String,
     required: true,
@@ -86,7 +149,7 @@ const PageSchema = new Schema<IPage>({
   },
   api_name: { 
     type: String, 
-    slug: ["name"], 
+    slug: ["name"],
     slugPaddingSize: 4,  
     unique: true,
     trim: true,
@@ -99,6 +162,9 @@ const PageSchema = new Schema<IPage>({
     type: String,
     default: "reset",
     trim: true,
+    // enum: ["reset", "deactivate"],
+    get: (value: string) => value.toLowerCase(),
+    set: (value: string) => value.toLowerCase(),
   },
   rules_js: {
     type: String,
@@ -106,6 +172,7 @@ const PageSchema = new Schema<IPage>({
     trim: true,
   },
   urltargetings: [UrltargetingsSchema],
+  conditions: [ConditionsSchema],
   generic: {
     type: Boolean,
     default: false,

package/src/models/Test.ts

@@ -26,6 +26,9 @@ export interface ITest extends Document {
   traffic_allocation_type: string;
   traffic_allocation: number;
   audiences_match_type: string;
+  pages_match_type: string;
+  page_targeting?: mongoose.Schema.Types.ObjectId;
+  audience_targeting?: mongoose.Schema.Types.ObjectId;
   // Metadata fields
   metadata_1: mongoose.Schema.Types.Mixed;
   metadata_2: mongoose.Schema.Types.Mixed;
@@ -82,7 +85,8 @@ export interface ITest extends Document {
 }
 
 const VariationsSchema = new Schema<IVariations>({
-  iid: { type: String, 
+  iid: {
+    type: String,
     trim: true,
     unique: true,
   },
@@ -103,88 +107,92 @@ const VariationsSchema = new Schema<IVariations>({
 const TestSchema = new Schema<ITest>(
   {
     iid: { type: String, trim: true },
-    organizationId: { 
-      type: mongoose.Schema.Types.ObjectId, 
+    organizationId: {
+      type: mongoose.Schema.Types.ObjectId,
       ref: "organization",
-      default: null 
+      default: null
     },
-    status: { 
-      type: String, 
+    status: {
+      type: String,
       default: "draft",
-      enum: ["live", "draft", "ended", "paused", "preview", "running", "archive"]
+      enum: ["live", "draft", "ended", "paused", "preview", "running", "archive"],
+      transform: (value: string) => value.toLowerCase(),
     },
     name: { type: String, required: true },
     traffic_allocation_type: { type: String, default: "manual", enum: ["manual", "multi-armed", "contextual"] },
     traffic_allocation: { type: Number, default: 100 },
-    audiences_match_type: { type: String, default: "all" },
+    audiences_match_type: { type: String, default: "AND", enum: ["AND", "OR", "any", "all"] },
+    pages_match_type: { type: String, default: "AND", enum: ["AND", "OR", "any", "all"] },
+    page_targeting: { type: mongoose.Schema.Types.ObjectId, ref: "page", default: null },
+    audience_targeting: { type: mongoose.Schema.Types.ObjectId, ref: "audience", default: null },
     // Metadata fields
     metadata_1: { type: mongoose.Schema.Types.Mixed, default: null },
     metadata_2: { type: mongoose.Schema.Types.Mixed, default: null },
     metadata_3: { type: mongoose.Schema.Types.Mixed, default: null },
     integrations_run_mode: { type: mongoose.Schema.Types.Mixed, default: null },
-    
+
     // Code fields
     jscode: { type: String, default: "" },
     reset_js: { type: String, default: "" },
     csscode: { type: String, default: "" },
     htmlcode: { type: String, default: "" },
-    
+
     // References with proper refs and defaults
-    audiences: { 
-      type: [mongoose.Schema.Types.ObjectId], 
-      ref: "audience", 
-      default: [] 
+    audiences: {
+      type: [mongoose.Schema.Types.ObjectId],
+      ref: "audience",
+      default: []
     },
-    pages: { 
-      type: [mongoose.Schema.Types.ObjectId], 
-      ref: "page", 
-      default: [] 
+    pages: {
+      type: [mongoose.Schema.Types.ObjectId],
+      ref: "page",
+      default: []
     },
     variations: [VariationsSchema],
-    environments: { 
-      type: [mongoose.Schema.Types.ObjectId], 
-      ref: "environment", 
-      default: [] 
+    environments: {
+      type: [mongoose.Schema.Types.ObjectId],
+      ref: "environment",
+      default: []
     },
-    pageelement: { 
-      type: [mongoose.Schema.Types.ObjectId], 
-      ref: "pageelement", 
-      default: [] 
+    pageelement: {
+      type: [mongoose.Schema.Types.ObjectId],
+      ref: "pageelement",
+      default: []
     },
-    client: { 
-      type: mongoose.Schema.Types.ObjectId, 
-      ref: "client" 
+    client: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: "client"
     },
-    goal: { 
-      type: [mongoose.Schema.Types.ObjectId], 
-      ref: "goal", 
-      default: [] 
+    goal: {
+      type: [mongoose.Schema.Types.ObjectId],
+      ref: "goal",
+      default: []
     },
-    pagetesttype: { 
-      type: [mongoose.Schema.Types.ObjectId], 
-      ref: "pagetesttype", 
-      default: [] 
+    pagetesttype: {
+      type: [mongoose.Schema.Types.ObjectId],
+      ref: "pagetesttype",
+      default: []
     },
-    tags: { 
-      type: [mongoose.Schema.Types.ObjectId], 
-      ref: "tag", 
-      default: [] 
+    tags: {
+      type: [mongoose.Schema.Types.ObjectId],
+      ref: "tag",
+      default: []
     },
-    hypothesis: { 
-      type: mongoose.Schema.Types.ObjectId, 
+    hypothesis: {
+      type: mongoose.Schema.Types.ObjectId,
       ref: "hypos"
     },
-    trigger: { 
-      type: [mongoose.Schema.Types.ObjectId], 
-      ref: "trigger", 
-      default: [] 
+    trigger: {
+      type: [mongoose.Schema.Types.ObjectId],
+      ref: "trigger",
+      default: []
     },
-    stageincustomerjourney: { 
-      type: mongoose.Schema.Types.ObjectId, 
-      ref: "stageincustomerjourney", 
+    stageincustomerjourney: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: "stageincustomerjourney",
       default: null
     },
-    
+
     // Test configuration
     property: { type: mongoose.Schema.Types.Mixed, default: null },
     platform: { type: String, default: "BQ" },
@@ -198,7 +206,9 @@ const TestSchema = new Schema<ITest>(
     pageNotContains: { type: String, default: null },
     eventparameter: { type: String, default: null },
     testid: { type: String, default: null },
-    testtool: { type: String, default: "" },
+    testtool: { type: String, default: "",
+      transform: (value: string) => value?.toLowerCase() || "",
+    },
     personalization: { type: Boolean, default: false },
     qaMode: { type: Boolean, default: false },
     dnt: { type: Boolean, default: false },
@@ -220,7 +230,7 @@ const TestSchema = new Schema<ITest>(
     timestamps: true
   }
 );
-TestSchema.pre('save', async function(next) {
+TestSchema.pre('save', async function (next) {
   if (!this.iid) {
     let unique = false;
     while (!unique) {
@@ -254,7 +264,6 @@ TestSchema.index({ iid: 1 });
 TestSchema.index({ client: 1, status: 1 });
 TestSchema.index({ client: 1, status: 1, livedate: 1 });
 TestSchema.index({ client: 1, status: 1, enddate: 1 });
-TestSchema.index({ client: 1, testtool: 1, status: 1 });
 TestSchema.index({ name: 1 }, { collation: { locale: 'en', strength: 2 } }); // Case-insensitive search
 TestSchema.index({ "variations._id": 1 });
 TestSchema.index({ status: 1, livedate: 1 });