Merge pull request #62 from samchon/v1.0

Fix #61

Author: samchon

package.json

@@ -1,6 +1,6 @@
 {
   "name": "safe-typeorm",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "Safe Relationship Decorators for the TypeORM",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",

src/builders/AppJoinBuilder.ts

@@ -237,6 +237,7 @@ export class AppJoinBuilder<Mine extends object>
                 data,
                 field,
                 {
+                    filter: child.filter || null,
                     targetData: null,
                     routerData: null
                 }

src/builders/JsonSelectBuilder.ts

@@ -59,6 +59,14 @@ export class JsonSelectBuilder<
                 this.joiner_.set(key as any, value.joiner_);
             else if (value === "join")
                 this.joiner_.join(key as AppJoinBuilder.Key<Mine>);
+            else if (value instanceof Array)
+            {
+                const [builder, filter] = value;
+                if (builder instanceof JsonSelectBuilder)
+                    this.joiner_.set(key as any, filter, builder as any);
+                else if (builder === "join")
+                    this.joiner_.join([key, filter] as any);
+            }
         }
     }
 
@@ -112,12 +120,14 @@ export class JsonSelectBuilder<
     private async _Convert(record: Mine): Promise<Destination>
     {
         const output: any = toPrimitive(record);
-        for (const [key, plan] of Object.entries(this.input))
+        for (const [key, value] of Object.entries(this.input))
         {
-            if (plan === undefined)
+            if (value === undefined)
                 continue;
 
+            const plan = value instanceof Array ? value[0] : value;
             const elem: any = (record as any)[key];
+
             if (plan instanceof JsonSelectBuilder)
             {
                 // HIERARCHICAL JSON-SELECT-BUILDER

src/test/features/test_app_join_builder_filter.ts

@@ -15,7 +15,7 @@ async function test(groupList: BbsGroup[]): Promise<void>
     }
 }
 
-export async function app_join_builder_filter(): Promise<void>
+export async function test_app_join_builder_filter(): Promise<void>
 {
     const groupList: BbsGroup[] = await generate_random_clean_groups();
     const articleList: BbsArticle[] = [];
@@ -30,13 +30,16 @@ export async function app_join_builder_filter(): Promise<void>
         stmt.andWhere(...BbsArticle.getWhereArguments("id", "IN", articleList));
     };
 
+    // TEST-APP-JOIN
     const app = new safe.AppJoinBuilder(BbsGroup);
+    app.join(["articles" as const, filter]);
     await app.execute(groupList);
     await test(groupList);
 
+    const reloaded: BbsGroup[] = await BbsGroup.findByIds(groupList.map(g => g.id));
     const json = safe.createJsonSelectBuilder(BbsGroup, {
         articles: ["join" as const, filter]
     });
-    await json.join(groupList);
-    await test(groupList);
+    await json.join(reloaded);
+    await test(reloaded);
 }