diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3d046fcda..999863dd9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -528,7 +528,7 @@ jobs: report_name: Coverage Backend type: lcov result_path: ./backend/coverage/lcov.info - min_coverage: 58 + min_coverage: 65 token: ${{ github.token }} ########################################################################## diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d8b71dac..7e8e748af 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,22 @@ All notable changes to this project will be documented in this file. Dates are d Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). +#### [1.8.1](https://github.com/gradido/gradido/compare/1.8.0...1.8.1) + +- 1851 integrate and test the behaviour of clipboard polyfill [`#1853`](https://github.com/gradido/gradido/pull/1853) +- fix: Deprecated Warning from Faker on Seeding [`#1854`](https://github.com/gradido/gradido/pull/1854) +- feat: Test Admin Resolver [`#1848`](https://github.com/gradido/gradido/pull/1848) +- devops: Disable DB Reset on Stage 1 [`#1852`](https://github.com/gradido/gradido/pull/1852) +- 🍰 Refactor notActivated and isDeleted [`#1791`](https://github.com/gradido/gradido/pull/1791) +- devops: Disable Send Email on Seeding [`#1849`](https://github.com/gradido/gradido/pull/1849) +- fix: Confirm Creation with Decimal [`#1838`](https://github.com/gradido/gradido/pull/1838) +- error message by no navigator.clipbord function [`#1841`](https://github.com/gradido/gradido/pull/1841) + #### [1.8.0](https://github.com/gradido/gradido/compare/1.7.1...1.8.0) +> 25 April 2022 + +- v1.8.0 [`#1836`](https://github.com/gradido/gradido/pull/1836) - Fix: database version requirement for backend corrected [`#1835`](https://github.com/gradido/gradido/pull/1835) - feat: More User Resolver Tests [`#1827`](https://github.com/gradido/gradido/pull/1827) - fix: Round Decay with Tranasction Links [`#1834`](https://github.com/gradido/gradido/pull/1834) diff --git a/admin/package.json b/admin/package.json index c5b2e60f5..1ff6de770 100644 --- a/admin/package.json +++ b/admin/package.json @@ -3,7 +3,7 @@ "description": "Administraion Interface for Gradido", "main": "index.js", "author": "Moriz Wahl", - "version": "1.8.0", + "version": "1.8.1", "license": "MIT", "private": false, "scripts": { diff --git a/admin/src/components/CreationFormular.spec.js b/admin/src/components/CreationFormular.spec.js index 083b7ca67..08ec71bdc 100644 --- a/admin/src/components/CreationFormular.spec.js +++ b/admin/src/components/CreationFormular.spec.js @@ -24,12 +24,6 @@ const mocks = { }, $store: { commit: stateCommitMock, - state: { - moderator: { - id: 0, - name: 'test moderator', - }, - }, }, } @@ -122,7 +116,6 @@ describe('CreationFormular', () => { creationDate: getCreationDate(2), amount: 90, memo: 'Test create coins', - moderator: 0, }, }), ) @@ -370,14 +363,12 @@ describe('CreationFormular', () => { creationDate: getCreationDate(1), amount: 200, memo: 'Test mass create coins', - moderator: 0, }, { email: 'bibi@bloxberg.de', creationDate: getCreationDate(1), amount: 200, memo: 'Test mass create coins', - moderator: 0, }, ], }, diff --git a/admin/src/components/CreationFormular.vue b/admin/src/components/CreationFormular.vue index cd4de5fd6..cdcd6ef1d 100644 --- a/admin/src/components/CreationFormular.vue +++ b/admin/src/components/CreationFormular.vue @@ -154,7 +154,6 @@ export default { creationDate: this.selected.date, amount: Number(this.value), memo: this.text, - moderator: Number(this.$store.state.moderator.id), }) }) this.$apollo @@ -188,7 +187,6 @@ export default { creationDate: this.selected.date, amount: Number(this.value), memo: this.text, - moderator: Number(this.$store.state.moderator.id), } this.$apollo .mutate({ diff --git a/admin/src/components/EditCreationFormular.spec.js b/admin/src/components/EditCreationFormular.spec.js index f5c7fb0fe..f39edad52 100644 --- a/admin/src/components/EditCreationFormular.spec.js +++ b/admin/src/components/EditCreationFormular.spec.js @@ -11,7 +11,6 @@ const apolloMutateMock = jest.fn().mockResolvedValue({ amount: 500, date: new Date(), memo: 'Test Schöpfung 2', - moderator: 0, }, }, }) @@ -28,12 +27,6 @@ const mocks = { mutate: apolloMutateMock, }, $store: { - state: { - moderator: { - id: 0, - name: 'test moderator', - }, - }, commit: stateCommitMock, }, } @@ -104,7 +97,6 @@ describe('EditCreationFormular', () => { creationDate: getCreationDate(0), amount: 500, memo: 'Test Schöpfung 2', - moderator: 0, }, }), ) @@ -129,7 +121,6 @@ describe('EditCreationFormular', () => { amount: 500, date: expect.any(Date), memo: 'Test Schöpfung 2', - moderator: 0, row: expect.any(Object), }, ], diff --git a/admin/src/components/EditCreationFormular.vue b/admin/src/components/EditCreationFormular.vue index 82b444154..fb30f2b77 100644 --- a/admin/src/components/EditCreationFormular.vue +++ b/admin/src/components/EditCreationFormular.vue @@ -120,7 +120,6 @@ export default { creationDate: this.selected.date, amount: Number(this.value), memo: this.text, - moderator: Number(this.$store.state.moderator.id), }, }) .then((result) => { @@ -129,7 +128,6 @@ export default { amount: Number(result.data.updatePendingCreation.amount), date: result.data.updatePendingCreation.date, memo: result.data.updatePendingCreation.memo, - moderator: Number(result.data.updatePendingCreation.moderator), row: this.row, }) this.toastSuccess( diff --git a/admin/src/graphql/createPendingCreation.js b/admin/src/graphql/createPendingCreation.js index 05402ed9f..9301ea489 100644 --- a/admin/src/graphql/createPendingCreation.js +++ b/admin/src/graphql/createPendingCreation.js @@ -1,19 +1,7 @@ import gql from 'graphql-tag' export const createPendingCreation = gql` - mutation ( - $email: String! - $amount: Decimal! - $memo: String! - $creationDate: String! - $moderator: Int! - ) { - createPendingCreation( - email: $email - amount: $amount - memo: $memo - creationDate: $creationDate - moderator: $moderator - ) + mutation ($email: String!, $amount: Decimal!, $memo: String!, $creationDate: String!) { + createPendingCreation(email: $email, amount: $amount, memo: $memo, creationDate: $creationDate) } ` diff --git a/admin/src/graphql/searchUsers.js b/admin/src/graphql/searchUsers.js index e28508d1b..ddf759031 100644 --- a/admin/src/graphql/searchUsers.js +++ b/admin/src/graphql/searchUsers.js @@ -5,15 +5,15 @@ export const searchUsers = gql` $searchText: String! $currentPage: Int $pageSize: Int - $notActivated: Boolean - $isDeleted: Boolean + $filterByActivated: Boolean + $filterByDeleted: Boolean ) { searchUsers( searchText: $searchText currentPage: $currentPage pageSize: $pageSize - notActivated: $notActivated - isDeleted: $isDeleted + filterByActivated: $filterByActivated + filterByDeleted: $filterByDeleted ) { userCount userList { diff --git a/admin/src/graphql/updatePendingCreation.js b/admin/src/graphql/updatePendingCreation.js index cd0ae6c8e..f0775e68b 100644 --- a/admin/src/graphql/updatePendingCreation.js +++ b/admin/src/graphql/updatePendingCreation.js @@ -1,27 +1,18 @@ import gql from 'graphql-tag' export const updatePendingCreation = gql` - mutation ( - $id: Int! - $email: String! - $amount: Decimal! - $memo: String! - $creationDate: String! - $moderator: Int! - ) { + mutation ($id: Int!, $email: String!, $amount: Decimal!, $memo: String!, $creationDate: String!) { updatePendingCreation( id: $id email: $email amount: $amount memo: $memo creationDate: $creationDate - moderator: $moderator ) { amount date memo creation - moderator } } ` diff --git a/admin/src/pages/Creation.spec.js b/admin/src/pages/Creation.spec.js index 204c35817..98c03d277 100644 --- a/admin/src/pages/Creation.spec.js +++ b/admin/src/pages/Creation.spec.js @@ -71,8 +71,8 @@ describe('Creation', () => { searchText: '', currentPage: 1, pageSize: 25, - isDeleted: false, - notActivated: false, + filterByActivated: true, + filterByDeleted: false, }, }), ) @@ -271,8 +271,8 @@ describe('Creation', () => { searchText: 'XX', currentPage: 1, pageSize: 25, - isDeleted: false, - notActivated: false, + filterByActivated: true, + filterByDeleted: false, }, }), ) @@ -288,8 +288,8 @@ describe('Creation', () => { searchText: '', currentPage: 1, pageSize: 25, - isDeleted: false, - notActivated: false, + filterByActivated: true, + filterByDeleted: false, }, }), ) @@ -305,8 +305,8 @@ describe('Creation', () => { searchText: '', currentPage: 2, pageSize: 25, - isDeleted: false, - notActivated: false, + filterByActivated: true, + filterByDeleted: false, }, }), ) diff --git a/admin/src/pages/Creation.vue b/admin/src/pages/Creation.vue index e5b93350f..54bc0d735 100644 --- a/admin/src/pages/Creation.vue +++ b/admin/src/pages/Creation.vue @@ -102,8 +102,8 @@ export default { searchText: this.criteria, currentPage: this.currentPage, pageSize: this.perPage, - notActivated: false, - isDeleted: false, + filterByActivated: true, + filterByDeleted: false, }, fetchPolicy: 'network-only', }) diff --git a/admin/src/pages/UserSearch.spec.js b/admin/src/pages/UserSearch.spec.js index 0b98d4d11..2eb24f84b 100644 --- a/admin/src/pages/UserSearch.spec.js +++ b/admin/src/pages/UserSearch.spec.js @@ -82,8 +82,8 @@ describe('UserSearch', () => { searchText: '', currentPage: 1, pageSize: 25, - notActivated: null, - isDeleted: null, + filterByActivated: null, + filterByDeleted: null, }, }), ) @@ -101,8 +101,8 @@ describe('UserSearch', () => { searchText: '', currentPage: 1, pageSize: 25, - notActivated: true, - isDeleted: null, + filterByActivated: false, + filterByDeleted: null, }, }), ) @@ -121,8 +121,8 @@ describe('UserSearch', () => { searchText: '', currentPage: 1, pageSize: 25, - notActivated: null, - isDeleted: true, + filterByActivated: null, + filterByDeleted: true, }, }), ) @@ -141,8 +141,8 @@ describe('UserSearch', () => { searchText: '', currentPage: 2, pageSize: 25, - notActivated: null, - isDeleted: null, + filterByActivated: null, + filterByDeleted: null, }, }), ) @@ -161,8 +161,8 @@ describe('UserSearch', () => { searchText: 'search string', currentPage: 1, pageSize: 25, - notActivated: null, - isDeleted: null, + filterByActivated: null, + filterByDeleted: null, }, }), ) @@ -178,8 +178,8 @@ describe('UserSearch', () => { searchText: '', currentPage: 1, pageSize: 25, - notActivated: null, - isDeleted: null, + filterByActivated: null, + filterByDeleted: null, }, }), ) diff --git a/admin/src/pages/UserSearch.vue b/admin/src/pages/UserSearch.vue index b2737bae6..f8ceac36c 100644 --- a/admin/src/pages/UserSearch.vue +++ b/admin/src/pages/UserSearch.vue @@ -3,11 +3,23 @@
- {{ filterCheckedEmails ? $t('unregistered_emails') : $t('all_emails') }} + {{ + filterByActivated === null + ? $t('all_emails') + : filterByActivated === false + ? $t('unregistered_emails') + : '' + }} - {{ filterDeletedUser ? $t('deleted_user') : $t('all_emails') }} + {{ + filterByDeleted === null + ? $t('all_emails') + : filterByDeleted === true + ? $t('deleted_user') + : '' + }}
@@ -60,8 +72,8 @@ export default { searchResult: [], massCreation: [], criteria: '', - filterCheckedEmails: null, - filterDeletedUser: null, + filterByActivated: null, + filterByDeleted: null, rows: 0, currentPage: 1, perPage: 25, @@ -70,11 +82,11 @@ export default { }, methods: { unconfirmedRegisterMails() { - this.filterCheckedEmails = this.filterCheckedEmails ? null : true + this.filterByActivated = this.filterByActivated === null ? false : null this.getUsers() }, deletedUserSearch() { - this.filterDeletedUser = this.filterDeletedUser ? null : true + this.filterByDeleted = this.filterByDeleted === null ? true : null this.getUsers() }, getUsers() { @@ -85,8 +97,8 @@ export default { searchText: this.criteria, currentPage: this.currentPage, pageSize: this.perPage, - notActivated: this.filterCheckedEmails, - isDeleted: this.filterDeletedUser, + filterByActivated: this.filterByActivated, + filterByDeleted: this.filterByDeleted, }, fetchPolicy: 'no-cache', }) diff --git a/backend/package.json b/backend/package.json index 641a24601..f195ab44f 100644 --- a/backend/package.json +++ b/backend/package.json @@ -1,6 +1,6 @@ { "name": "gradido-backend", - "version": "1.8.0", + "version": "1.8.1", "description": "Gradido unified backend providing an API-Service for Gradido Transactions", "main": "src/index.ts", "repository": "https://github.com/gradido/gradido/backend", diff --git a/backend/src/graphql/arg/CreatePendingCreationArgs.ts b/backend/src/graphql/arg/CreatePendingCreationArgs.ts index 0cadf5e62..11c345465 100644 --- a/backend/src/graphql/arg/CreatePendingCreationArgs.ts +++ b/backend/src/graphql/arg/CreatePendingCreationArgs.ts @@ -1,4 +1,4 @@ -import { ArgsType, Field, InputType, Int } from 'type-graphql' +import { ArgsType, Field, InputType } from 'type-graphql' import Decimal from 'decimal.js-light' @InputType() @@ -15,7 +15,4 @@ export default class CreatePendingCreationArgs { @Field(() => String) creationDate: string - - @Field(() => Int) - moderator: number } diff --git a/backend/src/graphql/arg/SearchUsersArgs.ts b/backend/src/graphql/arg/SearchUsersArgs.ts index 2a94d8998..b47f39d56 100644 --- a/backend/src/graphql/arg/SearchUsersArgs.ts +++ b/backend/src/graphql/arg/SearchUsersArgs.ts @@ -12,8 +12,8 @@ export default class SearchUsersArgs { pageSize?: number @Field(() => Boolean, { nullable: true }) - notActivated?: boolean | null + filterByActivated?: boolean | null @Field(() => Boolean, { nullable: true }) - isDeleted?: boolean | null + filterByDeleted?: boolean | null } diff --git a/backend/src/graphql/arg/UpdatePendingCreationArgs.ts b/backend/src/graphql/arg/UpdatePendingCreationArgs.ts index 3cd85e84b..691d73154 100644 --- a/backend/src/graphql/arg/UpdatePendingCreationArgs.ts +++ b/backend/src/graphql/arg/UpdatePendingCreationArgs.ts @@ -17,7 +17,4 @@ export default class UpdatePendingCreationArgs { @Field(() => String) creationDate: string - - @Field(() => Int) - moderator: number } diff --git a/backend/src/graphql/model/UpdatePendingCreation.ts b/backend/src/graphql/model/UpdatePendingCreation.ts index 85d3af2cc..e19e1e064 100644 --- a/backend/src/graphql/model/UpdatePendingCreation.ts +++ b/backend/src/graphql/model/UpdatePendingCreation.ts @@ -12,9 +12,6 @@ export class UpdatePendingCreation { @Field(() => Decimal) amount: Decimal - @Field(() => Number) - moderator: number - @Field(() => [Decimal]) creation: Decimal[] } diff --git a/backend/src/graphql/resolver/AdminResolver.test.ts b/backend/src/graphql/resolver/AdminResolver.test.ts new file mode 100644 index 000000000..6842f09ca --- /dev/null +++ b/backend/src/graphql/resolver/AdminResolver.test.ts @@ -0,0 +1,1060 @@ +/* eslint-disable @typescript-eslint/no-explicit-any */ +/* eslint-disable @typescript-eslint/explicit-module-boundary-types */ + +import { testEnvironment, resetToken, cleanDB } from '@test/helpers' +import { userFactory } from '@/seeds/factory/user' +import { creationFactory } from '@/seeds/factory/creation' +import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg' +import { peterLustig } from '@/seeds/users/peter-lustig' +import { stephenHawking } from '@/seeds/users/stephen-hawking' +import { garrickOllivander } from '@/seeds/users/garrick-ollivander' +import { + deleteUser, + unDeleteUser, + createPendingCreation, + createPendingCreations, + updatePendingCreation, + deletePendingCreation, + confirmPendingCreation, +} from '@/seeds/graphql/mutations' +import { getPendingCreations, login } from '@/seeds/graphql/queries' +import { GraphQLError } from 'graphql' +import { User } from '@entity/User' +/* eslint-disable-next-line @typescript-eslint/no-unused-vars */ +import { sendAccountActivationEmail } from '@/mailer/sendAccountActivationEmail' +import Decimal from 'decimal.js-light' +import { AdminPendingCreation } from '@entity/AdminPendingCreation' +import { Transaction as DbTransaction } from '@entity/Transaction' + +// mock account activation email to avoid console spam +jest.mock('@/mailer/sendAccountActivationEmail', () => { + return { + __esModule: true, + sendAccountActivationEmail: jest.fn(), + } +}) + +let mutate: any, query: any, con: any +let testEnv: any + +beforeAll(async () => { + testEnv = await testEnvironment() + mutate = testEnv.mutate + query = testEnv.query + con = testEnv.con + await cleanDB() +}) + +afterAll(async () => { + await cleanDB() + await con.close() +}) + +let admin: User +let user: User +let creation: AdminPendingCreation | void + +describe('AdminResolver', () => { + describe('delete user', () => { + describe('unauthenticated', () => { + it('returns an error', async () => { + await expect(mutate({ mutation: deleteUser, variables: { userId: 1 } })).resolves.toEqual( + expect.objectContaining({ + errors: [new GraphQLError('401 Unauthorized')], + }), + ) + }) + }) + + describe('authenticated', () => { + describe('without admin rights', () => { + beforeAll(async () => { + user = await userFactory(testEnv, bibiBloxberg) + await query({ + query: login, + variables: { email: 'bibi@bloxberg.de', password: 'Aa12345_' }, + }) + }) + + afterAll(async () => { + await cleanDB() + resetToken() + }) + + it('returns an error', async () => { + await expect( + mutate({ mutation: deleteUser, variables: { userId: user.id + 1 } }), + ).resolves.toEqual( + expect.objectContaining({ + errors: [new GraphQLError('401 Unauthorized')], + }), + ) + }) + }) + + describe('with admin rights', () => { + beforeAll(async () => { + admin = await userFactory(testEnv, peterLustig) + await query({ + query: login, + variables: { email: 'peter@lustig.de', password: 'Aa12345_' }, + }) + }) + + afterAll(async () => { + await cleanDB() + resetToken() + }) + + describe('user to be deleted does not exist', () => { + it('throws an error', async () => { + await expect( + mutate({ mutation: deleteUser, variables: { userId: admin.id + 1 } }), + ).resolves.toEqual( + expect.objectContaining({ + errors: [new GraphQLError(`Could not find user with userId: ${admin.id + 1}`)], + }), + ) + }) + }) + + describe('delete self', () => { + it('throws an error', async () => { + await expect( + mutate({ mutation: deleteUser, variables: { userId: admin.id } }), + ).resolves.toEqual( + expect.objectContaining({ + errors: [new GraphQLError('Moderator can not delete his own account!')], + }), + ) + }) + }) + + describe('delete with success', () => { + beforeAll(async () => { + user = await userFactory(testEnv, bibiBloxberg) + }) + + it('returns date string', async () => { + const result = await mutate({ mutation: deleteUser, variables: { userId: user.id } }) + expect(result).toEqual( + expect.objectContaining({ + data: { + deleteUser: expect.any(String), + }, + }), + ) + expect(new Date(result.data.deleteUser)).toEqual(expect.any(Date)) + }) + + describe('delete deleted user', () => { + it('throws an error', async () => { + await expect( + mutate({ mutation: deleteUser, variables: { userId: user.id } }), + ).resolves.toEqual( + expect.objectContaining({ + errors: [new GraphQLError(`Could not find user with userId: ${user.id}`)], + }), + ) + }) + }) + }) + }) + }) + }) + + describe('unDelete user', () => { + describe('unauthenticated', () => { + it('returns an error', async () => { + await expect(mutate({ mutation: unDeleteUser, variables: { userId: 1 } })).resolves.toEqual( + expect.objectContaining({ + errors: [new GraphQLError('401 Unauthorized')], + }), + ) + }) + }) + + describe('authenticated', () => { + describe('without admin rights', () => { + beforeAll(async () => { + user = await userFactory(testEnv, bibiBloxberg) + await query({ + query: login, + variables: { email: 'bibi@bloxberg.de', password: 'Aa12345_' }, + }) + }) + + afterAll(async () => { + await cleanDB() + resetToken() + }) + + it('returns an error', async () => { + await expect( + mutate({ mutation: unDeleteUser, variables: { userId: user.id + 1 } }), + ).resolves.toEqual( + expect.objectContaining({ + errors: [new GraphQLError('401 Unauthorized')], + }), + ) + }) + }) + + describe('with admin rights', () => { + beforeAll(async () => { + admin = await userFactory(testEnv, peterLustig) + await query({ + query: login, + variables: { email: 'peter@lustig.de', password: 'Aa12345_' }, + }) + }) + + afterAll(async () => { + await cleanDB() + resetToken() + }) + + describe('user to be undelete does not exist', () => { + it('throws an error', async () => { + await expect( + mutate({ mutation: unDeleteUser, variables: { userId: admin.id + 1 } }), + ).resolves.toEqual( + expect.objectContaining({ + errors: [new GraphQLError(`Could not find user with userId: ${admin.id + 1}`)], + }), + ) + }) + }) + + describe('user to undelete is not deleted', () => { + beforeAll(async () => { + user = await userFactory(testEnv, bibiBloxberg) + }) + + it('throws an error', async () => { + await expect( + mutate({ mutation: unDeleteUser, variables: { userId: user.id } }), + ).resolves.toEqual( + expect.objectContaining({ + errors: [new GraphQLError('User is not deleted')], + }), + ) + }) + + describe('undelete deleted user', () => { + beforeAll(async () => { + await mutate({ mutation: deleteUser, variables: { userId: user.id } }) + }) + + it('returns null', async () => { + await expect( + mutate({ mutation: unDeleteUser, variables: { userId: user.id } }), + ).resolves.toEqual( + expect.objectContaining({ + data: { unDeleteUser: null }, + }), + ) + }) + }) + }) + }) + }) + }) + + describe('creations', () => { + const variables = { + email: 'bibi@bloxberg.de', + amount: new Decimal(2000), + memo: 'Aktives Grundeinkommen', + creationDate: 'not-valid', + } + + describe('unauthenticated', () => { + describe('createPendingCreation', () => { + it('returns an error', async () => { + await expect(mutate({ mutation: createPendingCreation, variables })).resolves.toEqual( + expect.objectContaining({ + errors: [new GraphQLError('401 Unauthorized')], + }), + ) + }) + }) + + describe('createPendingCreations', () => { + it('returns an error', async () => { + await expect( + mutate({ + mutation: createPendingCreations, + variables: { pendingCreations: [variables] }, + }), + ).resolves.toEqual( + expect.objectContaining({ + errors: [new GraphQLError('401 Unauthorized')], + }), + ) + }) + }) + + describe('updatePendingCreation', () => { + it('returns an error', async () => { + await expect( + mutate({ + mutation: updatePendingCreation, + variables: { + id: 1, + email: 'bibi@bloxberg.de', + amount: new Decimal(300), + memo: 'Danke Bibi!', + creationDate: new Date().toString(), + }, + }), + ).resolves.toEqual( + expect.objectContaining({ + errors: [new GraphQLError('401 Unauthorized')], + }), + ) + }) + }) + + describe('getPendingCreations', () => { + it('returns an error', async () => { + await expect( + query({ + query: getPendingCreations, + }), + ).resolves.toEqual( + expect.objectContaining({ + errors: [new GraphQLError('401 Unauthorized')], + }), + ) + }) + }) + + describe('deletePendingCreation', () => { + it('returns an error', async () => { + await expect( + mutate({ + mutation: deletePendingCreation, + variables: { + id: 1, + }, + }), + ).resolves.toEqual( + expect.objectContaining({ + errors: [new GraphQLError('401 Unauthorized')], + }), + ) + }) + }) + + describe('confirmPendingCreation', () => { + it('returns an error', async () => { + await expect( + mutate({ + mutation: confirmPendingCreation, + variables: { + id: 1, + }, + }), + ).resolves.toEqual( + expect.objectContaining({ + errors: [new GraphQLError('401 Unauthorized')], + }), + ) + }) + }) + }) + + describe('authenticated', () => { + describe('without admin rights', () => { + beforeAll(async () => { + user = await userFactory(testEnv, bibiBloxberg) + await query({ + query: login, + variables: { email: 'bibi@bloxberg.de', password: 'Aa12345_' }, + }) + }) + + afterAll(async () => { + await cleanDB() + resetToken() + }) + + describe('createPendingCreation', () => { + it('returns an error', async () => { + await expect(mutate({ mutation: createPendingCreation, variables })).resolves.toEqual( + expect.objectContaining({ + errors: [new GraphQLError('401 Unauthorized')], + }), + ) + }) + }) + + describe('createPendingCreations', () => { + it('returns an error', async () => { + await expect( + mutate({ + mutation: createPendingCreations, + variables: { pendingCreations: [variables] }, + }), + ).resolves.toEqual( + expect.objectContaining({ + errors: [new GraphQLError('401 Unauthorized')], + }), + ) + }) + }) + + describe('updatePendingCreation', () => { + it('returns an error', async () => { + await expect( + mutate({ + mutation: updatePendingCreation, + variables: { + id: 1, + email: 'bibi@bloxberg.de', + amount: new Decimal(300), + memo: 'Danke Bibi!', + creationDate: new Date().toString(), + }, + }), + ).resolves.toEqual( + expect.objectContaining({ + errors: [new GraphQLError('401 Unauthorized')], + }), + ) + }) + }) + + describe('getPendingCreations', () => { + it('returns an error', async () => { + await expect( + query({ + query: getPendingCreations, + }), + ).resolves.toEqual( + expect.objectContaining({ + errors: [new GraphQLError('401 Unauthorized')], + }), + ) + }) + }) + + describe('deletePendingCreation', () => { + it('returns an error', async () => { + await expect( + mutate({ + mutation: deletePendingCreation, + variables: { + id: 1, + }, + }), + ).resolves.toEqual( + expect.objectContaining({ + errors: [new GraphQLError('401 Unauthorized')], + }), + ) + }) + }) + + describe('confirmPendingCreation', () => { + it('returns an error', async () => { + await expect( + mutate({ + mutation: confirmPendingCreation, + variables: { + id: 1, + }, + }), + ).resolves.toEqual( + expect.objectContaining({ + errors: [new GraphQLError('401 Unauthorized')], + }), + ) + }) + }) + }) + + describe('with admin rights', () => { + beforeAll(async () => { + admin = await userFactory(testEnv, peterLustig) + await query({ + query: login, + variables: { email: 'peter@lustig.de', password: 'Aa12345_' }, + }) + }) + + afterAll(async () => { + await cleanDB() + resetToken() + }) + + describe('createPendingCreation', () => { + beforeAll(async () => { + const now = new Date() + creation = await creationFactory(testEnv, { + email: 'peter@lustig.de', + amount: 400, + memo: 'Herzlich Willkommen bei Gradido!', + creationDate: new Date(now.getFullYear(), now.getMonth() - 1, 1).toISOString(), + }) + }) + + describe('user to create for does not exist', () => { + it('throws an error', async () => { + await expect(mutate({ mutation: createPendingCreation, variables })).resolves.toEqual( + expect.objectContaining({ + errors: [new GraphQLError('Could not find user with email: bibi@bloxberg.de')], + }), + ) + }) + }) + + describe('user to create for is deleted', () => { + beforeAll(async () => { + user = await userFactory(testEnv, stephenHawking) + variables.email = 'stephen@hawking.uk' + }) + + it('throws an error', async () => { + await expect(mutate({ mutation: createPendingCreation, variables })).resolves.toEqual( + expect.objectContaining({ + errors: [new GraphQLError('This user was deleted. Cannot make a creation.')], + }), + ) + }) + }) + + describe('user to create for has email not confirmed', () => { + beforeAll(async () => { + user = await userFactory(testEnv, garrickOllivander) + variables.email = 'garrick@ollivander.com' + }) + + it('throws an error', async () => { + await expect(mutate({ mutation: createPendingCreation, variables })).resolves.toEqual( + expect.objectContaining({ + errors: [new GraphQLError('Creation could not be saved, Email is not activated')], + }), + ) + }) + }) + + describe('valid user to create for', () => { + beforeAll(async () => { + user = await userFactory(testEnv, bibiBloxberg) + variables.email = 'bibi@bloxberg.de' + }) + + describe('date of creation is not a date string', () => { + it('throws an error', async () => { + await expect( + mutate({ mutation: createPendingCreation, variables }), + ).resolves.toEqual( + expect.objectContaining({ + errors: [ + new GraphQLError('No information for available creations for the given date'), + ], + }), + ) + }) + }) + + describe('date of creation is four months ago', () => { + it('throws an error', async () => { + const now = new Date() + variables.creationDate = new Date( + now.getFullYear(), + now.getMonth() - 4, + 1, + ).toString() + await expect( + mutate({ mutation: createPendingCreation, variables }), + ).resolves.toEqual( + expect.objectContaining({ + errors: [ + new GraphQLError('No information for available creations for the given date'), + ], + }), + ) + }) + }) + + describe('date of creation is in the future', () => { + it('throws an error', async () => { + const now = new Date() + variables.creationDate = new Date( + now.getFullYear(), + now.getMonth() + 4, + 1, + ).toString() + await expect( + mutate({ mutation: createPendingCreation, variables }), + ).resolves.toEqual( + expect.objectContaining({ + errors: [ + new GraphQLError('No information for available creations for the given date'), + ], + }), + ) + }) + }) + + describe('amount of creation is too high', () => { + it('throws an error', async () => { + variables.creationDate = new Date().toString() + await expect( + mutate({ mutation: createPendingCreation, variables }), + ).resolves.toEqual( + expect.objectContaining({ + errors: [ + new GraphQLError( + 'The amount (2000 GDD) to be created exceeds the amount (1000 GDD) still available for this month.', + ), + ], + }), + ) + }) + }) + + describe('creation is valid', () => { + it('returns an array of the open creations for the last three months', async () => { + variables.amount = new Decimal(200) + await expect( + mutate({ mutation: createPendingCreation, variables }), + ).resolves.toEqual( + expect.objectContaining({ + data: { + createPendingCreation: [1000, 1000, 800], + }, + }), + ) + }) + }) + + describe('second creation surpasses the available amount ', () => { + it('returns an array of the open creations for the last three months', async () => { + variables.amount = new Decimal(1000) + await expect( + mutate({ mutation: createPendingCreation, variables }), + ).resolves.toEqual( + expect.objectContaining({ + errors: [ + new GraphQLError( + 'The amount (1000 GDD) to be created exceeds the amount (800 GDD) still available for this month.', + ), + ], + }), + ) + }) + }) + }) + }) + + describe('createPendingCreations', () => { + // at this point we have this data in DB: + // bibi@bloxberg.de: [1000, 1000, 800] + // peter@lustig.de: [1000, 600, 1000] + // stephen@hawking.uk: [1000, 1000, 1000] - deleted + // garrick@ollivander.com: [1000, 1000, 1000] - not activated + + const massCreationVariables = [ + 'bibi@bloxberg.de', + 'peter@lustig.de', + 'stephen@hawking.uk', + 'garrick@ollivander.com', + 'bob@baumeister.de', + ].map((email) => { + return { + email, + amount: new Decimal(500), + memo: 'Grundeinkommen', + creationDate: new Date().toString(), + } + }) + + it('returns success, two successful creation and three failed creations', async () => { + await expect( + mutate({ + mutation: createPendingCreations, + variables: { pendingCreations: massCreationVariables }, + }), + ).resolves.toEqual( + expect.objectContaining({ + data: { + createPendingCreations: { + success: true, + successfulCreation: ['bibi@bloxberg.de', 'peter@lustig.de'], + failedCreation: [ + 'stephen@hawking.uk', + 'garrick@ollivander.com', + 'bob@baumeister.de', + ], + }, + }, + }), + ) + }) + }) + + describe('updatePendingCreation', () => { + // at this I expect to have this data in DB: + // bibi@bloxberg.de: [1000, 1000, 300] + // peter@lustig.de: [1000, 600, 500] + // stephen@hawking.uk: [1000, 1000, 1000] - deleted + // garrick@ollivander.com: [1000, 1000, 1000] - not activated + + describe('user for creation to update does not exist', () => { + it('throws an error', async () => { + await expect( + mutate({ + mutation: updatePendingCreation, + variables: { + id: 1, + email: 'bob@baumeister.de', + amount: new Decimal(300), + memo: 'Danke Bibi!', + creationDate: new Date().toString(), + }, + }), + ).resolves.toEqual( + expect.objectContaining({ + errors: [new GraphQLError('Could not find user with email: bob@baumeister.de')], + }), + ) + }) + }) + + describe('user for creation to update is deleted', () => { + it('throws an error', async () => { + await expect( + mutate({ + mutation: updatePendingCreation, + variables: { + id: 1, + email: 'stephen@hawking.uk', + amount: new Decimal(300), + memo: 'Danke Bibi!', + creationDate: new Date().toString(), + }, + }), + ).resolves.toEqual( + expect.objectContaining({ + errors: [new GraphQLError('User was deleted (stephen@hawking.uk)')], + }), + ) + }) + }) + + describe('creation does not exist', () => { + it('throws an error', async () => { + await expect( + mutate({ + mutation: updatePendingCreation, + variables: { + id: -1, + email: 'bibi@bloxberg.de', + amount: new Decimal(300), + memo: 'Danke Bibi!', + creationDate: new Date().toString(), + }, + }), + ).resolves.toEqual( + expect.objectContaining({ + errors: [new GraphQLError('No creation found to given id.')], + }), + ) + }) + }) + + describe('user email does not match creation user', () => { + it('throws an error', async () => { + await expect( + mutate({ + mutation: updatePendingCreation, + variables: { + id: creation ? creation.id : -1, + email: 'bibi@bloxberg.de', + amount: new Decimal(300), + memo: 'Danke Bibi!', + creationDate: new Date().toString(), + }, + }), + ).resolves.toEqual( + expect.objectContaining({ + errors: [ + new GraphQLError( + 'user of the pending creation and send user does not correspond', + ), + ], + }), + ) + }) + }) + + describe('creation update is not valid', () => { + it('throws an error', async () => { + await expect( + mutate({ + mutation: updatePendingCreation, + variables: { + id: creation ? creation.id : -1, + email: 'peter@lustig.de', + amount: new Decimal(1900), + memo: 'Danke Peter!', + creationDate: new Date().toString(), + }, + }), + ).resolves.toEqual( + expect.objectContaining({ + errors: [ + new GraphQLError( + 'The amount (1900 GDD) to be created exceeds the amount (500 GDD) still available for this month.', + ), + ], + }), + ) + }) + }) + + describe('creation update is successful changing month', () => { + it('returns update creation object', async () => { + await expect( + mutate({ + mutation: updatePendingCreation, + variables: { + id: creation ? creation.id : -1, + email: 'peter@lustig.de', + amount: new Decimal(300), + memo: 'Danke Peter!', + creationDate: new Date().toString(), + }, + }), + ).resolves.toEqual( + expect.objectContaining({ + data: { + updatePendingCreation: { + date: expect.any(String), + memo: 'Danke Peter!', + amount: '300', + creation: ['1000', '1000', '200'], + }, + }, + }), + ) + }) + }) + + describe('creation update is successful without changing month', () => { + it('returns update creation object', async () => { + await expect( + mutate({ + mutation: updatePendingCreation, + variables: { + id: creation ? creation.id : -1, + email: 'peter@lustig.de', + amount: new Decimal(200), + memo: 'Das war leider zu Viel!', + creationDate: new Date().toString(), + }, + }), + ).resolves.toEqual( + expect.objectContaining({ + data: { + updatePendingCreation: { + date: expect.any(String), + memo: 'Das war leider zu Viel!', + amount: '200', + creation: ['1000', '1000', '300'], + }, + }, + }), + ) + }) + }) + }) + + describe('getPendingCreations', () => { + it('returns four pending creations', async () => { + await expect( + query({ + query: getPendingCreations, + }), + ).resolves.toEqual( + expect.objectContaining({ + data: { + getPendingCreations: expect.arrayContaining([ + { + id: expect.any(Number), + firstName: 'Peter', + lastName: 'Lustig', + email: 'peter@lustig.de', + date: expect.any(String), + memo: 'Das war leider zu Viel!', + amount: '200', + moderator: admin.id, + creation: ['1000', '1000', '300'], + }, + { + id: expect.any(Number), + firstName: 'Peter', + lastName: 'Lustig', + email: 'peter@lustig.de', + date: expect.any(String), + memo: 'Grundeinkommen', + amount: '500', + moderator: admin.id, + creation: ['1000', '1000', '300'], + }, + { + id: expect.any(Number), + firstName: 'Bibi', + lastName: 'Bloxberg', + email: 'bibi@bloxberg.de', + date: expect.any(String), + memo: 'Grundeinkommen', + amount: '500', + moderator: admin.id, + creation: ['1000', '1000', '300'], + }, + { + id: expect.any(Number), + firstName: 'Bibi', + lastName: 'Bloxberg', + email: 'bibi@bloxberg.de', + date: expect.any(String), + memo: 'Aktives Grundeinkommen', + amount: '200', + moderator: admin.id, + creation: ['1000', '1000', '300'], + }, + ]), + }, + }), + ) + }) + }) + + describe('deletePendingCreation', () => { + describe('creation id does not exist', () => { + it('throws an error', async () => { + await expect( + mutate({ + mutation: deletePendingCreation, + variables: { + id: -1, + }, + }), + ).resolves.toEqual( + expect.objectContaining({ + errors: [new GraphQLError('Creation not found for given id.')], + }), + ) + }) + }) + + describe('creation id does exist', () => { + it('returns true', async () => { + await expect( + mutate({ + mutation: deletePendingCreation, + variables: { + id: creation ? creation.id : -1, + }, + }), + ).resolves.toEqual( + expect.objectContaining({ + data: { deletePendingCreation: true }, + }), + ) + }) + }) + }) + + describe('confirmPendingCreation', () => { + describe('creation does not exits', () => { + it('throws an error', async () => { + await expect( + mutate({ + mutation: confirmPendingCreation, + variables: { + id: -1, + }, + }), + ).resolves.toEqual( + expect.objectContaining({ + errors: [new GraphQLError('Creation not found to given id.')], + }), + ) + }) + }) + + describe('confirm own creation', () => { + beforeAll(async () => { + const now = new Date() + creation = await creationFactory(testEnv, { + email: 'peter@lustig.de', + amount: 400, + memo: 'Herzlich Willkommen bei Gradido!', + creationDate: new Date(now.getFullYear(), now.getMonth() - 1, 1).toISOString(), + }) + }) + + it('thows an error', async () => { + await expect( + mutate({ + mutation: confirmPendingCreation, + variables: { + id: creation ? creation.id : -1, + }, + }), + ).resolves.toEqual( + expect.objectContaining({ + errors: [new GraphQLError('Moderator can not confirm own pending creation')], + }), + ) + }) + }) + + describe('confirm creation for other user', () => { + beforeAll(async () => { + const now = new Date() + creation = await creationFactory(testEnv, { + email: 'bibi@bloxberg.de', + amount: 450, + memo: 'Herzlich Willkommen bei Gradido liebe Bibi!', + creationDate: new Date(now.getFullYear(), now.getMonth() - 2, 1).toISOString(), + }) + }) + + it('returns true', async () => { + await expect( + mutate({ + mutation: confirmPendingCreation, + variables: { + id: creation ? creation.id : -1, + }, + }), + ).resolves.toEqual( + expect.objectContaining({ + data: { confirmPendingCreation: true }, + }), + ) + }) + + it('creates a transaction', async () => { + const transaction = await DbTransaction.find() + expect(transaction[0].amount.toString()).toBe('450') + expect(transaction[0].memo).toBe('Herzlich Willkommen bei Gradido liebe Bibi!') + expect(transaction[0].linkedTransactionId).toEqual(null) + expect(transaction[0].transactionLinkId).toEqual(null) + expect(transaction[0].previous).toEqual(null) + expect(transaction[0].linkedUserId).toEqual(null) + expect(transaction[0].typeId).toEqual(1) + }) + }) + }) + }) + }) + }) +}) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 2009af3b0..78cbf3fc8 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -56,19 +56,19 @@ export class AdminResolver { searchText, currentPage = 1, pageSize = 25, - notActivated = null, - isDeleted = null, + filterByActivated = null, + filterByDeleted = null, }: SearchUsersArgs, ): Promise { const userRepository = getCustomRepository(UserRepository) const filterCriteria: ObjectLiteral[] = [] - if (notActivated !== null) { - filterCriteria.push({ emailChecked: !notActivated }) + if (filterByActivated !== null) { + filterCriteria.push({ emailChecked: filterByActivated }) } - if (isDeleted !== null) { - filterCriteria.push({ deletedAt: isDeleted ? Not(IsNull()) : IsNull() }) + if (filterByDeleted !== null) { + filterCriteria.push({ deletedAt: filterByDeleted ? Not(IsNull()) : IsNull() }) } const userFields = ['id', 'firstName', 'lastName', 'email', 'emailChecked', 'deletedAt'] @@ -157,11 +157,12 @@ export class AdminResolver { @Mutation(() => Date, { nullable: true }) async unDeleteUser(@Arg('userId', () => Int) userId: number): Promise { const user = await dbUser.findOne({ id: userId }, { withDeleted: true }) - // user exists ? if (!user) { throw new Error(`Could not find user with userId: ${userId}`) } - // recover user account + if (!user.deletedAt) { + throw new Error('User is not deleted') + } await user.recover() return null } @@ -169,7 +170,8 @@ export class AdminResolver { @Authorized([RIGHTS.CREATE_PENDING_CREATION]) @Mutation(() => [Number]) async createPendingCreation( - @Args() { email, amount, memo, creationDate, moderator }: CreatePendingCreationArgs, + @Args() { email, amount, memo, creationDate }: CreatePendingCreationArgs, + @Ctx() context: Context, ): Promise { const user = await dbUser.findOne({ email }, { withDeleted: true }) if (!user) { @@ -181,6 +183,7 @@ export class AdminResolver { if (!user.emailChecked) { throw new Error('Creation could not be saved, Email is not activated') } + const moderator = getUser(context) const creations = await getUserCreation(user.id) const creationDateObj = new Date(creationDate) if (isCreationValid(creations, amount, creationDateObj)) { @@ -190,7 +193,7 @@ export class AdminResolver { adminPendingCreation.created = new Date() adminPendingCreation.date = creationDateObj adminPendingCreation.memo = memo - adminPendingCreation.moderator = moderator + adminPendingCreation.moderator = moderator.id await AdminPendingCreation.save(adminPendingCreation) } @@ -202,12 +205,13 @@ export class AdminResolver { async createPendingCreations( @Arg('pendingCreations', () => [CreatePendingCreationArgs]) pendingCreations: CreatePendingCreationArgs[], + @Ctx() context: Context, ): Promise { let success = false const successfulCreation: string[] = [] const failedCreation: string[] = [] for (const pendingCreation of pendingCreations) { - await this.createPendingCreation(pendingCreation) + await this.createPendingCreation(pendingCreation, context) .then(() => { successfulCreation.push(pendingCreation.email) success = true @@ -226,7 +230,8 @@ export class AdminResolver { @Authorized([RIGHTS.UPDATE_PENDING_CREATION]) @Mutation(() => UpdatePendingCreation) async updatePendingCreation( - @Args() { id, email, amount, memo, creationDate, moderator }: UpdatePendingCreationArgs, + @Args() { id, email, amount, memo, creationDate }: UpdatePendingCreationArgs, + @Ctx() context: Context, ): Promise { const user = await dbUser.findOne({ email }, { withDeleted: true }) if (!user) { @@ -236,7 +241,13 @@ export class AdminResolver { throw new Error(`User was deleted (${email})`) } - const pendingCreationToUpdate = await AdminPendingCreation.findOneOrFail({ id }) + const moderator = getUser(context) + + const pendingCreationToUpdate = await AdminPendingCreation.findOne({ id }) + + if (!pendingCreationToUpdate) { + throw new Error('No creation found to given id.') + } if (pendingCreationToUpdate.userId !== user.id) { throw new Error('user of the pending creation and send user does not correspond') @@ -248,20 +259,18 @@ export class AdminResolver { creations = updateCreations(creations, pendingCreationToUpdate) } - if (!isCreationValid(creations, amount, creationDateObj)) { - throw new Error('Creation is not valid') - } + // all possible cases not to be true are thrown in this function + isCreationValid(creations, amount, creationDateObj) pendingCreationToUpdate.amount = amount pendingCreationToUpdate.memo = memo pendingCreationToUpdate.date = new Date(creationDate) - pendingCreationToUpdate.moderator = moderator + pendingCreationToUpdate.moderator = moderator.id await AdminPendingCreation.save(pendingCreationToUpdate) const result = new UpdatePendingCreation() result.amount = amount result.memo = pendingCreationToUpdate.memo result.date = pendingCreationToUpdate.date - result.moderator = pendingCreationToUpdate.moderator result.creation = await getUserCreation(user.id) @@ -298,8 +307,11 @@ export class AdminResolver { @Authorized([RIGHTS.DELETE_PENDING_CREATION]) @Mutation(() => Boolean) async deletePendingCreation(@Arg('id', () => Int) id: number): Promise { - const entity = await AdminPendingCreation.findOneOrFail(id) - const res = await AdminPendingCreation.delete(entity) + const pendingCreation = await AdminPendingCreation.findOne(id) + if (!pendingCreation) { + throw new Error('Creation not found for given id.') + } + const res = await AdminPendingCreation.delete(pendingCreation) return !!res } @@ -309,7 +321,10 @@ export class AdminResolver { @Arg('id', () => Int) id: number, @Ctx() context: Context, ): Promise { - const pendingCreation = await AdminPendingCreation.findOneOrFail(id) + const pendingCreation = await AdminPendingCreation.findOne(id) + if (!pendingCreation) { + throw new Error('Creation not found to given id.') + } const moderatorUser = getUser(context) if (moderatorUser.id === pendingCreation.userId) throw new Error('Moderator can not confirm own pending creation') @@ -340,8 +355,7 @@ export class AdminResolver { transaction.memo = pendingCreation.memo transaction.userId = pendingCreation.userId transaction.previous = lastTransaction ? lastTransaction.id : null - // TODO pending creations decimal - transaction.amount = new Decimal(Number(pendingCreation.amount)) + transaction.amount = pendingCreation.amount transaction.creationDate = pendingCreation.date transaction.balance = newBalance transaction.balanceDate = receivedCallDate @@ -504,7 +518,7 @@ function updateCreations(creations: Decimal[], pendingCreation: AdminPendingCrea if (index < 0) { throw new Error('You cannot create GDD for a month older than the last three months.') } - creations[index] = creations[index].plus(pendingCreation.amount) + creations[index] = creations[index].plus(pendingCreation.amount.toString()) return creations } @@ -512,12 +526,12 @@ function isCreationValid(creations: Decimal[], amount: Decimal, creationDate: Da const index = getCreationIndex(creationDate.getMonth()) if (index < 0) { - throw new Error(`No Creation found!`) + throw new Error('No information for available creations for the given date') } if (amount.greaterThan(creations[index].toString())) { throw new Error( - `The amount (${amount} GDD) to be created exceeds the available amount (${creations[index]} GDD) for this month.`, + `The amount (${amount} GDD) to be created exceeds the amount (${creations[index]} GDD) still available for this month.`, ) } diff --git a/backend/src/seeds/factory/creation.ts b/backend/src/seeds/factory/creation.ts index 64f693360..e49be3758 100644 --- a/backend/src/seeds/factory/creation.ts +++ b/backend/src/seeds/factory/creation.ts @@ -17,27 +17,22 @@ export const nMonthsBefore = (date: Date, months = 1): string => { export const creationFactory = async ( client: ApolloServerTestClient, creation: CreationInterface, -): Promise => { +): Promise => { const { mutate, query } = client - // login as Peter Lustig (admin) and get his user ID - const { - data: { - login: { id }, - }, - } = await query({ query: login, variables: { email: 'peter@lustig.de', password: 'Aa12345_' } }) + await query({ query: login, variables: { email: 'peter@lustig.de', password: 'Aa12345_' } }) - await mutate({ mutation: createPendingCreation, variables: { ...creation, moderator: id } }) + // TODO it would be nice to have this mutation return the id + await mutate({ mutation: createPendingCreation, variables: { ...creation } }) - // get User const user = await User.findOneOrFail({ where: { email: creation.email } }) - if (creation.confirmed) { - const pendingCreation = await AdminPendingCreation.findOneOrFail({ - where: { userId: user.id }, - order: { created: 'DESC' }, - }) + const pendingCreation = await AdminPendingCreation.findOneOrFail({ + where: { userId: user.id, amount: creation.amount }, + order: { created: 'DESC' }, + }) + if (creation.confirmed) { await mutate({ mutation: confirmPendingCreation, variables: { id: pendingCreation.id } }) if (creation.moveCreationDate) { @@ -55,5 +50,7 @@ export const creationFactory = async ( await transaction.save() } } + } else { + return pendingCreation } } diff --git a/backend/src/seeds/factory/user.ts b/backend/src/seeds/factory/user.ts index 4b5913d48..d94f94b3c 100644 --- a/backend/src/seeds/factory/user.ts +++ b/backend/src/seeds/factory/user.ts @@ -7,7 +7,7 @@ import { ApolloServerTestClient } from 'apollo-server-testing' export const userFactory = async ( client: ApolloServerTestClient, user: UserInterface, -): Promise => { +): Promise => { const { mutate } = client const { @@ -24,13 +24,15 @@ export const userFactory = async ( }) } - if (user.createdAt || user.deletedAt || user.isAdmin) { - // get user from database - const dbUser = await User.findOneOrFail({ id }) + // get user from database + const dbUser = await User.findOneOrFail({ id }) + if (user.createdAt || user.deletedAt || user.isAdmin) { if (user.createdAt) dbUser.createdAt = user.createdAt if (user.deletedAt) dbUser.deletedAt = user.deletedAt if (user.isAdmin) dbUser.isAdmin = new Date() await dbUser.save() } + + return dbUser } diff --git a/backend/src/seeds/graphql/mutations.ts b/backend/src/seeds/graphql/mutations.ts index 601b1fbbf..d3026dbdd 100644 --- a/backend/src/seeds/graphql/mutations.ts +++ b/backend/src/seeds/graphql/mutations.ts @@ -84,20 +84,8 @@ export const createTransactionLink = gql` // from admin interface export const createPendingCreation = gql` - mutation ( - $email: String! - $amount: Decimal! - $memo: String! - $creationDate: String! - $moderator: Int! - ) { - createPendingCreation( - email: $email - amount: $amount - memo: $memo - creationDate: $creationDate - moderator: $moderator - ) + mutation ($email: String!, $amount: Decimal!, $memo: String!, $creationDate: String!) { + createPendingCreation(email: $email, amount: $amount, memo: $memo, creationDate: $creationDate) } ` @@ -106,3 +94,48 @@ export const confirmPendingCreation = gql` confirmPendingCreation(id: $id) } ` + +export const deleteUser = gql` + mutation ($userId: Int!) { + deleteUser(userId: $userId) + } +` + +export const unDeleteUser = gql` + mutation ($userId: Int!) { + unDeleteUser(userId: $userId) + } +` + +export const createPendingCreations = gql` + mutation ($pendingCreations: [CreatePendingCreationArgs!]!) { + createPendingCreations(pendingCreations: $pendingCreations) { + success + successfulCreation + failedCreation + } + } +` + +export const updatePendingCreation = gql` + mutation ($id: Int!, $email: String!, $amount: Decimal!, $memo: String!, $creationDate: String!) { + updatePendingCreation( + id: $id + email: $email + amount: $amount + memo: $memo + creationDate: $creationDate + ) { + amount + date + memo + creation + } + } +` + +export const deletePendingCreation = gql` + mutation ($id: Int!) { + deletePendingCreation(id: $id) + } +` diff --git a/backend/src/seeds/graphql/queries.ts b/backend/src/seeds/graphql/queries.ts index 76a386953..82067c968 100644 --- a/backend/src/seeds/graphql/queries.ts +++ b/backend/src/seeds/graphql/queries.ts @@ -148,3 +148,21 @@ export const queryTransactionLink = gql` } } ` + +// from admin interface + +export const getPendingCreations = gql` + query { + getPendingCreations { + id + firstName + lastName + email + amount + memo + date + moderator + creation + } + } +` diff --git a/backend/src/seeds/index.ts b/backend/src/seeds/index.ts index 37c9992a7..f26000e06 100644 --- a/backend/src/seeds/index.ts +++ b/backend/src/seeds/index.ts @@ -4,7 +4,7 @@ import createServer from '../server/createServer' import { createTestClient } from 'apollo-server-testing' -import { name, internet, random } from 'faker' +import { name, internet, datatype } from 'faker' import { users } from './users/index' import { creations } from './creation/index' @@ -13,6 +13,9 @@ import { userFactory } from './factory/user' import { creationFactory } from './factory/creation' import { transactionLinkFactory } from './factory/transactionLink' import { entities } from '@entity/index' +import CONFIG from '@/config' + +CONFIG.EMAIL = false const context = { token: '', @@ -57,7 +60,7 @@ const run = async () => { firstName: name.firstName(), lastName: name.lastName(), email: internet.email(), - language: random.boolean() ? 'en' : 'de', + language: datatype.boolean() ? 'en' : 'de', }) } diff --git a/database/package.json b/database/package.json index 13c638c79..a19cc57da 100644 --- a/database/package.json +++ b/database/package.json @@ -1,6 +1,6 @@ { "name": "gradido-database", - "version": "1.8.0", + "version": "1.8.1", "description": "Gradido Database Tool to execute database migrations", "main": "src/index.ts", "repository": "https://github.com/gradido/gradido/database", diff --git a/deployment/bare_metal/.env.dist b/deployment/bare_metal/.env.dist index a7e266bdf..a1751a859 100644 --- a/deployment/bare_metal/.env.dist +++ b/deployment/bare_metal/.env.dist @@ -38,7 +38,7 @@ KLICKTIPP_PASSWORD= KLICKTIPP_APIKEY_DE= KLICKTIPP_APIKEY_EN= -EMAIL=false +EMAIL=true EMAIL_USERNAME=peter@lustig.de EMAIL_SENDER=peter@lustig.de EMAIL_PASSWORD=1234 diff --git a/deployment/bare_metal/start.sh b/deployment/bare_metal/start.sh index 95b89241f..b608952c0 100755 --- a/deployment/bare_metal/start.sh +++ b/deployment/bare_metal/start.sh @@ -105,7 +105,8 @@ yarn install yarn build if [ "$DEPLOY_SEED_DATA" = "true" ]; then yarn dev_up - yarn dev_reset +# As dev_reset is not running properly (0019-replace_login_user_id_with_state_user_id) +# yarn dev_reset else yarn up fi diff --git a/frontend/package.json b/frontend/package.json index 18021e705..7b448a73d 100755 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "bootstrap-vue-gradido-wallet", - "version": "1.8.0", + "version": "1.8.1", "private": true, "scripts": { "start": "node run/server.js", @@ -25,6 +25,7 @@ "babel-preset-vue": "^2.0.2", "bootstrap": "^4.5.3", "bootstrap-vue": "^2.21.2", + "clipboard-polyfill": "^4.0.0-rc1", "es6-promise": "^4.1.1", "eslint": "^7.25.0", "eslint-config-prettier": "^8.1.0", diff --git a/frontend/src/main.js b/frontend/src/main.js index 585b603cb..0edcb7211 100755 --- a/frontend/src/main.js +++ b/frontend/src/main.js @@ -16,6 +16,8 @@ import router from './routes/router' import { apolloProvider } from './plugins/apolloProvider' +import 'clipboard-polyfill/overwrite-globals' + // plugin setup Vue.use(DashboardPlugin) Vue.config.productionTip = false diff --git a/frontend/yarn.lock b/frontend/yarn.lock index b7648c9c8..0c4186d87 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -4856,6 +4856,11 @@ cli-width@^2.0.0: resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz#b0433d0b4e9c847ef18868a4ef16fd5fc8271c48" integrity sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw== +clipboard-polyfill@^4.0.0-rc1: + version "4.0.0-rc1" + resolved "https://registry.yarnpkg.com/clipboard-polyfill/-/clipboard-polyfill-4.0.0-rc1.tgz#a000ab25b1f582bca03667dc572854f1c8d92b04" + integrity sha512-Cel03Es9ZgP6pYA2JT9cZ2VgvOH2/EHgB7jji84FpINBJWqfMEwiI1Y3LstVL+E43cm3CnCrLL2vwb9DMbr28A== + clipboardy@^2.0.0: version "2.3.0" resolved "https://registry.yarnpkg.com/clipboardy/-/clipboardy-2.3.0.tgz#3c2903650c68e46a91b388985bc2774287dba290" diff --git a/package.json b/package.json index c8abef594..af38a987a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gradido", - "version": "1.8.0", + "version": "1.8.1", "description": "Gradido", "main": "index.js", "repository": "git@github.com:gradido/gradido.git",