again revert

This commit is contained in:
einhornimmond 2025-10-22 11:36:30 +02:00
parent c2ca16bebc
commit 2ac59f99cf
9 changed files with 28 additions and 24 deletions

View File

@ -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

2
.gitignore vendored
View File

@ -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

View File

@ -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'

View File

@ -1,4 +1,5 @@
import util from 'util'
import { Decimal } from 'decimal.js-light'
export abstract class AbstractLoggingView {

View File

@ -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])

View File

@ -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', () => {
})
})

View File

@ -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.

View File

@ -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()
}

View File

@ -10,7 +10,7 @@ export const userFactory = async (user: UserInterface): Promise<User> => {
dbUserContact.email = user.email ?? ''
dbUserContact.type = UserContactType.USER_CONTACT_EMAIL
let dbUser = new User()
dbUser.firstName = user.firstName ?? ''
dbUser.lastName = user.lastName ?? ''