codebase-models 1.0.7 → 2.0.1

package/dist/src/models/Test.js

@@ -25,240 +25,137 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const mongoose_1 = __importStar(require("mongoose"));
 const VariationsSchema = new mongoose_1.Schema({
-    name: {
-        type: String,
-    },
-    css_code: {
-        type: String,
-    },
-    baseline: {
-        type: Boolean,
-    },
-    traffic_allocation: {
-        type: Number,
-    },
-    metadata_1: {
-        type: mongoose_1.default.Schema.Types.Mixed,
-    },
-    metadata_2: {
-        type: mongoose_1.default.Schema.Types.Mixed,
-    },
-    metadata_3: {
-        type: mongoose_1.default.Schema.Types.Mixed,
-    },
-    jscode: {
-        type: String,
-    },
-    reset_js: {
-        type: String,
-    },
-    csscode: {
-        type: String,
-    },
-    changesets: {
-        type: String,
-        default: "[]",
-    },
+    name: { type: String, required: true },
+    css_code: { type: String, default: "" },
+    baseline: { type: Boolean, default: false },
+    traffic_allocation: { type: Number, default: 0 },
+    metadata_1: { type: mongoose_1.default.Schema.Types.Mixed, default: null },
+    metadata_2: { type: mongoose_1.default.Schema.Types.Mixed, default: null },
+    metadata_3: { type: mongoose_1.default.Schema.Types.Mixed, default: null },
+    jscode: { type: String, default: "" },
+    reset_js: { type: String, default: "" },
+    csscode: { type: String, default: "" },
+    changesets: { type: String, default: "[]" }
 });
 const TestSchema = new mongoose_1.Schema({
-    organisationId: {
-        type: String,
-        default: null,
+    organizationId: {
+        type: mongoose_1.default.Schema.Types.ObjectId,
+        ref: "organization",
+        default: null
     },
     status: {
         type: String,
         default: "draft",
-        enum: ["live", "draft", "ended", "paused", "preview"], // running is live
-    },
-    name: {
-        type: String,
-        required: true,
-    },
-    traffic_allocation: {
-        type: Number,
-        default: 100,
-    },
-    audiences_match_type: {
-        type: String,
-        default: "all",
-    },
-    metadata_1: {
-        type: mongoose_1.default.Schema.Types.Mixed,
-    },
-    metadata_2: {
-        type: mongoose_1.default.Schema.Types.Mixed,
-    },
-    metadata_3: {
-        type: mongoose_1.default.Schema.Types.Mixed,
-    },
-    integrations_run_mode: {
-        type: mongoose_1.default.Schema.Types.Mixed,
-    },
-    jscode: {
-        type: String,
-        default: "",
-    },
-    reset_js: {
-        type: String,
-    },
-    csscode: {
-        type: String,
-    },
+        enum: ["live", "draft", "ended", "paused", "preview", "running"]
+    },
+    name: { type: String, required: true },
+    traffic_allocation: { type: Number, default: 100 },
+    audiences_match_type: { type: String, default: "all" },
+    // Metadata fields
+    metadata_1: { type: mongoose_1.default.Schema.Types.Mixed, default: null },
+    metadata_2: { type: mongoose_1.default.Schema.Types.Mixed, default: null },
+    metadata_3: { type: mongoose_1.default.Schema.Types.Mixed, default: null },
+    integrations_run_mode: { type: mongoose_1.default.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_1.default.Schema.Types.ObjectId],
         ref: "audience",
-        default: [],
+        default: []
     },
     pages: {
         type: [mongoose_1.default.Schema.Types.ObjectId],
         ref: "page",
-        default: [],
+        default: []
     },
     variations: [VariationsSchema],
     environments: {
         type: [mongoose_1.default.Schema.Types.ObjectId],
         ref: "environment",
-        default: [],
+        default: []
     },
     pageelement: {
         type: [mongoose_1.default.Schema.Types.ObjectId],
         ref: "pageelement",
-        default: [],
+        default: []
     },
     client: {
         type: mongoose_1.default.Schema.Types.ObjectId,
-        ref: "client",
-    },
-    property: {
-        type: mongoose_1.default.Schema.Types.Mixed,
-    },
-    platform: {
-        type: String,
-        default: "BQ",
-    },
-    viewId: {
-        type: String,
+        ref: "client"
     },
     goal: {
         type: [mongoose_1.default.Schema.Types.ObjectId],
         ref: "goal",
-        default: [],
+        default: []
     },
     pagetesttype: {
         type: [mongoose_1.default.Schema.Types.ObjectId],
         ref: "pagetesttype",
-        default: [],
-    },
-    controlimage: {
-        type: String,
-        default: null,
-    },
-    variationimage: {
-        type: String,
-        default: null,
+        default: []
     },
     tags: {
         type: [mongoose_1.default.Schema.Types.ObjectId],
         ref: "tag",
-        default: [],
+        default: []
     },
     hypothesis: {
         type: mongoose_1.default.Schema.Types.ObjectId,
-        ref: "hypos",
-        default: null,
-    },
-    //  Action , Posibility, Hypothesis
-    // Check if we need anymore
-    urltargeting: {
-        type: [],
-        default: [],
-    },
-    // Check if we need anymore
-    pageaudience: {
-        type: String,
-        default: null,
-    },
-    targetaudience: {
-        type: String,
-        default: null,
-    },
-    page: {
-        type: String,
-        default: null,
-    },
-    pageNotContains: {
-        type: String,
-        default: null,
-    },
-    eventparameter: {
-        type: String,
-        default: null,
-    },
-    htmlcode: {
-        type: String,
-        default: "",
-    },
-    testid: {
-        type: String,
-        default: null,
-    },
-    testtool: {
-        type: String,
-        default: "",
-    },
-    kameleoontestdetails: {
-        type: mongoose_1.default.Schema.Types.Mixed,
-        default: null,
-    },
-    vwotestdetails: {
-        type: mongoose_1.default.Schema.Types.Mixed,
-        default: null,
+        ref: "hypos"
     },
     trigger: {
         type: [mongoose_1.default.Schema.Types.ObjectId],
         ref: "trigger",
-        default: [],
-    },
-    triggerevents: {
-        type: [],
-        default: [],
+        default: []
     },
     stageincustomerjourney: {
         type: mongoose_1.default.Schema.Types.ObjectId,
-        ref: "stageincustomerjourney",
-        default: null,
-    },
-    selectedevent: {
-        type: String,
-        default: null,
-    },
-    revenue: {
-        type: [],
-        default: [],
-    },
-    significance: {
-        type: String,
-        default: "",
-    },
-    recommendedsamplesize: {
-        type: Number,
-        default: null,
-    },
-    livedate: {
-        type: Date,
-        default: null,
-    },
-    defaultControl: {
-        type: String,
-        default: null,
-    },
-    enddate: {
-        type: Date,
-        default: null,
-    },
+        ref: "stageincustomerjourney"
+    },
+    // Test configuration
+    property: { type: mongoose_1.default.Schema.Types.Mixed, default: null },
+    platform: { type: String, default: "BQ" },
+    viewId: { type: String, default: "" },
+    controlimage: { type: String, default: null },
+    variationimage: { type: String, default: null },
+    urltargeting: { type: [], default: [] },
+    pageaudience: { type: String, default: null },
+    targetaudience: { type: String, default: null },
+    page: { type: String, default: null },
+    pageNotContains: { type: String, default: null },
+    eventparameter: { type: String, default: null },
+    testid: { type: String, default: null },
+    testtool: { type: String, default: "" },
+    personalization: { type: Boolean, default: false },
+    kameleoontestdetails: { type: mongoose_1.default.Schema.Types.Mixed, default: null },
+    vwotestdetails: { type: mongoose_1.default.Schema.Types.Mixed, default: null },
+    triggerevents: { type: [], default: [] },
+    selectedevent: { type: String, default: null },
+    revenue: { type: [], default: [] },
+    significance: { type: String, default: "" },
+    recommendedsamplesize: { type: Number, default: null },
+    livedate: { type: Date, default: null },
+    defaultControl: { type: String, default: null },
+    enddate: { type: Date, default: null }
 }, {
-    timestamps: true,
+    timestamps: true
 });
+// Add compound indexes for better query performance
 TestSchema.index({ client: 1, status: 1 });
-const Test = (0, mongoose_1.model)("test", TestSchema);
+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 });
+TestSchema.index({ status: 1, enddate: 1 });
+// Add partial indexes for better performance
+TestSchema.index({ status: 1 }, { partialFilterExpression: { status: { $in: ['live', 'running', 'draft', 'paused', 'preview', 'ended'] } } });
+TestSchema.index({ client: 1, status: 1 }, { partialFilterExpression: { status: { $in: ['live', 'running', 'draft', 'paused', 'preview', 'ended'] } } });
+// Add TTL index for automatic cleanup of ended tests after 1 year
+TestSchema.index({ enddate: 1 }, { expireAfterSeconds: 31536000 });
+const Test = mongoose_1.default.models.test || (0, mongoose_1.model)("test", TestSchema);
 exports.default = Test;

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

@@ -31,8 +31,7 @@ export interface ITestSequentialValue extends Document {
     nMax: number;
     createdAt?: Date;
     updatedAt?: Date;
+    organizationId?: mongoose.Schema.Types.ObjectId;
 }
-declare const TestSequentialValue: mongoose.Model<ITestSequentialValue, {}, {}, {}, mongoose.Document<unknown, {}, ITestSequentialValue> & ITestSequentialValue & {
-    _id: mongoose.Types.ObjectId;
-}, any>;
+declare const TestSequentialValue: mongoose.Model<any, {}, {}, {}, any, any>;
 export default TestSequentialValue;

package/dist/src/models/TestSequentialValue.js

@@ -25,6 +25,11 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const mongoose_1 = __importStar(require("mongoose"));
 const TestSequentialValueSchema = new mongoose_1.Schema({
+    organizationId: {
+        type: mongoose_1.default.Schema.Types.ObjectId,
+        ref: "organization",
+        default: null,
+    },
     test: {
         type: mongoose_1.default.Schema.Types.ObjectId,
         ref: "test",
@@ -50,5 +55,5 @@ const TestSequentialValueSchema = new mongoose_1.Schema({
     timestamps: true,
 });
 TestSequentialValueSchema.index({ test: 1 });
-const TestSequentialValue = (0, mongoose_1.model)("testsequentialvalue", TestSequentialValueSchema);
+const TestSequentialValue = mongoose_1.default.models.testsequentialvalue || (0, mongoose_1.model)("testsequentialvalue", TestSequentialValueSchema);
 exports.default = TestSequentialValue;

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

@@ -29,8 +29,7 @@ export interface ITier extends Document {
     colorSwatch?: string;
     createdAt?: Date;
     updatedAt?: Date;
+    organizationId?: mongoose.Schema.Types.ObjectId;
 }
-declare const Tier: mongoose.Model<ITier, {}, {}, {}, mongoose.Document<unknown, {}, ITier> & ITier & {
-    _id: mongoose.Types.ObjectId;
-}, any>;
+declare const Tier: mongoose.Model<any, {}, {}, {}, any, any>;
 export default Tier;

package/dist/src/models/Tier.js

@@ -1,7 +1,35 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-const mongoose_1 = require("mongoose");
+const mongoose_1 = __importStar(require("mongoose"));
 const TierSchema = new mongoose_1.Schema({
+    organizationId: {
+        type: mongoose_1.default.Schema.Types.ObjectId,
+        ref: "organization",
+        default: null,
+    },
     name: {
         type: String,
         unique: true,
@@ -23,5 +51,5 @@ const TierSchema = new mongoose_1.Schema({
         default: new Date(),
     },
 });
-const Tier = (0, mongoose_1.model)("tier", TierSchema);
+const Tier = mongoose_1.default.models.tier || (0, mongoose_1.model)("tier", TierSchema);
 exports.default = Tier;

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

@@ -29,8 +29,7 @@ export interface ITrigger extends Document {
     slug?: string;
     createdAt?: Date;
     updatedAt?: Date;
+    organizationId?: mongoose.Schema.Types.ObjectId;
 }
-declare const Trigger: mongoose.Model<ITrigger, {}, {}, {}, mongoose.Document<unknown, {}, ITrigger> & ITrigger & {
-    _id: mongoose.Types.ObjectId;
-}, any>;
+declare const Trigger: mongoose.Model<any, {}, {}, {}, any, any>;
 export default Trigger;

package/dist/src/models/Trigger.js

@@ -1,7 +1,35 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-const mongoose_1 = require("mongoose");
+const mongoose_1 = __importStar(require("mongoose"));
 const TriggerSchema = new mongoose_1.Schema({
+    organizationId: {
+        type: mongoose_1.default.Schema.Types.ObjectId,
+        ref: "organization",
+        default: null,
+    },
     name: {
         type: String,
     },
@@ -20,5 +48,5 @@ const TriggerSchema = new mongoose_1.Schema({
         default: new Date(),
     },
 });
-const Trigger = (0, mongoose_1.model)("trigger", TriggerSchema);
+const Trigger = mongoose_1.default.models.trigger || (0, mongoose_1.model)("trigger", TriggerSchema);
 exports.default = Trigger;

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

@@ -35,8 +35,7 @@ export interface IUser extends Document {
     createdAt: Date;
     updatedAt: Date;
     resetLink: string;
+    organizationId?: mongoose.Schema.Types.ObjectId;
 }
-declare const User: mongoose.Model<IUser, {}, {}, {}, mongoose.Document<unknown, {}, IUser> & IUser & {
-    _id: mongoose.Types.ObjectId;
-}, any>;
+declare const User: mongoose.Model<any, {}, {}, {}, any, any>;
 export default User;

package/dist/src/models/User.js

@@ -53,18 +53,17 @@ const UserSchema = new mongoose_1.Schema({
         type: Boolean,
         default: false,
     },
-    createdAt: {
-        type: Date,
-        default: new Date(),
-    },
-    updatedAt: {
-        type: Date,
-        default: new Date(),
-    },
-    resetLink: {
-        type: String,
+    organizationId: {
+        type: mongoose_1.default.Schema.Types.ObjectId,
+        ref: "organization",
         default: null,
     },
+}, {
+    timestamps: true
 });
-const User = (0, mongoose_1.model)("user", UserSchema);
+// Add compound indexes for common query patterns
+UserSchema.index({ organizationId: 1, role: 1 });
+UserSchema.index({ organizationId: 1, client: 1 });
+UserSchema.index({ email: 1 }, { unique: true });
+const User = mongoose_1.default.models.user || (0, mongoose_1.model)("user", UserSchema);
 exports.default = User;

package/index.ts

@@ -18,7 +18,6 @@ import ClientRetention from "./src/models/ClientRetention";
 import ClientStrategy from "./src/models/ClientStrategy";
 import ClientSurvey from "./src/models/ClientSurvay";
 import CVRReport from "./src/models/CVRReport";
-import Experiments from "./src/models/Experiments";
 import Faq from "./src/models/Faqs";
 import Feedback from "./src/models/Feedback";
 import Goal from "./src/models/Goal";
@@ -32,6 +31,7 @@ import PageElement from "./src/models/PageElement";
 import PageTestType from "./src/models/PageTestType";
 import Portfolio from "./src/models/Portfolio";
 import ReadNotification from "./src/models/ReadNotification";
+import Organization from "./src/models/Organization";
 import Role from "./src/models/Role";
 import SavedSegment from "./src/models/SavedSegment";
 import Segment from "./src/models/Segment";
@@ -43,9 +43,10 @@ import Temp from "./src/models/Temp";
 import Tier from "./src/models/Tier";
 import Trigger from "./src/models/Trigger";
 import ClientScript from "./src/models/ClientScript";
-import ClientExperiment from "./src/models/ClientExperiment";
 import Audience from "./src/models/Audience";
 import Environment from "./src/models/Environment";
+import PrecalculationFilters from "./src/models/PrecalculationFilters";
+import BqPreCompiledData from "./src/models/BqPreCompiledData";
 
 async function seedRoles() {
   const checkRoles = await Role.countDocuments();
@@ -113,7 +114,6 @@ export {
   ClientStrategy,
   ClientSurvey,
   CVRReport,
-  Experiments,
   Faq,
   Feedback,
   Goal,
@@ -138,7 +138,9 @@ export {
   Tier,
   Trigger,
   ClientScript,
-  ClientExperiment,
   Audience,
   Environment,
+  Organization,
+  PrecalculationFilters,
+  BqPreCompiledData,
 };

package/package.json

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

package/src/models/Announcement.ts

@@ -2,48 +2,71 @@ import mongoose, { Document, Schema, model } from "mongoose";
 
 export interface IAnnouncement extends Document {
   title: string;
-  description?: String;
-  active?: Boolean;
-  forRoles?: mongoose.Schema.Types.ObjectId;
-  forUsers?: mongoose.Schema.Types.ObjectId;
-  readBy?: mongoose.Schema.Types.ObjectId;
+  description?: string;
+  active?: boolean;
+  forRoles?: mongoose.Schema.Types.ObjectId[];
+  forUsers?: mongoose.Schema.Types.ObjectId[];
+  readBy?: mongoose.Schema.Types.ObjectId[];
+  organizationId?: mongoose.Schema.Types.ObjectId;
 }
 
 const AnnouncementSchema = new Schema<IAnnouncement>(
   {
-    title: {
-      type: String,
-      required: true,
+    organizationId: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: "organization",
+      default: null,
     },
-    description: {
-      type: String,
-      required: false,
+    title: { 
+      type: String, 
+      required: true,
+      trim: true 
     },
-    active: {
-      type: Boolean,
-      default: true,
+    description: { 
+      type: String, 
+      trim: true 
     },
-    forRoles: {
-      type: [mongoose.Schema.Types.ObjectId],
-      required: true,
-      ref: "role",
+    active: { 
+      type: Boolean, 
+      default: true 
     },
-    forUsers: {
-      type: [mongoose.Schema.Types.ObjectId],
-      required: false,
-      ref: "user",
+    forRoles: { 
+      type: [mongoose.Schema.Types.ObjectId], 
+      required: true, 
+      ref: "role" 
     },
-    readBy: {
-      type: [mongoose.Schema.Types.ObjectId],
-      required: false,
-      ref: "user",
+    forUsers: { 
+      type: [mongoose.Schema.Types.ObjectId], 
+      ref: "user" 
     },
+    readBy: { 
+      type: [mongoose.Schema.Types.ObjectId], 
+      ref: "user" 
+    }
   },
   {
-    timestamps: true,
+    timestamps: true
   }
 );
 
-const Announcement = model<IAnnouncement>("announcement", AnnouncementSchema);
+// Add compound indexes for better query performance
+AnnouncementSchema.index({ active: 1, createdAt: -1 }); // For active announcements sorted by date
+AnnouncementSchema.index({ forRoles: 1, active: 1 }); // For role-based announcements
+AnnouncementSchema.index({ forUsers: 1, active: 1 }); // For user-specific announcements
+AnnouncementSchema.index({ readBy: 1 }); // For tracking read status
+AnnouncementSchema.index({ title: 1 }, { collation: { locale: 'en', strength: 2 } }); // Case-insensitive title search
+
+// Add text index for full-text search
+// AnnouncementSchema.index({ 
+//   title: 'text', 
+//   description: 'text' 
+// }, { 
+//   weights: { 
+//     title: 10, 
+//     description: 5 
+//   } 
+// });
+
+const Announcement = mongoose.models.announcement || model<IAnnouncement>("announcement", AnnouncementSchema);
 
 export default Announcement;

package/src/models/AppEvent.ts

@@ -76,6 +76,6 @@ const AppEventsSchema = new Schema<IAppEvent>(
   }
 );
 
-const AppEvent = model<IAppEvent>("appevent", AppEventsSchema);
+const AppEvent = mongoose.models.appevent || model<IAppEvent>("appevent", AppEventsSchema);
 
 export default AppEvent;