diff --git a/app/Controllers/Http/EmployeesController.ts b/app/Controllers/Http/EmployeesController.ts index 57d0644..7fe559a 100644 --- a/app/Controllers/Http/EmployeesController.ts +++ b/app/Controllers/Http/EmployeesController.ts @@ -49,26 +49,21 @@ export default class EmployeesController { public async store ({request, bouncer}: HttpContextContract) { await bouncer.with('EmployeesPolicy').authorize('store') - try { - const payload = await request.validate(CreateEmployeeValidator) - - return await Employee.create({ - firstName: payload.firstName, - lastName: payload.lastName, - shorthand: payload.shorthand, - email: payload.email, - phone: payload.phone, - mobile: payload.mobile, - contractHours: payload.contractHours, - username: payload.username, - password: payload.password, - role: payload.role, - isActive: payload.isActive - }) - } catch (error) { - return error - } + const payload = await request.validate(CreateEmployeeValidator) + return await Employee.create({ + firstName: payload.firstName, + lastName: payload.lastName, + shorthand: payload.shorthand, + email: payload.email, + phone: payload.phone, + mobile: payload.mobile, + contractHours: payload.contractHours, + username: payload.username, + password: payload.password, + role: payload.role ?? 'employee', + isActive: payload.isActive ?? false + }) } public async show ({params, bouncer, auth}: HttpContextContract) : Promise { @@ -127,8 +122,8 @@ export default class EmployeesController { await employee.save() return response.ok({ - status: 200, - message: "Employee updated successfully" + status: 200, + message: "Employee updated successfully" }) } diff --git a/app/Controllers/Http/SettingsController.ts b/app/Controllers/Http/SettingsController.ts index df7ce22..23b47ef 100644 --- a/app/Controllers/Http/SettingsController.ts +++ b/app/Controllers/Http/SettingsController.ts @@ -22,7 +22,7 @@ export default class SettingsController { } - public async get({params, auth, response}: HttpContextContract): Promise { + public async get({params, auth}: HttpContextContract): Promise { const key = params.key