IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2026-02-06 09:56:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3203 from gradido/3201-feature-x-sendcoins-filter-on-authentoicated-communities-for-selection

Browse Source 
feat(backend): x-sendcoins: filter on authenticated communities for selection
This commit is contained in:
clauspeterhuebner 2023-09-05 23:46:53 +02:00 committed by GitHub
commit 9590235202
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
backend/src/graphql/resolver/CommunityResolver.test.ts
View File

@ -294,7 +294,7 @@ describe('CommunityResolver', () => {
})
})
describe('with several community entries', () => {
describe('returns 2 filtered communities even with 3 existing entries', () => {
beforeEach(async () => {
await cleanDB()
jest.clearAllMocks()
@ -316,8 +316,8 @@ describe('CommunityResolver', () => {
foreignCom1.url = 'http://stage-2.gradido.net/api'
foreignCom1.publicKey = Buffer.from('publicKey-stage-2_Community')
foreignCom1.privateKey = Buffer.from('privateKey-stage-2_Community')
foreignCom1.communityUuid = 'Stage2-Com-UUID'
foreignCom1.authenticatedAt = new Date()
// foreignCom1.communityUuid = 'Stage2-Com-UUID'
// foreignCom1.authenticatedAt = new Date()
foreignCom1.name = 'Stage-2_Community-name'
foreignCom1.description = 'Stage-2_Community-description'
foreignCom1.creationDate = new Date()
@ -336,7 +336,7 @@ describe('CommunityResolver', () => {
await DbCommunity.insert(foreignCom2)
})
it('returns 3 community entries', async () => {
it('returns 2 community entries', async () => {
await expect(query({ query: communities })).resolves.toMatchObject({
data: {
communities: [
@ -350,6 +350,7 @@ describe('CommunityResolver', () => {
uuid: homeCom1.communityUuid,
authenticatedAt: homeCom1.authenticatedAt?.toISOString(),
},
/*
{
id: expect.any(Number),
foreign: foreignCom1.foreign,
@ -360,6 +361,7 @@ describe('CommunityResolver', () => {
uuid: foreignCom1.communityUuid,
authenticatedAt: foreignCom1.authenticatedAt?.toISOString(),
},
*/
{
id: expect.any(Number),
foreign: foreignCom2.foreign,

2
backend/src/graphql/resolver/CommunityResolver.ts
View File

@ -1,3 +1,4 @@
import { IsNull, Not } from '@dbTools/typeorm'
import { Community as DbCommunity } from '@entity/Community'
import { FederatedCommunity as DbFederatedCommunity } from '@entity/FederatedCommunity'
import { Resolver, Query, Authorized } from 'type-graphql'
@ -28,6 +29,7 @@ export class CommunityResolver {
@Query(() => [Community])
async communities(): Promise<Community[]> {
const dbCommunities: DbCommunity[] = await DbCommunity.find({
where: { communityUuid: Not(IsNull()) }, //, authenticatedAt: Not(IsNull()) },
order: {
name: 'ASC',
},