codebase-models 1.0.6 → 2.0.0

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,
     },

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

@@ -35,6 +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;

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
 });
+// 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 = (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.6",
+  "version": "2.0.0",
   "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
   }
 );
 
+// 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 = model<IAnnouncement>("announcement", AnnouncementSchema);
 
 export default Announcement;

package/src/models/Audience.ts

@@ -1,6 +1,7 @@
 import mongoose, { Document, Schema, model } from "mongoose";
 
 export interface IAudience extends Document {
+  organizationId?: mongoose.Schema.Types.ObjectId;
   name: string;
   rules_js?: string;
   client?: mongoose.Schema.Types.ObjectId;
@@ -8,6 +9,11 @@ export interface IAudience extends Document {
 
 const AudienceSchema = new Schema<IAudience>(
   {
+    organizationId: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: "organization",
+      default: null,
+    },
     name: {
       type: String,
       required: true,

package/src/models/BqPreCompiledData.ts

@@ -0,0 +1,62 @@
+import mongoose, { Document, Schema, model } from "mongoose";
+
+export interface IBqPreCompiledData extends Document {
+  title: string;
+  organizationId: mongoose.Schema.Types.ObjectId;
+  client: mongoose.Schema.Types.ObjectId;
+  test: mongoose.Schema.Types.ObjectId;
+  from: Date;
+  to: Date;
+  filters: any;
+  otherFilters: any;
+  cloudurl: string;
+}
+
+const BqPreCompiledDataSchema = new Schema<IBqPreCompiledData>({
+  title: {
+    type: String,
+    default: null,
+  },
+  organizationId: {
+    type: mongoose.Schema.Types.ObjectId,
+    ref: "organization",
+    default: null,
+  },
+  client: {
+    type: mongoose.Schema.Types.ObjectId,
+    ref: "client",
+    default: null,
+  },
+  test: {
+    type: mongoose.Schema.Types.ObjectId,
+    ref: "test",
+    default: null,
+  },
+  from: {
+    type: Date,
+    default: null,
+  },
+  filters: {
+    type: Object,
+    default: null,
+  },
+  to: {
+    type: Date,
+    default: null,
+  },
+  otherFilters: {
+    type: Object,
+    default: null,
+  },
+  cloudurl: {
+    type: String,
+    default: null,
+  },
+}, {
+    timestamps: true
+});
+
+BqPreCompiledDataSchema.index({ organizationId: 1, client: 1 });
+const BqPreCompiledData = model<IBqPreCompiledData>("bqprecompileddata", BqPreCompiledDataSchema);
+
+export default BqPreCompiledData;

package/src/models/CVRReport.ts

@@ -1,19 +1,27 @@
 import mongoose, { Document, Schema, model } from "mongoose";
 
 export interface ICVRReport extends Document {
+  organizationId?: mongoose.Schema.Types.ObjectId;
   reportLink?: string;
   client?: mongoose.Schema.Types.ObjectId;
 }
 
 const CVRReportSchema = new Schema<ICVRReport>(
   {
+    organizationId: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: "organization",
+      default: null,
+    },
     reportLink: {
       type: String,
       default: null,
+      trim: true,
     },
     client: {
       type: mongoose.Schema.Types.ObjectId,
       ref: "client",
+      index: true,
     },
   },
   {
@@ -21,5 +29,14 @@ const CVRReportSchema = new Schema<ICVRReport>(
   }
 );
 
+// Compound index for client and reportLink
+CVRReportSchema.index({ client: 1 });
+
+// Sparse index for reportLink
+CVRReportSchema.index({ reportLink: 1 }, { sparse: true });
+
+// TTL index for automatic cleanup of old reports (1 year)
+CVRReportSchema.index({ createdAt: 1 }, { expireAfterSeconds: 31536000 });
+
 const CVRReport = model<ICVRReport>("cvrreport", CVRReportSchema);
 export default CVRReport;

package/src/models/Client.ts

@@ -12,11 +12,11 @@ export interface IProperty extends Document {
 const PropertySchema: Schema = new Schema<IProperty>({
   propertyname: { type: String, required: true },
   viewId: { type: String, required: true },
-  platform: { type: String, required: false, default: "UA" },
+  platform: { type: String, default: "GA4" }
 });
 
 export interface IClient extends Document {
-  organisationId?: string;
+  organizationId?: mongoose.Schema.Types.ObjectId;
   name: string;
   slug?: string;
   viewId?: string;
@@ -37,71 +37,51 @@ export interface IClient extends Document {
 
 const ClientSchema: Schema = new Schema<IClient>(
   {
-    organisationId: {
-      type: String,
-      default: null,
-    },
-    name: {
-      type: String,
-      required: true,
-    },
-    slug: { type: String, slug: ["name"], slugPaddingSize: 4, unique: true },
-    viewId: {
-      type: String,
-    },
-    portfolioClient: {
-      type: Boolean,
-      default: false,
+    organizationId: { type: mongoose.Schema.Types.ObjectId, 
+      ref: "organization",
+      default: null },
+    name: { type: String, required: true },
+    slug: { 
+      type: String, 
+      slug: ["name"], 
+      slugPaddingSize: 4, 
+      unique: true 
     },
+    viewId: { type: String },
+    portfolioClient: { type: Boolean, default: false },
     gaproperties: [PropertySchema],
-    tier: {
-      type: mongoose.Schema.Types.ObjectId,
-      ref: "tier",
-      default: null,
-    },
-    active: {
-      type: Boolean,
-      default: true,
-    },
-    currency: {
-      type: String,
-      default: "USD",
-    },
-    logo: {
-      type: String,
-      default: "",
-    },
-    createdBy: {
-      type: mongoose.Schema.Types.ObjectId,
-      ref: "user",
-      default: null,
-    },
-    onboardDate: {
-      type: Date,
-      default: new Date(),
-    },
-    bqClientId: {
-      type: String,
-      default: null,
-    },
-    defaultDataSet: {
-      type: String,
-    },
-    NDAStatus: {
-      type: Boolean,
-      default: false,
-    },
-    retainerValue: {
-      type: Number,
+    tier: { 
+      type: mongoose.Schema.Types.ObjectId, 
+      ref: "tier", 
+      default: null 
     },
-    useIntraDayTable: {
-      type: Boolean,
+    active: { type: Boolean, default: true },
+    currency: { type: String, default: "USD" },
+    logo: { type: String, default: "" },
+    createdBy: { 
+      type: mongoose.Schema.Types.ObjectId, 
+      ref: "user", 
+      default: null 
     },
+    onboardDate: { type: Date, default: Date.now },
+    bqClientId: { type: String, default: null },
+    defaultDataSet: { type: String },
+    NDAStatus: { type: Boolean, default: false },
+    retainerValue: { type: Number },
+    useIntraDayTable: { type: Boolean }
   },
-  { timestamps: true }
+  { 
+    timestamps: true 
+  }
 );
 
+// Add compound indexes for better query performance
 ClientSchema.index({ active: 1 });
+ClientSchema.index({ organizationId: 1, active: 1 });
+ClientSchema.index({ name: 1 }, { collation: { locale: 'en', strength: 2 } }); // Case-insensitive search
+ClientSchema.index({ tier: 1, active: 1 }); // For tier-based queries
+ClientSchema.index({ onboardDate: 1 }); // For date-based queries
+ClientSchema.index({ portfolioClient: 1, active: 1 }); // For portfolio client queries
 
 const Client = model<IClient>("client", ClientSchema);
 

package/src/models/ClientAdditionalRevenue.ts

@@ -1,7 +1,7 @@
 import mongoose, { Document, Schema, model } from "mongoose";
 
 export interface IClientAdditionalRevenue extends Document {
-  organisationId?: string;
+  organizationId?: mongoose.Schema.Types.ObjectId;
   client?: mongoose.Schema.Types.ObjectId;
   additionalRevenueForTests: IAdditionalRevenue;
   createdBy?: mongoose.Schema.Types.ObjectId;
@@ -36,8 +36,9 @@ const AdditionalRevenueSchema = new Schema<IAdditionalRevenue>({
 
 const ClientAdditionalRevenueSchema = new Schema<IClientAdditionalRevenue>(
   {
-    organisationId: {
-      type: String,
+    organizationId: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: "organization",
       default: null,
     },
     client: {

package/src/models/ClientLearning.ts

@@ -2,7 +2,7 @@ import mongoose, { Document, Schema, model } from "mongoose";
 
 export interface IClientLearning extends Document {
   name: string;
-  organisationId?: string;
+  organizationId?: mongoose.Schema.Types.ObjectId;
   client?: mongoose.Schema.Types.ObjectId;
   viewId?: string;
   createdBy?: mongoose.Schema.Types.ObjectId;
@@ -13,9 +13,11 @@ const ClientLearningSchema = new Schema<IClientLearning>(
     name: {
       type: String,
       required: true,
+      trim: true,
     },
-    organisationId: {
-      type: String,
+    organizationId: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: "organization",
       default: null,
     },
     client: {
@@ -35,10 +37,12 @@ const ClientLearningSchema = new Schema<IClientLearning>(
   }
 );
 
-ClientLearningSchema.index({
-  client: 1,
-  viewId: 1,
-});
+// Compound indexes for common query patterns
+ClientLearningSchema.index({ client: 1 });
+// Sparse indexes for optional fields
+ClientLearningSchema.index({ organisationId: 1 }, { sparse: true });
+// Case-insensitive index for name
+ClientLearningSchema.index({ name: 1 }, { collation: { locale: 'en', strength: 2 } });
 
 const ClientLearning = model<IClientLearning>(
   "clientlearning",

package/src/models/ClientLinks.ts

@@ -1,7 +1,7 @@
 import mongoose, { Document, Schema, model } from "mongoose";
 
 export interface IClientLinks extends Document {
-  organisationId?: string;
+  organizationId?: mongoose.Schema.Types.ObjectId;
   title: string;
   description?: string;
   link?: string;
@@ -13,20 +13,24 @@ export interface IClientLinks extends Document {
 
 const ClientLinksSchema = new Schema<IClientLinks>(
   {
-    organisationId: {
-      type: String,
+    organizationId: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: "organization",
       default: null,
     },
     title: {
       type: String,
       required: true,
+      trim: true,
     },
     description: {
       type: String,
+      trim: true,
     },
     link: {
       type: String,
       required: true,
+      trim: true,
     },
     client: {
       type: mongoose.Schema.Types.ObjectId,
@@ -49,10 +53,17 @@ const ClientLinksSchema = new Schema<IClientLinks>(
   }
 );
 
-ClientLinksSchema.index({
-  client: 1,
-  viewId: 1,
-});
+// Compound indexes for common query patterns
+ClientLinksSchema.index({ client: 1 });
+ClientLinksSchema.index({ client: 1, private: 1 });
+ClientLinksSchema.index({ client: 1, createdAt: -1 });
+
+// Sparse indexes for optional fields
+ClientLinksSchema.index({ viewId: 1 }, { sparse: true });
+ClientLinksSchema.index({ organisationId: 1 }, { sparse: true });
+
+// Case-insensitive indexes
+ClientLinksSchema.index({ title: 1 }, { collation: { locale: 'en', strength: 2 } });
 
 const ClientLinks = model<IClientLinks>("clientlink", ClientLinksSchema);
 export default ClientLinks;

package/src/models/ClientNextSteps.ts

@@ -2,7 +2,7 @@ import mongoose, { Document, Schema, model } from "mongoose";
 
 export interface IClientNextSteps extends Document {
   name: string;
-  organisationId?: string;
+  organizationId?: mongoose.Schema.Types.ObjectId;
   client?: mongoose.Schema.Types.ObjectId;
   viewId?: string;
   createdBy?: mongoose.Schema.Types.ObjectId;
@@ -14,8 +14,9 @@ const ClientNextStepsSchema = new Schema<IClientNextSteps>(
       type: String,
       required: true,
     },
-    organisationId: {
-      type: String,
+    organizationId: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: "organization",
       default: null,
     },
     client: {

package/src/models/ClientNote.ts

@@ -1,7 +1,7 @@
 import mongoose, { Document, Schema, model } from "mongoose";
 
 export interface IClientNote extends Document {
-  organisationId?: string;
+  organizationId?: mongoose.Schema.Types.ObjectId;
   client?: mongoose.Schema.Types.ObjectId;
   viewId?: string;
   pageType?: mongoose.Schema.Types.ObjectId;
@@ -14,8 +14,9 @@ export interface IClientNote extends Document {
 
 const ClientNoteSchema = new Schema<IClientNote>(
   {
-    organisationId: {
-      type: String,
+    organizationId: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: "organization",
       default: null,
     },
     client: {