codebase-models 1.0.3 → 1.0.5

package/dist/index.d.ts

@@ -68,6 +68,6 @@ 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';
 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, 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 };

package/dist/index.js

@@ -127,26 +127,19 @@ function seedRoles() {
                     },
                 ]);
             }));
-            console.log("Roles seeded successfully");
         }
     });
 }
 function connect(uri, options) {
     return __awaiter(this, void 0, void 0, function* () {
         if (uri) {
-            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;
+            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");
             }
+            return mongooseConnection;
         }
         throw new Error("URI is required to connect to the database");
     });

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

@@ -26,7 +26,7 @@ import mongoose, { Document } from "mongoose";
 export interface IAudience extends Document {
     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

@@ -35,7 +35,7 @@ const AudienceSchema = new mongoose_1.Schema({
     client: {
         type: mongoose_1.default.Schema.Types.ObjectId,
         ref: "client",
-    },
+    }
 }, {
     timestamps: true,
 });

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

@@ -44,8 +44,6 @@ 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

@@ -89,12 +89,6 @@ const ClientSchema = new mongoose_1.Schema({
         type: Boolean,
         default: false,
     },
-    retainerValue: {
-        type: Number,
-    },
-    useIntraDayTable: {
-        type: Boolean,
-    },
 }, { timestamps: true });
 ClientSchema.index({ active: 1 });
 const Client = (0, mongoose_1.model)("client", ClientSchema);

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

@@ -48,9 +48,9 @@ export interface IExperiments extends Document {
     js: string;
     reset_js: string;
     csscode: string;
-    audiences?: mongoose.Schema.Types.Array;
+    audiences: mongoose.Schema.Types.Array;
     variations: IVariations;
-    environments?: mongoose.Schema.Types.Array;
+    environments: mongoose.Schema.Types.Array;
 }
 declare const Experiments: mongoose.Model<IExperiments, {}, {}, {}, mongoose.Document<unknown, {}, IExperiments> & IExperiments & {
     _id: mongoose.Types.ObjectId;

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

@@ -49,13 +49,13 @@ export interface ITest extends Document {
     jscode: string;
     reset_js: string;
     csscode: string;
-    audiences?: mongoose.Schema.Types.ObjectId[];
+    audiences: mongoose.Schema.Types.ObjectId[];
     variations: IVariations[];
-    environments?: mongoose.Schema.Types.Array;
+    environments: mongoose.Schema.Types.Array;
     pages?: mongoose.Schema.Types.ObjectId[];
     pageelement?: mongoose.Schema.Types.ObjectId[];
     client?: mongoose.Schema.Types.ObjectId;
-    property?: mongoose.Schema.Types.Mixed;
+    property: mongoose.Schema.Types.Mixed;
     platform: string;
     viewId: string;
     goal?: mongoose.Schema.Types.ObjectId[];

package/package.json

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

package/src/models/ClientRetention.ts

@@ -28,6 +28,7 @@ const ClientRetentionSchema = new Schema<IClientRetention>(
     year: {
       type: Number,
       required: true,
+      default: new Date().getFullYear(),
     },
     retentions: {
       type: [
@@ -36,14 +37,19 @@ const ClientRetentionSchema = new Schema<IClientRetention>(
           year: {
             type: Number,
             required: true,
+            default: new Date().getFullYear(),
           },
           month: {
             type: Number,
             required: true,
+            default: new Date().getMonth() + 1,
           },
           monthName: {
             type: String,
             required: true,
+            default: new Date().toLocaleString("default", {
+              month: "long",
+            }),
           },
           active: {
             type: Boolean,
@@ -53,6 +59,7 @@ const ClientRetentionSchema = new Schema<IClientRetention>(
           retainerValue: {
             type: Number,
             required: true,
+            default:0,
           },
           otherPayments: {
             type: Number,

package/src/models/Report.ts

@@ -15,6 +15,7 @@ export interface IReports extends Document {
   from?: Date;
   to?: Date;
   createdBy?: mongoose.Schema.Types.ObjectId;
+  excludedFromCalculations?: boolean;
   createdAt?: Date;
   updatedAt?: Date;
 }
@@ -67,6 +68,10 @@ const ReportsSchema = new Schema<IReports>({
     type: mongoose.Schema.Types.ObjectId,
     ref: "user",
   },
+  excludedFromCalculations: {
+    type: Boolean,
+    default: false
+  },
   createdAt: {
     type: Date,
     default: new Date(),