@brimble/models 1.4.62 → 1.4.64

package/.turbo/turbo-build.log

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

package/dist/index.d.ts

@@ -10,6 +10,7 @@ export { default as Member } from "./member";
 export { default as Log } from "./logs";
 export { default as SubscriptionPlan } from "./subscription_plan";
 export { default as Card } from "./card";
+export { default as Server } from "./server";
 export { IUser, IGit, IProject, IFollowing, IIntegration, IEnv, IServer, ITenancy, IDomain, IToken, IMember, ITeam, IInstalledIntegration, ILog, ISubscriptionPlan, 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";

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.closeMongo = exports.db = exports.connectToMongo = exports.CARD_TYPES = exports.SUBSCRIPTION_STATUS = exports.PROJECT_STATUS = exports.ROLES = exports.SERVER_STATUS = exports.ENVIRONMENT = exports.OAUTH_PERMISSIONS = exports.INTEGRATION_PROVIDERS = exports.INTEGRATION_TYPES = exports.GIT_TYPE = exports.Card = exports.SubscriptionPlan = exports.Log = exports.Member = exports.Team = exports.Token = exports.Env = exports.Domain = exports.Integration = exports.Following = exports.Project = exports.User = void 0;
+exports.closeMongo = exports.db = exports.connectToMongo = exports.CARD_TYPES = exports.SUBSCRIPTION_STATUS = exports.PROJECT_STATUS = exports.ROLES = exports.SERVER_STATUS = exports.ENVIRONMENT = exports.OAUTH_PERMISSIONS = exports.INTEGRATION_PROVIDERS = exports.INTEGRATION_TYPES = exports.GIT_TYPE = exports.Server = exports.Card = exports.SubscriptionPlan = exports.Log = exports.Member = exports.Team = exports.Token = exports.Env = exports.Domain = exports.Integration = exports.Following = exports.Project = exports.User = void 0;
 var user_1 = require("./user");
 Object.defineProperty(exports, "User", { enumerable: true, get: function () { return __importDefault(user_1).default; } });
 var project_1 = require("./project");
@@ -37,6 +37,8 @@ var subscription_plan_1 = require("./subscription_plan");
 Object.defineProperty(exports, "SubscriptionPlan", { enumerable: true, get: function () { return __importDefault(subscription_plan_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");
+Object.defineProperty(exports, "Server", { enumerable: true, get: function () { return __importDefault(server_1).default; } });
 var enum_1 = require("./enum");
 Object.defineProperty(exports, "GIT_TYPE", { enumerable: true, get: function () { return enum_1.GIT_TYPE; } });
 Object.defineProperty(exports, "INTEGRATION_TYPES", { enumerable: true, get: function () { return enum_1.INTEGRATION_TYPES; } });

package/dist/server.d.ts

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

package/dist/server.js

@@ -2,12 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const mongoose_1 = require("mongoose");
 const enum_1 = require("./enum");
-const tenancySchema = new mongoose_1.Schema({
+const serverSchema = new mongoose_1.Schema({
     name: {
         type: mongoose_1.Schema.Types.ObjectId,
         ref: "User",
         required: true,
     },
+    region: String,
     ip_address: {
         ref: "Team",
         type: mongoose_1.Schema.Types.ObjectId,
@@ -20,4 +21,4 @@ const tenancySchema = new mongoose_1.Schema({
     },
     size: Number
 }, { timestamps: true });
-exports.default = (0, mongoose_1.model)("Tenancy", tenancySchema);
+exports.default = (0, mongoose_1.model)("Server", serverSchema);

package/dist/tenancy.js

@@ -16,6 +16,14 @@ const tenancySchema = new mongoose_1.Schema({
         ref: "Server",
         required: true,
     },
+    username: {
+        type: String,
+        required: true
+    },
+    password: {
+        type: String,
+        required: true
+    },
     storage_size: Number,
     memory: Number
 }, { timestamps: true });

package/dist/types/server.d.ts

@@ -6,4 +6,5 @@ export interface IServer extends Document {
     ip_address: string;
     provider_id: string;
     status: SERVER_STATUS;
+    size: number;
 }

package/dist/types/tenancy.d.ts

@@ -6,6 +6,8 @@ export interface ITenancy extends Document {
     user: IUser;
     team: ITeam;
     server: IServer;
+    username: string;
+    password: string;
     memory: number;
     storage: number;
 }

package/index.ts

@@ -10,6 +10,7 @@ export { default as Member } from "./member";
 export { default as Log } from "./logs";
 export { default as SubscriptionPlan } from "./subscription_plan";
 export { default as Card } from "./card";
+export { default as Server } from "./server";
 export {
   IUser,
   IGit,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brimble/models",
-  "version": "1.4.62",
+  "version": "1.4.64",
   "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": "a15acb82e25d8714ade6b26e47bf59ae15fc8979"
+  "gitHead": "4c4c67262877a2ba3ae67edbe4138d460bdb873c"
 }

package/server.ts

@@ -1,27 +1,28 @@
 import { model, Schema } from "mongoose";
-import { ITenancy } from "./types";
+import { IServer } from "./types";
 import { SERVER_STATUS } from "./enum";
 
-const tenancySchema = new Schema(
+const serverSchema = new Schema(
   {
     name: {
       type: Schema.Types.ObjectId,
       ref: "User",
       required: true,
     },
+    region: String,
     ip_address: {
       ref: "Team",
       type: Schema.Types.ObjectId,
     },
     provider_id: String,
     status: {
-        type: String,
-        enum: Object.values(SERVER_STATUS),
-        default: SERVER_STATUS.Active,
+      type: String,
+      enum: Object.values(SERVER_STATUS),
+      default: SERVER_STATUS.Active,
     },
     size: Number
   },
   { timestamps: true },
 );
 
-export default model<ITenancy>("Tenancy", tenancySchema);
+export default model<IServer>("Server", serverSchema);

package/tenancy.ts

@@ -13,9 +13,17 @@ const tenancySchema = new Schema(
       type: Schema.Types.ObjectId,
     },
     server: {
-        type: Schema.Types.ObjectId,
-        ref: "Server",
-        required: true,
+      type: Schema.Types.ObjectId,
+      ref: "Server",
+      required: true,
+    },
+    username: {
+      type: String,
+      required: true
+    },
+    password: {
+      type: String,
+      required: true
     },
     storage_size: Number,
     memory: Number

package/types/server.ts

@@ -11,4 +11,6 @@ export interface IServer extends Document {
     provider_id: string;
 
     status: SERVER_STATUS;
+
+    size: number;
 }

package/types/tenancy.ts

@@ -10,6 +10,10 @@ export interface ITenancy extends Document {
 
   server: IServer;
 
+  username: string;
+
+  password: string;
+
   memory: number;
 
   storage: number;