From 2ac59f99cf15b97a626b44fae61fc7caa66a1726 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Wed, 22 Oct 2025 11:36:30 +0200 Subject: [PATCH] again revert --- .github/workflows/lint.yml | 1 + .gitignore | 2 +- database/src/AppDatabase.ts | 1 + database/src/logging/AbstractLogging.view.ts | 1 + .../src/queries/pendingTransactions.test.ts | 16 ++++++++-------- database/src/queries/user.test.ts | 17 +++++++++-------- database/src/seeds/community.ts | 2 +- .../src/seeds/factory/pendingTransaction.ts | 10 +++++----- database/src/seeds/factory/user.ts | 2 +- 9 files changed, 28 insertions(+), 24 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index df24c2b9f..341053694 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -26,6 +26,7 @@ jobs: run: | cd ./config-schema biome ci . + echo $? echo "success=$([ $? -eq 0 ] && echo true || echo false)" >> $GITHUB_OUTPUT - name: Lint - Shared id: shared diff --git a/.gitignore b/.gitignore index d98f0c163..d82288fbd 100644 --- a/.gitignore +++ b/.gitignore @@ -12,7 +12,7 @@ messages.pot nbproject .metadata /out/* -.env +/.env package-lock.json /deployment/bare_metal/.env /deployment/bare_metal/nginx/sites-available/gradido.conf diff --git a/database/src/AppDatabase.ts b/database/src/AppDatabase.ts index c5275cb18..3096aaecd 100644 --- a/database/src/AppDatabase.ts +++ b/database/src/AppDatabase.ts @@ -1,5 +1,6 @@ import { DataSource as DBDataSource, FileLogger } from 'typeorm' import { Migration, entities } from './entity' + import { getLogger } from 'log4js' import { latestDbVersion } from '.' import { CONFIG } from './config' diff --git a/database/src/logging/AbstractLogging.view.ts b/database/src/logging/AbstractLogging.view.ts index f9a96ad5a..00fdd4703 100644 --- a/database/src/logging/AbstractLogging.view.ts +++ b/database/src/logging/AbstractLogging.view.ts @@ -1,4 +1,5 @@ import util from 'util' + import { Decimal } from 'decimal.js-light' export abstract class AbstractLoggingView { diff --git a/database/src/queries/pendingTransactions.test.ts b/database/src/queries/pendingTransactions.test.ts index 5eab17136..c59c312e4 100644 --- a/database/src/queries/pendingTransactions.test.ts +++ b/database/src/queries/pendingTransactions.test.ts @@ -1,8 +1,8 @@ -import { - PendingTransaction as DbPendingTransaction, - User as DbUser, - UserContact as DbUserContact, - Community as DbCommunity, +import { + PendingTransaction as DbPendingTransaction, + User as DbUser, + UserContact as DbUserContact, + Community as DbCommunity } from '..' import { countOpenPendingTransactions } from './pendingTransactions' import { PendingTransactionState } from 'shared' @@ -79,7 +79,7 @@ describe('countOpenPendingTransactions', () => { 'Bob -> Peter new', PendingTransactionState.NEW ) - + }) it('should return 0 if called with empty array', async () => { const count = await countOpenPendingTransactions([]) @@ -109,13 +109,13 @@ describe('countOpenPendingTransactions', () => { it('peter has three transactions, should return 3', async () => { const count = await countOpenPendingTransactions([peter.gradidoID]) expect(count).toBe(3) - }) + }) it('bibi has two transactions, should return 2', async () => { const count = await countOpenPendingTransactions([bibi.gradidoID]) expect(count).toBe(2) - }) + }) it('bob has one transaction, should return 1', async () => { const count = await countOpenPendingTransactions([bob.gradidoID]) diff --git a/database/src/queries/user.test.ts b/database/src/queries/user.test.ts index 23279770d..b653a5349 100644 --- a/database/src/queries/user.test.ts +++ b/database/src/queries/user.test.ts @@ -1,4 +1,4 @@ -import { User as DbUser, UserContact as DbUserContact, Community as DbCommunity } from '../entity' +import { User as DbUser, UserContact as DbUserContact, Community as DbCommunity } from '..' import { AppDatabase } from '../AppDatabase' import { aliasExists, findUserByIdentifier } from './user' import { userFactory } from '../seeds/factory/user' @@ -70,12 +70,12 @@ describe('user.queries', () => { const user = await findUserByIdentifier(userBibi.gradidoID, communityUuid) expect(user).toMatchObject(userBibi) }) - + it('userIdentifier is alias', async () => { const user = await findUserByIdentifier(userBibi.alias, communityUuid) expect(user).toMatchObject(userBibi) }) - + it('userIdentifier is email', async () => { const user = await findUserByIdentifier(userBibi.emailContact.email, communityUuid) expect(user).toMatchObject(userBibi) @@ -85,18 +85,18 @@ describe('user.queries', () => { expect(user).toBeNull() }) }) - + describe('communityIdentifier is community name', () => { it('userIdentifier is gradido id', async () => { const user = await findUserByIdentifier(userBibi.gradidoID, communityName) expect(user).toMatchObject(userBibi) }) - + it('userIdentifier is alias', async () => { const user = await findUserByIdentifier(userBibi.alias, communityName) expect(user).toMatchObject(userBibi) }) - + it('userIdentifier is email', async () => { const user = await findUserByIdentifier(userBibi.emailContact.email, communityName) expect(user).toMatchObject(userBibi) @@ -117,12 +117,12 @@ describe('user.queries', () => { const user = await findUserByIdentifier(userBibi.gradidoID) expect(user).toMatchObject(userBibi) }) - + it('userIdentifier is alias', async () => { const user = await findUserByIdentifier(userBibi.alias) expect(user).toMatchObject(userBibi) }) - + it('userIdentifier is email', async () => { const user = await findUserByIdentifier(userBibi.emailContact.email) expect(user).toMatchObject(userBibi) @@ -137,3 +137,4 @@ describe('user.queries', () => { }) }) + diff --git a/database/src/seeds/community.ts b/database/src/seeds/community.ts index 000eea9ef..12a5bd67f 100644 --- a/database/src/seeds/community.ts +++ b/database/src/seeds/community.ts @@ -1,6 +1,6 @@ +import { Community, FederatedCommunity } from '../entity' import { randomBytes } from 'node:crypto' import { v4 as uuidv4 } from 'uuid' -import { Community, FederatedCommunity } from '../entity' /** * Creates a community. diff --git a/database/src/seeds/factory/pendingTransaction.ts b/database/src/seeds/factory/pendingTransaction.ts index 64f10cee7..2e8c7d256 100644 --- a/database/src/seeds/factory/pendingTransaction.ts +++ b/database/src/seeds/factory/pendingTransaction.ts @@ -1,4 +1,4 @@ -import { PendingTransaction as DbPendingTransaction, User as DbUser } from '../..' +import { User as DbUser, PendingTransaction as DbPendingTransaction } from '../..' import { PendingTransactionState } from 'shared' import { Decimal } from 'decimal.js-light' @@ -14,10 +14,10 @@ export async function pendingTransactionFactory( pendingTransaction.memo = memo pendingTransaction.amount = amount pendingTransaction.userId = sender.id - pendingTransaction.userGradidoID = sender.gradidoID - pendingTransaction.userCommunityUuid = sender.communityUuid! + pendingTransaction.userGradidoID = sender.gradidoID + pendingTransaction.userCommunityUuid = sender.communityUuid! pendingTransaction.linkedUserId = receiver.id - pendingTransaction.linkedUserGradidoID = receiver.gradidoID - pendingTransaction.linkedUserCommunityUuid = receiver.communityUuid! + pendingTransaction.linkedUserGradidoID = receiver.gradidoID + pendingTransaction.linkedUserCommunityUuid = receiver.communityUuid! await pendingTransaction.save() } diff --git a/database/src/seeds/factory/user.ts b/database/src/seeds/factory/user.ts index 369aa51a4..3772fe66d 100644 --- a/database/src/seeds/factory/user.ts +++ b/database/src/seeds/factory/user.ts @@ -10,7 +10,7 @@ export const userFactory = async (user: UserInterface): Promise => { dbUserContact.email = user.email ?? '' dbUserContact.type = UserContactType.USER_CONTACT_EMAIL - + let dbUser = new User() dbUser.firstName = user.firstName ?? '' dbUser.lastName = user.lastName ?? ''