From e4ec7a1d5945828d8bdca421bf3a9bbaba274cf8 Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 17 Aug 2022 12:04:03 +0200 Subject: [PATCH] Change Message to ContributionMessage, change 0046 to 0047. --- backend/src/config/index.ts | 2 +- backend/src/graphql/enum/MessageType.ts | 11 +++++++++++ .../Contribution.ts | 6 +++--- .../ContributionMessage.ts} | 9 +++++++-- database/entity/Contribution.ts | 2 +- database/entity/ContributionMessage.ts | 1 + database/entity/Message.ts | 1 - database/entity/index.ts | 4 ++-- ...046-messages_tables.ts => 0047-messages_tables.ts} | 5 +++-- 9 files changed, 29 insertions(+), 12 deletions(-) create mode 100644 backend/src/graphql/enum/MessageType.ts rename database/entity/{0046-messages_tables => 0047-messages_tables}/Contribution.ts (92%) rename database/entity/{0046-messages_tables/Message.ts => 0047-messages_tables/ContributionMessage.ts} (80%) create mode 100644 database/entity/ContributionMessage.ts delete mode 100644 database/entity/Message.ts rename database/migrations/{0046-messages_tables.ts => 0047-messages_tables.ts} (85%) diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts index 8ee58da16..ae73fa8ac 100644 --- a/backend/src/config/index.ts +++ b/backend/src/config/index.ts @@ -10,7 +10,7 @@ Decimal.set({ }) const constants = { - DB_VERSION: '0046-messages_tables', + DB_VERSION: '0047-messages_tables', DECAY_START_TIME: new Date('2021-05-13 17:46:31-0000'), // GMT+0 LOG4JS_CONFIG: 'log4js-config.json', // default log level on production should be info diff --git a/backend/src/graphql/enum/MessageType.ts b/backend/src/graphql/enum/MessageType.ts new file mode 100644 index 000000000..a4606e464 --- /dev/null +++ b/backend/src/graphql/enum/MessageType.ts @@ -0,0 +1,11 @@ +import { registerEnumType } from 'type-graphql' + +export enum ContributionMessageType { + HISTORY = 'HISTORY', + DIALOG = 'DIALOG', +} + +registerEnumType(ContributionMessageType, { + name: 'ContributionMessageType', + description: 'Name of the Type of the ContributionMessage', +}) diff --git a/database/entity/0046-messages_tables/Contribution.ts b/database/entity/0047-messages_tables/Contribution.ts similarity index 92% rename from database/entity/0046-messages_tables/Contribution.ts rename to database/entity/0047-messages_tables/Contribution.ts index cede519ac..1ba31bb88 100644 --- a/database/entity/0046-messages_tables/Contribution.ts +++ b/database/entity/0047-messages_tables/Contribution.ts @@ -11,7 +11,7 @@ import { } from 'typeorm' import { DecimalTransformer } from '../../src/typeorm/DecimalTransformer' import { User } from '../User' -import { Message } from '../Message' +import { ContributionMessage } from '../ContributionMessage' @Entity('contributions') export class Contribution extends BaseEntity { @@ -83,7 +83,7 @@ export class Contribution extends BaseEntity { @DeleteDateColumn({ name: 'deleted_at' }) deletedAt: Date | null - @OneToMany(() => Message, (message) => message.contribution) + @OneToMany(() => ContributionMessage, (message) => message.contribution) @JoinColumn({ name: 'contribution_id' }) - messages?: Message[] + messages?: ContributionMessage[] } diff --git a/database/entity/0046-messages_tables/Message.ts b/database/entity/0047-messages_tables/ContributionMessage.ts similarity index 80% rename from database/entity/0046-messages_tables/Message.ts rename to database/entity/0047-messages_tables/ContributionMessage.ts index 513535720..a09d19f75 100644 --- a/database/entity/0046-messages_tables/Message.ts +++ b/database/entity/0047-messages_tables/ContributionMessage.ts @@ -1,8 +1,10 @@ import { BaseEntity, Column, Entity, JoinColumn, ManyToOne, PrimaryGeneratedColumn } from 'typeorm' import { Contribution } from '../Contribution' -@Entity('messages', { engine: 'InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci' }) -export class Message extends BaseEntity { +@Entity('contribution_messages', { + engine: 'InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci', +}) +export class ContributionMessage extends BaseEntity { @PrimaryGeneratedColumn('increment', { unsigned: true }) id: number @@ -30,4 +32,7 @@ export class Message extends BaseEntity { @Column({ name: 'deleted_by', default: null, unsigned: true, nullable: true }) deletedBy: number + + @Column({ length: 12, nullable: false, collation: 'utf8mb4_unicode_ci' }) + type: string } diff --git a/database/entity/Contribution.ts b/database/entity/Contribution.ts index 7494f3ea9..f6530f00b 100644 --- a/database/entity/Contribution.ts +++ b/database/entity/Contribution.ts @@ -1 +1 @@ -export { Contribution } from './0046-messages_tables/Contribution' +export { Contribution } from './0047-messages_tables/Contribution' diff --git a/database/entity/ContributionMessage.ts b/database/entity/ContributionMessage.ts new file mode 100644 index 000000000..9b6450811 --- /dev/null +++ b/database/entity/ContributionMessage.ts @@ -0,0 +1 @@ +export { ContributionMessage } from './0047-messages_tables/ContributionMessage' diff --git a/database/entity/Message.ts b/database/entity/Message.ts deleted file mode 100644 index 9de65316d..000000000 --- a/database/entity/Message.ts +++ /dev/null @@ -1 +0,0 @@ -export { Message } from './0046-messages_tables/Message' diff --git a/database/entity/index.ts b/database/entity/index.ts index 9aa3ce9de..abd31bfb9 100644 --- a/database/entity/index.ts +++ b/database/entity/index.ts @@ -7,7 +7,7 @@ import { TransactionLink } from './TransactionLink' import { User } from './User' import { Contribution } from './Contribution' import { EventProtocol } from './EventProtocol' -import { Message } from './Message' +import { ContributionMessage } from './ContributionMessage' export const entities = [ Contribution, @@ -19,5 +19,5 @@ export const entities = [ TransactionLink, User, EventProtocol, - Message, + ContributionMessage, ] diff --git a/database/migrations/0046-messages_tables.ts b/database/migrations/0047-messages_tables.ts similarity index 85% rename from database/migrations/0046-messages_tables.ts rename to database/migrations/0047-messages_tables.ts index a23e2242a..36fa42a8e 100644 --- a/database/migrations/0046-messages_tables.ts +++ b/database/migrations/0047-messages_tables.ts @@ -10,7 +10,7 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promise>) { await queryFn(` - CREATE TABLE IF NOT EXISTS \`messages\` ( + CREATE TABLE IF NOT EXISTS \`contribution_messages\` ( \`id\` int(10) unsigned NOT NULL AUTO_INCREMENT, \`contribution_id\` int(10) unsigned NOT NULL, \`user_id\` int(10) unsigned NOT NULL, @@ -19,11 +19,12 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis \`updated_at\` datetime DEFAULT NULL, \`deleted_at\` datetime DEFAULT NULL, \`deleted_by\` int(10) unsigned DEFAULT NULL, + \`type\` varchar(12) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT "DIALOG", PRIMARY KEY (\`id\`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; `) } export async function downgrade(queryFn: (query: string, values?: any[]) => Promise>) { - await queryFn(`DROP TABLE IF EXISTS \`messages\`;`) + await queryFn(`DROP TABLE IF EXISTS \`contribution_messages\`;`) }