codebase-models 3.1.2 → 3.1.4

package/dist/index.d.ts

@@ -81,6 +81,6 @@ import ThreadMessage from "./src/models/ThreadMessage";
 import Provider from "./src/models/Provider";
 import ApiLog from "./src/models/ApiLog";
 import { ProviderType } from "./src/models/Provider";
-import Log from "./src/models/Log";
+import OldReport from "./src/models/OldReport";
 export declare function connect(uri: string, options?: mongoose.ConnectOptions | undefined): Promise<typeof mongoose>;
-export { generateRandomIID, RolesConstants, Client, ClientReportsTemp, Report, Provider, 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, TestTimeline, Snippet, StageInCustomerJourney, Tag, Temp, Tier, Trigger, ClientScript, Audience, Environment, Organization, PrecalculationFilters, BqPreCompiledData, CronData, CronConfig, UserPermission, UserOrganization, Package, Invitation, Thread, ThreadMessage, ApiLog, ProviderType, Log, };
+export { generateRandomIID, RolesConstants, Client, ClientReportsTemp, Report, Provider, 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, TestTimeline, Snippet, StageInCustomerJourney, Tag, Temp, Tier, Trigger, ClientScript, Audience, Environment, Organization, PrecalculationFilters, BqPreCompiledData, CronData, CronConfig, UserPermission, UserOrganization, Package, Invitation, Thread, ThreadMessage, ApiLog, ProviderType, OldReport, };

package/dist/index.js

@@ -13,7 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (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.TestTimeline = 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.Provider = exports.Report = exports.ClientReportsTemp = exports.Client = exports.RolesConstants = exports.generateRandomIID = exports.connect = void 0;
-exports.Log = exports.ProviderType = exports.ApiLog = exports.ThreadMessage = exports.Thread = exports.Invitation = exports.Package = exports.UserOrganization = exports.UserPermission = exports.CronConfig = exports.CronData = void 0;
+exports.OldReport = exports.ProviderType = exports.ApiLog = exports.ThreadMessage = exports.Thread = exports.Invitation = exports.Package = exports.UserOrganization = exports.UserPermission = exports.CronConfig = exports.CronData = void 0;
 const mongoose_1 = __importDefault(require("mongoose"));
 const Client_1 = __importDefault(require("./src/models/Client"));
 exports.Client = Client_1.default;
@@ -132,8 +132,8 @@ const ApiLog_1 = __importDefault(require("./src/models/ApiLog"));
 exports.ApiLog = ApiLog_1.default;
 const Provider_2 = require("./src/models/Provider");
 Object.defineProperty(exports, "ProviderType", { enumerable: true, get: function () { return Provider_2.ProviderType; } });
-const Log_1 = __importDefault(require("./src/models/Log"));
-exports.Log = Log_1.default;
+const OldReport_1 = __importDefault(require("./src/models/OldReport"));
+exports.OldReport = OldReport_1.default;
 function seedRoles() {
     return __awaiter(this, void 0, void 0, function* () {
         const checkRoles = yield Role_1.default.countDocuments();

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

@@ -32,6 +32,7 @@ export interface IClient extends Document {
     iid: string;
     organization: mongoose.Schema.Types.ObjectId;
     name: string;
+    url: string;
     slug?: string;
     viewId?: string;
     portfolioClient?: boolean;

package/dist/src/models/Client.js

@@ -51,6 +51,7 @@ const ClientSchema = new mongoose_1.Schema({
         unique: true,
         default: () => (0, constant_1.generateRandomIID)(),
     },
+    url: { type: String, required: true },
     organization: {
         type: mongoose_1.default.Schema.Types.ObjectId,
         ref: "organization",

package/dist/src/models/{Log.d.ts → OldReport.d.ts}

@@ -22,26 +22,27 @@
 /// <reference types="mongoose/types/validation" />
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
-import { Document } from "mongoose";
-export interface ILogMeta {
-    operationType?: string;
-    operationName?: string;
-    rootFields?: string[];
-    userId?: string;
-    ip?: string;
-    clientFullUrl?: string;
-    clientId?: string;
-    organizationId?: string;
-    timestamp?: string;
-    [key: string]: any;
+import mongoose, { Document } from "mongoose";
+export interface IOldReport extends Document {
+    iid: string;
+    name: string;
+    segmentName?: string;
+    reportLink?: string;
+    conclusion?: string;
+    variant?: string;
+    client?: mongoose.Schema.Types.ObjectId;
+    viewId?: string;
+    test?: mongoose.Schema.Types.ObjectId;
+    gaTestId?: string;
+    reportDetails?: mongoose.Schema.Types.Mixed;
+    learnings?: mongoose.Schema.Types.Mixed;
+    from?: Date;
+    to?: Date;
+    createdBy?: mongoose.Schema.Types.ObjectId;
+    excludedFromCalculations?: boolean;
+    createdAt?: Date;
+    updatedAt?: Date;
+    organizationId?: mongoose.Schema.Types.ObjectId;
 }
-export interface ILog extends Document {
-    level: string;
-    message: string;
-    meta: ILogMeta;
-    timestamp: Date;
-}
-declare const Log: import("mongoose").Model<ILog, {}, {}, {}, Document<unknown, {}, ILog> & ILog & {
-    _id: import("mongoose").Types.ObjectId;
-}, any>;
-export default Log;
+declare const OldReport: mongoose.Model<any, {}, {}, {}, any, any>;
+export default OldReport;

package/dist/src/models/OldReport.js

@@ -0,0 +1,107 @@
+"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;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const mongoose_1 = __importStar(require("mongoose"));
+const constant_1 = require("../constant");
+const OldReportSchema = new mongoose_1.Schema({
+    iid: {
+        type: String,
+        trim: true,
+    },
+    organizationId: {
+        type: mongoose_1.default.Schema.Types.ObjectId,
+        ref: "organization",
+        default: null,
+    },
+    name: { type: String, required: true },
+    segmentName: { type: String },
+    reportLink: { type: String },
+    conclusion: { type: String },
+    variant: { type: String },
+    client: {
+        type: mongoose_1.default.Schema.Types.ObjectId,
+        ref: "client"
+    },
+    viewId: { type: String },
+    test: {
+        type: mongoose_1.default.Schema.Types.ObjectId,
+        ref: "test"
+    },
+    gaTestId: { type: String },
+    reportDetails: { type: mongoose_1.default.Schema.Types.Mixed },
+    learnings: {
+        type: mongoose_1.default.Schema.Types.Mixed,
+        default: []
+    },
+    from: { type: Date },
+    to: { type: Date },
+    createdBy: {
+        type: mongoose_1.default.Schema.Types.ObjectId,
+        ref: "user"
+    },
+    excludedFromCalculations: {
+        type: Boolean,
+        default: false
+    }
+}, {
+    timestamps: true
+});
+OldReportSchema.pre('save', function (next) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (!this.iid) {
+            let unique = false;
+            while (!unique) {
+                const id = (0, constant_1.generateRandomIID)();
+                const existing = yield mongoose_1.default.models.report.findOne({ iid: id });
+                if (!existing) {
+                    this.iid = id;
+                    unique = true;
+                }
+            }
+        }
+        next();
+    });
+});
+// Add compound indexes for better query performance
+OldReportSchema.index({ client: 1, conclusion: 1 });
+// ReportsSchema.index({ test: 1, to: -1 }); // For sorting reports by date
+// OldReportSchema.index({ client: 1, test: 1 }); // For client-specific test reports
+// OldReportSchema.index({ from: 1, to: 1 }); // For date range queries
+// OldReportSchema.index({ client: 1, "reportDetails.implementedStatus": 1 }); // For implemented status queries
+// ReportsSchema.index({ client: 1, "reportDetails.conclusionFactorStatusAll": 1 }); // For conclusion factor queries
+// ReportsSchema.index({ client: 1, gaTestId: 1 }); // For GA test ID lookups
+// ReportsSchema.index({ createdBy: 1, to: -1 }); // For user's reports
+// ReportsSchema.index({ client: 1, excludedFromCalculations: 1 }); // For calculation exclusions
+const OldReport = mongoose_1.default.models.oldreport || (0, mongoose_1.model)("oldreport", OldReportSchema);
+exports.default = OldReport;

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

@@ -25,16 +25,7 @@
 import mongoose, { Document } from "mongoose";
 export declare enum ProviderType {
     SHOPIFY = "shopify",
-    BIGQUERY = "bigquery",
-    GOOGLE_ANALYTICS = "google_analytics",
-    GOOGLE_TAG_MANAGER = "google_tag_manager",
-    GOOGLE_ADS = "google_ads",
-    GOOGLE_SEARCH_CONSOLE = "google_search_console",
-    GOOGLE_SHEETS = "google_sheets",
-    GOOGLE_DOCS = "google_docs",
-    GOOGLE_DRIVE = "google_drive",
-    GOOGLE_MAIL = "google_mail",
-    GOOGLE_CALENDAR = "google_calendar"
+    BIGQUERY = "bigquery"
 }
 export interface IShopifyMetadata {
     apiKey: string;

package/dist/src/models/Provider.js

@@ -31,15 +31,15 @@ var ProviderType;
 (function (ProviderType) {
     ProviderType["SHOPIFY"] = "shopify";
     ProviderType["BIGQUERY"] = "bigquery";
-    ProviderType["GOOGLE_ANALYTICS"] = "google_analytics";
-    ProviderType["GOOGLE_TAG_MANAGER"] = "google_tag_manager";
-    ProviderType["GOOGLE_ADS"] = "google_ads";
-    ProviderType["GOOGLE_SEARCH_CONSOLE"] = "google_search_console";
-    ProviderType["GOOGLE_SHEETS"] = "google_sheets";
-    ProviderType["GOOGLE_DOCS"] = "google_docs";
-    ProviderType["GOOGLE_DRIVE"] = "google_drive";
-    ProviderType["GOOGLE_MAIL"] = "google_mail";
-    ProviderType["GOOGLE_CALENDAR"] = "google_calendar";
+    // GOOGLE_ANALYTICS = "google_analytics",
+    // GOOGLE_TAG_MANAGER = "google_tag_manager",
+    // GOOGLE_ADS = "google_ads",
+    // GOOGLE_SEARCH_CONSOLE = "google_search_console",
+    // GOOGLE_SHEETS = "google_sheets",
+    // GOOGLE_DOCS = "google_docs",
+    // GOOGLE_DRIVE = "google_drive",
+    // GOOGLE_MAIL = "google_mail",
+    // GOOGLE_CALENDAR = "google_calendar",
     // Add more provider types as needed
 })(ProviderType || (exports.ProviderType = ProviderType = {}));
 const ProviderSchema = new mongoose_1.Schema({

package/index.ts

@@ -58,8 +58,7 @@ import ThreadMessage from "./src/models/ThreadMessage";
 import Provider from "./src/models/Provider";
 import ApiLog from "./src/models/ApiLog";
 import { ProviderType } from "./src/models/Provider";
-import Log from "./src/models/Log";
-
+import OldReport from "./src/models/OldReport";
 async function seedRoles() {
   const checkRoles = await Role.countDocuments();
   if (checkRoles < RolesConstants.length) {
@@ -167,5 +166,5 @@ export {
   ThreadMessage,
   ApiLog,
   ProviderType,
-  Log,
+  OldReport,
 };

package/package.json

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

package/src/models/Client.ts

@@ -19,6 +19,7 @@ export interface IClient extends Document {
   iid: string;
   organization: mongoose.Schema.Types.ObjectId;
   name: string;
+  url: string;
   slug?: string;
   viewId?: string;
   portfolioClient?: boolean;
@@ -44,6 +45,7 @@ const ClientSchema: Schema = new Schema<IClient>(
       unique: true,
       default: () => generateRandomIID(),
     },
+    url: { type: String, required: true },
     organization: {
       type: mongoose.Schema.Types.ObjectId,
       ref: "organization",

package/src/models/OldReport.ts

@@ -0,0 +1,102 @@
+import mongoose, { Document, Schema, model } from "mongoose";
+import { generateRandomIID } from "../constant";
+
+export interface IOldReport extends Document {
+  iid: string;
+  name: string;
+  segmentName?: string;
+  reportLink?: string;
+  conclusion?: string;
+  variant?: string;
+  client?: mongoose.Schema.Types.ObjectId;
+  viewId?: string;
+  test?: mongoose.Schema.Types.ObjectId;
+  gaTestId?: string;
+  reportDetails?: mongoose.Schema.Types.Mixed;
+  learnings?: mongoose.Schema.Types.Mixed;
+  from?: Date;
+  to?: Date;
+  createdBy?: mongoose.Schema.Types.ObjectId;
+  excludedFromCalculations?: boolean;
+  createdAt?: Date;
+  updatedAt?: Date;
+  organizationId?: mongoose.Schema.Types.ObjectId;
+}
+
+const OldReportSchema = new Schema<IOldReport>(
+  {
+    iid: {
+      type: String,
+      trim: true,
+    },
+    organizationId: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: "organization",
+      default: null,
+    },
+    name: { type: String, required: true },
+    segmentName: { type: String },
+    reportLink: { type: String },
+    conclusion: { type: String },
+    variant: { type: String },
+    client: { 
+      type: mongoose.Schema.Types.ObjectId, 
+      ref: "client" 
+    },
+    viewId: { type: String },
+    test: { 
+      type: mongoose.Schema.Types.ObjectId, 
+      ref: "test" 
+    },
+    gaTestId: { type: String },
+    reportDetails: { type: mongoose.Schema.Types.Mixed },
+    learnings: { 
+      type: mongoose.Schema.Types.Mixed, 
+      default: [] 
+    },
+    from: { type: Date },
+    to: { type: Date },
+    createdBy: { 
+      type: mongoose.Schema.Types.ObjectId, 
+      ref: "user" 
+    },
+    excludedFromCalculations: { 
+      type: Boolean, 
+      default: false 
+    }
+  },
+  {
+    timestamps: true
+  }
+);
+
+OldReportSchema.pre('save', async function(next) {
+  if (!this.iid) {
+    let unique = false;
+    while (!unique) {
+      const id = generateRandomIID();
+      const existing = await mongoose.models.report.findOne({ iid: id });
+      if (!existing) {
+        this.iid = id;
+        unique = true;
+      }
+    }
+  }
+  next();
+});
+
+
+// Add compound indexes for better query performance
+OldReportSchema.index({ client: 1, conclusion: 1 });
+// ReportsSchema.index({ test: 1, to: -1 }); // For sorting reports by date
+// OldReportSchema.index({ client: 1, test: 1 }); // For client-specific test reports
+// OldReportSchema.index({ from: 1, to: 1 }); // For date range queries
+// OldReportSchema.index({ client: 1, "reportDetails.implementedStatus": 1 }); // For implemented status queries
+// ReportsSchema.index({ client: 1, "reportDetails.conclusionFactorStatusAll": 1 }); // For conclusion factor queries
+// ReportsSchema.index({ client: 1, gaTestId: 1 }); // For GA test ID lookups
+// ReportsSchema.index({ createdBy: 1, to: -1 }); // For user's reports
+// ReportsSchema.index({ client: 1, excludedFromCalculations: 1 }); // For calculation exclusions
+
+const OldReport = mongoose.models.oldreport || model<IOldReport>("oldreport", OldReportSchema);
+
+export default OldReport;

package/src/models/Provider.ts

@@ -5,15 +5,15 @@ import { generateRandomIID } from "../constant";
 export enum ProviderType {
   SHOPIFY = "shopify",
   BIGQUERY = "bigquery",
-  GOOGLE_ANALYTICS = "google_analytics",
-  GOOGLE_TAG_MANAGER = "google_tag_manager",
-  GOOGLE_ADS = "google_ads",
-  GOOGLE_SEARCH_CONSOLE = "google_search_console",
-  GOOGLE_SHEETS = "google_sheets",
-  GOOGLE_DOCS = "google_docs",
-  GOOGLE_DRIVE = "google_drive",
-  GOOGLE_MAIL = "google_mail",
-  GOOGLE_CALENDAR = "google_calendar",
+  // GOOGLE_ANALYTICS = "google_analytics",
+  // GOOGLE_TAG_MANAGER = "google_tag_manager",
+  // GOOGLE_ADS = "google_ads",
+  // GOOGLE_SEARCH_CONSOLE = "google_search_console",
+  // GOOGLE_SHEETS = "google_sheets",
+  // GOOGLE_DOCS = "google_docs",
+  // GOOGLE_DRIVE = "google_drive",
+  // GOOGLE_MAIL = "google_mail",
+  // GOOGLE_CALENDAR = "google_calendar",
   // Add more provider types as needed
 }
 
@@ -84,7 +84,7 @@ const ProviderSchema = new Schema<IProvider>(
       ref: "client",
       required: true,
     },
-    user: { 
+    user: {
       type: mongoose.Schema.Types.ObjectId,
       ref: "user",
       required: true,

package/dist/src/models/Log.js

@@ -1,34 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const mongoose_1 = require("mongoose");
-const LogSchema = new mongoose_1.Schema({
-    level: {
-        type: String,
-        required: true,
-        trim: true,
-    },
-    message: {
-        type: String,
-        required: true,
-    },
-    meta: {
-        type: mongoose_1.Schema.Types.Mixed,
-        default: {},
-    },
-    timestamp: {
-        type: Date,
-        default: Date.now,
-    },
-}, {
-    collection: "logs",
-    timestamps: false,
-});
-LogSchema.index({
-    "meta.rootFields": 1,
-    "meta.userId": 1,
-    "meta.clientId": 1,
-    "meta.timestamp": -1,
-});
-LogSchema.index({ "meta.operationType": 1 });
-const Log = (0, mongoose_1.model)("Log", LogSchema);
-exports.default = Log;

package/src/models/Log.ts

@@ -1,59 +0,0 @@
-import { Document, Schema, model } from "mongoose";
-
-export interface ILogMeta {
-  operationType?: string;
-  operationName?: string;
-  rootFields?: string[];
-  userId?: string;
-  ip?: string;
-  clientFullUrl?: string;
-  clientId?: string;
-  organizationId?: string;
-  timestamp?: string;
-  [key: string]: any;
-}
-
-export interface ILog extends Document {
-  level: string;
-  message: string;
-  meta: ILogMeta;
-  timestamp: Date;
-}
-
-const LogSchema = new Schema<ILog>(
-  {
-    level: {
-      type: String,
-      required: true,
-      trim: true,
-    },
-    message: {
-      type: String,
-      required: true,
-    },
-    meta: {
-      type: Schema.Types.Mixed,
-      default: {},
-    },
-    timestamp: {
-      type: Date,
-      default: Date.now,
-    },
-  },
-  {
-    collection: "logs",
-    timestamps: false,
-  }
-);
-
-LogSchema.index({
-  "meta.rootFields": 1,
-  "meta.userId": 1,
-  "meta.clientId": 1,
-  "meta.timestamp": -1,
-});
-LogSchema.index({ "meta.operationType": 1 });
-
-const Log = model<ILog>("Log", LogSchema);
-
-export default Log;