chyz 1.0.13-rc.2 → 1.0.13-rc.5

package/BaseChyz.ts

@@ -3,6 +3,7 @@ import {RouteDefinition} from "./model/RouteDefinition";
 import {NextFunction, Request, Response} from "express";
 import {Controller} from "./base/Controller";
 import Utils from "./requiments/Utils";
+import {ModelManager} from "./base";
 
 
 const express = require("express");
@@ -83,6 +84,13 @@ export default class BaseChyz {
             this.controllerpath = this.config.controllerpath
         }
 
+
+        /**
+         * Model Register
+         */
+
+        this.loadModels();
+
         /**
          * Express Server
          */
@@ -144,7 +152,6 @@ export default class BaseChyz {
         }
 
 
-
         this.init();
 
         return this;
@@ -229,6 +236,30 @@ export default class BaseChyz {
         return BaseChyz.middlewares[key] ?? null
     }
 
+    /**
+     * load model
+     */
+    async loadModels() {
+        let models: any = {}
+        let path = `${this._controllerpath}/../Models`;
+        fs.readdirSync(path).forEach((file: string) => {
+            if (file !== "index.ts") {
+                let model = require(`${path}/${file}`);
+                // @ts-ignore
+                let className = file.split(".")[0] + "Class";
+                if (model[className])
+                    models[className.replace("Class","")] = new model[className];
+            }
+        })
+
+        ModelManager._register(models);
+
+        for (const key of Object.keys(ModelManager)) {
+            if(key!="_register"){
+                ModelManager[key].init();
+            }
+        }
+    }
 
     /**
      * load contoller
@@ -288,8 +319,8 @@ export default class BaseChyz {
                                     res.status(e.statusCode || 500)
                                     // @ts-ignore
                                     res.json({error: {code: e.statusCode || 500, name: e.name, message: e.message}})
-                                }else{
-                                    res.json(e )
+                                } else {
+                                    res.json(e)
                                 }
                             }
                         })
@@ -308,7 +339,6 @@ export default class BaseChyz {
         BaseChyz.express.use(methodOverride());
 
 
-
         // CORS
         BaseChyz.express.use(function (req: any, res: Response, next: any) {
             // @ts-ignore
@@ -352,10 +382,3 @@ export default class BaseChyz {
 
 
 }
-
-
-process.on('uncaughtException', err => {
-    BaseChyz.error('There was an uncaught error', err)
-    process.exit(1) //mandatory (as per the Node.js docs)
-})
-

package/Examples/Controllers/ApiController.ts

@@ -7,7 +7,7 @@
  *
  */
 
-import {Controller} from "../../base";
+import {Controller, ModelManager} from "../../base";
 import BaseChyz from "../../BaseChyz";
 // @ts-ignore
 import {Request, Response} from "express";
@@ -18,10 +18,8 @@ import {JwtHttpBearerAuth} from "../../filters/auth";
 
 import {ValidationHttpException} from "../../base";
 import {ForbiddenHttpException} from "../../base";
-import {OrderClass, Order} from "../Models/Order";
-import {CustomerClass, Customer} from "../Models/Customer";
-import {Products} from "../Models/Products";
-import {ProductModels} from "../Models/ProductModels";
+
+
 
 @controller("/api")
 class ApiController extends Controller {
@@ -70,17 +68,15 @@ class ApiController extends Controller {
         data.Customer["2fa"] = "true";
 
         //Customer Model Create
-        let customer: CustomerClass = Customer;
+        let customer  = ModelManager.Customer;
         //Order Model Create
-        let order: OrderClass = Order;
+        let order  = ModelManager.Order;
 
 
         let transaction
         try {
             // get transaction
             transaction = await BaseChyz.getComponent("db").transaction();
-
-
             customer.load(data, "Customer");//load customer data
             let cus: any = await customer.save({}, {transaction});
 
@@ -117,7 +113,20 @@ class ApiController extends Controller {
 
     @get("order/list")
     async listOrder(req: Request, res: Response) {
-        let product = await Products.findAll({include: [ProductModels.model()]});
+        let product = await ModelManager.Products.findAll({include: [ModelManager.ProductModels.model()]});
+        return res.json(product)
+
+    }
+
+    @get("categories")
+    async Categories(req: Request, res: Response) {
+        let product = await ModelManager.Categories.findAll( {include:[
+                {
+                    model: ModelManager.Products.model(),
+                    // as: 'product',
+                    // through: { attributes: [] } // Hide unwanted `PlayerGameTeam` nested object from results
+                }
+            ]} );
         return res.json(product)
 
     }

package/Examples/Controllers/KeyCloakController.ts

@@ -16,8 +16,8 @@ import {get,post,controller} from "../../decorator";
 import {ValidationHttpException,ForbiddenHttpException} from "../../base";
 import {KeyCloakHttpBearerAuth} from "../../filters/auth/KeyCloakHttpBearerAuth";
 
-import {OrderClass, Order} from "../Models/Order";
-import {CustomerClass, Customer} from "../Models/Customer";
+import {OrderClass} from "../Models/Order";
+import {CustomerClass} from "../Models/Customer";
 
 @controller("/oauth2.0")
 class ApiController extends Controller {
@@ -46,9 +46,9 @@ class ApiController extends Controller {
         data.Customer["2fa"] = "true";
 
         //Customer Model Create
-        let customer: CustomerClass = Customer;
+        let customer: CustomerClass = new CustomerClass();
         //Order Model Create
-        let order: OrderClass = Order ;
+        let order: OrderClass = new OrderClass() ;
 
 
         let transaction

package/Examples/Models/Categories.ts

@@ -4,7 +4,8 @@
  * E-mail: cihan@chy.com.tr
  * Github:https://github.com/cihan53/
  */
-import {DataTypes, Model} from "../../base";
+import {DataTypes, ModelManager, Model, Relation} from "../../base";
+import {ProductToCategoriesClass} from "./ProductToCategories";
 
 export class CategoriesClass extends Model {
     [x: string]: any;
@@ -29,8 +30,19 @@ export class CategoriesClass extends Model {
         }
     }
 
+    relations(): Relation[] {
+        return [
+            {
+                type: "belongsToMany",
+                foreignKey: "category_id",
+                sourceKey: "id",
+                model: ModelManager.Products.model(),
+                through: ModelManager.ProductToCategories.model()
+            }
+        ]
+    }
 
 }
 
-const Categories = new CategoriesClass();
-export {Categories};
+// const Categories = new CategoriesClass();
+// export {Categories};

package/Examples/Models/Customer.ts

@@ -108,8 +108,8 @@ export class CustomerClass extends Model {
 
 }
 
-const Customer = new CustomerClass();
-export {Customer};
+// const Customer = new CustomerClass();
+// export {Customer};
 
 
 

package/Examples/Models/Order.ts

@@ -1,5 +1,5 @@
 import {DataTypes, Model, Relation} from "../../base";
-import {OrderItem} from "./OrderItem";
+import {OrderItemClass} from "./OrderItem";
 
 export class OrderClass extends Model {
     [x: string]: any;
@@ -50,15 +50,15 @@ export class OrderClass extends Model {
                 type: "hasOne",
                 sourceKey: "order_id",
                 foreignKey: "id",
-                model: OrderItem.model()
+                model: (new OrderItemClass()).model()
             }
         ]
     }
 }
 
-const Order = new OrderClass()
-export {Order};
-
+// const Order = new OrderClass()
+// export {Order};
+//
 
 
 

package/Examples/Models/OrderItem.ts

@@ -20,8 +20,8 @@ export class OrderItemClass extends Model {
     }
 
 }
-const OrderItem = new OrderItemClass()
-export { OrderItem };
+// const OrderItem = new OrderItemClass()
+// export { OrderItem };
 
 
 

package/Examples/Models/ProductModels.ts

@@ -4,8 +4,7 @@
  * E-mail: cihan@chy.com.tr
  * Github:https://github.com/cihan53/
  */
-import {DataTypes, Model, Relation} from "../../base";
-import {Products} from "./Products";
+import {DataTypes, ModelManager, Model, Relation} from "../../base";
 
 export class ProductModelsClass extends Model {
     [x: string]: any;
@@ -40,11 +39,11 @@ export class ProductModelsClass extends Model {
                 type: "hasOne",
                 foreignKey: "id",
                 sourceKey: "category_id",
-                model: Products.model()
+                model: ModelManager.Products.model()
             }
         ]
     }
 }
 
-const ProductModels = new ProductModelsClass();
-export {ProductModels}
+// const ProductModels = new ProductModelsClass();
+// export {ProductModels}

package/Examples/Models/ProductToCategories.ts

@@ -4,7 +4,7 @@
  * E-mail: cihan@chy.com.tr
  * Github:https://github.com/cihan53/
  */
-import {DataTypes, Model} from "../../base";
+import {DataTypes, ModelManager, Model, Relation} from "../../base";
 
 export class ProductToCategoriesClass extends Model {
     [x: string]: any;
@@ -21,7 +21,7 @@ export class ProductToCategoriesClass extends Model {
                 type: DataTypes.INTEGER,
                 allowNull: false
             },
-            categories_id: {
+            category_id: {
                 type: DataTypes.INTEGER,
                 allowNull: false
             }
@@ -29,7 +29,18 @@ export class ProductToCategoriesClass extends Model {
         }
     }
 
+    // relations(): Relation[] {
+    //     return [
+    //         {
+    //             type: "hasMany",
+    //             foreignKey: "category_id",
+    //             sourceKey: "id",
+    //             model: ModelManager.Categories.model(),
+    //         }
+    //     ]
+    // }
+
 }
 
-const ProductToCategories = new ProductToCategoriesClass()
-export {ProductToCategories}
+// const ProductToCategories = new ProductToCategoriesClass()
+// export {ProductToCategories}

package/Examples/Models/Products.ts

@@ -4,8 +4,8 @@
  * E-mail: cihan@chy.com.tr
  * Github:https://github.com/cihan53/
  */
-import {DataTypes, Model, Relation} from "../../base";
-import {ProductModels} from "./ProductModels";
+import {DataTypes, ModelManager, Model, Relation} from "../../base";
+
 
 export class ProductsClass extends Model {
     [x: string]: any;
@@ -36,14 +36,15 @@ export class ProductsClass extends Model {
     relations(): Relation[] {
         return [
             {
-                type: "hasOne",
-                foreignKey: "id",
-                sourceKey: "model_id",
-                model: ProductModels.model()
+                type: "belongsToMany",
+                foreignKey: "product_id",
+                sourceKey: "id",
+                model: ModelManager.Categories.model(),
+                through: ModelManager.ProductToCategories.model()
             }
         ]
     }
 }
 
-const Products = new ProductsClass()
-export {Products}
+// const Products = new ProductsClass()
+// export {Products}

package/Examples/Models/Stocks.ts

@@ -56,5 +56,5 @@ export class StocksClass extends Model {
     }
 }
 
-const Stocks = new StocksClass();
-export {Stocks}
+// const Stocks = new StocksClass();
+// export {Stocks}

package/Examples/Models/UserPermission.ts

@@ -33,5 +33,5 @@ export class UserPermissionClass extends Model {
     }
 }
 
-const UserPermission = new UserPermissionClass();
-export {UserPermission}
+// const UserPermission = new UserPermissionClass();
+// export {UserPermission}

package/Examples/Models/index.ts

@@ -0,0 +1,19 @@
+/*
+ *
+ * Copyright (c) 2021. Chy Bilgisayar Bilisim
+ * Author: Cihan Ozturk
+ *  E-mail: cihan@chy.com.tr
+ *  Github:https://github.com/cihan53/
+ *
+ */
+import {ModelManager} from "../../base";
+// import {Order, OrderClass} from "./Order";
+// import {Customer, CustomerClass} from "./Customer";
+// import {Products} from "./Products";
+// import {ProductModels} from "./ProductModels";
+// import {Categories} from "./Categories";
+// import {ProductToCategories} from "./ProductToCategories";
+//
+// Dependencies._register({Order, Customer,CustomerClass,OrderClass, Products, ProductModels, Categories, ProductToCategories});
+//
+// console.log("denmemem")

package/Examples/index.ts

@@ -13,6 +13,7 @@ import {WebUser} from "../web/WebUser";
 import {User} from "./Models/User";
 import {DbConnection} from "../base";
 
+
 let config = {
     port: process.env.PORT,
     controllerpath: "C:\\PROJELER\\github\\Chy-Nodejs-Framework\\Examples\\Controllers",