Fix/adjustmnet when param is a boolean

.prettierignore

@@ -6,3 +6,5 @@ config.json
 package.json
 *.html
 *.txt
+*.hbs
+templates/**

instructions.ts

@@ -38,7 +38,7 @@ export default async function instructions(projectRoot: string) {
   const controllerPath = `${projectRoot}/app/Controllers/Http`
   copyFolderToProjetct({ pathDestiny: controllerPath, folder: 'Controllers' })
 
-  console.log('Coping Prividers')
+  console.log('Coping Providers')
   const providersPath = `${projectRoot}/providers`
   copyFolderToProjetct({ pathDestiny: providersPath, folder: 'providers', noCaptlize: true })
 
@@ -66,48 +66,11 @@ export default async function instructions(projectRoot: string) {
     noCaptlize: true,
   })
 
-  // Coby Controllers
-  // console.log('Coping Controllers')
-  // const controllersPath = `${projectRoot}/app/Controllers/Http`
-  // console.log({ controllersPath, projectRoot })
-  // if (!fs.existsSync(controllersPath)) {
-  //   fs.mkdirSync(modelPath, { recursive: true })
-  // }
-
-  // // 3. Copy models
-  // const modelPath = `${projectRoot}/app/Models`
-  // if (!fs.existsSync(modelPath)) {
-  //   fs.mkdirSync(modelPath, { recursive: true })
-  // }
-  // fs.copyFileSync(`${packageBasePath}/models/Permission.txt`, `${modelPath}/Permission.ts`)
-  // fs.copyFileSync(`${packageBasePath}/models/Role.txt`, `${modelPath}/Role.ts`)
-  // fs.copyFileSync(`${packageBasePath}/models/RolePermission.txt`, `${modelPath}/RolePermission.ts`)
-  // fs.copyFileSync(`${packageBasePath}/models/UserPermission.txt`, `${modelPath}/UserPermission.ts`)
-  // fs.copyFileSync(`${packageBasePath}/models/UserRole.txt`, `${modelPath}/UserRole.ts`)
-
-  // // 4. Copy migrations
-  // const migrationPath = `${projectRoot}/database/migrations`
-  // if (!fs.existsSync(migrationPath)) {
-  //   fs.mkdirSync(migrationPath, { recursive: true })
-  // }
-  // fs.copyFileSync(
-  //   `${packageBasePath}/migrations/acl_1_roles.txt`,
-  //   `${migrationPath}/acl_1_roles.ts`
-  // )
-  // fs.copyFileSync(
-  //   `${packageBasePath}/migrations/acl_2_permissions.txt`,
-  //   `${migrationPath}/acl_2_permissions.ts`
-  // )
-  // fs.copyFileSync(
-  //   `${packageBasePath}/migrations/acl_3_role_permissions.txt`,
-  //   `${migrationPath}/acl_3_role_permissions.ts`
-  // )
-  // fs.copyFileSync(
-  //   `${packageBasePath}/migrations/acl_4_user_permissions.txt`,
-  //   `${migrationPath}/acl_4_user_permissions.ts`
-  // )
-  // fs.copyFileSync(
-  //   `${packageBasePath}/migrations/acl_5_user_roles.txt`,
-  //   `${migrationPath}/acl_5_user_roles.ts`
-  // )
+  console.log('Coping code-templates')
+  const codeTemplatesPath = `${projectRoot}/code-templates`
+  copyFolderToProjetct({
+    pathDestiny: codeTemplatesPath,
+    folder: 'code-templates',
+    noCaptlize: true,
+  })
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inovan.do/adonis-crud",
-  "version": "0.0.14",
+  "version": "0.1.21",
   "description": "A crud abstraction for AdonisJs",
   "main": "build/providers/AdonisCrudProvider.js",
   "scripts": {
@@ -142,4 +142,4 @@
   "directories": {
     "doc": "docs"
   }
-}
+}

providers/AdonisCrudProvider.ts

@@ -21,20 +21,5 @@ export default class AdonisCrudProvider {
     })
   }
 
-  public async boot() {
-    const Route = this.app.container.use('Adonis/Core/Route')
-    Route.resource('/codegem', 'CodeGemController').apiOnly()
-    Route.post('/auth/register', 'AuthController.store')
-    Route.post('/auth/login', 'AuthController.login')
-    Route.post('/auth/reset-password', 'AuthController.resetPassword')
-    Route.get('/auth/me', 'AuthController.me').middleware('auth')
-
-    Route.group(() => {
-      Route.resource('profiles', 'ProfileController').apiOnly()
-    }).middleware('auth')
-
-    Route.group(() => {
-      Route.resource('users', 'UserController').apiOnly()
-    }).middleware('auth')
-  }
+  public async boot() {}
 }

src/Decorators/Controller/CrudDecorator.ts

@@ -24,29 +24,32 @@ type FunctionMap = {
 export function Crud(options: CrudOperationsOptions): ClassDecorator {
   const functionMap: FunctionMap = {
     async index(ctx) {
-      const { transform } = ctx
       const authUser = ctx.auth.user
-      const { all, page, perPage } = ctx.request.all()
+
+      const { all, page = 1, perPage = 10, sort = 'created_at', order = 'desc' } = ctx.request.all()
 
       const qs = ctx.request.qs()
 
       const query = options.repository.index({ qs, authUser })
-
+      query.orderBy(sort, order)
       if (all) {
         return query.exec()
       }
 
-      const paginatedItems = await query.paginate(page, perPage)
-      const pagination = {
-        page: 1,
-        firstPage: 1,
-        lastPage: 1,
-      }
-
-      return {
-        pagination,
-        data: await transform.withContext(ctx).collection(paginatedItems, options.transformer),
-      }
+      const { rows, currentPage, total, lastPage } = await query.paginate(page, perPage)
+
+      return ctx.transform.paginate(
+        {
+          rows,
+          pages: {
+            page: currentPage,
+            perPage: perPage,
+            total: total,
+            lastPage: lastPage,
+          },
+        },
+        options.transformer
+      )
     },
 
     async show(ctx) {
@@ -81,7 +84,6 @@ export function Crud(options: CrudOperationsOptions): ClassDecorator {
       }
 
       const newObject = await options.repository.store(body)
-      console.log({ new: `${newObject.constructor.table}` })
       options.event.emit(`new:${newObject.constructor.table}`, newObject)
 
       return ctx.response.status(201).json(newObject)
@@ -103,24 +105,43 @@ export function Crud(options: CrudOperationsOptions): ClassDecorator {
           return ctx.response.badRequest(this.errorsRequest)
         }
       }
+      const currentObject = await options.repository.getById({ id })
+      if (!currentObject) {
+        return ctx.response.status(404).json({ msg: 'Not Found' })
+      }
+
+      options.event.emit(`beforeUpdate:${currentObject.constructor.table}`, {
+        body,
+        id,
+        currentObject: currentObject.toJSON(),
+      })
 
       const updatedObject = await options.repository.update({ id, body })
 
       if (!updatedObject) {
         return ctx.response.status(404)
       }
 
-      const updateOutput = await transform.withContext(ctx).item(updatedObject, options.transformer)
+      options.event.emit(`afterUpdate:${currentObject.constructor.table}`, {
+        body,
+        id,
+        updatedObject: updatedObject.toJSON(),
+      })
 
+      const updateOutput = await transform.withContext(ctx).item(updatedObject, options.transformer)
       return ctx.response.status(200).json(updateOutput)
     },
 
     async destroy(ctx) {
       const { params } = ctx
-
+      const currentObject = await options.repository.getById({ id: params.id })
       const deleted = await options.repository.destroy(params.id)
 
       if (deleted) {
+        options.event.emit(`afterDelete:${currentObject.constructor.table}`, {
+          id: params.id,
+          deleted: currentObject.toJSON(),
+        })
         return ctx.response.status(204)
       }
 

src/Decorators/Repository/CrudRepository.ts

@@ -1,5 +1,6 @@
 import { LucidModel } from '@ioc:Adonis/Lucid/Orm'
 import { QueryBuilder } from '../../QueryBuilder/QueryBuilder'
+import { DateTime } from 'luxon'
 
 type FunctionMap = {
   [key: string]: Function
@@ -25,7 +26,6 @@ export function CrudRepository<T extends LucidModel>(Model: T): ClassDecorator {
           qs: rest,
           selectFields: [],
         })
-        console.log('updated to return query', query)
         return query
       },
       async show({ id, status }) {
@@ -47,10 +47,12 @@ export function CrudRepository<T extends LucidModel>(Model: T): ClassDecorator {
         const modelToDelete = await this.getById({ id })
         if (!modelToDelete) return false
         try {
-          await modelToDelete.delete()
+          await modelToDelete.merge({ status: false, deleted_at: DateTime.now() })
+          await modelToDelete.save()
+
           return true
         } catch (error) {
-          return false
+          throw error
         }
       },
       async getById({ id, status = true }) {