update abac implementation

Author: DylanBulmer

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codrjs/models",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",

src/entities/Annotation.ts

@@ -2,6 +2,7 @@ import type { Types } from "mongoose";
 import { Base, IBaseMinimal } from "./Base";
 
 export interface IAnnotation extends IBaseMinimal {
+  readonly kind: "Annotation";
   projectId: Types.ObjectId;
   datasetId: Types.ObjectId;
   sampleId: Types.ObjectId;

src/entities/Audit.ts

@@ -3,6 +3,7 @@ import type { IBaseMinimal } from "./Base";
 import type { ActionType, EntityType } from "../types";
 
 export interface IAudit extends Omit<IBaseMinimal, "createdBy"> {
+  readonly kind: "Audit";
   entityType: EntityType; // (where) what entity got modified
   action: ActionType; // action taken
   userId: Types.ObjectId; // who

src/entities/Base.ts

@@ -2,15 +2,16 @@ import { Types } from "mongoose";
 import { AtLeast } from "../types";
 
 export interface IBase {
+  readonly kind: string;
   __v?: number;
   _id: Types.ObjectId;
-  createdAt: string;
-  updatedAt: string;
+  createdAt: Date;
+  updatedAt: Date;
   createdBy: Types.ObjectId;
   updatedBy: Types.ObjectId;
 }
 
-export type IBaseMinimal = AtLeast<IBase, 'createdBy'>
+export type IBaseMinimal = AtLeast<IBase, "createdBy">;
 
 export class Base {
   readonly __v: IBase["__v"];
@@ -31,9 +32,9 @@ export class Base {
     this.__v = __v;
     this._id = _id || new Types.ObjectId();
 
-    const now = Date.now();
-    this.createdAt = new Date(createdAt || now);
-    this.updatedAt = new Date(updatedAt || now);
+    const now = new Date(Date.now());
+    this.createdAt = createdAt || now;
+    this.updatedAt = updatedAt || now;
 
     this.createdBy = createdBy;
     this.updatedBy = updatedBy || createdBy;
@@ -43,8 +44,8 @@ export class Base {
     return {
       __v: this.__v,
       _id: this._id,
-      createdAt: this.createdAt.toISOString(),
-      updatedAt: this.updatedAt.toISOString(),
+      createdAt: this.createdAt,
+      updatedAt: this.updatedAt,
       createdBy: this.createdBy,
       updatedBy: this.updatedBy,
     };

src/entities/Config/BaseConfig.ts

@@ -1,6 +1,7 @@
 import { Base, IBaseMinimal } from "../Base";
 
 export interface IBaseConfig extends IBaseMinimal {
+  readonly kind: "Config";
   verison?: string;
   flags?: { isDeleted: boolean };
 }

src/entities/Config/Project/index.ts

@@ -2,7 +2,7 @@ import BaseConfig, { IBaseConfig } from "../BaseConfig";
 import { DisplayConfig } from "./types/Display";
 import { SampleConfig } from "./types/Sample";
 
-export interface IProjectConfig extends IBaseConfig {
+export interface IProjectConfig extends Omit<IBaseConfig, "kind"> {
   // $schema: string;
   display: DisplayConfig;
   sample: SampleConfig;
@@ -26,6 +26,7 @@ export default class ProjectConfig extends BaseConfig {
     sample,
   }: IProjectConfig) {
     super({
+      kind: 'Config',
       verison,
       flags,
       _id,

src/entities/Dataset.ts

@@ -3,6 +3,7 @@ import { Group, IGroup } from "./Group";
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface IDataset extends IGroup {
+  readonly kind: "Dataset";
   projectId: Types.ObjectId;
 }
 

src/entities/Message.ts

@@ -3,6 +3,7 @@ import type { MessageType } from "../types";
 import { Base, IBaseMinimal } from "./Base";
 
 export interface IMessage extends IBaseMinimal {
+  readonly kind: "Message";
   type: MessageType;
   subject: string;
   body: string;

src/entities/Profile.ts

@@ -1,7 +1,9 @@
 import type { Types } from "mongoose";
 import { Base, IBaseMinimal } from "./Base";
+import { User } from "./User";
 
 export interface IProfile extends IBaseMinimal {
+  readonly kind: "Profile";
   name: {
     first: string;
     last: string;
@@ -23,6 +25,7 @@ export class Profile extends Base {
   avatarUrl?: string;
   username: string;
   userId: Types.ObjectId;
+  user?: User;
 
   constructor({
     name,
@@ -32,17 +35,19 @@ export class Profile extends Base {
     phone,
     _id,
     __v,
+    user,
     createdAt,
     updatedAt,
     createdBy,
     updatedBy,
-  }: IProfile) {
+  }: IProfile & { user?: User }) {
     super({ _id, __v, createdAt, updatedAt, createdBy, updatedBy });
     this.name = name;
     this.avatarUrl = avatarUrl;
     this.userId = userId;
     this.phone = phone;
     this.username = username;
+    this.user = user;
   }
 
   toJSON() {

src/entities/Project.ts

@@ -3,6 +3,7 @@ import { Flags, TaskType } from "../types";
 import { Base, IBaseMinimal } from "./Base";
 
 export interface IProject extends IBaseMinimal {
+  readonly kind: "Project";
   name: string;
   type: TaskType;
   slug: string;