From 4b04f81f02f86d36a578668bcbf213a836319759 Mon Sep 17 00:00:00 2001 From: Claus-Peter Huebner Date: Tue, 18 Jul 2023 16:32:59 +0200 Subject: [PATCH] add default value on field createdAt like it is in migration --- backend/src/graphql/resolver/util/modifyUserRole.ts | 1 - database/entity/0069-add_user_roles_table/User.ts | 2 +- database/entity/0069-add_user_roles_table/UserRole.ts | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/backend/src/graphql/resolver/util/modifyUserRole.ts b/backend/src/graphql/resolver/util/modifyUserRole.ts index 5acc71f93..f9af28a22 100644 --- a/backend/src/graphql/resolver/util/modifyUserRole.ts +++ b/backend/src/graphql/resolver/util/modifyUserRole.ts @@ -12,7 +12,6 @@ export async function setUserRole(user: DbUser, role: string | null | undefined) user.userRoles.push(UserRole.create()) } // and initialize the userRole - user.userRoles[0].createdAt = new Date() user.userRoles[0].role = role user.userRoles[0].userId = user.id await UserRole.save(user.userRoles[0]) diff --git a/database/entity/0069-add_user_roles_table/User.ts b/database/entity/0069-add_user_roles_table/User.ts index 2236fd099..a49bb4b87 100644 --- a/database/entity/0069-add_user_roles_table/User.ts +++ b/database/entity/0069-add_user_roles_table/User.ts @@ -60,7 +60,7 @@ export class User extends BaseEntity { }) lastName: string - @Column({ name: 'created_at', default: () => 'CURRENT_TIMESTAMP', nullable: false }) + @Column({ name: 'created_at', default: () => 'CURRENT_TIMESTAMP(3)', nullable: false }) createdAt: Date @DeleteDateColumn({ name: 'deleted_at', nullable: true }) diff --git a/database/entity/0069-add_user_roles_table/UserRole.ts b/database/entity/0069-add_user_roles_table/UserRole.ts index 4734de8d9..118753b20 100644 --- a/database/entity/0069-add_user_roles_table/UserRole.ts +++ b/database/entity/0069-add_user_roles_table/UserRole.ts @@ -12,7 +12,7 @@ export class UserRole extends BaseEntity { @Column({ length: 40, nullable: false, collation: 'utf8mb4_unicode_ci' }) role: string - @Column({ name: 'created_at', default: () => 'CURRENT_TIMESTAMP', nullable: false }) + @Column({ name: 'created_at', default: () => 'CURRENT_TIMESTAMP(3)', nullable: false }) createdAt: Date @Column({ name: 'updated_at', nullable: true, default: null, type: 'datetime' })