codebase-models 2.0.2 → 2.0.4

package/dist/src/models/Hypothesis.js

@@ -70,5 +70,5 @@ const HypothesisSchema = new mongoose_1.Schema({
 HypothesisSchema.index({ hypothesisNumber: 1, isActive: 1 });
 HypothesisSchema.index({ tagged: 1, isActive: 1 });
 HypothesisSchema.index({ name: 1, isActive: 1 });
-const Hypothesis = mongoose_1.default.models.hypothesis || (0, mongoose_1.model)("hypothesis", HypothesisSchema);
+const Hypothesis = mongoose_1.default.models.hypos || (0, mongoose_1.model)("hypos", HypothesisSchema);
 exports.default = Hypothesis;

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

@@ -43,5 +43,7 @@ export interface IHypothesisSheet extends Document {
     thoughtsOfTeam?: Number;
     tested?: Boolean;
 }
-declare const HypothesisSheet: mongoose.Model<any, {}, {}, {}, any, any>;
+declare const HypothesisSheet: mongoose.Model<IHypothesisSheet, {}, {}, {}, mongoose.Document<unknown, {}, IHypothesisSheet> & IHypothesisSheet & {
+    _id: mongoose.Types.ObjectId;
+}, any>;
 export default HypothesisSheet;

package/dist/src/models/HypothesisSheet.js

@@ -109,5 +109,5 @@ const HypothesisSheetSchema = new mongoose_1.Schema({
 }, {
     timestamps: true,
 });
-const HypothesisSheet = mongoose_1.default.models.hypothesissheet || (0, mongoose_1.model)("hypothesisSheet", HypothesisSheetSchema);
+const HypothesisSheet = (0, mongoose_1.model)("hypothesisSheet", HypothesisSheetSchema);
 exports.default = HypothesisSheet;

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

@@ -34,5 +34,7 @@ export interface INewIdeas extends Document {
     totalPriority?: string;
     createdBy?: mongoose.Schema.Types.ObjectId;
 }
-declare const NewIdeas: mongoose.Model<any, {}, {}, {}, any, any>;
+declare const NewIdeas: mongoose.Model<INewIdeas, {}, {}, {}, mongoose.Document<unknown, {}, INewIdeas> & INewIdeas & {
+    _id: mongoose.Types.ObjectId;
+}, any>;
 export default NewIdeas;

package/dist/src/models/NewIdeas.js

@@ -67,5 +67,5 @@ NewIdeasSchema.index({
     client: 1,
     viewId: 1,
 });
-const NewIdeas = mongoose_1.default.models.newideas || (0, mongoose_1.model)("newideas", NewIdeasSchema);
+const NewIdeas = (0, mongoose_1.model)("Newideas", NewIdeasSchema);
 exports.default = NewIdeas;

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/package.json

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

package/src/models/Hypothesis.ts

@@ -62,6 +62,6 @@ HypothesisSchema.index({ tagged: 1, isActive: 1 });
 HypothesisSchema.index({ name: 1, isActive: 1 });
 
 
-const Hypothesis = mongoose.models.hypothesis || model<IHypothesis>("hypothesis", HypothesisSchema);
+const Hypothesis = mongoose.models.hypos || model<IHypothesis>("hypos", HypothesisSchema);
 
 export default Hypothesis;

package/src/models/HypothesisSheet.ts

@@ -107,7 +107,7 @@ const HypothesisSheetSchema = new Schema<IHypothesisSheet>(
   }
 );
 
-const HypothesisSheet = mongoose.models.hypothesissheet || model<IHypothesisSheet>(
+const HypothesisSheet = model<IHypothesisSheet>(
   "hypothesisSheet",
   HypothesisSheetSchema
 );

package/src/models/NewIdeas.ts

@@ -60,5 +60,5 @@ NewIdeasSchema.index({
   viewId: 1,
 });
 
-const NewIdeas = mongoose.models.newideas || model<INewIdeas>("newideas", NewIdeasSchema);
+const NewIdeas = model<INewIdeas>("Newideas", NewIdeasSchema);
 export default NewIdeas;

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: {