Merge branch 'master' of https://github.com/Uconnect-Technologies/wer…

…tik-js

src/framework/database/helpers/paginate.ts

@@ -9,7 +9,7 @@ export default async function (model) {
           throw new Error("Requested fields must be an array")
         }
         let page = get(args, "pagination.page", 1)
-        let limit = get(args, "pagination.limit", 500)
+        let limit = get(args, "pagination.limit", 100)
         let filters = get(args, "filters", {})
         let sorting = get(args, "sorting", [])
         let offset = limit * (page - 1)
@@ -53,6 +53,7 @@ export default async function (model) {
             previousPage: page == 1 ? 1 : page - 1,
             pages: totalPages,
             hasMore: page < totalPages,
+            limit: limit,
           },
         })
       } catch (error) {

src/framework/graphql/generalSchema.ts

@@ -81,5 +81,6 @@ export default `
 		nextPage: Int
 		previousPage: Int
 		hasMore: Boolean
+		limit: Int
 	}
 `

src/next/crud/index.ts

@@ -3,7 +3,7 @@ import convertFiltersIntoSequalizeObject from "./../../framework/database/helper
 
 export const paginate = async (arg, tableInstance) => {
   let page = get(arg, "pagination.page", 1)
-  let limit = get(arg, "pagination.limit", 500)
+  let limit = get(arg, "pagination.limit", 100)
   let sorting = get(arg, "sorting", [])
   let offset = limit * (page - 1)
   const where = await convertFiltersIntoSequalizeObject(arg.where)
@@ -25,6 +25,7 @@ export const paginate = async (arg, tableInstance) => {
       previousPage: page == 1 ? 1 : page - 1,
       pages: totalPages,
       hasMore: page < totalPages,
+      limit: limit
     },
   }
 }

src/next/database.ts

@@ -52,7 +52,7 @@ export const applyRelationshipsFromStoreToDatabase = async (
   store.database.relationships.forEach((element) => {
     const currentTable = app.modules[element.currentModule].tableInstance
     const referencedTable = app.modules[element.referencedModule].tableInstance
-    // element.type willbe hasOne, hasMany, belongsTo or belongsToMany
+    // element.type will be hasOne, hasMany, belongsTo or belongsToMany
     currentTable[element.type](referencedTable, element.options || {})
   })
 }
@@ -70,7 +70,7 @@ export const applyRelationshipsFromStoreToGraphql = async (
 
     store.graphql.resolvers[element.currentModule] = {
       ...oldResolvers,
-      [element.graphqlKey]: async (parent, args, context) => {
+      [element.graphqlKey]: async (parent, _args, context) => {
         const tableInstance =
           context.wertik.modules[element.referencedModule].tableInstance
         let referencedModuleKey =

src/next/devServers/dev-ilyas.ts

@@ -28,6 +28,24 @@ const devIlyas = async () => {
         database: "default",
         table: "shirts",
       }),
+      shirt_sales: useModule({
+        name: "shirt_sales",
+        useDatabase: true,
+        database: "default",
+        table: "shirt_sales",
+        on: ({ hasOne }) => {
+          hasOne({
+            module: "shirts",
+            graphqlKey: "shirt",
+            database: "default",
+            options: {
+              foreignKey: "id",
+              sourceKey: "shirt_id",
+              targetKey: "shirt_id",
+            },
+          })
+        },
+      }),
     },
   })
 }

src/next/graphql/generalSchema.ts

@@ -86,5 +86,6 @@ export default `
 		nextPage: Int
 		previousPage: Int
 		hasMore: Boolean
+		limit: Int
 	}
 `

src/next/index.ts

@@ -95,9 +95,6 @@ const Wertik: (configuration: WertikConfiguration) => Promise<WertikApp> = (
         }
       }
 
-      applyRelationshipsFromStoreToDatabase(store, wertikApp)
-      applyRelationshipsFromStoreToGraphql(store, wertikApp)
-
       if (configuration.modules) {
         for (const moduleName of Object.keys(configuration.modules || {})) {
           wertikApp.modules[moduleName] = await configuration.modules[
@@ -133,6 +130,9 @@ const Wertik: (configuration: WertikConfiguration) => Promise<WertikApp> = (
         }
       }
 
+      applyRelationshipsFromStoreToDatabase(store, wertikApp)
+      applyRelationshipsFromStoreToGraphql(store, wertikApp) 
+
       expressApp.get("/w/info", function (req, res) {
         res.json({
           message: "You are running wertik-js v3",

src/next/types/modules.ts

@@ -33,7 +33,7 @@ export interface RelationParams {
   module: string
   graphqlKey: string
   database: string
-  options: {
+  options?: {
     [key: string]: string | number | null
   }
 }