From cb4ee4590ad5ed68a7408a1fefe3d0b79178ed52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Claus-Peter=20H=C3=BCbner?= <claus-peter.huebner@email.de>
Date: Thu, 21 Jul 2022 23:16:19 +0200
Subject: [PATCH] adapt User and UserContact entity

---
 .../0044-adapt_users_table_for_gradidoid/User.ts | 16 ++++++++++++++--
 .../UserContact.ts                               |  6 +++---
 database/entity/User.ts                          |  2 +-
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/database/entity/0044-adapt_users_table_for_gradidoid/User.ts b/database/entity/0044-adapt_users_table_for_gradidoid/User.ts
index f4063f65c..1e7e9d8d8 100644
--- a/database/entity/0044-adapt_users_table_for_gradidoid/User.ts
+++ b/database/entity/0044-adapt_users_table_for_gradidoid/User.ts
@@ -1,4 +1,13 @@
-import { BaseEntity, Entity, PrimaryGeneratedColumn, Column, DeleteDateColumn } from 'typeorm'
+import {
+  BaseEntity,
+  Entity,
+  PrimaryGeneratedColumn,
+  Column,
+  DeleteDateColumn,
+  OneToMany,
+  JoinColumn,
+} from 'typeorm'
+import { Contribution } from '../Contribution'
 
 @Entity('users', { engine: 'InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci' })
 export class User extends BaseEntity {
@@ -9,7 +18,6 @@ export class User extends BaseEntity {
     name: 'gradido_id',
     length: 36,
     nullable: false,
-    default: null,
     collation: 'utf8mb4_unicode_ci',
   })
   gradidoID: string
@@ -94,4 +102,8 @@ export class User extends BaseEntity {
     default: null,
   })
   passphrase: string
+
+  @OneToMany(() => Contribution, (contribution) => contribution.user)
+  @JoinColumn({ name: 'user_id' })
+  contributions?: Contribution[]
 }
diff --git a/database/entity/0044-adapt_users_table_for_gradidoid/UserContact.ts b/database/entity/0044-adapt_users_table_for_gradidoid/UserContact.ts
index 53aac52ab..fee0afeda 100644
--- a/database/entity/0044-adapt_users_table_for_gradidoid/UserContact.ts
+++ b/database/entity/0044-adapt_users_table_for_gradidoid/UserContact.ts
@@ -29,12 +29,12 @@ export class UserContact extends BaseEntity {
   @Column({ length: 255, unique: false, nullable: true, collation: 'utf8mb4_unicode_ci' })
   phone: string
 
-  @Column({ name: 'created', default: () => 'CURRENT_TIMESTAMP', nullable: false })
+  @Column({ name: 'created_at', default: () => 'CURRENT_TIMESTAMP', nullable: false })
   createdAt: Date
 
-  @DeleteDateColumn()
+  @DeleteDateColumn({ name: 'updated_at', nullable: true })
   updatedAt: Date | null
 
-  @DeleteDateColumn()
+  @DeleteDateColumn({ name: 'deleted_at', nullable: true })
   deletedAt: Date | null
 }
diff --git a/database/entity/User.ts b/database/entity/User.ts
index 2226e4d51..a29e87cd7 100644
--- a/database/entity/User.ts
+++ b/database/entity/User.ts
@@ -1 +1 @@
-export { User } from './0039-contributions_table/User'
+export { User } from './0044-adapt_users_table_for_gradidoid/User'