@brimble/models 1.5.3 → 1.5.5

package/dist/types/domain.d.ts

@@ -1,7 +1,8 @@
 import { Document } from "mongoose";
-import { IProject } from "./project";
-export interface IDomainBase {
+import { IProject } from "./";
+export interface IDomain extends Document {
     name: string;
+    project: IProject;
     user_id: string;
     team_id: string;
     primary: boolean;
@@ -12,6 +13,3 @@ export interface IDomainBase {
         expiry: Date;
     };
 }
-export interface IDomain extends Document, IDomainBase {
-    project: IProject;
-}

package/dist/types/env.d.ts

@@ -1,6 +1,6 @@
 import { Document } from "mongoose";
 import { ENVIRONMENT } from "../enum";
-import { IUser } from "./user";
+import { IProject, IUser } from "./";
 export interface IEnv extends Document {
     name: string;
     value: string;
@@ -8,6 +8,3 @@ export interface IEnv extends Document {
     user: IUser;
     environment: ENVIRONMENT;
 }
-interface IProject {
-}
-export {};

package/dist/types/logs.d.ts

@@ -1,8 +1,8 @@
 import { Document } from "mongoose";
 import { PROJECT_STATUS } from "../enum";
-import { IUser } from "./user";
 import { IProject } from "./project";
-export interface ILogBase {
+import { IUser } from "./user";
+export interface ILog extends Document {
     logFile: string;
     name: string;
     commit: {
@@ -15,6 +15,9 @@ export interface ILogBase {
             username: string;
         };
     };
+    status: PROJECT_STATUS;
+    project: IProject;
+    user?: IUser;
     jobs: {
         id: number;
         name: string;
@@ -24,8 +27,3 @@ export interface ILogBase {
     createdAt: Date | string;
     updatedAt: Date | string;
 }
-export interface ILog extends Document, ILogBase {
-    status: PROJECT_STATUS;
-    project: IProject;
-    user?: IUser;
-}

package/dist/types/member.d.ts

@@ -1,7 +1,6 @@
 import { Document } from "mongoose";
 import { ROLES } from "../enum";
-import { IUser } from "./user";
-import { ITeam } from "./team";
+import { ITeam, IUser } from "./";
 export interface IMember extends Document {
     user: IUser;
     team: ITeam;

package/dist/types/project.d.ts

@@ -1,14 +1,14 @@
 import { Document } from "mongoose";
 import { GIT_TYPE, PROJECT_STATUS } from "../enum";
-import { IDomainBase } from "./domain";
+import { IDomain } from "./domain";
 import { IEnv } from "./env";
-import { ILogBase } from "./logs";
+import { ILog } from "./logs";
 import { ITeam } from "./team";
 import { IUser } from "./user";
 import { IServer } from "./server";
 export interface IProject extends Document {
     name: string;
-    domains: Array<IDomainBase>;
+    domains: Array<IDomain>;
     environments: Array<IEnv>;
     uuid: number;
     pid: number;
@@ -33,8 +33,8 @@ export interface IProject extends Document {
     status: PROJECT_STATUS;
     framework: string;
     description: string;
-    logs: Array<ILogBase>;
-    log: ILogBase;
+    logs: Array<ILog>;
+    log: ILog;
     maintenance: boolean;
     passwordEnabled: boolean;
     password: string | null;

package/dist/types/team.d.ts

@@ -1,7 +1,5 @@
 import { Document } from "mongoose";
-import { IMember } from "./member";
-import { ITenancy } from "./tenancy";
-import { ISubscription } from "./subscription";
+import { IMember, IProject, ISubscription, ITenancy } from "./";
 export interface ITeam extends Document {
     name: string;
     description: string;
@@ -12,6 +10,3 @@ export interface ITeam extends Document {
     tenant: ITenancy;
     subscription: ISubscription;
 }
-interface IProject {
-}
-export {};

package/dist/types/user.d.ts

@@ -1,8 +1,6 @@
 import { Document } from "mongoose";
-import { IGit } from "./git";
-import { IFollowing } from "./following";
-import { ITeam } from "./team";
-import { ITenancy } from "./tenancy";
+import { IGit } from ".";
+import { IFollowing, IProject, ITeam, ITenancy } from "./";
 export interface IUser extends Document {
     first_name: string;
     last_name: string;
@@ -27,6 +25,3 @@ export interface IUser extends Document {
     tenant: ITenancy;
     is_waitlist: boolean;
 }
-interface IProject {
-}
-export {};

package/package.json

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

package/types/domain.ts

@@ -1,9 +1,9 @@
-// domain.ts
 import { Document } from "mongoose";
-import { IProject } from "./project";
+import { IProject } from "./";
 
-export interface IDomainBase {
+export interface IDomain extends Document {
   name: string;
+  project: IProject;
   user_id: string;
   team_id: string;
   primary: boolean;
@@ -14,7 +14,3 @@ export interface IDomainBase {
     expiry: Date;
   };
 }
-
-export interface IDomain extends Document, IDomainBase {
-  project: IProject;
-}

package/types/env.ts

@@ -1,6 +1,6 @@
 import { Document } from "mongoose";
 import { ENVIRONMENT } from "../enum";
-import { IUser } from "./user";
+import { IProject, IUser } from "./";
 
 export interface IEnv extends Document {
   name: string;
@@ -9,4 +9,3 @@ export interface IEnv extends Document {
   user: IUser;
   environment: ENVIRONMENT;
 }
-interface IProject {}

package/types/logs.ts

@@ -1,9 +1,9 @@
 import { Document } from "mongoose";
 import { PROJECT_STATUS } from "../enum";
-import { IUser } from "./user";
 import { IProject } from "./project";
+import { IUser } from "./user";
 
-export interface ILogBase {
+export interface ILog extends Document {
   logFile: string;
   name: string;
   commit: {
@@ -16,6 +16,9 @@ export interface ILogBase {
       username: string;
     };
   };
+  status: PROJECT_STATUS;
+  project: IProject;
+  user?: IUser;
   jobs: {
     id: number;
     name: string;
@@ -25,8 +28,3 @@ export interface ILogBase {
   createdAt: Date | string;
   updatedAt: Date | string;
 }
-export interface ILog extends Document, ILogBase {
-  status: PROJECT_STATUS;
-  project: IProject;
-  user?: IUser;
-}

package/types/member.ts

@@ -1,7 +1,6 @@
 import { Document } from "mongoose";
 import { ROLES } from "../enum";
-import { IUser } from "./user";
-import { ITeam } from "./team";
+import { ITeam, IUser } from "./";
 
 export interface IMember extends Document {
   user: IUser;

package/types/project.ts

@@ -1,15 +1,15 @@
 import { Document } from "mongoose";
 import { GIT_TYPE, PROJECT_STATUS } from "../enum";
-import { IDomainBase } from "./domain";
+import { IDomain } from "./domain";
 import { IEnv } from "./env";
-import { ILogBase } from "./logs";
+import { ILog } from "./logs";
 import { ITeam } from "./team";
 import { IUser } from "./user";
 import { IServer } from "./server";
 
 export interface IProject extends Document {
   name: string;
-  domains: Array<IDomainBase>;
+  domains: Array<IDomain>;
   environments: Array<IEnv>;
   uuid: number;
   pid: number;
@@ -34,8 +34,8 @@ export interface IProject extends Document {
   status: PROJECT_STATUS;
   framework: string;
   description: string;
-  logs: Array<ILogBase>;
-  log: ILogBase;
+  logs: Array<ILog>;
+  log: ILog;
   maintenance: boolean;
   passwordEnabled: boolean;
   password: string | null;

package/types/team.ts

@@ -1,7 +1,5 @@
 import { Document } from "mongoose";
-import { IMember } from "./member";
-import { ITenancy } from "./tenancy";
-import { ISubscription } from "./subscription";
+import {IMember, IProject, ISubscription, ITenancy} from "./";
 
 export interface ITeam extends Document {
   name: string;
@@ -12,5 +10,4 @@ export interface ITeam extends Document {
   isCreator: boolean;
   tenant: ITenancy;
   subscription: ISubscription;
-}
-interface IProject {}
+}

package/types/user.ts

@@ -1,8 +1,6 @@
 import { Document } from "mongoose";
-import { IGit } from "./git";
-import { IFollowing } from "./following";
-import { ITeam } from "./team";
-import { ITenancy } from "./tenancy";
+import { IGit } from ".";
+import { IFollowing, IProject, ITeam, ITenancy } from "./";
 
 export interface IUser extends Document {
   first_name: string;
@@ -28,4 +26,3 @@ export interface IUser extends Document {
   tenant: ITenancy;
   is_waitlist: boolean;
 }
-interface IProject {}