WIP

CHANGELOG.md

@@ -12,6 +12,11 @@
 
 ---
 
+## [v0.4.0](https://github.com/foxifyjs/odin/releases/tag/v0.4.0) - *(2018-11-16)*
+
+- :zap: Added `morphOne` relation
+- :star2: Improved `toJsonSchema` functionality
+
 ## [v0.3.0](https://github.com/foxifyjs/odin/releases/tag/v0.3.0) - *(2018-11-16)*
 
 - :zap: Added `toJsonSchema` static method to Model so you can easily use it with `Foxify` router schema option

README.md

@@ -83,6 +83,7 @@ User.schema = {
   - [ ] `deleted`
   - [ ] `restored`
 - [ ] Relationships
+  - [x] `embedMany`
   - [x] `hasMany`
   - [x] `hasOne`
   - [ ] `hasManyThrough`

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@foxify/odin",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "description": "Active Record Model",
   "author": "Ardalan Amini <ardalanamini22@gmail.com> [https://github.com/ardalanamini]",
   "contributors": [

src/Model.ts

@@ -148,6 +148,24 @@ class Model<T extends object = {}> extends Base<T>
 
     const jsonSchema = jsonSchemaGenerator(this.schema);
 
+    if (this.timestamps) {
+      jsonSchema.properties[this.CREATED_AT] = {
+        type: "string",
+      };
+
+      jsonSchema.properties[this.UPDATED_AT] = {
+        type: "string",
+      };
+
+      jsonSchema.required.push(this.CREATED_AT);
+    }
+
+    if (this.softDelete) {
+      jsonSchema.properties[this.DELETED_AT] = {
+        type: "string",
+      };
+    }
+
     for (const key of Object.getOwnPropertyNames(this.prototype)) {
       if (key === "constructor") continue;
 
@@ -163,6 +181,9 @@ class Model<T extends object = {}> extends Base<T>
 
         jsonSchema.properties[key] = {
           type: "array",
+          items: {
+            type: "object",
+          },
         };
       }
     }

src/base/Relational.ts

@@ -9,6 +9,19 @@ interface Relational<T extends object = {}> extends Base<T> {
 }
 
 class Relational extends Base {
+  public embedMany<T extends Model = any>(
+    relation: string | typeof Model,
+    localKey?: string,
+    foreignKey?: string
+  ): Relation<T> {
+    if (utils.string.isString(relation))
+      relation = this.constructor.models[relation] as typeof Model;
+
+    const EmbedMany: any = drivers[this.constructor.driver].Relation.EmbedMany;
+
+    return new EmbedMany(this, relation, localKey, foreignKey, this.embedMany);
+  }
+
   public hasMany<T extends Model = any>(
     relation: string | typeof Model,
     localKey?: string,

src/drivers/Driver.ts

@@ -39,6 +39,12 @@ namespace Driver {
 
   export interface Join<T = any> extends Filter {
     join(table: string, query?: Driver.JoinQuery<T>, as?: string): this;
+
+    whereIn(field: string, embeddedField: string): this;
+    whereIn(field: string, values: any[]): this;
+
+    whereNotIn(field: string, embeddedField: string): this;
+    whereNotIn(field: string, values: any[]): this;
   }
 
   export type JoinQuery<T = any> = (query: Join<T>) => Join<T>;

src/drivers/MongoDB/Driver/Join.ts

@@ -112,6 +112,20 @@ class Join<T = any> extends Filter {
 
     return this;
   }
+
+  /******************************* Where Clauses ******************************/
+
+  public whereIn(field: string, embeddedField: string): this;
+  public whereIn(field: string, values: any[]): this;
+  public whereIn(field: string, values: any) {
+    return super.whereIn(field, values);
+  }
+
+  public whereNotIn(field: string, embeddedField: string): this;
+  public whereNotIn(field: string, values: any[]): this;
+  public whereNotIn(field: string, values: any) {
+    return super.whereNotIn(field, values);
+  }
 }
 
 export default Join;

src/drivers/MongoDB/Relation/EmbedMany.ts

@@ -0,0 +1,14 @@
+import Query from "../../../base/Query";
+import { EmbedMany as Base } from "../../Relation";
+
+class EmbedMany<T extends object = {}> extends Base {
+  public load(query: Query<T>) {
+    return query.join(
+      this.relation,
+      q => q.whereIn(this.foreignKey, `${this.model.constructor.toString()}.${this.localKey}`),
+      this.as
+    );
+  }
+}
+
+export default EmbedMany;

src/drivers/MongoDB/Relation/index.ts

@@ -1,3 +1,4 @@
+export { default as EmbedMany } from "./EmbedMany";
 export { default as HasMany } from "./HasMany";
 export { default as HasOne } from "./HasOne";
 export { default as MorphMany } from "./MorphMany";

src/drivers/Relation/EmbedMany.ts

@@ -0,0 +1,17 @@
+import * as Model from "../../index";
+import * as utils from "../../utils";
+import HasMany from "../Relation/HasMany";
+
+abstract class EmbedMany extends HasMany {
+  constructor(
+    model: Model,
+    relation: typeof Model,
+    localKey: string = `${utils.makeTableId(relation.toString())}s`,
+    foreignKey: string = "id",
+    caller: (...args: any[]) => any
+  ) {
+    super(model, relation, localKey, foreignKey, caller);
+  }
+}
+
+export default EmbedMany;

src/drivers/Relation/index.ts

@@ -1,3 +1,4 @@
+export { default as EmbedMany } from "./EmbedMany";
 export { default as HasMany } from "./HasMany";
 export { default as HasOne } from "./HasOne";
 export { default as MorphMany } from "./MorphMany";