From 272ab8ce8570a25a86b6aebf346438f2af251e34 Mon Sep 17 00:00:00 2001 From: einhorn_b Date: Wed, 13 Sep 2023 20:55:34 +0200 Subject: [PATCH] add community, add using dlt-database --- dlt-connector/.env.dist | 14 +- dlt-connector/.env.template | 10 + dlt-connector/jest.config.js | 13 +- dlt-connector/package.json | 6 +- dlt-connector/src/config/index.ts | 17 +- .../src/controller/Community.test.ts | 57 +++ dlt-connector/src/controller/Community.ts | 36 ++ .../src/graphql/enum/TransactionErrorType.ts | 13 + .../src/graphql/input/CommunityDraft.ts | 20 ++ .../src/graphql/input/TransactionInput.ts | 6 + .../src/graphql/model/TransactionError.ts | 20 ++ .../src/graphql/model/TransactionResult.ts | 20 ++ .../resolver/CommunityResolver.test.ts | 93 +++++ .../src/graphql/resolver/CommunityResolver.ts | 78 ++++ dlt-connector/src/graphql/schema.ts | 11 +- .../src/graphql/validator/DateString.ts | 21 ++ .../src/graphql/validator/Decimal.ts | 22 ++ dlt-connector/src/typeorm/DBVersion.ts | 28 ++ dlt-connector/src/typeorm/DataSource.ts | 26 ++ dlt-connector/src/utils.test.ts | 8 + dlt-connector/src/utils.ts | 27 ++ dlt-connector/test/TestDB.ts | 55 +++ dlt-connector/tsconfig.json | 12 + dlt-connector/yarn.lock | 339 +++++++++++++++++- dlt-database/entity/0001-init_db/Account.ts | 22 +- .../entity/0001-init_db/AccountCommunity.ts | 6 +- dlt-database/entity/0001-init_db/Community.ts | 17 +- .../0001-init_db/ConfirmedTransaction.ts | 4 +- dlt-database/entity/0001-init_db/Migration.ts | 13 + .../entity/0001-init_db/TransactionRecipe.ts | 8 +- dlt-database/entity/0001-init_db/User.ts | 2 +- .../0002-refactor_add_community/Community.ts | 63 ++++ dlt-database/entity/Community.ts | 2 +- dlt-database/entity/Migration.ts | 1 + dlt-database/entity/index.ts | 19 + .../migrations/0002-refactor_add_community.ts | 25 ++ 36 files changed, 1079 insertions(+), 55 deletions(-) create mode 100644 dlt-connector/src/controller/Community.test.ts create mode 100644 dlt-connector/src/controller/Community.ts create mode 100644 dlt-connector/src/graphql/enum/TransactionErrorType.ts create mode 100644 dlt-connector/src/graphql/input/CommunityDraft.ts create mode 100644 dlt-connector/src/graphql/model/TransactionError.ts create mode 100644 dlt-connector/src/graphql/model/TransactionResult.ts create mode 100644 dlt-connector/src/graphql/resolver/CommunityResolver.test.ts create mode 100644 dlt-connector/src/graphql/resolver/CommunityResolver.ts create mode 100644 dlt-connector/src/graphql/validator/DateString.ts create mode 100644 dlt-connector/src/graphql/validator/Decimal.ts create mode 100644 dlt-connector/src/typeorm/DBVersion.ts create mode 100644 dlt-connector/src/typeorm/DataSource.ts create mode 100644 dlt-connector/src/utils.test.ts create mode 100644 dlt-connector/src/utils.ts create mode 100644 dlt-connector/test/TestDB.ts create mode 100644 dlt-database/entity/0001-init_db/Migration.ts create mode 100644 dlt-database/entity/0002-refactor_add_community/Community.ts create mode 100644 dlt-database/entity/Migration.ts create mode 100644 dlt-database/entity/index.ts create mode 100644 dlt-database/migrations/0002-refactor_add_community.ts diff --git a/dlt-connector/.env.dist b/dlt-connector/.env.dist index 96867eebb..ecc032986 100644 --- a/dlt-connector/.env.dist +++ b/dlt-connector/.env.dist @@ -1,4 +1,4 @@ -CONFIG_VERSION=v2.2023-07-07 +CONFIG_VERSION=v4.2023-09-12 # SET LOG LEVEL AS NEEDED IN YOUR .ENV # POSSIBLE VALUES: all | trace | debug | info | warn | error | fatal @@ -7,6 +7,16 @@ CONFIG_VERSION=v2.2023-07-07 # IOTA IOTA_API_URL=https://chrysalis-nodes.iota.org IOTA_COMMUNITY_ALIAS=GRADIDO: TestHelloWelt2 +IOTA_HOME_COMMUNITY_SEED=aabbccddeeff00112233445566778899aabbccddeeff00112233445566778899 + +# Database +DB_HOST=localhost +DB_PORT=3306 +DB_USER=root +DB_PASSWORD= +DB_DATABASE=gradido_dlt +#DB_DATABASE_TEST=gradido_dlt_test +TYPEORM_LOGGING_RELATIVE_PATH=typeorm.backend.log # DLT-Connector -DLT_CONNECTOR_PORT=6000 \ No newline at end of file +DLT_CONNECTOR_PORT=6010 \ No newline at end of file diff --git a/dlt-connector/.env.template b/dlt-connector/.env.template index bd9466046..e3793f642 100644 --- a/dlt-connector/.env.template +++ b/dlt-connector/.env.template @@ -3,6 +3,16 @@ CONFIG_VERSION=$DLT_CONNECTOR_CONFIG_VERSION #IOTA IOTA_API_URL=$IOTA_API_URL IOTA_COMMUNITY_ALIAS=$IOTA_COMMUNITY_ALIAS +IOTA_HOME_COMMUNITY_SEED=$IOTA_HOME_COMMUNITY_SEED + +# Database +DB_HOST=localhost +DB_PORT=3306 +DB_USER=root +DB_PASSWORD= +DB_DATABASE=gradido_dlt +DB_DATABASE_TEST=$DB_DATABASE_TEST +TYPEORM_LOGGING_RELATIVE_PATH=typeorm.backend.log # DLT-Connector DLT_CONNECTOR_PORT=$DLT_CONNECTOR_PORT \ No newline at end of file diff --git a/dlt-connector/jest.config.js b/dlt-connector/jest.config.js index 45bee507e..b834c6656 100644 --- a/dlt-connector/jest.config.js +++ b/dlt-connector/jest.config.js @@ -6,7 +6,7 @@ module.exports = { collectCoverageFrom: ['src/**/*.ts', '!**/node_modules/**', '!src/seeds/**', '!build/**'], coverageThreshold: { global: { - lines: 63, + lines: 73, }, }, setupFiles: ['/test/testSetup.ts'], @@ -14,22 +14,25 @@ module.exports = { modulePathIgnorePatterns: ['/build/'], moduleNameMapper: { '@/(.*)': '/src/$1', + '@controller/(.*)': '/src/controller/$1', '@enum/(.*)': '/src/graphql/enum/$1', '@resolver/(.*)': '/src/graphql/resolver/$1', '@input/(.*)': '/src/graphql/input/$1', '@proto/(.*)': '/src/proto/$1', '@test/(.*)': '/test/$1', + '@typeorm/(.*)': '/src/typeorm/$1', '@client/(.*)': '/src/client/$1', '@entity/(.*)': // eslint-disable-next-line n/no-process-env process.env.NODE_ENV === 'development' - ? '/../database/entity/$1' - : '/../database/build/entity/$1', + ? '/../dlt-database/entity/$1' + : '/../dlt-database/build/entity/$1', '@dbTools/(.*)': // eslint-disable-next-line n/no-process-env process.env.NODE_ENV === 'development' - ? '/../database/src/$1' - : '/../database/build/src/$1', + ? '/../dlt-database/src/$1' + : '/../dlt-database/build/src/$1', + '@validator/(.*)': '/src/graphql/validator/$1', }, } /* diff --git a/dlt-connector/package.json b/dlt-connector/package.json index e520df019..7d318f49c 100644 --- a/dlt-connector/package.json +++ b/dlt-connector/package.json @@ -25,6 +25,7 @@ "cors": "^2.8.5", "cross-env": "^7.0.3", "decimal.js-light": "^2.5.1", + "dlt-database": "file:../dlt-database", "dotenv": "10.0.0", "express": "4.17.1", "graphql": "^16.7.1", @@ -32,8 +33,10 @@ "log4js": "^6.7.1", "nodemon": "^2.0.20", "reflect-metadata": "^0.1.13", + "sodium-native": "^4.0.4", "tsconfig-paths": "^4.1.2", - "type-graphql": "^2.0.0-beta.2" + "type-graphql": "^2.0.0-beta.2", + "typeorm": "^0.3.17" }, "devDependencies": { "@eslint-community/eslint-plugin-eslint-comments": "^3.2.1", @@ -41,6 +44,7 @@ "@types/cors": "^2.8.13", "@types/jest": "^27.0.2", "@types/node": "^18.11.18", + "@types/sodium-native": "^2.3.5", "@types/uuid": "^8.3.4", "@typescript-eslint/eslint-plugin": "^5.57.1", "@typescript-eslint/parser": "^5.57.1", diff --git a/dlt-connector/src/config/index.ts b/dlt-connector/src/config/index.ts index be0d4b7da..fa192fc3b 100644 --- a/dlt-connector/src/config/index.ts +++ b/dlt-connector/src/config/index.ts @@ -4,11 +4,12 @@ dotenv.config() const constants = { LOG4JS_CONFIG: 'log4js-config.json', + DB_VERSION: '0002-refactor_add_community', // default log level on production should be info LOG_LEVEL: process.env.LOG_LEVEL || 'info', CONFIG_VERSION: { DEFAULT: 'DEFAULT', - EXPECTED: 'v2.2023-07-07', + EXPECTED: 'v4.2023-09-12', CURRENT: '', }, } @@ -17,13 +18,24 @@ const server = { PRODUCTION: process.env.NODE_ENV === 'production' || false, } +const database = { + DB_HOST: process.env.DB_HOST ?? 'localhost', + DB_PORT: process.env.DB_PORT ? parseInt(process.env.DB_PORT) : 3306, + DB_USER: process.env.DB_USER ?? 'root', + DB_PASSWORD: process.env.DB_PASSWORD ?? '', + DB_DATABASE: process.env.DB_DATABASE ?? 'gradido_dlt', + DB_DATABASE_TEST: process.env.DB_DATABASE_TEST || null, + TYPEORM_LOGGING_RELATIVE_PATH: process.env.TYPEORM_LOGGING_RELATIVE_PATH ?? 'typeorm.backend.log', +} + const iota = { IOTA_API_URL: process.env.IOTA_API_URL ?? 'https://chrysalis-nodes.iota.org', IOTA_COMMUNITY_ALIAS: process.env.IOTA_COMMUNITY_ALIAS ?? 'GRADIDO: TestHelloWelt2', + IOTA_HOME_COMMUNITY_SEED: process.env.IOTA_HOME_COMMUNITY_SEED ?? null, } const dltConnector = { - DLT_CONNECTOR_PORT: process.env.DLT_CONNECTOR_PORT || 6000, + DLT_CONNECTOR_PORT: process.env.DLT_CONNECTOR_PORT || 6010, } // Check config version @@ -41,6 +53,7 @@ if ( export const CONFIG = { ...constants, ...server, + ...database, ...iota, ...dltConnector, } diff --git a/dlt-connector/src/controller/Community.test.ts b/dlt-connector/src/controller/Community.test.ts new file mode 100644 index 000000000..9bdb03e48 --- /dev/null +++ b/dlt-connector/src/controller/Community.test.ts @@ -0,0 +1,57 @@ +import 'reflect-metadata' +import { CommunityDraft } from '@/graphql/input/CommunityDraft' +import { create as createCommunity, getAllTopics, iotaTopicFromCommunityUUID, isExist } from './Community' +import { TestDB } from '@test/TestDB' +import { getDataSource } from '@/typeorm/DataSource' + +jest.mock('@typeorm/DataSource', () => ({ + getDataSource: () => TestDB.instance.dbConnect, +})) + +describe('controller/Community', () => { + beforeAll(async () => { + await TestDB.instance.setupTestDB() + // apolloTestServer = await createApolloTestServer() + }) + + afterAll(async () => { + await TestDB.instance.teardownTestDB() + }) + + describe('createCommunity', () => { + it('valid community', async () => { + const communityDraft = new CommunityDraft() + communityDraft.foreign = false + communityDraft.createdAt = '2022-05-01T17:00:12.128Z' + communityDraft.uuid = '3d813cbb-47fb-32ba-91df-831e1593ac29' + + const iotaTopic = iotaTopicFromCommunityUUID(communityDraft.uuid) + expect(iotaTopic).toEqual('204ef6aed15fbf0f9da5819e88f8eea8e3adbe1e2c2d43280780a4b8c2d32b56') + + const createdAtDate = new Date(communityDraft.createdAt) + const communityEntity = createCommunity(communityDraft) + expect(communityEntity).toMatchObject({ + iotaTopic, + createdAt: createdAtDate, + foreign: false, + }) + await getDataSource().manager.save(communityEntity) + }) + }) + + describe('list communities', () => { + it('get all topics', async () => { + expect(await getAllTopics()).toMatchObject([ + '204ef6aed15fbf0f9da5819e88f8eea8e3adbe1e2c2d43280780a4b8c2d32b56', + ]) + }) + + it('isExist with communityDraft', async () => { + const communityDraft = new CommunityDraft() + communityDraft.foreign = false + communityDraft.createdAt = '2022-05-01T17:00:12.128Z' + communityDraft.uuid = '3d813cab-47fb-32ba-91df-831e1593ac29' + expect(await isExist(communityDraft)).toBe(false) + }) + }) +}) diff --git a/dlt-connector/src/controller/Community.ts b/dlt-connector/src/controller/Community.ts new file mode 100644 index 000000000..6ba5421bb --- /dev/null +++ b/dlt-connector/src/controller/Community.ts @@ -0,0 +1,36 @@ +import { CommunityDraft } from '@/graphql/input/CommunityDraft' +import { uuid4ToBuffer } from '@/utils' +import { Community } from '@entity/Community' +import { getDataSource } from '@typeorm/DataSource' +import { crypto_generichash as cryptoHash } from 'sodium-native' + +export const iotaTopicFromCommunityUUID = (communityUUID: string): string => { + const hash = Buffer.alloc(32) + cryptoHash(hash, uuid4ToBuffer(communityUUID)) + return hash.toString('hex') +} + +export const isExist = async (community: CommunityDraft | string): Promise => { + const iotaTopic = + community instanceof CommunityDraft ? iotaTopicFromCommunityUUID(community.uuid) : community + const result = await getDataSource().manager.find(Community, { + where: { iotaTopic }, + }) + return result.length > 0 +} + +export const create = (community: CommunityDraft, topic?: string): Community => { + const communityEntity = new Community() + communityEntity.iotaTopic = topic ?? iotaTopicFromCommunityUUID(community.uuid) + communityEntity.createdAt = new Date(community.createdAt) + communityEntity.foreign = community.foreign + if (!community.foreign) { + // TODO: generate keys + } + return communityEntity +} + +export const getAllTopics = async (): Promise => { + const communities = await getDataSource().manager.find(Community, { select: { iotaTopic: true } }) + return communities.map((community) => community.iotaTopic) +} diff --git a/dlt-connector/src/graphql/enum/TransactionErrorType.ts b/dlt-connector/src/graphql/enum/TransactionErrorType.ts new file mode 100644 index 000000000..0e72292c1 --- /dev/null +++ b/dlt-connector/src/graphql/enum/TransactionErrorType.ts @@ -0,0 +1,13 @@ +import { registerEnumType } from 'type-graphql' + +export enum TransactionErrorType { + NOT_IMPLEMENTED_YET = 'Not Implemented yet', + MISSING_PARAMETER = 'Missing parameter', + ALREADY_EXIST = 'Already exist', + DB_ERROR = 'DB Error', +} + +registerEnumType(TransactionErrorType, { + name: 'TransactionErrorType', + description: 'Transaction Error Type', +}) diff --git a/dlt-connector/src/graphql/input/CommunityDraft.ts b/dlt-connector/src/graphql/input/CommunityDraft.ts new file mode 100644 index 000000000..f028ea06c --- /dev/null +++ b/dlt-connector/src/graphql/input/CommunityDraft.ts @@ -0,0 +1,20 @@ +// https://www.npmjs.com/package/@apollo/protobufjs + +import { IsBoolean, IsUUID } from 'class-validator' +import { Field, InputType } from 'type-graphql' +import { isValidDateString } from '@validator/DateString' + +@InputType() +export class CommunityDraft { + @Field(() => String) + @IsUUID('4') + uuid: string + + @Field(() => Boolean) + @IsBoolean() + foreign: boolean + + @Field(() => String) + @isValidDateString() + createdAt: string +} diff --git a/dlt-connector/src/graphql/input/TransactionInput.ts b/dlt-connector/src/graphql/input/TransactionInput.ts index 02eba916e..a6990906b 100755 --- a/dlt-connector/src/graphql/input/TransactionInput.ts +++ b/dlt-connector/src/graphql/input/TransactionInput.ts @@ -3,16 +3,22 @@ import { Decimal } from 'decimal.js-light' import { TransactionType } from '../enum/TransactionType' import { InputType, Field } from 'type-graphql' +import { IsEnum } from 'class-validator' +import { IsPositiveDecimal } from '../validator/Decimal' +import { isValidDateString } from '../validator/DateString' @InputType() export class TransactionInput { @Field(() => TransactionType) + @IsEnum(TransactionType) type: TransactionType @Field(() => Decimal) + @IsPositiveDecimal() amount: Decimal @Field(() => Number) + @isValidDateString() createdAt: number // @protoField.d(4, 'string') diff --git a/dlt-connector/src/graphql/model/TransactionError.ts b/dlt-connector/src/graphql/model/TransactionError.ts new file mode 100644 index 000000000..891ad2a89 --- /dev/null +++ b/dlt-connector/src/graphql/model/TransactionError.ts @@ -0,0 +1,20 @@ +import { ObjectType, Field } from 'type-graphql' +import { TransactionErrorType } from '../enum/TransactionErrorType' + +@ObjectType() +export class TransactionError implements Error { + constructor(type: TransactionErrorType, message: string) { + this.type = type + this.message = message + this.name = type.toString() + } + + @Field(() => TransactionErrorType) + type: TransactionErrorType + + @Field(() => String) + message: string + + @Field(() => String) + name: string +} diff --git a/dlt-connector/src/graphql/model/TransactionResult.ts b/dlt-connector/src/graphql/model/TransactionResult.ts new file mode 100644 index 000000000..1e7f4f054 --- /dev/null +++ b/dlt-connector/src/graphql/model/TransactionResult.ts @@ -0,0 +1,20 @@ +import { ObjectType, Field } from 'type-graphql' +import { TransactionError } from './TransactionError' + +@ObjectType() +export class TransactionResult { + constructor(content?: TransactionError) { + this.succeed = true + if (content instanceof TransactionError) { + this.error = content + this.succeed = false + } + } + + // the error if one happened + @Field(() => TransactionError, { nullable: true }) + error?: TransactionError + + @Field(() => Boolean) + succeed: boolean +} diff --git a/dlt-connector/src/graphql/resolver/CommunityResolver.test.ts b/dlt-connector/src/graphql/resolver/CommunityResolver.test.ts new file mode 100644 index 000000000..f815ca0f5 --- /dev/null +++ b/dlt-connector/src/graphql/resolver/CommunityResolver.test.ts @@ -0,0 +1,93 @@ +import 'reflect-metadata' +import { ApolloServer } from '@apollo/server' +import { createApolloTestServer } from '@test/ApolloServerMock' +import assert from 'assert' +import { TestDB } from '@test/TestDB' +import { TransactionResult } from '../model/TransactionResult' + +let apolloTestServer: ApolloServer + +jest.mock('@typeorm/DataSource', () => ({ + getDataSource: () => TestDB.instance.dbConnect, +})) + +describe('graphql/resolver/CommunityResolver', () => { + beforeAll(async () => { + apolloTestServer = await createApolloTestServer() + }) + + it('test version query', async () => { + const response = await apolloTestServer.executeOperation({ + query: '{ version }', + }) + // Note the use of Node's assert rather than Jest's expect; if using + // TypeScript, `assert`` will appropriately narrow the type of `body` + // and `expect` will not. + // Source: https://www.apollographql.com/docs/apollo-server/testing/testing + assert(response.body.kind === 'single') + expect(response.body.singleResult.errors).toBeUndefined() + expect(response.body.singleResult.data?.version).toBe('0.1') + }) + + describe('tests with db', () => { + beforeAll(async () => { + await TestDB.instance.setupTestDB() + // apolloTestServer = await createApolloTestServer() + }) + + afterAll(async () => { + await TestDB.instance.teardownTestDB() + }) + + it('test add foreign community', async () => { + const response = await apolloTestServer.executeOperation({ + query: 'mutation ($input: CommunityDraft!) { addCommunity(data: $input) {succeed} }', + variables: { + input: { + uuid: '3d813cbb-37fb-42ba-91df-831e1593ac29', + foreign: true, + createdAt: '2012-04-17T17:12:00Z', + }, + }, + }) + assert(response.body.kind === 'single') + expect(response.body.singleResult.errors).toBeUndefined() + const transactionResult = response.body.singleResult.data?.addCommunity as TransactionResult + expect(transactionResult.succeed).toEqual(true) + }) + + it('test add home community', async () => { + const response = await apolloTestServer.executeOperation({ + query: 'mutation ($input: CommunityDraft!) { addCommunity(data: $input) {succeed} }', + variables: { + input: { + uuid: '3d823cad-37fb-41cd-91df-152e1593ac29', + foreign: false, + createdAt: '2012-05-12T13:12:00Z', + }, + }, + }) + assert(response.body.kind === 'single') + expect(response.body.singleResult.errors).toBeUndefined() + const transactionResult = response.body.singleResult.data?.addCommunity as TransactionResult + expect(transactionResult.succeed).toEqual(true) + }) + + it('test add existing community', async () => { + const response = await apolloTestServer.executeOperation({ + query: 'mutation ($input: CommunityDraft!) { addCommunity(data: $input) {succeed} }', + variables: { + input: { + uuid: '3d823cad-37fb-41cd-91df-152e1593ac29', + foreign: false, + createdAt: '2012-05-12T13:12:00Z', + }, + }, + }) + assert(response.body.kind === 'single') + expect(response.body.singleResult.errors).toBeUndefined() + const transactionResult = response.body.singleResult.data?.addCommunity as TransactionResult + expect(transactionResult.succeed).toEqual(false) + }) + }) +}) diff --git a/dlt-connector/src/graphql/resolver/CommunityResolver.ts b/dlt-connector/src/graphql/resolver/CommunityResolver.ts new file mode 100644 index 000000000..ee1ed0ee7 --- /dev/null +++ b/dlt-connector/src/graphql/resolver/CommunityResolver.ts @@ -0,0 +1,78 @@ +import { Resolver, Query, Arg, Mutation } from 'type-graphql' + +import { CommunityDraft } from '@input/CommunityDraft' + +import { getDataSource } from '@typeorm/DataSource' + +import { TransactionResult } from '../model/TransactionResult' +import { TransactionError } from '../model/TransactionError' +import { + create as createCommunity, + iotaTopicFromCommunityUUID, + isExist, +} from '@/controller/Community' +import { TransactionErrorType } from '../enum/TransactionErrorType' +import { logger } from '@test/testSetup' + +@Resolver() +export class CommunityResolver { + // Why a dummy function? + // to prevent this error by start: + // GeneratingSchemaError: Some errors occurred while generating GraphQL schema: + // Type Query must define one or more fields. + // it seems that at least one query must be defined + // https://github.com/ardatan/graphql-tools/issues/764 + @Query(() => String) + version(): string { + return '0.1' + } + + @Mutation(() => TransactionResult) + async addCommunity( + @Arg('data') + communityDraft: CommunityDraft, + ): Promise { + try { + const topic = iotaTopicFromCommunityUUID(communityDraft.uuid) + // check if community was already written to db + if (await isExist(topic)) { + return new TransactionResult( + new TransactionError(TransactionErrorType.ALREADY_EXIST, 'community already exist!'), + ) + } + const community = createCommunity(communityDraft, topic) + + let result: TransactionResult + + if (!communityDraft.foreign) { + // TODO: CommunityRoot Transaction for blockchain + } + + const queryRunner = getDataSource().createQueryRunner() + await queryRunner.connect() + await queryRunner.startTransaction() + + try { + await queryRunner.manager.save(community) + await queryRunner.commitTransaction() + result = new TransactionResult() + } catch (err) { + logger.error('error saving new community into db: %s', err) + result = new TransactionResult( + new TransactionError(TransactionErrorType.DB_ERROR, 'error saving community into db'), + ) + await queryRunner.rollbackTransaction() + } finally { + await queryRunner.release() + } + + return result + } catch (error) { + if (error instanceof TransactionError) { + return new TransactionResult(error) + } else { + throw error + } + } + } +} diff --git a/dlt-connector/src/graphql/schema.ts b/dlt-connector/src/graphql/schema.ts index 84951f360..fc9c26919 100755 --- a/dlt-connector/src/graphql/schema.ts +++ b/dlt-connector/src/graphql/schema.ts @@ -4,10 +4,19 @@ import { buildSchema } from 'type-graphql' import { DecimalScalar } from './scalar/Decimal' import { TransactionResolver } from './resolver/TransactionsResolver' +import { CommunityResolver } from './resolver/CommunityResolver' export const schema = async (): Promise => { return buildSchema({ - resolvers: [TransactionResolver], + resolvers: [TransactionResolver, CommunityResolver], scalarsMap: [{ type: Decimal, scalar: DecimalScalar }], + validate: { + validationError: { target: false }, + skipMissingProperties: true, + skipNullProperties: true, + skipUndefinedProperties: false, + forbidUnknownValues: true, + stopAtFirstError: true, + }, }) } diff --git a/dlt-connector/src/graphql/validator/DateString.ts b/dlt-connector/src/graphql/validator/DateString.ts new file mode 100644 index 000000000..300841b31 --- /dev/null +++ b/dlt-connector/src/graphql/validator/DateString.ts @@ -0,0 +1,21 @@ +import { registerDecorator, ValidationOptions } from 'class-validator' + +export function isValidDateString(validationOptions?: ValidationOptions) { + // eslint-disable-next-line @typescript-eslint/ban-types + return function (object: Object, propertyName: string) { + registerDecorator({ + name: 'isValidDateString', + target: object.constructor, + propertyName, + options: validationOptions, + validator: { + validate(value: string): boolean { + return new Date(value).toString() !== 'Invalid Date' + }, + defaultMessage(): string { + return `${propertyName} must be a valid date string` + }, + }, + }) + } +} diff --git a/dlt-connector/src/graphql/validator/Decimal.ts b/dlt-connector/src/graphql/validator/Decimal.ts new file mode 100644 index 000000000..fd2604514 --- /dev/null +++ b/dlt-connector/src/graphql/validator/Decimal.ts @@ -0,0 +1,22 @@ +import { registerDecorator, ValidationOptions, ValidationArguments } from 'class-validator' +import { Decimal } from 'decimal.js-light' + +export function IsPositiveDecimal(validationOptions?: ValidationOptions) { + // eslint-disable-next-line @typescript-eslint/ban-types + return function (object: Object, propertyName: string) { + registerDecorator({ + name: 'isPositiveDecimal', + target: object.constructor, + propertyName, + options: validationOptions, + validator: { + validate(value: Decimal): boolean { + return value.greaterThan(0) + }, + defaultMessage(args: ValidationArguments): string { + return `The ${propertyName} must be a positive value ${args.property}` + }, + }, + }) + } +} diff --git a/dlt-connector/src/typeorm/DBVersion.ts b/dlt-connector/src/typeorm/DBVersion.ts new file mode 100644 index 000000000..14da39368 --- /dev/null +++ b/dlt-connector/src/typeorm/DBVersion.ts @@ -0,0 +1,28 @@ +import { Migration } from '@entity/Migration' + +import { logger } from '@/server/logger' + +const getDBVersion = async (): Promise => { + try { + const [dbVersion] = await Migration.find({ order: { version: 'DESC' }, take: 1 }) + return dbVersion ? dbVersion.fileName : null + } catch (error) { + logger.error(error) + return null + } +} + +const checkDBVersion = async (DB_VERSION: string): Promise => { + const dbVersion = await getDBVersion() + if (!dbVersion?.includes(DB_VERSION)) { + logger.error( + `Wrong database version detected - the backend requires '${DB_VERSION}' but found '${ + dbVersion ?? 'None' + }`, + ) + return false + } + return true +} + +export { checkDBVersion, getDBVersion } diff --git a/dlt-connector/src/typeorm/DataSource.ts b/dlt-connector/src/typeorm/DataSource.ts new file mode 100644 index 000000000..eafa977aa --- /dev/null +++ b/dlt-connector/src/typeorm/DataSource.ts @@ -0,0 +1,26 @@ +// TODO This is super weird - since the entities are defined in another project they have their own globals. +// We cannot use our connection here, but must use the external typeorm installation +import { DataSource as DBDataSource, FileLogger } from '@dbTools/typeorm' +import { entities } from '@entity/index' + +import { CONFIG } from '@/config' + +const DataSource = new DBDataSource({ + type: 'mysql', + host: CONFIG.DB_HOST, + port: CONFIG.DB_PORT, + username: CONFIG.DB_USER, + password: CONFIG.DB_PASSWORD, + database: CONFIG.DB_DATABASE, + entities, + synchronize: false, + logging: true, + logger: new FileLogger('all', { + logPath: CONFIG.TYPEORM_LOGGING_RELATIVE_PATH, + }), + extra: { + charset: 'utf8mb4_unicode_ci', + }, +}) + +export const getDataSource = () => DataSource diff --git a/dlt-connector/src/utils.test.ts b/dlt-connector/src/utils.test.ts new file mode 100644 index 000000000..74051f343 --- /dev/null +++ b/dlt-connector/src/utils.test.ts @@ -0,0 +1,8 @@ +import { hardenDerivationIndex, HARDENED_KEY_BITMASK } from './utils' + +describe('utils', () => { + it('test bitmask for hardened keys', () => { + const derivationIndex = hardenDerivationIndex(1) + expect(derivationIndex).toBeGreaterThan(HARDENED_KEY_BITMASK) + }) +}) diff --git a/dlt-connector/src/utils.ts b/dlt-connector/src/utils.ts new file mode 100644 index 000000000..22dacaedd --- /dev/null +++ b/dlt-connector/src/utils.ts @@ -0,0 +1,27 @@ +export const uuid4ToBuffer = (uuid: string): Buffer => { + // Remove dashes from the UUIDv4 string + const cleanedUUID = uuid.replace(/-/g, '') + + // Create a Buffer object from the hexadecimal values + const buffer = Buffer.from(cleanedUUID, 'hex') + + return buffer +} + +export const HARDENED_KEY_BITMASK = 0x80000000 + +/* + * change derivation index from x => x' + * for more infos to hardened keys look here: + * https://en.bitcoin.it/wiki/BIP_0032 + */ +export const hardenDerivationIndex = (derivationIndex: number): number => { + /* + TypeScript uses signed integers by default, + but bip32-ed25519 expects an unsigned value for the derivation index. + The >>> shifts the bits 0 places to the right, which effectively makes no change to the value, + but forces TypeScript to treat derivationIndex as an unsigned value. + Source: ChatGPT + */ + return (derivationIndex | HARDENED_KEY_BITMASK) >>> 0 +} diff --git a/dlt-connector/test/TestDB.ts b/dlt-connector/test/TestDB.ts new file mode 100644 index 000000000..49d0a2ccf --- /dev/null +++ b/dlt-connector/test/TestDB.ts @@ -0,0 +1,55 @@ +import { DataSource, FileLogger } from '@dbTools/typeorm' +import { entities } from '@entity/index' + +import { CONFIG } from '@/config' +import { LogError } from '@/server/LogError' + +export class TestDB { + // eslint-disable-next-line no-use-before-define + private static _instance: TestDB + + private constructor() { + if (!CONFIG.DB_DATABASE_TEST) { + throw new LogError('no test db in config') + } + this.dbConnect = new DataSource({ + type: 'mysql', + host: CONFIG.DB_HOST, + port: CONFIG.DB_PORT, + username: CONFIG.DB_USER, + password: CONFIG.DB_PASSWORD, + database: CONFIG.DB_DATABASE_TEST, + entities, + synchronize: true, + dropSchema: true, + logging: true, + logger: new FileLogger('all', { + logPath: CONFIG.TYPEORM_LOGGING_RELATIVE_PATH, + }), + extra: { + charset: 'utf8mb4_unicode_ci', + }, + }) + } + + public static get instance(): TestDB { + if (!this._instance) this._instance = new TestDB() + return this._instance + } + + public dbConnect!: DataSource + + async setupTestDB() { + // eslint-disable-next-line no-console + try { + await this.dbConnect.initialize() + } catch (error) { + // eslint-disable-next-line no-console + console.log(error) + } + } + + async teardownTestDB() { + await this.dbConnect.destroy() + } +} diff --git a/dlt-connector/tsconfig.json b/dlt-connector/tsconfig.json index bdc5e3a9b..48560973b 100644 --- a/dlt-connector/tsconfig.json +++ b/dlt-connector/tsconfig.json @@ -55,7 +55,12 @@ "@scalar/*": ["src/graphql/scalar/*"], "@test/*": ["test/*"], "@proto/*" : ["src/proto/*"], + "@controller/*": ["src/controller/*"], + "@validator/*" : ["src/graphql/validator/*"], + "@typeorm/*" : ["src/typeorm/*"], /* external */ + "@dbTools/*": ["../dlt-database/src/*", "../../dlt-database/build/src/*"], + "@entity/*": ["../dlt-database/entity/*", "../../dlt-database/build/entity/*"] }, // "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */ "typeRoots": ["node_modules/@types"], /* List of folders to include type definitions from. */ @@ -79,4 +84,11 @@ "skipLibCheck": true, /* Skip type checking of declaration files. */ "forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */ }, + "references": [ + { + "path": "../dlt-database/tsconfig.json", + // add 'prepend' if you want to include the referenced project in your output file + // "prepend": true + } + ] } diff --git a/dlt-connector/yarn.lock b/dlt-connector/yarn.lock index 54c58c1e6..7a42a2a1d 100644 --- a/dlt-connector/yarn.lock +++ b/dlt-connector/yarn.lock @@ -410,6 +410,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" +"@babel/runtime@^7.21.0": + version "7.22.15" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.15.tgz#38f46494ccf6cf020bd4eed7124b425e83e523b8" + integrity sha512-T0O+aa+4w0u06iNmapipJXMV4HoUir03hpx3/YqXXhu9xim3w+dVphjFWl1OH8NbZHw5Lbm9k45drDkgq2VNNA== + dependencies: + regenerator-runtime "^0.14.0" + "@babel/template@^7.22.5", "@babel/template@^7.3.3": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.5.tgz#0c8c4d944509875849bd0344ff0050756eefc6ec" @@ -936,6 +943,11 @@ dependencies: "@sinonjs/commons" "^1.7.0" +"@sqltools/formatter@^1.2.5": + version "1.2.5" + resolved "https://registry.yarnpkg.com/@sqltools/formatter/-/formatter-1.2.5.tgz#3abc203c79b8c3e90fd6c156a0c62d5403520e12" + integrity sha512-Uy0+khmZqUrUGm5dmMqVlnvufZRSK0FbYzVgp0UMstm+F5+W2/jnEEQyc9vo1ZR/E5ZI/B1WjjoTqBqwJL6Krw== + "@tootallnate/once@1": version "1.1.2" resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82" @@ -1100,6 +1112,13 @@ resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a" integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw== +"@types/mysql@^2.15.8": + version "2.15.21" + resolved "https://registry.yarnpkg.com/@types/mysql/-/mysql-2.15.21.tgz#7516cba7f9d077f980100c85fd500c8210bd5e45" + integrity sha512-NPotx5CVful7yB+qZbWtXL2fA4e7aEHkihHLjklc6ID8aq7bhguHgeIoC1EmSNTAuCgI6ZXrjt2ZSaXnYX0EUg== + dependencies: + "@types/node" "*" + "@types/node-fetch@^2.6.1": version "2.6.4" resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.4.tgz#1bc3a26de814f6bf466b25aeb1473fa1afe6a660" @@ -1155,6 +1174,13 @@ "@types/mime" "*" "@types/node" "*" +"@types/sodium-native@^2.3.5": + version "2.3.5" + resolved "https://registry.yarnpkg.com/@types/sodium-native/-/sodium-native-2.3.5.tgz#5d2681e7b6b67bcbdc63cfb133e303ec9e942e43" + integrity sha512-a3DAIpW8+36XAY8aIR36JBQQsfOabxHuJwx11DL/PTvnbwEWPAXW66b8QbMi0r2vUnkOfREsketxdvjBmQxqDQ== + dependencies: + "@types/node" "*" + "@types/stack-utils@^2.0.0": version "2.0.1" resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c" @@ -1370,6 +1396,11 @@ ansi-styles@^5.0.0: resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b" integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA== +any-promise@^1.0.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f" + integrity sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A== + anymatch@^3.0.3, anymatch@~3.1.2: version "3.1.3" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e" @@ -1378,6 +1409,11 @@ anymatch@^3.0.3, anymatch@~3.1.2: normalize-path "^3.0.0" picomatch "^2.0.4" +app-root-path@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-3.1.0.tgz#5971a2fc12ba170369a7a1ef018c71e6e47c2e86" + integrity sha512-biN3PwB2gUtjaYy/isrU3aNWI5w+fAfvHkSvCKeQGxhmYpwKFUxudR3Yya+KqVRHBmEDYh+/lTozYCFbmzX4nA== + aproba@^1.0.3: version "1.2.0" resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" @@ -1560,6 +1596,11 @@ big-integer@^1.6.44: resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.51.tgz#0df92a5d9880560d3ff2d5fd20245c889d130686" integrity sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg== +bignumber.js@9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.0.0.tgz#805880f84a329b5eac6e7cb6f8274b6d82bdf075" + integrity sha512-t/OYhhJ2SD+YGBQcjY8GzzDHEk9f3nerxjtfa6tlMXfe7frs/WozhvCNoGvpM0P3bNf3Gq5ZRMlGr5f3r4/N8A== + binary-extensions@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" @@ -1641,6 +1682,13 @@ brace-expansion@^1.1.7: balanced-match "^1.0.0" concat-map "0.0.1" +brace-expansion@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae" + integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA== + dependencies: + balanced-match "^1.0.0" + braces@^3.0.2, braces@~3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" @@ -1690,6 +1738,14 @@ buffer@^5.5.0: base64-js "^1.3.1" ieee754 "^1.1.13" +buffer@^6.0.3: + version "6.0.3" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6" + integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA== + dependencies: + base64-js "^1.3.1" + ieee754 "^1.2.1" + builtins@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88" @@ -1756,7 +1812,7 @@ chalk@^2.0.0, chalk@^2.4.2: escape-string-regexp "^1.0.5" supports-color "^5.3.0" -chalk@^4.0.0, chalk@^4.1.0: +chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== @@ -1820,6 +1876,18 @@ cli-cursor@^3.1.0: dependencies: restore-cursor "^3.1.0" +cli-highlight@^2.1.11: + version "2.1.11" + resolved "https://registry.yarnpkg.com/cli-highlight/-/cli-highlight-2.1.11.tgz#49736fa452f0aaf4fae580e30acb26828d2dc1bf" + integrity sha512-9KDcoEVwyUXrjcJNvHD0NFc/hiwe/WPVYIleQh2O1N2Zro5gWJZ/K+3DGn8w8P/F6FxOgzyC5bxDyHIgCSPhGg== + dependencies: + chalk "^4.0.0" + highlight.js "^10.7.1" + mz "^2.4.0" + parse5 "^5.1.1" + parse5-htmlparser2-tree-adapter "^6.0.0" + yargs "^16.0.0" + cli-width@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6" @@ -1834,6 +1902,15 @@ cliui@^7.0.2: strip-ansi "^6.0.0" wrap-ansi "^7.0.0" +cliui@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa" + integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ== + dependencies: + string-width "^4.2.0" + strip-ansi "^6.0.1" + wrap-ansi "^7.0.0" + co@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" @@ -1990,6 +2067,11 @@ cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3: shebang-command "^2.0.0" which "^2.0.1" +crypto@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/crypto/-/crypto-1.0.1.tgz#2af1b7cad8175d24c8a1b0778255794a21803037" + integrity sha512-VxBKmeNcqQdiUQUW2Tzq0t377b54N2bMtXO/qiLa+6eRRmmC4qT3D4OnTGoT/U6O9aklQ/jTwbOtRMTTY8G0Ig== + cssom@^0.4.4: version "0.4.4" resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10" @@ -2016,6 +2098,13 @@ data-urls@^2.0.0: whatwg-mimetype "^2.3.0" whatwg-url "^8.0.0" +date-fns@^2.29.3: + version "2.30.0" + resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.30.0.tgz#f367e644839ff57894ec6ac480de40cae4b0f4d0" + integrity sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw== + dependencies: + "@babel/runtime" "^7.21.0" + date-format@^4.0.14: version "4.0.14" resolved "https://registry.yarnpkg.com/date-format/-/date-format-4.0.14.tgz#7a8e584434fb169a521c8b7aa481f355810d9400" @@ -2120,6 +2209,11 @@ delegates@^1.0.0: resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ== +denque@^2.0.1: + version "2.1.0" + resolved "https://registry.yarnpkg.com/denque/-/denque-2.1.0.tgz#e93e1a6569fb5e66f16a3c2a2964617d349d6ab1" + integrity sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw== + depd@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df" @@ -2167,6 +2261,20 @@ dir-glob@^3.0.1: dependencies: path-type "^4.0.0" +"dlt-database@file:../dlt-database": + version "1.23.2" + dependencies: + "@types/uuid" "^8.3.4" + cross-env "^7.0.3" + crypto "^1.0.1" + decimal.js-light "^2.5.1" + dotenv "^10.0.0" + mysql2 "^2.3.0" + reflect-metadata "^0.1.13" + ts-mysql-migrate "^1.0.2" + typeorm "^0.3.16" + uuid "^8.3.2" + doctrine@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d" @@ -2188,11 +2296,16 @@ domexception@^2.0.1: dependencies: webidl-conversions "^5.0.0" -dotenv@10.0.0: +dotenv@10.0.0, dotenv@^10.0.0: version "10.0.0" resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-10.0.0.tgz#3d4227b8fb95f81096cdd2b66653fb2c7085ba81" integrity sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q== +dotenv@^16.0.3: + version "16.3.1" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.3.1.tgz#369034de7d7e5b120972693352a3bf112172cc3e" + integrity sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ== + dset@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/dset/-/dset-3.1.2.tgz#89c436ca6450398396dc6538ea00abc0c54cd45a" @@ -2937,6 +3050,13 @@ gauge@~2.7.3: strip-ansi "^3.0.1" wide-align "^1.1.0" +generate-function@^2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.3.1.tgz#f069617690c10c868e73b8465746764f97c3479f" + integrity sha512-eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ== + dependencies: + is-property "^1.0.2" + gensync@^1.0.0-beta.2: version "1.0.0-beta.2" resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" @@ -3020,6 +3140,17 @@ glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4: once "^1.3.0" path-is-absolute "^1.0.0" +glob@^8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e" + integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^5.0.1" + once "^1.3.0" + globals@^11.1.0: version "11.12.0" resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" @@ -3168,6 +3299,11 @@ has@^1.0.3: dependencies: function-bind "^1.1.1" +highlight.js@^10.7.1: + version "10.7.3" + resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.7.3.tgz#697272e3991356e40c3cac566a74eef681756531" + integrity sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A== + html-encoding-sniffer@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz#42a6dc4fd33f00281176e8b23759ca4e4fa185f3" @@ -3247,7 +3383,14 @@ iconv-lite@0.4.24, iconv-lite@^0.4.24: dependencies: safer-buffer ">= 2.1.2 < 3" -ieee754@^1.1.13: +iconv-lite@^0.6.3: + version "0.6.3" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" + integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== + dependencies: + safer-buffer ">= 2.1.2 < 3.0.0" + +ieee754@^1.1.13, ieee754@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== @@ -3472,6 +3615,11 @@ is-potential-custom-element-name@^1.0.1: resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5" integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ== +is-property@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84" + integrity sha512-Ks/IoX00TtClbGQr4TWXemAnktAQvYB7HzcCxDGqEZU6oCmb2INHuOoKxbtR+HFkmYWBKv/dOZtGRiAjDhj92g== + is-regex@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" @@ -4303,6 +4451,13 @@ minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2: dependencies: brace-expansion "^1.1.7" +minimatch@^5.0.1: + version "5.1.6" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96" + integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g== + dependencies: + brace-expansion "^2.0.1" + minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5, minimist@^1.2.6: version "1.2.8" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" @@ -4313,6 +4468,11 @@ mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3: resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113" integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A== +mkdirp@^2.1.3: + version "2.1.6" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-2.1.6.tgz#964fbcb12b2d8c5d6fbc62a963ac95a273e2cc19" + integrity sha512-+hEnITedc8LAtIP9u3HJDFIdcLV2vXP33sqLLIzkv1Db1zO/1OxbvYf0Y1OC/S/Qo5dxHXepofhmxL02PsKe+A== + ms@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" @@ -4338,6 +4498,46 @@ mute-stream@0.0.8: resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== +mysql2@^2.3.0: + version "2.3.3" + resolved "https://registry.yarnpkg.com/mysql2/-/mysql2-2.3.3.tgz#944f3deca4b16629052ff8614fbf89d5552545a0" + integrity sha512-wxJUev6LgMSgACDkb/InIFxDprRa6T95+VEoR+xPvtngtccNH2dGjEB/fVZ8yg1gWv1510c9CvXuJHi5zUm0ZA== + dependencies: + denque "^2.0.1" + generate-function "^2.3.1" + iconv-lite "^0.6.3" + long "^4.0.0" + lru-cache "^6.0.0" + named-placeholders "^1.1.2" + seq-queue "^0.0.5" + sqlstring "^2.3.2" + +mysql@^2.18.1: + version "2.18.1" + resolved "https://registry.yarnpkg.com/mysql/-/mysql-2.18.1.tgz#2254143855c5a8c73825e4522baf2ea021766717" + integrity sha512-Bca+gk2YWmqp2Uf6k5NFEurwY/0td0cpebAucFpY/3jhrwrVGuxU2uQFCHjU19SJfje0yQvi+rVWdq78hR5lig== + dependencies: + bignumber.js "9.0.0" + readable-stream "2.3.7" + safe-buffer "5.1.2" + sqlstring "2.3.1" + +mz@^2.4.0: + version "2.7.0" + resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32" + integrity sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q== + dependencies: + any-promise "^1.0.0" + object-assign "^4.0.1" + thenify-all "^1.0.0" + +named-placeholders@^1.1.2: + version "1.1.3" + resolved "https://registry.yarnpkg.com/named-placeholders/-/named-placeholders-1.1.3.tgz#df595799a36654da55dda6152ba7a137ad1d9351" + integrity sha512-eLoBxg6wE/rZkJPhU/xRX1WTpkFEwDJEN96oxFrTsqBdbT5ec295Q+CoHrL9IT0DipqKhmGcaZmwOt8OON5x1w== + dependencies: + lru-cache "^7.14.1" + napi-build-utils@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806" @@ -4402,6 +4602,11 @@ node-fetch@^2.6.7: dependencies: whatwg-url "^5.0.0" +node-gyp-build@^4.6.0: + version "4.6.1" + resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.6.1.tgz#24b6d075e5e391b8d5539d98c7fc5c210cac8a3e" + integrity sha512-24vnklJmyRS8ViBNI8KbtK/r/DmXQMRiOMXTNz2nrTnAYUwjmEEbnnpB/+kt+yWRv73bPsSPRFddrcIbAxSiMQ== + node-int64@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" @@ -4474,7 +4679,7 @@ nwsapi@^2.2.0: resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.7.tgz#738e0707d3128cb750dddcfe90e4610482df0f30" integrity sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ== -object-assign@^4, object-assign@^4.1.0: +object-assign@^4, object-assign@^4.0.1, object-assign@^4.1.0: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== @@ -4620,11 +4825,23 @@ parse-json@^5.2.0: json-parse-even-better-errors "^2.3.0" lines-and-columns "^1.1.6" -parse5@6.0.1: +parse5-htmlparser2-tree-adapter@^6.0.0: + version "6.0.1" + resolved "https://registry.yarnpkg.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz#2cdf9ad823321140370d4dbf5d3e92c7c8ddc6e6" + integrity sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA== + dependencies: + parse5 "^6.0.1" + +parse5@6.0.1, parse5@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw== +parse5@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178" + integrity sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug== + parseurl@~1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" @@ -4848,6 +5065,19 @@ react-is@^17.0.1: resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== +readable-stream@2.3.7: + version "2.3.7" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" + integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.3" + isarray "~1.0.0" + process-nextick-args "~2.0.0" + safe-buffer "~5.1.1" + string_decoder "~1.1.1" + util-deprecate "~1.0.1" + readable-stream@^2.0.6: version "2.3.8" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b" @@ -4887,6 +5117,11 @@ reflect-metadata@^0.1.13: resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.13.tgz#67ae3ca57c972a2aa1642b10fe363fe32d49dc08" integrity sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg== +regenerator-runtime@^0.14.0: + version "0.14.0" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz#5e19d68eb12d486f797e15a3c6a918f7cec5eb45" + integrity sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA== + regexp-tree@~0.1.1: version "0.1.27" resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.27.tgz#2198f0ef54518ffa743fe74d983b56ffd631b6cd" @@ -5034,7 +5269,7 @@ safe-regex@^2.1.1: dependencies: regexp-tree "~0.1.1" -"safer-buffer@>= 2.1.2 < 3": +"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0": version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== @@ -5106,6 +5341,11 @@ send@0.18.0: range-parser "~1.2.1" statuses "2.0.1" +seq-queue@^0.0.5: + version "0.0.5" + resolved "https://registry.yarnpkg.com/seq-queue/-/seq-queue-0.0.5.tgz#d56812e1c017a6e4e7c3e3a37a1da6d78dd3c93e" + integrity sha512-hr3Wtp/GZIc/6DAGPDcV4/9WoZhjrkXsi5B/07QgX8tsdc6ilr7BFM6PM6rbdAX1kFSDYeZGLipIZZKyQP0O5Q== + serve-static@1.14.1: version "1.14.1" resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9" @@ -5211,6 +5451,13 @@ slash@^4.0.0: resolved "https://registry.yarnpkg.com/slash/-/slash-4.0.0.tgz#2422372176c4c6c5addb5e2ada885af984b396a7" integrity sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew== +sodium-native@^4.0.4: + version "4.0.4" + resolved "https://registry.yarnpkg.com/sodium-native/-/sodium-native-4.0.4.tgz#561b7c39c97789f8202d6fd224845fe2e8cd6879" + integrity sha512-faqOKw4WQKK7r/ybn6Lqo1F9+L5T6NlBJJYvpxbZPetpWylUVqz449mvlwIBKBqxEHbWakWuOlUt8J3Qpc4sWw== + dependencies: + node-gyp-build "^4.6.0" + source-map-support@^0.5.6: version "0.5.21" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" @@ -5260,6 +5507,16 @@ sprintf-js@~1.0.2: resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g== +sqlstring@2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/sqlstring/-/sqlstring-2.3.1.tgz#475393ff9e91479aea62dcaf0ca3d14983a7fb40" + integrity sha512-ooAzh/7dxIG5+uDik1z/Rd1vli0+38izZhGzSa34FwR7IbelPWCCKSNIl8jlL/F7ERvy8CB2jNeM1E9i9mXMAQ== + +sqlstring@^2.3.2: + version "2.3.3" + resolved "https://registry.yarnpkg.com/sqlstring/-/sqlstring-2.3.3.tgz#2ddc21f03bce2c387ed60680e739922c65751d0c" + integrity sha512-qC9iz2FlN7DQl3+wjwn3802RTyjCx7sDvfQEXchwa6CWOx07/WVfh91gBmQ9fahw8snwGEWU3xGzOt4tFyHLxg== + stack-utils@^2.0.3: version "2.0.6" resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.6.tgz#aaf0748169c02fc33c8232abccf933f54a1cc34f" @@ -5303,7 +5560,7 @@ string-width@^1.0.1: is-fullwidth-code-point "^1.0.0" strip-ansi "^3.0.0" -"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0: +"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -5502,6 +5759,20 @@ text-table@^0.2.0: resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw== +thenify-all@^1.0.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726" + integrity sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA== + dependencies: + thenify ">= 3.1.0 < 4" + +"thenify@>= 3.1.0 < 4": + version "3.3.1" + resolved "https://registry.yarnpkg.com/thenify/-/thenify-3.3.1.tgz#8932e686a4066038a016dd9e2ca46add9838a95f" + integrity sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw== + dependencies: + any-promise "^1.0.0" + throat@^6.0.1: version "6.0.2" resolved "https://registry.yarnpkg.com/throat/-/throat-6.0.2.tgz#51a3fbb5e11ae72e2cf74861ed5c8020f89f29fe" @@ -5599,6 +5870,14 @@ ts-jest@^27.0.5: semver "7.x" yargs-parser "20.x" +ts-mysql-migrate@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/ts-mysql-migrate/-/ts-mysql-migrate-1.0.2.tgz#736d37c3aa3fef92f226b869098e939950d0e18c" + integrity sha512-zDW6iQsfPCJfQ3JMhfUGjhy8aK+VNTvPrXmJH66PB2EGEvyn4m7x2nBdhDNhKuwYU9LMxW1p+l39Ei+btXNpxA== + dependencies: + "@types/mysql" "^2.15.8" + mysql "^2.18.1" + ts-node@^10.9.1: version "10.9.1" resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.1.tgz#e73de9102958af9e1f0b168a6ff320e25adcff4b" @@ -5724,6 +6003,27 @@ typedarray-to-buffer@^3.1.5: dependencies: is-typedarray "^1.0.0" +typeorm@^0.3.16, typeorm@^0.3.17: + version "0.3.17" + resolved "https://registry.yarnpkg.com/typeorm/-/typeorm-0.3.17.tgz#a73c121a52e4fbe419b596b244777be4e4b57949" + integrity sha512-UDjUEwIQalO9tWw9O2A4GU+sT3oyoUXheHJy4ft+RFdnRdQctdQ34L9SqE2p7LdwzafHx1maxT+bqXON+Qnmig== + dependencies: + "@sqltools/formatter" "^1.2.5" + app-root-path "^3.1.0" + buffer "^6.0.3" + chalk "^4.1.2" + cli-highlight "^2.1.11" + date-fns "^2.29.3" + debug "^4.3.4" + dotenv "^16.0.3" + glob "^8.1.0" + mkdirp "^2.1.3" + reflect-metadata "^0.1.13" + sha.js "^2.4.11" + tslib "^2.5.0" + uuid "^9.0.0" + yargs "^17.6.2" + typescript@^4.9.4: version "4.9.5" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a" @@ -5812,6 +6112,11 @@ utils-merge@1.0.1: resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA== +uuid@^8.3.2: + version "8.3.2" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" + integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== + uuid@^9.0.0: version "9.0.0" resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.0.tgz#592f550650024a38ceb0c562f2f6aa435761efb5" @@ -6040,7 +6345,12 @@ yargs-parser@20.x, yargs-parser@^20.2.2: resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== -yargs@^16.2.0: +yargs-parser@^21.1.1: + version "21.1.1" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35" + integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== + +yargs@^16.0.0, yargs@^16.2.0: version "16.2.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== @@ -6053,6 +6363,19 @@ yargs@^16.2.0: y18n "^5.0.5" yargs-parser "^20.2.2" +yargs@^17.6.2: + version "17.7.2" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269" + integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w== + dependencies: + cliui "^8.0.1" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.3" + y18n "^5.0.5" + yargs-parser "^21.1.1" + yn@3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" diff --git a/dlt-database/entity/0001-init_db/Account.ts b/dlt-database/entity/0001-init_db/Account.ts index d7a2254df..05bbf3393 100644 --- a/dlt-database/entity/0001-init_db/Account.ts +++ b/dlt-database/entity/0001-init_db/Account.ts @@ -6,15 +6,13 @@ import { ManyToOne, JoinColumn, OneToMany, - ManyToMany, - JoinTable, } from 'typeorm' -import { User } from './User' -import { Community } from './Community' -import { TransactionRecipe } from './TransactionRecipe' -import { ConfirmedTransaction } from './ConfirmedTransaction' +import { User } from '../User' +import { TransactionRecipe } from '../TransactionRecipe' +import { ConfirmedTransaction } from '../ConfirmedTransaction' import { DecimalTransformer } from '../../src/typeorm/DecimalTransformer' import { Decimal } from 'decimal.js-light' +import { AccountCommunity } from '../AccountCommunity' @Entity('accounts') export class Account { @@ -23,7 +21,7 @@ export class Account { @ManyToOne(() => User, (user) => user.accounts) // Assuming you have a User entity with 'accounts' relation @JoinColumn({ name: 'user_id' }) - user: User + user?: User // if user id is null, account belongs to community gmw or auf @Column({ name: 'user_id', type: 'int', unsigned: true, nullable: true }) @@ -60,13 +58,9 @@ export class Account { }) balanceDate: Date - @ManyToMany(() => Community, (community) => community.communityAccounts) - @JoinTable({ - name: 'accounts_communities', - joinColumn: { name: 'account_id', referencedColumnName: 'id' }, - inverseJoinColumn: { name: 'community_id', referencedColumnName: 'id' }, - }) - accountCommunities: Community[] + @OneToMany(() => AccountCommunity, (accountCommunity) => accountCommunity.account) + @JoinColumn({ name: 'account_id' }) + accountCommunities: AccountCommunity[] @OneToMany(() => TransactionRecipe, (recipe) => recipe.signingAccount) transactionRecipesSigning?: TransactionRecipe[] diff --git a/dlt-database/entity/0001-init_db/AccountCommunity.ts b/dlt-database/entity/0001-init_db/AccountCommunity.ts index ad9787ab9..2b9ad38f9 100644 --- a/dlt-database/entity/0001-init_db/AccountCommunity.ts +++ b/dlt-database/entity/0001-init_db/AccountCommunity.ts @@ -1,7 +1,7 @@ import { Entity, PrimaryGeneratedColumn, Column, ManyToOne, JoinColumn } from 'typeorm' -import { Account } from './Account' -import { Community } from './Community' +import { Account } from '../Account' +import { Community } from '../Community' @Entity('accounts_communities') export class AccountCommunity { @@ -15,7 +15,7 @@ export class AccountCommunity { @Column({ name: 'account_id', type: 'int', unsigned: true }) accountId: number - @ManyToOne(() => Community, (community) => community.communityAccounts) + @ManyToOne(() => Community, (community) => community.accountCommunities) @JoinColumn({ name: 'community_id' }) community: Community diff --git a/dlt-database/entity/0001-init_db/Community.ts b/dlt-database/entity/0001-init_db/Community.ts index 4be6a7f40..6c8daa8e9 100644 --- a/dlt-database/entity/0001-init_db/Community.ts +++ b/dlt-database/entity/0001-init_db/Community.ts @@ -6,11 +6,10 @@ import { JoinColumn, OneToOne, OneToMany, - ManyToMany, - JoinTable, } from 'typeorm' -import { Account } from './Account' -import { TransactionRecipe } from './TransactionRecipe' +import { Account } from '../Account' +import { TransactionRecipe } from '../TransactionRecipe' +import { AccountCommunity } from '../AccountCommunity' @Entity('communities') export class Community { @@ -52,13 +51,9 @@ export class Community { @Column({ name: 'confirmed_at', type: 'datetime', nullable: true }) confirmedAt?: Date - @ManyToMany(() => Account, (account) => account.accountCommunities) - @JoinTable({ - name: 'accounts_communities', - joinColumn: { name: 'community_id', referencedColumnName: 'id' }, - inverseJoinColumn: { name: 'account_id', referencedColumnName: 'id' }, - }) - communityAccounts: Account[] + @OneToMany(() => AccountCommunity, (accountCommunity) => accountCommunity.community) + @JoinColumn({ name: 'community_id' }) + accountCommunities: AccountCommunity[] @OneToMany(() => TransactionRecipe, (recipe) => recipe.senderCommunity) transactionRecipesSender?: TransactionRecipe[] diff --git a/dlt-database/entity/0001-init_db/ConfirmedTransaction.ts b/dlt-database/entity/0001-init_db/ConfirmedTransaction.ts index 4cd616464..5b1119229 100644 --- a/dlt-database/entity/0001-init_db/ConfirmedTransaction.ts +++ b/dlt-database/entity/0001-init_db/ConfirmedTransaction.ts @@ -2,8 +2,8 @@ import { Entity, PrimaryGeneratedColumn, Column, ManyToOne, JoinColumn, OneToOne import { Decimal } from 'decimal.js-light' import { DecimalTransformer } from '../../src/typeorm/DecimalTransformer' -import { Account } from './Account' -import { TransactionRecipe } from './TransactionRecipe' +import { Account } from '../Account' +import { TransactionRecipe } from '../TransactionRecipe' @Entity('confirmed_transactions') export class ConfirmedTransaction { diff --git a/dlt-database/entity/0001-init_db/Migration.ts b/dlt-database/entity/0001-init_db/Migration.ts new file mode 100644 index 000000000..f1163cfbc --- /dev/null +++ b/dlt-database/entity/0001-init_db/Migration.ts @@ -0,0 +1,13 @@ +import { BaseEntity, Entity, PrimaryGeneratedColumn, Column } from 'typeorm' + +@Entity('migrations') +export class Migration extends BaseEntity { + @PrimaryGeneratedColumn() // This is actually not a primary column + version: number + + @Column({ length: 256, nullable: true, default: null }) + fileName: string + + @Column({ type: 'datetime', default: () => 'CURRENT_TIMESTAMP' }) + date: Date +} diff --git a/dlt-database/entity/0001-init_db/TransactionRecipe.ts b/dlt-database/entity/0001-init_db/TransactionRecipe.ts index e923c2b00..12d3dbdfe 100644 --- a/dlt-database/entity/0001-init_db/TransactionRecipe.ts +++ b/dlt-database/entity/0001-init_db/TransactionRecipe.ts @@ -10,9 +10,9 @@ import { import { Decimal } from 'decimal.js-light' import { DecimalTransformer } from '../../src/typeorm/DecimalTransformer' -import { Account } from './Account' -import { Community } from './Community' -import { ConfirmedTransaction } from './ConfirmedTransaction' +import { Account } from '../Account' +import { Community } from '../Community' +import { ConfirmedTransaction } from '../ConfirmedTransaction' @Entity('transaction_recipes') export class TransactionRecipe { @@ -48,7 +48,7 @@ export class TransactionRecipe { @JoinColumn({ name: 'recipient_community_id' }) recipientCommunity?: Community - @Column({ name: 'sender_community_id', type: 'int', unsigned: true, nullable: true }) + @Column({ name: 'recipient_community_id', type: 'int', unsigned: true, nullable: true }) recipientCommunityId?: number @Column({ diff --git a/dlt-database/entity/0001-init_db/User.ts b/dlt-database/entity/0001-init_db/User.ts index 8fb7dc3ef..d6868d458 100644 --- a/dlt-database/entity/0001-init_db/User.ts +++ b/dlt-database/entity/0001-init_db/User.ts @@ -8,7 +8,7 @@ import { CreateDateColumn, } from 'typeorm' -import { Account } from './Account' +import { Account } from '../Account' @Entity('users', { engine: 'InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci' }) export class User extends BaseEntity { diff --git a/dlt-database/entity/0002-refactor_add_community/Community.ts b/dlt-database/entity/0002-refactor_add_community/Community.ts new file mode 100644 index 000000000..00f582194 --- /dev/null +++ b/dlt-database/entity/0002-refactor_add_community/Community.ts @@ -0,0 +1,63 @@ +import { + Entity, + PrimaryGeneratedColumn, + Column, + CreateDateColumn, + JoinColumn, + OneToOne, + OneToMany, +} from 'typeorm' +import { Account } from '../Account' +import { TransactionRecipe } from '../TransactionRecipe' +import { AccountCommunity } from '../AccountCommunity' + +@Entity('communities') +export class Community { + @PrimaryGeneratedColumn('increment', { unsigned: true }) + id: number + + @Column({ name: 'iota_topic', collation: 'utf8mb4_unicode_ci' }) + iotaTopic: string + + @Column({ name: 'root_pubkey', type: 'binary', length: 32, unique: true, nullable: true }) + rootPubkey?: Buffer + + @Column({ name: 'root_privkey', type: 'binary', length: 64, nullable: true }) + rootPrivkey?: Buffer + + @Column({ name: 'root_chaincode', type: 'binary', length: 32, nullable: true }) + rootChaincode?: Buffer + + @Column({ type: 'tinyint', default: true }) + foreign: boolean + + @Column({ name: 'gmw_account_id', type: 'int', unsigned: true, nullable: true }) + gmwAccountId?: number + + @OneToOne(() => Account) + @JoinColumn({ name: 'gmw_account_id' }) + gmwAccount?: Account + + @Column({ name: 'auf_account_id', type: 'int', unsigned: true, nullable: true }) + aufAccountId?: number + + @OneToOne(() => Account) + @JoinColumn({ name: 'auf_account_id' }) + aufAccount?: Account + + @CreateDateColumn({ name: 'created_at', type: 'datetime', default: () => 'CURRENT_TIMESTAMP(3)' }) + createdAt: Date + + @Column({ name: 'confirmed_at', type: 'datetime', nullable: true }) + confirmedAt?: Date + + @OneToMany(() => AccountCommunity, (accountCommunity) => accountCommunity.community) + @JoinColumn({ name: 'community_id' }) + accountCommunities: AccountCommunity[] + + @OneToMany(() => TransactionRecipe, (recipe) => recipe.senderCommunity) + transactionRecipesSender?: TransactionRecipe[] + + @OneToMany(() => TransactionRecipe, (recipe) => recipe.recipientCommunity) + transactionRecipesRecipient?: TransactionRecipe[] +} diff --git a/dlt-database/entity/Community.ts b/dlt-database/entity/Community.ts index 377102b71..211837e40 100644 --- a/dlt-database/entity/Community.ts +++ b/dlt-database/entity/Community.ts @@ -1 +1 @@ -export { Community } from './0001-init_db/Community' +export { Community } from './0002-refactor_add_community/Community' diff --git a/dlt-database/entity/Migration.ts b/dlt-database/entity/Migration.ts new file mode 100644 index 000000000..9f1e743d0 --- /dev/null +++ b/dlt-database/entity/Migration.ts @@ -0,0 +1 @@ +export { Migration } from './0001-init_db/Migration' diff --git a/dlt-database/entity/index.ts b/dlt-database/entity/index.ts new file mode 100644 index 000000000..74c2e2258 --- /dev/null +++ b/dlt-database/entity/index.ts @@ -0,0 +1,19 @@ +import { Account } from './Account' +import { AccountCommunity } from './AccountCommunity' +import { Community } from './Community' +import { ConfirmedTransaction } from './ConfirmedTransaction' +import { InvalidTransaction } from './InvalidTransaction' +import { Migration } from './Migration' +import { TransactionRecipe } from './TransactionRecipe' +import { User } from './User' + +export const entities = [ + AccountCommunity, + Account, + Community, + ConfirmedTransaction, + InvalidTransaction, + Migration, + TransactionRecipe, + User, +] diff --git a/dlt-database/migrations/0002-refactor_add_community.ts b/dlt-database/migrations/0002-refactor_add_community.ts new file mode 100644 index 000000000..90e7e179a --- /dev/null +++ b/dlt-database/migrations/0002-refactor_add_community.ts @@ -0,0 +1,25 @@ +/* eslint-disable @typescript-eslint/explicit-module-boundary-types */ +/* eslint-disable @typescript-eslint/no-explicit-any */ + +export async function upgrade(queryFn: (query: string, values?: any[]) => Promise>) { + // write upgrade logic as parameter of queryFn + await queryFn( + `ALTER TABLE \`communities\` MODIFY COLUMN \`root_privkey\` binary(64) NULL DEFAULT NULL;`, + ) + await queryFn( + `ALTER TABLE \`communities\` MODIFY COLUMN \`root_pubkey\` binary(32) NULL DEFAULT NULL;`, + ) + await queryFn( + `ALTER TABLE \`communities\` MODIFY COLUMN \`root_chaincode\` binary(32) NULL DEFAULT NULL;`, + ) +} + +export async function downgrade(queryFn: (query: string, values?: any[]) => Promise>) { + await queryFn( + `ALTER TABLE \`communities\` MODIFY COLUMN \`root_privkey\` binary(32) DEFAULT NULL;`, + ) + await queryFn(`ALTER TABLE \`communities\` MODIFY COLUMN \`root_pubkey\` binary(32) NOT NULL;`) + await queryFn( + `ALTER TABLE \`communities\` MODIFY COLUMN \`root_chaincode\` binary(32) DEFAULT NULL;`, + ) +}