socrates/duty-schedule-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Included user-information in employee Model.

Browse Source
This commit is contained in:
Sockenklaus
2021-11-04 14:00:13 +01:00
parent 63c1407643
commit 3d2e551a8e
13 changed files with 171 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
app/Validators/CreateEmployeeValidator.ts
View File

@@ -38,15 +38,17 @@ export default class CreateEmployeeValidator {
trim: true
}),
shorthand: schema.string({
shorthand: schema.string(
{
trim: true
},
[
},
[
rules.unique({
table: 'employees',
column: 'shorthand',
caseInsensitive: true,
})
]),
]),
email: schema.string.optional({
trim: true
@@ -61,7 +63,40 @@ export default class CreateEmployeeValidator {
mobile: schema.string.optional(),
contractHours: schema.number.optional()
contractHours: schema.number.optional(
[
rules.unsigned(),
rules.range(0, 40)
]
),
role: schema.string(
{
trim: true
}
),
isActive: schema.boolean.optional(),
username: schema.string.optional(
{
trim: true
},
[
rules.unique({
table: 'employees',
column: 'username',
caseInsensitive: true,
})
]
),
password: schema.string.optional(
{},
[
rules.requiredIfExists('username')
]
)
})

32
app/Validators/UpdateEmployeeValidator.ts
View File

@@ -45,6 +45,7 @@ export default class UpdateEmployeeValidator {
rules.unique({
table: 'employees',
column: 'shorthand',
caseInsensitive: true,
whereNot: {
id: this.ctx.params.id
}
@@ -64,7 +65,36 @@ export default class UpdateEmployeeValidator {
mobile: schema.string.optional(),
contractHours: schema.number.optional()
contractHours: schema.number.optional([
rules.unsigned(),
rules.range(0, 40)
]),
role: schema.string({
trim: true
}),
isActive: schema.boolean.optional(),
username: schema.string.optional(
{
trim: true
},
[
rules.unique({
table: 'employees',
column: 'username',
caseInsensitive: true,
})
]
),
password: schema.string.optional(
{},
[
rules.requiredIfExists('username')
]
)
})