IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/2882-feature-distingue-communities-and-communities_federation-in-database' into 2946-feature-x-com-3-introduce-business-communities

Browse Source
This commit is contained in:
Claus-Peter Hübner 2023-04-27 22:14:03 +02:00
commit 315df80142
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
backend/src/federation/validateCommunities.test.ts
View File

@ -5,7 +5,7 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
import { Community as DbCommunity } from '@entity/Community'
import { FederatedCommunity as DbFederatedCommunity } from '@entity/FederatedCommunity'
import { testEnvironment, cleanDB } from '@test/helpers'
import { logger } from '@test/testSetup'
@ -59,9 +59,9 @@ describe('validate Communities', () => {
endPoint: 'http//localhost:5001/api/',
lastAnnouncedAt: new Date(),
}
await DbCommunity.createQueryBuilder()
await DbFederatedCommunity.createQueryBuilder()
.insert()
.into(DbCommunity)
.into(DbFederatedCommunity)
.values(variables1)
.orUpdate({
conflict_target: ['id', 'publicKey', 'apiVersion'],
@ -90,9 +90,9 @@ describe('validate Communities', () => {
endPoint: 'http//localhost:5001/api/',
lastAnnouncedAt: new Date(),
}
await DbCommunity.createQueryBuilder()
await DbFederatedCommunity.createQueryBuilder()
.insert()
.into(DbCommunity)
.into(DbFederatedCommunity)
.values(variables2)
.orUpdate({
conflict_target: ['id', 'publicKey', 'apiVersion'],
@ -118,7 +118,7 @@ describe('validate Communities', () => {
})
})
describe('with three Communities of api 1_0, 1_1 and 2_0', () => {
let dbCom: DbCommunity
let dbCom: DbFederatedCommunity
beforeEach(async () => {
const variables3 = {
publicKey: Buffer.from('11111111111111111111111111111111'),
@ -126,16 +126,16 @@ describe('validate Communities', () => {
endPoint: 'http//localhost:5001/api/',
lastAnnouncedAt: new Date(),
}
await DbCommunity.createQueryBuilder()
await DbFederatedCommunity.createQueryBuilder()
.insert()
.into(DbCommunity)
.into(DbFederatedCommunity)
.values(variables3)
.orUpdate({
conflict_target: ['id', 'publicKey', 'apiVersion'],
overwrite: ['end_point', 'last_announced_at'],
})
.execute()
dbCom = await DbCommunity.findOneOrFail({
dbCom = await DbFederatedCommunity.findOneOrFail({
where: { publicKey: variables3.publicKey, apiVersion: variables3.apiVersion },
})
jest.clearAllMocks()

1
database/migrations/0065-refactor_communities_table.ts
View File

@ -33,5 +33,4 @@ export async function downgrade(queryFn: (query: string, values?: any[]) => Prom
// write downgrade logic as parameter of queryFn
await queryFn(`DROP TABLE communities;`)
await queryFn(`RENAME TABLE federated_communities TO communities;`)
}