diff --git a/src/db/models/SavedFilter.ts b/src/db/models/SavedFilter.ts index 8c62068..aecb49b 100644 --- a/src/db/models/SavedFilter.ts +++ b/src/db/models/SavedFilter.ts @@ -22,15 +22,15 @@ export interface ISavedFilterInput extends ISavedFilterAttributes {} export interface ISavedFilterOutput extends ISavedFilterAttributes {} class SavedFilterModel extends Model implements ISavedFilterAttributes { - public id!: string; - public keycloak_id!: string; - public title!: string; - public tag!: string; - public queries!: any[]; - public type!: string; - public creation_date!: Date; - public updated_date!: Date; - public favorite!: boolean; + public id: string; + public keycloak_id: string; + public title: string; + public tag: string; + public queries: any[]; + public type: string; + public creation_date: Date; + public updated_date: Date; + public favorite: boolean; } SavedFilterModel.init( diff --git a/src/db/models/User.ts b/src/db/models/User.ts index 07a8787..edb21df 100644 --- a/src/db/models/User.ts +++ b/src/db/models/User.ts @@ -39,14 +39,14 @@ export interface IUserInput extends IUserAttributes {} export interface IUserOuput extends IUserAttributes {} class UserModel extends Model implements IUserAttributes { - public id!: number; - public keycloak_id!: string; + public id: number; + public keycloak_id: string; public commercial_use_reason: string; public accepted_terms: boolean; public understand_disclaimer: boolean; public completed_registration: boolean; - public creation_date!: Date; - public updated_date!: Date; + public creation_date: Date; + public updated_date: Date; public deleted: boolean; public roles: string[]; public portal_usages: string[]; @@ -144,7 +144,7 @@ UserModel.init( affiliation: { type: DataTypes.CITEXT, validate: { - isAlphanumeric: true, + is: NAME_REGEX, }, }, public_email: { diff --git a/src/db/models/UserSets.ts b/src/db/models/UserSets.ts index 83f75bb..1892fae 100644 --- a/src/db/models/UserSets.ts +++ b/src/db/models/UserSets.ts @@ -1,6 +1,6 @@ import { DataTypes, Model } from 'sequelize'; -import { UUID_VERSION } from '../../utils/constants'; +import { NAME_REGEX, UUID_VERSION } from '../../utils/constants'; import sequelizeConnection from '../config'; interface IUserSetAttributes { @@ -19,13 +19,13 @@ export interface IUserSetsInput extends IUserSetAttributes {} export interface IUserSetsOutput extends IUserSetAttributes {} class UserSetModel extends Model implements IUserSetAttributes { - public id!: string; - public keycloak_id!: string; - public content!: any; - public alias!: string; - public sharedpublicly!: boolean; - public creation_date!: Date; - public updated_date!: Date; + public id: string; + public keycloak_id: string; + public content: any; + public alias: string; + public sharedpublicly: boolean; + public creation_date: Date; + public updated_date: Date; } UserSetModel.init( @@ -50,7 +50,7 @@ UserSetModel.init( type: DataTypes.STRING, allowNull: false, validate: { - isAlpha: true, + is: NAME_REGEX, }, }, sharedpublicly: { diff --git a/src/utils/constants.ts b/src/utils/constants.ts index a0f2feb..0ae40d3 100644 --- a/src/utils/constants.ts +++ b/src/utils/constants.ts @@ -1,3 +1,3 @@ export const UUID_VERSION = 4; -export const NAME_REGEX = /^[a-zA-ZÀ-ÿ0-9- ]+$/; +export const NAME_REGEX = /^[a-zà-ÿ ,.'-_]+$/iu; export const MAX_LENGTH_PER_ROLE = 35;