diff --git a/database/entity/0087-add_dlt_users_table/DltTransaction.ts b/database/entity/0088-add_dlt_users_table/DltTransaction.ts similarity index 100% rename from database/entity/0087-add_dlt_users_table/DltTransaction.ts rename to database/entity/0088-add_dlt_users_table/DltTransaction.ts diff --git a/database/entity/0087-add_dlt_users_table/DltUser.ts b/database/entity/0088-add_dlt_users_table/DltUser.ts similarity index 100% rename from database/entity/0087-add_dlt_users_table/DltUser.ts rename to database/entity/0088-add_dlt_users_table/DltUser.ts diff --git a/database/entity/0087-add_dlt_users_table/User.ts b/database/entity/0088-add_dlt_users_table/User.ts similarity index 98% rename from database/entity/0087-add_dlt_users_table/User.ts rename to database/entity/0088-add_dlt_users_table/User.ts index 8d5466241..f9b079a04 100644 --- a/database/entity/0087-add_dlt_users_table/User.ts +++ b/database/entity/0088-add_dlt_users_table/User.ts @@ -16,7 +16,8 @@ import { UserContact } from '../UserContact' import { UserRole } from '../UserRole' import { GeometryTransformer } from '../../src/typeorm/GeometryTransformer' import { Community } from '../Community' -import { DltUser } from '../DltUser' +// removed in current version +import { DltUser } from './DltUser' @Entity('users', { engine: 'InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci' }) export class User extends BaseEntity { diff --git a/database/entity/0088-merge_dlt_tables/DltTransaction.ts b/database/entity/0089-merge_dlt_tables/DltTransaction.ts similarity index 100% rename from database/entity/0088-merge_dlt_tables/DltTransaction.ts rename to database/entity/0089-merge_dlt_tables/DltTransaction.ts diff --git a/database/entity/0088-merge_dlt_tables/Transaction.ts b/database/entity/0089-merge_dlt_tables/Transaction.ts similarity index 100% rename from database/entity/0088-merge_dlt_tables/Transaction.ts rename to database/entity/0089-merge_dlt_tables/Transaction.ts diff --git a/database/entity/0088-merge_dlt_tables/TransactionLink.ts b/database/entity/0089-merge_dlt_tables/TransactionLink.ts similarity index 100% rename from database/entity/0088-merge_dlt_tables/TransactionLink.ts rename to database/entity/0089-merge_dlt_tables/TransactionLink.ts diff --git a/database/entity/0088-merge_dlt_tables/User.ts b/database/entity/0089-merge_dlt_tables/User.ts similarity index 100% rename from database/entity/0088-merge_dlt_tables/User.ts rename to database/entity/0089-merge_dlt_tables/User.ts diff --git a/database/entity/DltTransaction.ts b/database/entity/DltTransaction.ts index 373e5f593..bc3244dc0 100644 --- a/database/entity/DltTransaction.ts +++ b/database/entity/DltTransaction.ts @@ -1 +1 @@ -export { DltTransaction } from './0088-merge_dlt_tables/DltTransaction' +export { DltTransaction } from './0089-merge_dlt_tables/DltTransaction' diff --git a/database/entity/DltUser.ts b/database/entity/DltUser.ts deleted file mode 100644 index 29c835233..000000000 --- a/database/entity/DltUser.ts +++ /dev/null @@ -1 +0,0 @@ -export { DltUser } from './0087-add_dlt_users_table/DltUser' diff --git a/database/entity/Transaction.ts b/database/entity/Transaction.ts index 7b014e17a..2f4b2ccfc 100644 --- a/database/entity/Transaction.ts +++ b/database/entity/Transaction.ts @@ -1 +1 @@ -export { Transaction } from './0088-merge_dlt_tables/Transaction' +export { Transaction } from './0089-merge_dlt_tables/Transaction' diff --git a/database/entity/TransactionLink.ts b/database/entity/TransactionLink.ts index ff69e101f..fa8af166d 100644 --- a/database/entity/TransactionLink.ts +++ b/database/entity/TransactionLink.ts @@ -1 +1 @@ -export { TransactionLink } from './0088-merge_dlt_tables/TransactionLink' +export { TransactionLink } from './0089-merge_dlt_tables/TransactionLink' diff --git a/database/entity/User.ts b/database/entity/User.ts index 3836c683e..92b529cb1 100644 --- a/database/entity/User.ts +++ b/database/entity/User.ts @@ -1 +1 @@ -export { User } from './0088-merge_dlt_tables/User' +export { User } from './0089-merge_dlt_tables/User' diff --git a/database/logging/DltUserLogging.view.ts b/database/logging/DltUserLogging.view.ts deleted file mode 100644 index c98c3f351..000000000 --- a/database/logging/DltUserLogging.view.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { DltUser } from '../entity/DltUser' -import { AbstractLoggingView } from './AbstractLogging.view' -import { UserLoggingView } from './UserLogging.view' - -export class DltUserLoggingView extends AbstractLoggingView { - public constructor(private self: DltUser) { - super() - } - - // eslint-disable-next-line @typescript-eslint/no-explicit-any - public toJSON(): any { - return { - id: this.self.id, - user: this.self.user - ? new UserLoggingView(this.self.user).toJSON() - : { id: this.self.userId }, - messageId: this.self.messageId, - verified: this.self.verified, - createdAt: this.dateToString(this.self.createdAt), - verifiedAt: this.dateToString(this.self.verifiedAt), - } - } -} diff --git a/database/migrations/0087-add_dlt_users_table.ts b/database/migrations/0088-add_dlt_users_table.ts similarity index 100% rename from database/migrations/0087-add_dlt_users_table.ts rename to database/migrations/0088-add_dlt_users_table.ts diff --git a/database/migrations/0088-merge_dlt_tables.ts b/database/migrations/0089-merge_dlt_tables.ts similarity index 100% rename from database/migrations/0088-merge_dlt_tables.ts rename to database/migrations/0089-merge_dlt_tables.ts