@brimble/models 1.6.0 → 1.6.2

package/dist/member-permission.js

@@ -4,7 +4,6 @@ const mongoose_1 = require("mongoose");
 const memberPermissionSchema = new mongoose_1.Schema({
     permission: { type: mongoose_1.Schema.Types.ObjectId, ref: 'Permission' },
     member: { type: mongoose_1.Schema.Types.ObjectId, ref: 'Member' },
-    role: { type: mongoose_1.Schema.Types.ObjectId, ref: 'Role' },
     enabled: { type: Boolean, default: false }
 });
 exports.default = (0, mongoose_1.model)("MemberPermission", memberPermissionSchema);

package/dist/permission.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const mongoose_1 = require("mongoose");
 const enum_1 = require("./enum");
 const permissionSchema = new mongoose_1.Schema({
-    name: { type: String },
-    role: { type: mongoose_1.Schema.Types.ObjectId, ref: 'Role' },
+    title: { type: String },
+    role: [{ type: mongoose_1.Schema.Types.ObjectId, ref: 'Role' }],
     type: { type: String, enum: Object.values(enum_1.PERMISSION_TYPE) }
 });
 exports.default = (0, mongoose_1.model)("Permission", permissionSchema);

package/dist/project/index.js

@@ -97,7 +97,7 @@ const projectSchema = new mongoose_1.Schema({
     from: mongoose_1.Schema.Types.ObjectId,
     container_stats_schedule_id: {
         type: String,
-        default: null
+        default: null,
     },
     previews: [
         {
@@ -109,6 +109,7 @@ const projectSchema = new mongoose_1.Schema({
         type: Number,
         default: 3,
     },
-    specs: Object
+    specs: Object,
+    last_requested: mongoose_1.Schema.Types.Date,
 }, { timestamps: true });
 exports.default = (0, mongoose_1.model)("Project", projectSchema);

package/dist/project/preview.js

@@ -27,5 +27,6 @@ const previewsSchema = new mongoose_1.Schema({
         ref: "Log",
         type: mongoose_1.Schema.Types.ObjectId,
     },
+    last_requested: mongoose_1.Schema.Types.Date,
 }, { timestamps: true });
 exports.default = (0, mongoose_1.model)("Preview", previewsSchema);

package/dist/role.js

@@ -5,6 +5,7 @@ const enum_1 = require("./enum");
 const roleSchema = new mongoose_1.Schema({
     type: { type: String, enum: Object.values(enum_1.ROLES) },
     description: { type: String },
-    is_custom: { type: Boolean, default: false }
+    is_custom: { type: Boolean, default: false },
+    permissions: [{ type: mongoose_1.Schema.Types.ObjectId, ref: 'Permission' }]
 });
 exports.default = (0, mongoose_1.model)("Role", roleSchema);

package/dist/server.js

@@ -31,6 +31,7 @@ const serverSchema = new mongoose_1.Schema({
         type: Boolean,
         default: false,
     },
+    region: String,
     tag: String,
 }, { timestamps: true });
 exports.default = (0, mongoose_1.model)("Server", serverSchema);

package/dist/types/member-permission.d.ts

@@ -1,8 +1,8 @@
 import { Document } from "mongoose";
-import { IUser } from "./user";
 import { IPermission } from "./permission";
+import { IMember } from "./member";
 export interface IMemberPermission extends Document {
-    permission_id: IPermission;
-    member_id: IUser;
+    permission: IPermission;
+    member: IMember;
     enabled: boolean;
 }

package/dist/types/permission.d.ts

@@ -2,7 +2,7 @@ import { Document } from "mongoose";
 import { IRole } from "./role";
 import { PERMISSION_TYPE } from "../enum";
 export interface IPermission extends Document {
-    name: string;
-    role_id: IRole;
+    title: string;
+    role: IRole[];
     type: PERMISSION_TYPE;
 }

package/dist/types/project/index.d.ts

@@ -58,4 +58,5 @@ export interface IProject extends Document {
         memory: number;
         cpu: number;
     };
+    last_requested: Date;
 }

package/dist/types/project/preview.d.ts

@@ -15,4 +15,5 @@ export interface IPreview extends Document {
     issue_comment_id: number;
     status: PROJECT_STATUS;
     log: ILog;
+    last_requested: Date;
 }

package/dist/types/role.d.ts

@@ -5,5 +5,5 @@ export interface IRole extends Document {
     type: ROLES;
     description?: string;
     is_custom?: boolean;
-    default_permissions: IPermission[];
+    permissions: IPermission[];
 }

package/dist/types/server.d.ts

@@ -9,4 +9,5 @@ export interface IServer extends Document {
     default: boolean;
     is_downscaled: boolean;
     tag: string;
+    region: string;
 }

package/member-permission.ts

@@ -4,7 +4,6 @@ import { IMemberPermission } from "./types/member-permission";
 const memberPermissionSchema = new Schema({
     permission: { type: Schema.Types.ObjectId, ref: 'Permission' },
     member: { type: Schema.Types.ObjectId, ref: 'Member' },
-    role: { type: Schema.Types.ObjectId, ref: 'Role' },
     enabled: { type: Boolean, default: false }
 });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brimble/models",
-  "version": "1.6.0",
+  "version": "1.6.2",
   "description": "Brimble models",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/permission.ts

@@ -3,8 +3,8 @@ import { IPermission } from "./types/permission";
 import { PERMISSION_TYPE } from "./enum";
 
 const permissionSchema = new Schema({
-    name: { type: String },
-    role: { type: Schema.Types.ObjectId, ref: 'Role' },
+    title: { type: String },
+    role: [{ type: Schema.Types.ObjectId, ref: 'Role' }],
     type: { type: String, enum: Object.values(PERMISSION_TYPE) }
 });
 

package/role.ts

@@ -5,7 +5,8 @@ import { IRole } from "./types/role";
 const roleSchema = new Schema({
     type: { type: String, enum: Object.values(ROLES) },
     description: { type: String },
-    is_custom: { type: Boolean, default: false }
+    is_custom: { type: Boolean, default: false },
+    permissions: [{ type: Schema.Types.ObjectId, ref: 'Permission' }]
 });
 
 export default model<IRole>("Role", roleSchema);

package/types/member-permission.ts

@@ -1,11 +1,11 @@
 import { Document } from "mongoose";
-import { IUser } from "./user";
 import { IPermission } from "./permission";
+import { IMember } from "./member";
 
 export interface IMemberPermission extends Document {
-    permission_id: IPermission;
+    permission: IPermission;
 
-    member_id: IUser;
+    member: IMember;
 
     enabled: boolean;
 }

package/types/permission.ts

@@ -3,9 +3,9 @@ import { IRole } from "./role";
 import { PERMISSION_TYPE } from "../enum";
 
 export interface IPermission extends Document {
-  name: string;
+  title: string;
 
-  role_id: IRole;
+  role: IRole[];
 
   type: PERMISSION_TYPE;
 }

package/types/role.ts

@@ -9,5 +9,5 @@ export interface IRole extends Document {
 
     is_custom?: boolean;
 
-    default_permissions: IPermission[];
+    permissions: IPermission[];
 }