From 583a74bcdc1170baec58bfb11f448f8b5bcc6dec Mon Sep 17 00:00:00 2001 From: Sockenklaus Date: Mon, 15 Nov 2021 16:48:20 +0100 Subject: [PATCH] contractHours notNullable, defaultTo(0) --- app/Policies/EmployeesPolicy.ts | 4 ++++ database/migrations/1634413335137_employees.ts | 2 ++ 2 files changed, 6 insertions(+) diff --git a/app/Policies/EmployeesPolicy.ts b/app/Policies/EmployeesPolicy.ts index 109eb0a..9741f65 100644 --- a/app/Policies/EmployeesPolicy.ts +++ b/app/Policies/EmployeesPolicy.ts @@ -1,5 +1,6 @@ import { BasePolicy } from '@ioc:Adonis/Addons/Bouncer' import Employee from 'App/Models/Employee' +import Logger from '@ioc:Adonis/Core/Logger' export default class EmployeesPolicy extends BasePolicy { public async index(employee: Employee) { @@ -15,6 +16,9 @@ export default class EmployeesPolicy extends BasePolicy { } public async update(employee: Employee, editContractHours: boolean, query: Employee) { + Logger.info("Is Admin? "+employee.isAdmin()) + Logger.info("Same ids? "+(employee.id === query.id)) + Logger.info("Edit contract Hours? "+editContractHours) return employee.isAdmin() || (employee.id === query.id && !editContractHours) } diff --git a/database/migrations/1634413335137_employees.ts b/database/migrations/1634413335137_employees.ts index 2276a74..d621410 100644 --- a/database/migrations/1634413335137_employees.ts +++ b/database/migrations/1634413335137_employees.ts @@ -27,6 +27,8 @@ export default class Employees extends BaseSchema { .defaultTo(false) .notNullable() table.decimal('contract_hours', 2, 2) + .notNullable() + .defaultTo(0) }) }