- add key word table for submitter with adeqate validations ind DatasetController.ts an model Subject.ts

- npm updates
This commit is contained in:
Kaimbacher 2023-05-19 11:30:49 +02:00
parent 43fd349301
commit 440fdb9fa7
8 changed files with 657 additions and 324 deletions

View file

@ -199,6 +199,17 @@ export default class DatasetController {
]),
}),
subjects: schema.array([rules.minLength(3)]).members(
schema.object().members({
value: schema.string({ trim: true }, [rules.minLength(3), rules.maxLength(255)]),
// type: schema.enum(Object.values(TitleTypes)),
language: schema.string({ trim: true }, [
rules.minLength(2),
rules.maxLength(255),
]),
}),
),
});
try {
@ -262,5 +273,11 @@ export default class DatasetController {
'authors.minLength': 'at least {{ options.minLength }} author must be defined',
'after': `{{ field }} must be older than ${dayjs().add(10, 'day')}`,
'subjects.minLength': 'at least {{ options.minLength }} keywords must be defined',
'subjects.*.value.required': 'keyword value is required',
'subjects.*.value.minLength': 'keyword value must be at least {{ options.minLength }} characters long',
'subjects.*.type.required': 'keyword type is required',
'subjects.*.language.required': 'language of keyword is required',
};
}

76
app/Models/Subject.ts Normal file
View file

@ -0,0 +1,76 @@
import { column, BaseModel, SnakeCaseNamingStrategy, manyToMany, ManyToMany, beforeCreate, beforeUpdate } from '@ioc:Adonis/Lucid/Orm';
import { DateTime } from 'luxon';
import dayjs from 'dayjs';
import Dataset from './Dataset';
export default class Subject extends BaseModel {
public static namingStrategy = new SnakeCaseNamingStrategy();
public static table = 'dataset_subjects';
public static selfAssignPrimaryKey = false;
@column({
isPrimary: true,
})
public id: number;
@column({})
public language: string;
@column({})
public type: string;
@column({})
public value: string;
@column({})
public external_key: string;
@column.dateTime({
serialize: (value: Date | null) => {
return value ? dayjs(value).format('MMMM D YYYY HH:mm a') : value;
},
autoCreate: true,
})
public created_at: DateTime;
@column.dateTime({
serialize: (value: Date | null) => {
return value ? dayjs(value).format('MMMM D YYYY HH:mm a') : value;
},
autoCreate: true,
autoUpdate: true,
})
public updated_at: DateTime;
@beforeCreate()
@beforeUpdate()
public static async resetDate(role) {
role.created_at = this.formatDateTime(role.created_at);
role.updated_at = this.formatDateTime(role.updated_at);
}
private static formatDateTime(datetime) {
let value = new Date(datetime);
return datetime
? value.getFullYear() +
'-' +
(value.getMonth() + 1) +
'-' +
value.getDate() +
' ' +
value.getHours() +
':' +
value.getMinutes() +
':' +
value.getSeconds()
: datetime;
}
@manyToMany(() => Dataset, {
pivotForeignKey: 'subject_id',
pivotRelatedForeignKey: 'document_id',
pivotTable: 'link_dataset_subjects',
})
public datasets: ManyToMany<typeof Dataset>;
}