Merge pull request #235 from Uconnect-Technologies/roadmap-1.9.7

Roadmap 1.9.7 Beta

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wertik-js",
-  "version": "1.9.960",
+  "version": "1.9.97-beta",
   "main": "lib/main.js",
   "repository": "https://github.com/Uconnect-Technologies/wertik-js.git",
   "welcomeResponse": "Welcome to wertik, You are successfully running Wertik.",

src/framework/database/helpers/index.ts

@@ -1,11 +1,12 @@
 const sequelize = require("sequelize");
 
-// mysql helpers
-
 export const convertFieldsIntoSequelizeFields = (fields) => {
   let k = Object.keys(fields);
   k.forEach((element) => {
-    const t = fields[element].type;
+    let t = fields[element].type;
+    if (t.toLowerCase() === "number") {
+      t = "integer";
+    }
     fields[element].type = sequelize[t.toUpperCase()];
     fields[element].oldType = t;
   });

src/framework/defaults/defaultConfigurations/defaultConfiguration.ts

@@ -34,9 +34,11 @@ export default {
   },
   restApi: {
     showWertik404Page: true,
-    onCustomApiFailure: function ({ path, res }) {
+    onCustomApiFailure: function ({ path, res, err }) {
       res.send("failed at " + path);
     },
+    // Below function for custom 404 page or response.
+    // restApi404Handler: function () {}
   },
   modules: [
     {
@@ -124,13 +126,13 @@ export default {
   sockets: {
     disable: false,
     onClientConnected: function () {
-      console.log("onClientConnected")
+      console.log("onClientConnected");
     },
     onMessageReceived: function () {
-      console.log("onMessageReceived")
+      console.log("onMessageReceived");
     },
-    onClientDisconnect: function () { 
-      console.log("onClientDisconnect")
+    onClientDisconnect: function () {
+      console.log("onClientDisconnect");
     },
   },
   storage: {

src/framework/initialization/startServers.ts

@@ -10,11 +10,20 @@ export default function (configuration: IConfiguration, servers: any) {
 
     const expressAppPort = get(configuration, "port", defaultPort);
     const showWertik404Page = get(configuration, "restApi.showWertik404Page", true);
+    const restApi404Handler = get(configuration, "restApi.restApi404Handler", function (req, res) {
+      res.status(404).json({
+        message: "Not found",
+        data: {
+          message: "Request page didn't found",
+        },
+      });
+    });
     const restApiBeforeStart = get(configuration, "restApi.beforeStart", function () {});
 
     const graphqlPath = get(configuration, "graphql.path", "/graphql");
     const graphqlVoyagerPath = get(configuration, "graphql.graphqlVoyagerPath", "/graphql-voyager");
     const disableGraphqlVoyager = get(configuration, "graphql.disableGraphqlVoyager", false);
+
     const disableGraphql = get(configuration, "graphql.disable", false);
     const disableSockets = get(configuration, "sockets.disable", false);
 
@@ -25,16 +34,11 @@ export default function (configuration: IConfiguration, servers: any) {
       graphql.applyMiddleware({ app: restApi, path: graphqlPath });
       graphql.installSubscriptionHandlers(httpServer);
     }
+
     restApiBeforeStart({ express: restApi });
+
     if (showWertik404Page) {
-      restApi.get("*", function (req, res) {
-        res.status(404).json({
-          message: "Not found",
-          data: {
-            message: "Request page didn't found",
-          },
-        });
-      });
+      restApi.get("*", restApi404Handler);
     }
 
     httpServer.listen(expressAppPort, () => {

src/framework/types/configuration.ts

@@ -177,6 +177,7 @@ export interface IConfigurationRestApi {
   onCustomApiFailure: Function;
   showWertik404Page: boolean;
   beforeStart: Function;
+  restApi404Handler: Function;
 }
 
 export interface IConfigurationGraphql {