@brimble/models 1.4.87 → 1.4.88

package/.turbo/turbo-build.log

@@ -1,3 +1,3 @@
 yarn run v1.22.19
 $ tsc -p .
-Done in 1.79s.
+Done in 2.20s.

package/dist/index.d.ts

@@ -8,11 +8,11 @@ export { default as Token } from "./token";
 export { default as Team } from "./team";
 export { default as Member } from "./member";
 export { default as Log } from "./logs";
-export { default as SubscriptionPlan } from "./subscription_plan";
+export { default as SubscriptionPlan } from "./subscription";
 export { default as Card } from "./card";
 export { default as Server } from "./server";
 export { default as Tenancy } from "./tenancy";
-export { IUser, IGit, IProject, IFollowing, IIntegration, IEnv, IServer, ITenancy, IDomain, IToken, IMember, ITeam, IInstalledIntegration, ILog, ISubscriptionPlan, ICard } from "./types";
+export { IUser, IGit, IProject, IFollowing, IIntegration, IEnv, IServer, ITenancy, IDomain, IToken, IMember, ITeam, IInstalledIntegration, ILog, ISubscription, ICard } from "./types";
 export { GIT_TYPE, INTEGRATION_TYPES, INTEGRATION_PROVIDERS, OAUTH_PERMISSIONS, ENVIRONMENT, SERVER_STATUS, ROLES, PROJECT_STATUS, SUBSCRIPTION_STATUS, CARD_TYPES } from "./enum";
 import mongoose from "mongoose";
 export declare const connectToMongo: (mongoUrl: string, config?: mongoose.ConnectOptions) => Promise<void>;

package/dist/index.js

@@ -33,8 +33,8 @@ var member_1 = require("./member");
 Object.defineProperty(exports, "Member", { enumerable: true, get: function () { return __importDefault(member_1).default; } });
 var logs_1 = require("./logs");
 Object.defineProperty(exports, "Log", { enumerable: true, get: function () { return __importDefault(logs_1).default; } });
-var subscription_plan_1 = require("./subscription_plan");
-Object.defineProperty(exports, "SubscriptionPlan", { enumerable: true, get: function () { return __importDefault(subscription_plan_1).default; } });
+var subscription_1 = require("./subscription");
+Object.defineProperty(exports, "SubscriptionPlan", { enumerable: true, get: function () { return __importDefault(subscription_1).default; } });
 var card_1 = require("./card");
 Object.defineProperty(exports, "Card", { enumerable: true, get: function () { return __importDefault(card_1).default; } });
 var server_1 = require("./server");

package/dist/subscription.d.ts

@@ -0,0 +1,4 @@
+/// <reference types="mongoose" />
+import { ISubscription } from "./types";
+declare const _default: import("mongoose").Model<ISubscription, {}, {}>;
+export default _default;

package/dist/subscription.js

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const mongoose_1 = require("mongoose");
+const enum_1 = require("./enum");
+const subscriptionPlanSchema = new mongoose_1.Schema({
+    team_id: {
+        type: mongoose_1.Schema.Types.ObjectId,
+        required: true,
+        ref: "Team",
+    },
+    admin_id: {
+        type: mongoose_1.Schema.Types.ObjectId,
+        required: true,
+        ref: "User",
+    },
+    plan_code: {
+        type: String,
+        required: true,
+        unique: true,
+    },
+    status: {
+        type: String,
+        enum: Object.values(enum_1.SUBSCRIPTION_STATUS),
+        default: enum_1.SUBSCRIPTION_STATUS.ACTIVE
+    },
+    specifications: {
+        type: Object,
+        default: {},
+        select: true
+    },
+    amount: Number,
+    debit_date: String,
+    start_date: String,
+    expiry_date: String,
+    reminder_date: String,
+    transaction_retries: Number,
+}, {
+    timestamps: true,
+    collection: "subscriptions"
+});
+exports.default = (0, mongoose_1.model)("Subscription", subscriptionPlanSchema);

package/dist/team.js

@@ -28,7 +28,7 @@ const teamSchema = new mongoose_1.Schema({
     subscription: {
         type: mongoose_1.Schema.Types.ObjectId,
         required: false,
-        ref: "SubscriptionPlan",
+        ref: "Subscription",
     },
     tenant: { type: mongoose_1.Schema.Types.ObjectId, ref: "Tenancy", required: false }
 }, {

package/dist/tenancy.js

@@ -24,10 +24,6 @@ const tenancySchema = new mongoose_1.Schema({
         type: String,
         required: true
     },
-    directory: {
-        type: String,
-        required: true
-    },
     storage_size: Number,
     memory: Number
 }, { timestamps: true });

package/dist/types/index.d.ts

@@ -10,7 +10,7 @@ export { ITeam } from "./team";
 export { IMember } from "./member";
 export { IInstalledIntegration } from "./installed_integration";
 export { ILog } from "./logs";
-export { ISubscriptionPlan } from "./subscription_plan";
+export { ISubscription } from "./subscription";
 export { ICard } from "./card";
 export { ITenancy } from "./tenancy";
 export { IServer } from "./server";

package/dist/types/server.d.ts

@@ -8,4 +8,5 @@ export interface IServer extends Document {
     status: SERVER_STATUS;
     private_key: string;
     default: boolean;
+    directory: string;
 }

package/dist/types/subscription.d.ts

@@ -0,0 +1,16 @@
+import { Document } from "mongoose";
+import { SUBSCRIPTION_STATUS } from "../enum";
+export interface ISubscription extends Document {
+    team_id: string;
+    admin_id: string;
+    plan_code: string;
+    status: SUBSCRIPTION_STATUS;
+    amount: number;
+    debit_date: string;
+    start_date: string;
+    expiry_date: string;
+    reminder_date: string;
+    specifications: {
+        [key: string]: any;
+    };
+}

package/dist/types/subscription.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/types/team.d.ts

@@ -1,5 +1,5 @@
 import { Document } from "mongoose";
-import { IMember, IProject, ISubscriptionPlan, ITenancy } from "./";
+import { IMember, IProject, ISubscription, ITenancy } from "./";
 export interface ITeam extends Document {
     name: string;
     description: string;
@@ -8,5 +8,5 @@ export interface ITeam extends Document {
     image: string;
     isCreator: boolean;
     tenant: ITenancy;
-    subscription: ISubscriptionPlan;
+    subscription: ISubscription;
 }

package/index.ts

@@ -8,7 +8,7 @@ export { default as Token } from "./token";
 export { default as Team } from "./team";
 export { default as Member } from "./member";
 export { default as Log } from "./logs";
-export { default as SubscriptionPlan } from "./subscription_plan";
+export { default as SubscriptionPlan } from "./subscription";
 export { default as Card } from "./card";
 export { default as Server } from "./server";
 export { default as Tenancy } from "./tenancy";
@@ -28,7 +28,7 @@ export {
   ITeam,
   IInstalledIntegration,
   ILog,
-  ISubscriptionPlan,
+  ISubscription,
   ICard
 } from "./types";
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brimble/models",
-  "version": "1.4.87",
+  "version": "1.4.88",
   "description": "Brimble models",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -21,5 +21,5 @@
     "ts-node": "^8.10.2",
     "typescript": "^4.9.4"
   },
-  "gitHead": "35bdfc202d17e6b5763e3ee6704ba3c84b760151"
+  "gitHead": "a27fbadaa6239b541cc151b7e277f444b44720c9"
 }

package/{subscription_plan.ts → subscription.ts}

@@ -1,6 +1,6 @@
 import { model, Schema } from "mongoose";
 import {SUBSCRIPTION_STATUS} from "./enum";
-import {ISubscriptionPlan} from "./types";
+import {ISubscription} from "./types";
 
 const subscriptionPlanSchema: Schema = new Schema({
         team_id: {
@@ -31,13 +31,14 @@ const subscriptionPlanSchema: Schema = new Schema({
         amount: Number,
         debit_date: String,
         start_date: String,
+        expiry_date: String,
         reminder_date: String,
         transaction_retries: Number,
     },
     {
         timestamps: true,
-        collection: "subscription_plans"
+        collection: "subscriptions"
     },
 );
 
-export default model<ISubscriptionPlan>("SubscriptionPlan", subscriptionPlanSchema);
+export default model<ISubscription>("Subscription", subscriptionPlanSchema);

package/team.ts

@@ -29,7 +29,7 @@ const teamSchema: Schema = new Schema(
     subscription: {
         type: Schema.Types.ObjectId,
         required: false,
-        ref: "SubscriptionPlan",
+        ref: "Subscription",
     },
     tenant: { type: Schema.Types.ObjectId, ref: "Tenancy", required: false }
   },

package/tenancy.ts

@@ -25,10 +25,6 @@ const tenancySchema = new Schema(
       type: String,
       required: true
     },
-    directory: {
-      type: String,
-      required: true
-    },
     storage_size: Number,
     memory: Number
   },

package/types/index.ts

@@ -10,7 +10,7 @@ export { ITeam } from "./team";
 export { IMember } from "./member";
 export { IInstalledIntegration } from "./installed_integration";
 export { ILog } from "./logs";
-export { ISubscriptionPlan } from "./subscription_plan";
+export { ISubscription } from "./subscription";
 export { ICard } from "./card";
 export { ITenancy } from "./tenancy";
 export { IServer } from "./server";

package/types/server.ts

@@ -15,4 +15,6 @@ export interface IServer extends Document {
     private_key: string;
 
     default: boolean;
+
+    directory: string;
 }

package/types/{subscription_plan.ts → subscription.ts}

@@ -1,6 +1,7 @@
 import { Document } from "mongoose";
 import {SUBSCRIPTION_STATUS} from "../enum";
-export interface ISubscriptionPlan extends Document {
+
+export interface ISubscription extends Document {
     team_id: string;
     admin_id: string;
     plan_code: string;
@@ -8,6 +9,7 @@ export interface ISubscriptionPlan extends Document {
     amount: number;
     debit_date: string;
     start_date: string;
+    expiry_date: string;
     reminder_date: string;
     specifications: {
         [key: string]: any;

package/types/team.ts

@@ -1,5 +1,5 @@
 import { Document } from "mongoose";
-import {IMember, IProject, ISubscriptionPlan, ITenancy} from "./";
+import {IMember, IProject, ISubscription, ITenancy} from "./";
 
 export interface ITeam extends Document {
   name: string;
@@ -9,5 +9,5 @@ export interface ITeam extends Document {
   image: string;
   isCreator: boolean;
   tenant: ITenancy;
-  subscription: ISubscriptionPlan;
+  subscription: ISubscription;
 }