codebase-models 1.0.6 → 2.0.0

package/.github/workflows/npm-publish.yml

@@ -0,0 +1,33 @@
+# This workflow will run tests using node and then publish a package to GitHub Packages when a release is created
+# For more information see: https://docs.github.com/en/actions/publishing-packages/publishing-nodejs-packages
+
+name: Publish Codebase Shared Models on NPM
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+      - run: npm ci
+
+  publish-npm:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          registry-url: https://registry.npmjs.org/
+      - run: npm ci
+      - run: npm publish
+        env:
+          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}

package/dist/index.d.ts

@@ -41,7 +41,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";
@@ -55,6 +54,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";
@@ -66,8 +66,9 @@ 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 Environment from "./src/models/Environment";
+import PrecalculationFilters from "./src/models/PrecalculationFilters";
+import BqPreCompiledData from "./src/models/BqPreCompiledData";
 export declare function connect(uri: string, options?: mongoose.ConnectOptions | undefined): Promise<typeof mongoose>;
-export { Client, ClientReportsTemp, QueryLog, Report, Test, TestSequentialValue, User, AppEvent, Announcement, ClientAdditionalRevenue, ClientLearning, ClientLinks, ClientNextStep, ClientNote, ClientRetention, ClientStrategy, ClientSurvey, CVRReport, Experiments, Faq, Feedback, Goal, Hypothesis, HypothesisSheet, LandingPages, NewIdeas, Notification, Page, PageElement, PageTestType, Portfolio, ReadNotification, Role, SavedSegment, Segment, SegmentCombination, Snippet, StageInCustomerJourney, Tag, Temp, Tier, Trigger, ClientScript, ClientExperiment, Audience, Environment };
+export { Client, ClientReportsTemp, QueryLog, Report, Test, TestSequentialValue, User, AppEvent, Announcement, ClientAdditionalRevenue, ClientLearning, ClientLinks, ClientNextStep, ClientNote, ClientRetention, ClientStrategy, ClientSurvey, CVRReport, Faq, Feedback, Goal, Hypothesis, HypothesisSheet, LandingPages, NewIdeas, Notification, Page, PageElement, PageTestType, Portfolio, ReadNotification, Role, SavedSegment, Segment, SegmentCombination, Snippet, StageInCustomerJourney, Tag, Temp, Tier, Trigger, ClientScript, Audience, Environment, Organization, PrecalculationFilters, BqPreCompiledData, };

package/dist/index.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Environment = exports.Audience = exports.ClientExperiment = exports.ClientScript = exports.Trigger = exports.Tier = exports.Temp = exports.Tag = exports.StageInCustomerJourney = exports.Snippet = exports.SegmentCombination = exports.Segment = exports.SavedSegment = exports.Role = exports.ReadNotification = exports.Portfolio = exports.PageTestType = exports.PageElement = exports.Page = exports.Notification = exports.NewIdeas = exports.LandingPages = exports.HypothesisSheet = exports.Hypothesis = exports.Goal = exports.Feedback = exports.Faq = exports.Experiments = exports.CVRReport = exports.ClientSurvey = exports.ClientStrategy = exports.ClientRetention = exports.ClientNote = exports.ClientNextStep = exports.ClientLinks = exports.ClientLearning = exports.ClientAdditionalRevenue = exports.Announcement = exports.AppEvent = exports.User = exports.TestSequentialValue = exports.Test = exports.Report = exports.QueryLog = exports.ClientReportsTemp = exports.Client = exports.connect = void 0;
+exports.BqPreCompiledData = exports.PrecalculationFilters = exports.Organization = exports.Environment = exports.Audience = exports.ClientScript = exports.Trigger = exports.Tier = exports.Temp = exports.Tag = exports.StageInCustomerJourney = exports.Snippet = exports.SegmentCombination = exports.Segment = exports.SavedSegment = exports.Role = exports.ReadNotification = exports.Portfolio = exports.PageTestType = exports.PageElement = exports.Page = exports.Notification = exports.NewIdeas = exports.LandingPages = exports.HypothesisSheet = exports.Hypothesis = exports.Goal = exports.Feedback = exports.Faq = exports.CVRReport = exports.ClientSurvey = exports.ClientStrategy = exports.ClientRetention = exports.ClientNote = exports.ClientNextStep = exports.ClientLinks = exports.ClientLearning = exports.ClientAdditionalRevenue = exports.Announcement = exports.AppEvent = exports.User = exports.TestSequentialValue = exports.Test = exports.Report = exports.QueryLog = exports.ClientReportsTemp = exports.Client = exports.connect = void 0;
 const mongoose_1 = __importDefault(require("mongoose"));
 const Client_1 = __importDefault(require("./src/models/Client"));
 exports.Client = Client_1.default;
@@ -50,8 +50,6 @@ const ClientSurvay_1 = __importDefault(require("./src/models/ClientSurvay"));
 exports.ClientSurvey = ClientSurvay_1.default;
 const CVRReport_1 = __importDefault(require("./src/models/CVRReport"));
 exports.CVRReport = CVRReport_1.default;
-const Experiments_1 = __importDefault(require("./src/models/Experiments"));
-exports.Experiments = Experiments_1.default;
 const Faqs_1 = __importDefault(require("./src/models/Faqs"));
 exports.Faq = Faqs_1.default;
 const Feedback_1 = __importDefault(require("./src/models/Feedback"));
@@ -78,6 +76,8 @@ const Portfolio_1 = __importDefault(require("./src/models/Portfolio"));
 exports.Portfolio = Portfolio_1.default;
 const ReadNotification_1 = __importDefault(require("./src/models/ReadNotification"));
 exports.ReadNotification = ReadNotification_1.default;
+const Organization_1 = __importDefault(require("./src/models/Organization"));
+exports.Organization = Organization_1.default;
 const Role_1 = __importDefault(require("./src/models/Role"));
 exports.Role = Role_1.default;
 const SavedSegment_1 = __importDefault(require("./src/models/SavedSegment"));
@@ -100,12 +100,14 @@ const Trigger_1 = __importDefault(require("./src/models/Trigger"));
 exports.Trigger = Trigger_1.default;
 const ClientScript_1 = __importDefault(require("./src/models/ClientScript"));
 exports.ClientScript = ClientScript_1.default;
-const ClientExperiment_1 = __importDefault(require("./src/models/ClientExperiment"));
-exports.ClientExperiment = ClientExperiment_1.default;
 const Audience_1 = __importDefault(require("./src/models/Audience"));
 exports.Audience = Audience_1.default;
 const Environment_1 = __importDefault(require("./src/models/Environment"));
 exports.Environment = Environment_1.default;
+const PrecalculationFilters_1 = __importDefault(require("./src/models/PrecalculationFilters"));
+exports.PrecalculationFilters = PrecalculationFilters_1.default;
+const BqPreCompiledData_1 = __importDefault(require("./src/models/BqPreCompiledData"));
+exports.BqPreCompiledData = BqPreCompiledData_1.default;
 function seedRoles() {
     return __awaiter(this, void 0, void 0, function* () {
         const checkRoles = yield Role_1.default.countDocuments();
@@ -127,19 +129,26 @@ function seedRoles() {
                     },
                 ]);
             }));
+            console.log("Roles seeded successfully");
         }
     });
 }
 function connect(uri, options) {
     return __awaiter(this, void 0, void 0, function* () {
         if (uri) {
-            console.log("Connecting to the database on URI: ", uri);
-            const mongooseConnection = yield mongoose_1.default.connect(uri, options);
-            if (mongooseConnection.connection.readyState === 1) {
-                yield seedRoles();
-                console.log("Roles seeded successfully");
+            if (mongoose_1.default.connection.readyState === 1) {
+                // Already connected
+                console.log("Already connected to the database");
+                return mongoose_1.default;
+            }
+            else {
+                console.log("Connecting to the database on URI: ", uri);
+                const mongooseConnection = yield mongoose_1.default.connect(uri, options);
+                if (mongooseConnection.connection.readyState === 1) {
+                    yield seedRoles();
+                }
+                return mongooseConnection;
             }
-            return mongooseConnection;
         }
         throw new Error("URI is required to connect to the database");
     });

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

@@ -25,11 +25,12 @@
 import mongoose, { Document } 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;
 }
 declare const Announcement: mongoose.Model<IAnnouncement, {}, {}, {}, mongoose.Document<unknown, {}, IAnnouncement> & IAnnouncement & {
     _id: mongoose.Types.ObjectId;

package/dist/src/models/Announcement.js

@@ -25,35 +25,55 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const mongoose_1 = __importStar(require("mongoose"));
 const AnnouncementSchema = new mongoose_1.Schema({
+    organizationId: {
+        type: mongoose_1.default.Schema.Types.ObjectId,
+        ref: "organization",
+        default: null,
+    },
     title: {
         type: String,
         required: true,
+        trim: true
     },
     description: {
         type: String,
-        required: false,
+        trim: true
     },
     active: {
         type: Boolean,
-        default: true,
+        default: true
     },
     forRoles: {
         type: [mongoose_1.default.Schema.Types.ObjectId],
         required: true,
-        ref: "role",
+        ref: "role"
     },
     forUsers: {
         type: [mongoose_1.default.Schema.Types.ObjectId],
-        required: false,
-        ref: "user",
+        ref: "user"
     },
     readBy: {
         type: [mongoose_1.default.Schema.Types.ObjectId],
-        required: false,
-        ref: "user",
-    },
+        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 = (0, mongoose_1.model)("announcement", AnnouncementSchema);
 exports.default = Announcement;

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

@@ -24,9 +24,10 @@
 /// <reference types="mongoose/types/inferschematype" />
 import mongoose, { Document } from "mongoose";
 export interface IAudience extends Document {
+    organizationId?: mongoose.Schema.Types.ObjectId;
     name: string;
     rules_js?: string;
-    client: mongoose.Schema.Types.ObjectId;
+    client?: mongoose.Schema.Types.ObjectId;
 }
 declare const Audience: mongoose.Model<IAudience, {}, {}, {}, mongoose.Document<unknown, {}, IAudience> & IAudience & {
     _id: mongoose.Types.ObjectId;

package/dist/src/models/Audience.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 AudienceSchema = new mongoose_1.Schema({
+    organizationId: {
+        type: mongoose_1.default.Schema.Types.ObjectId,
+        ref: "organization",
+        default: null,
+    },
     name: {
         type: String,
         required: true,
@@ -35,7 +40,7 @@ const AudienceSchema = new mongoose_1.Schema({
     client: {
         type: mongoose_1.default.Schema.Types.ObjectId,
         ref: "client",
-    }
+    },
 }, {
     timestamps: true,
 });

package/dist/src/models/{Experiments.d.ts → BqPreCompiledData.d.ts}

@@ -23,36 +23,18 @@
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
 import mongoose, { Document } from "mongoose";
-export interface IVariations extends Document {
-    name: string;
-    css_code: string;
-    baseline: Boolean;
-    traffic_allocation: Number;
-    metadata_1: mongoose.Schema.Types.Mixed;
-    metadata_2: mongoose.Schema.Types.Mixed;
-    metadata_3: mongoose.Schema.Types.Mixed;
-    js: string;
-    reset_js: string;
-    css: string;
-    changesets: string;
+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;
 }
-export interface IExperiments extends Document {
-    status: string;
-    name: string;
-    traffic_allocation: Number;
-    audiences_match_type: string;
-    metadata_1: mongoose.Schema.Types.Mixed;
-    metadata_2: mongoose.Schema.Types.Mixed;
-    metadata_3: mongoose.Schema.Types.Mixed;
-    integrations_run_mode: mongoose.Schema.Types.Mixed;
-    js: string;
-    reset_js: string;
-    csscode: string;
-    audiences: mongoose.Schema.Types.Array;
-    variations: IVariations;
-    environments: mongoose.Schema.Types.Array;
-}
-declare const Experiments: mongoose.Model<IExperiments, {}, {}, {}, mongoose.Document<unknown, {}, IExperiments> & IExperiments & {
+declare const BqPreCompiledData: mongoose.Model<IBqPreCompiledData, {}, {}, {}, mongoose.Document<unknown, {}, IBqPreCompiledData> & IBqPreCompiledData & {
     _id: mongoose.Types.ObjectId;
 }, any>;
-export default Experiments;
+export default BqPreCompiledData;

package/dist/src/models/{ClientExperiment.js → BqPreCompiledData.js}

@@ -24,69 +24,49 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const mongoose_1 = __importStar(require("mongoose"));
-const PageTargetingSchema = new mongoose_1.Schema({
-    condition: {
+const BqPreCompiledDataSchema = new mongoose_1.Schema({
+    title: {
         type: String,
         default: null,
     },
-    routes: {
-        type: mongoose_1.default.Schema.Types.Mixed,
-    },
-});
-const AudienceTargetingSchema = new mongoose_1.Schema({
-    javascript: {
-        type: String,
-        default: "return true",
-    },
-});
-const VariantsSchema = new mongoose_1.Schema({
-    name: {
-        type: String,
+    organizationId: {
+        type: mongoose_1.default.Schema.Types.ObjectId,
+        ref: "organization",
         default: null,
     },
-    traffic_allocation: {
-        type: Number,
+    client: {
+        type: mongoose_1.default.Schema.Types.ObjectId,
+        ref: "client",
         default: null,
     },
-    javascript: {
-        type: String,
+    test: {
+        type: mongoose_1.default.Schema.Types.ObjectId,
+        ref: "test",
         default: null,
     },
-    css: {
-        type: String,
+    from: {
+        type: Date,
         default: null,
     },
-    slug: {
-        type: String,
+    filters: {
+        type: Object,
         default: null,
     },
-});
-const ClientExperimentSchema = new mongoose_1.Schema({
-    organisationId: {
-        type: String,
+    to: {
+        type: Date,
         default: null,
     },
-    name: String,
-    status: {
-        type: String,
-        default: "draft",
-    },
-    experimentUrl: String,
-    client: {
-        type: mongoose_1.default.Schema.Types.ObjectId,
-        ref: "client",
+    otherFilters: {
+        type: Object,
+        default: null,
     },
-    viewId: {
+    cloudurl: {
         type: String,
+        default: null,
     },
-    pageTargeting: [PageTargetingSchema],
-    audienceTargeting: AudienceTargetingSchema,
-    variants: [VariantsSchema],
 }, {
-    timestamps: true,
-});
-ClientExperimentSchema.index({
-    client: 1,
+    timestamps: true
 });
-const ClientExperiment = (0, mongoose_1.model)("clientexperiment", ClientExperimentSchema);
-exports.default = ClientExperiment;
+BqPreCompiledDataSchema.index({ organizationId: 1, client: 1 });
+const BqPreCompiledData = (0, mongoose_1.model)("bqprecompileddata", BqPreCompiledDataSchema);
+exports.default = BqPreCompiledData;

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

@@ -24,6 +24,7 @@
 /// <reference types="mongoose/types/inferschematype" />
 import mongoose, { Document } from "mongoose";
 export interface ICVRReport extends Document {
+    organizationId?: mongoose.Schema.Types.ObjectId;
     reportLink?: string;
     client?: mongoose.Schema.Types.ObjectId;
 }

package/dist/src/models/CVRReport.js

@@ -25,16 +25,29 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const mongoose_1 = __importStar(require("mongoose"));
 const CVRReportSchema = new mongoose_1.Schema({
+    organizationId: {
+        type: mongoose_1.default.Schema.Types.ObjectId,
+        ref: "organization",
+        default: null,
+    },
     reportLink: {
         type: String,
         default: null,
+        trim: true,
     },
     client: {
         type: mongoose_1.default.Schema.Types.ObjectId,
         ref: "client",
+        index: true,
     },
 }, {
     timestamps: true,
 });
+// 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 = (0, mongoose_1.model)("cvrreport", CVRReportSchema);
 exports.default = CVRReport;

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

@@ -29,7 +29,7 @@ export interface IProperty extends Document {
     platform?: string;
 }
 export interface IClient extends Document {
-    organisationId?: string;
+    organizationId?: mongoose.Schema.Types.ObjectId;
     name: string;
     slug?: string;
     viewId?: string;
@@ -44,6 +44,8 @@ export interface IClient extends Document {
     bqClientId?: string;
     defaultDataSet?: string;
     NDAStatus?: boolean;
+    retainerValue: number;
+    useIntraDayTable: boolean;
 }
 declare const Client: mongoose.Model<IClient, {}, {}, {}, mongoose.Document<unknown, {}, IClient> & IClient & {
     _id: mongoose.Types.ObjectId;

package/dist/src/models/Client.js

@@ -32,64 +32,50 @@ mongoose_1.default.plugin(mongoose_slug_updater_1.default);
 const PropertySchema = new mongoose_1.Schema({
     propertyname: { type: String, required: true },
     viewId: { type: String, required: true },
-    platform: { type: String, required: false, default: "UA" },
+    platform: { type: String, default: "GA4" }
 });
 const ClientSchema = new mongoose_1.Schema({
-    organisationId: {
+    organizationId: { type: mongoose_1.default.Schema.Types.ObjectId,
+        ref: "organization",
+        default: null },
+    name: { type: String, required: true },
+    slug: {
         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,
+        slug: ["name"],
+        slugPaddingSize: 4,
+        unique: true
     },
+    viewId: { type: String },
+    portfolioClient: { type: Boolean, default: false },
     gaproperties: [PropertySchema],
     tier: {
         type: mongoose_1.default.Schema.Types.ObjectId,
         ref: "tier",
-        default: null,
-    },
-    active: {
-        type: Boolean,
-        default: true,
-    },
-    currency: {
-        type: String,
-        default: "USD",
-    },
-    logo: {
-        type: String,
-        default: "",
+        default: null
     },
+    active: { type: Boolean, default: true },
+    currency: { type: String, default: "USD" },
+    logo: { type: String, default: "" },
     createdBy: {
         type: mongoose_1.default.Schema.Types.ObjectId,
         ref: "user",
-        default: null,
-    },
-    onboardDate: {
-        type: Date,
-        default: new Date(),
-    },
-    bqClientId: {
-        type: String,
-        default: null,
+        default: null
     },
-    defaultDataSet: {
-        type: String,
-    },
-    NDAStatus: {
-        type: Boolean,
-        default: false,
-    },
-}, { timestamps: true });
+    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
+});
+// 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 = (0, mongoose_1.model)("client", ClientSchema);
 exports.default = Client;

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

@@ -24,7 +24,7 @@
 /// <reference types="mongoose/types/inferschematype" />
 import mongoose, { Document } 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;

package/dist/src/models/ClientAdditionalRevenue.js

@@ -44,8 +44,9 @@ const AdditionalRevenueSchema = new mongoose_1.Schema({
     },
 });
 const ClientAdditionalRevenueSchema = new mongoose_1.Schema({
-    organisationId: {
-        type: String,
+    organizationId: {
+        type: mongoose_1.default.Schema.Types.ObjectId,
+        ref: "organization",
         default: null,
     },
     client: {

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

@@ -25,7 +25,7 @@
 import mongoose, { Document } 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;

package/dist/src/models/ClientLearning.js

@@ -28,9 +28,11 @@ const ClientLearningSchema = new mongoose_1.Schema({
     name: {
         type: String,
         required: true,
+        trim: true,
     },
-    organisationId: {
-        type: String,
+    organizationId: {
+        type: mongoose_1.default.Schema.Types.ObjectId,
+        ref: "organization",
         default: null,
     },
     client: {
@@ -47,9 +49,11 @@ const ClientLearningSchema = new mongoose_1.Schema({
 }, {
     timestamps: true,
 });
-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 = (0, mongoose_1.model)("clientlearning", ClientLearningSchema);
 exports.default = ClientLearning;

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

@@ -24,7 +24,7 @@
 /// <reference types="mongoose/types/inferschematype" />
 import mongoose, { Document } from "mongoose";
 export interface IClientLinks extends Document {
-    organisationId?: string;
+    organizationId?: mongoose.Schema.Types.ObjectId;
     title: string;
     description?: string;
     link?: string;