codebase-models 2.0.3 → 2.0.5

package/dist/index.d.ts

@@ -70,5 +70,6 @@ import Audience from "./src/models/Audience";
 import Environment from "./src/models/Environment";
 import PrecalculationFilters from "./src/models/PrecalculationFilters";
 import BqPreCompiledData from "./src/models/BqPreCompiledData";
+import CustomQuery from "./src/models/CustomQuery";
 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, 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, };
+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, CustomQuery, 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.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;
+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.CustomQuery = 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;
@@ -108,6 +108,8 @@ const PrecalculationFilters_1 = __importDefault(require("./src/models/Precalcula
 exports.PrecalculationFilters = PrecalculationFilters_1.default;
 const BqPreCompiledData_1 = __importDefault(require("./src/models/BqPreCompiledData"));
 exports.BqPreCompiledData = BqPreCompiledData_1.default;
+const CustomQuery_1 = __importDefault(require("./src/models/CustomQuery"));
+exports.CustomQuery = CustomQuery_1.default;
 function seedRoles() {
     return __awaiter(this, void 0, void 0, function* () {
         const checkRoles = yield Role_1.default.countDocuments();

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

@@ -0,0 +1,37 @@
+/// <reference types="mongoose/types/aggregate" />
+/// <reference types="mongoose/types/callback" />
+/// <reference types="mongoose/types/collection" />
+/// <reference types="mongoose/types/connection" />
+/// <reference types="mongoose/types/cursor" />
+/// <reference types="mongoose/types/document" />
+/// <reference types="mongoose/types/error" />
+/// <reference types="mongoose/types/expressions" />
+/// <reference types="mongoose/types/helpers" />
+/// <reference types="mongoose/types/middlewares" />
+/// <reference types="mongoose/types/indexes" />
+/// <reference types="mongoose/types/models" />
+/// <reference types="mongoose/types/mongooseoptions" />
+/// <reference types="mongoose/types/pipelinestage" />
+/// <reference types="mongoose/types/populate" />
+/// <reference types="mongoose/types/query" />
+/// <reference types="mongoose/types/schemaoptions" />
+/// <reference types="mongoose/types/schematypes" />
+/// <reference types="mongoose/types/session" />
+/// <reference types="mongoose/types/types" />
+/// <reference types="mongoose/types/utility" />
+/// <reference types="mongoose/types/validation" />
+/// <reference types="mongoose/types/virtuals" />
+/// <reference types="mongoose/types/inferschematype" />
+import mongoose, { Document } from 'mongoose';
+interface ICustomQuery extends Document {
+    organizationId?: mongoose.Schema.Types.ObjectId;
+    title: string;
+    module: string;
+    client: mongoose.Schema.Types.ObjectId;
+    query: string;
+    createdBy?: mongoose.Schema.Types.ObjectId;
+}
+declare const CustomQuery: mongoose.Model<ICustomQuery, {}, {}, {}, mongoose.Document<unknown, {}, ICustomQuery> & ICustomQuery & {
+    _id: mongoose.Types.ObjectId;
+}, any>;
+export default CustomQuery;

package/dist/src/models/CustomQuery.js

@@ -0,0 +1,39 @@
+"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 = __importStar(require("mongoose"));
+const CustomQuerySchema = new mongoose_1.Schema({
+    organizationId: { type: mongoose_1.default.Schema.Types.ObjectId, ref: "organization", default: null },
+    title: { type: String, required: true },
+    module: { type: String, required: true },
+    client: { type: mongoose_1.default.Schema.Types.ObjectId, ref: 'client', required: true },
+    query: { type: String, required: true },
+    createdBy: { type: mongoose_1.default.Schema.Types.ObjectId, ref: 'user', default: null },
+}, {
+    timestamps: true, // Automatically adds createdAt and updatedAt fields
+});
+CustomQuerySchema.index({ module: 1, client: 1 }, { unique: true });
+const CustomQuery = (0, mongoose_1.model)('CustomQuery', CustomQuerySchema);
+exports.default = CustomQuery;

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

@@ -23,8 +23,15 @@
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
 import mongoose, { Document } from "mongoose";
+export interface IFilters extends Document {
+    matchType: string;
+    value: string;
+    eventKey: string;
+    eventValue: string;
+}
 export interface IPrecalculationFilters extends Document {
     title: string;
+    filterString: string;
     organizationId: mongoose.Schema.Types.ObjectId;
     client: mongoose.Schema.Types.ObjectId;
     filters: any;

package/dist/src/models/PrecalculationFilters.js

@@ -24,11 +24,21 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const mongoose_1 = __importStar(require("mongoose"));
+const FiltersSchema = new mongoose_1.Schema({
+    matchType: { type: String, required: true },
+    value: { type: String, required: true },
+    eventKey: { type: String },
+    eventValue: { type: String },
+});
 const PrecalculationFiltersSchema = new mongoose_1.Schema({
     title: {
         type: String,
         trim: true,
     },
+    filterString: {
+        type: String,
+        required: true,
+    },
     organizationId: {
         type: mongoose_1.default.Schema.Types.ObjectId,
         ref: "organization",
@@ -38,7 +48,7 @@ const PrecalculationFiltersSchema = new mongoose_1.Schema({
         ref: "client",
     },
     filters: {
-        type: Object,
+        type: FiltersSchema,
         required: true,
     },
     otherFilters: {

package/index.ts

@@ -47,6 +47,7 @@ import Audience from "./src/models/Audience";
 import Environment from "./src/models/Environment";
 import PrecalculationFilters from "./src/models/PrecalculationFilters";
 import BqPreCompiledData from "./src/models/BqPreCompiledData";
+import CustomQuery from "./src/models/CustomQuery";
 
 async function seedRoles() {
   const checkRoles = await Role.countDocuments();
@@ -128,6 +129,7 @@ export {
   Portfolio,
   ReadNotification,
   Role,
+  CustomQuery,
   SavedSegment,
   Segment,
   SegmentCombination,

package/package.json

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

package/src/models/CustomQuery.ts

@@ -0,0 +1,29 @@
+import mongoose, { Schema, model, Document } from 'mongoose';
+
+interface ICustomQuery extends Document {
+    organizationId?: mongoose.Schema.Types.ObjectId;
+    title: string;
+    module: string;
+    client: mongoose.Schema.Types.ObjectId;
+    query: string;
+    createdBy?: mongoose.Schema.Types.ObjectId;
+}
+
+const CustomQuerySchema = new Schema<ICustomQuery>(
+    {
+        organizationId: { type: mongoose.Schema.Types.ObjectId, ref: "organization", default: null },
+        title: { type: String, required: true },
+        module: { type: String, required: true },
+        client: { type: mongoose.Schema.Types.ObjectId, ref: 'client', required: true },
+        query: { type: String, required: true },
+        createdBy: { type: mongoose.Schema.Types.ObjectId, ref: 'user', default: null },
+    },
+    {
+        timestamps: true, // Automatically adds createdAt and updatedAt fields
+    }
+);
+CustomQuerySchema.index({ module: 1, client: 1 }, { unique: true });
+
+const CustomQuery = model<ICustomQuery>('CustomQuery', CustomQuerySchema);
+
+export default CustomQuery;

package/src/models/PrecalculationFilters.ts

@@ -1,18 +1,37 @@
 import mongoose, { Document, Schema, model } from "mongoose";
 
+export interface IFilters extends Document {
+    matchType: string;
+    value: string;
+    eventKey: string;
+    eventValue: string;
+  }
+
 export interface IPrecalculationFilters extends Document {
   title: string;
+  filterString: string;
   organizationId: mongoose.Schema.Types.ObjectId;
   client: mongoose.Schema.Types.ObjectId;
   filters: any;
   otherFilters: any;
 }
 
+const FiltersSchema = new Schema<IFilters>({
+    matchType: { type: String, required: true },
+    value: { type: String, required: true },
+    eventKey: { type: String },
+    eventValue: { type: String },
+  });
+
 const PrecalculationFiltersSchema = new Schema<IPrecalculationFilters>({
     title: {
         type: String,
         trim: true,
     },
+    filterString: {
+        type: String,
+        required: true,
+    },
     organizationId: {
         type: mongoose.Schema.Types.ObjectId,
         ref: "organization",
@@ -22,7 +41,7 @@ const PrecalculationFiltersSchema = new Schema<IPrecalculationFilters>({
         ref: "client",
     },
     filters: {
-        type: Object,
+        type: FiltersSchema,
         required: true,
     },
     otherFilters: {