Remove unchanged User change.

database/entity/0046-messages_tables/User.ts

@@ -1,92 +0,0 @@
-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 {
-  @PrimaryGeneratedColumn('increment', { unsigned: true })
-  id: number
-
-  @Column({ name: 'public_key', type: 'binary', length: 32, default: null, nullable: true })
-  pubKey: Buffer
-
-  @Column({ name: 'privkey', type: 'binary', length: 80, default: null, nullable: true })
-  privKey: Buffer
-
-  @Column({ length: 255, unique: true, nullable: false, collation: 'utf8mb4_unicode_ci' })
-  email: string
-
-  @Column({
-    name: 'first_name',
-    length: 255,
-    nullable: true,
-    default: null,
-    collation: 'utf8mb4_unicode_ci',
-  })
-  firstName: string
-
-  @Column({
-    name: 'last_name',
-    length: 255,
-    nullable: true,
-    default: null,
-    collation: 'utf8mb4_unicode_ci',
-  })
-  lastName: string
-
-  @DeleteDateColumn()
-  deletedAt: Date | null
-
-  @Column({ type: 'bigint', default: 0, unsigned: true })
-  password: BigInt
-
-  @Column({ name: 'email_hash', type: 'binary', length: 32, default: null, nullable: true })
-  emailHash: Buffer
-
-  @Column({ name: 'created', default: () => 'CURRENT_TIMESTAMP', nullable: false })
-  createdAt: Date
-
-  @Column({ name: 'email_checked', type: 'bool', nullable: false, default: false })
-  emailChecked: boolean
-
-  @Column({ length: 4, default: 'de', collation: 'utf8mb4_unicode_ci', nullable: false })
-  language: string
-
-  @Column({ name: 'is_admin', type: 'datetime', nullable: true, default: null })
-  isAdmin: Date | null
-
-  @Column({ name: 'referrer_id', type: 'int', unsigned: true, nullable: true, default: null })
-  referrerId?: number | null
-
-  @Column({
-    name: 'contribution_link_id',
-    type: 'int',
-    unsigned: true,
-    nullable: true,
-    default: null,
-  })
-  contributionLinkId?: number | null
-
-  @Column({ name: 'publisher_id', default: 0 })
-  publisherId: number
-
-  @Column({
-    type: 'text',
-    name: 'passphrase',
-    collation: 'utf8mb4_unicode_ci',
-    nullable: true,
-    default: null,
-  })
-  passphrase: string
-
-  @OneToMany(() => Contribution, (contribution) => contribution.user)
-  @JoinColumn({ name: 'user_id' })
-  contributions?: Contribution[]
-}

database/entity/User.ts

@@ -1 +1 @@
-export { User } from './0046-messages_tables/User'
+export { User } from './0040-add_contribution_link_id_to_user/User'