124 Commits

Author SHA1 Message Date
Wolfgang Huß
80fdc8d30a Merge branch 'master' of github.com:gradido/gradido into daily-rule-for-contribution-links-frontend
# Conflicts:
#	backend/src/seeds/graphql/mutations.ts
2022-10-13 12:01:06 +02:00
Moriz Wahl
686c24a57d add tests for daily contribution link 2022-10-12 17:17:10 +02:00
Wolfgang Huß
6d06c0f2d8 Merge branch 'master' of github.com:gradido/gradido into 2218-refactor-logout-to-mutation
# Conflicts:
#	backend/src/graphql/resolver/UserResolver.test.ts
#	backend/src/seeds/factory/contributionLink.ts
#	backend/src/seeds/factory/creation.ts
2022-10-12 16:23:04 +02:00
elweyn
4461ff92a5 Correct tests after changing login and logout from queries to mutations. 2022-09-22 12:22:56 +02:00
Claus-Peter Hübner
bb8fc6a16e change using findUserByEmail() instead of raw queries 2022-09-15 17:48:22 +02:00
Claus-Peter Hübner
411e03c843 rework PR comments 2022-09-15 02:40:59 +02:00
Claus-Peter Hübner
7cd5ecb463 linting 2022-09-12 19:02:12 +02:00
Claus-Peter Hübner
94f15f7475 Merge remote-tracking branch 'origin/master' into
1798-feature-gradidoid-1-adapt-and-migrate-database-schema
2022-09-12 18:18:46 +02:00
Claus-Peter Hübner
97dee4d67c adapt tests to work with User and UserContact 2022-09-02 02:34:45 +02:00
Claus-Peter Hübner
eedaf9e6e3 unit tests of AdminResolver now with Users and UserContacts 2022-08-31 23:04:55 +02:00
Claus-Peter Hübner
faa0500f10 adapt seeding using User and UserContact 2022-08-31 15:44:41 +02:00
Claus-Peter Hübner
852c4e6499 change seeding now with UserContacts entry 2022-08-31 01:12:12 +02:00
elweyn
7156f1afd5 Setup Test file for ContributionMessageResolver. 2022-08-29 12:58:01 +02:00
elweyn
f96fb5aa63 Add searchAdminUsers query to mocks. 2022-08-17 10:21:40 +02:00
Moriz Wahl
af9d874fea fix: Update contribution_date when Moved by Seed 2022-07-25 13:29:45 +02:00
Hannes Heine
d5a2c24d7e
Merge branch 'master' into 2000-contribution-delete 2022-07-19 12:25:12 +02:00
elweyn
4c33d3784b Added mutation for deleteContribution 2022-07-18 13:07:44 +02:00
elweyn
11dacd40be Change query listAllContributions now gets contributionCount and contributionList instead of linkCount and linkList. 2022-07-18 11:34:30 +02:00
elweyn
3a8fb6b353 Change query of listContribution to get contributionCount and contributionList instead of link... 2022-07-18 11:31:39 +02:00
elweyn
93c2d6814a Change the listContribution query to give back ContributionListResult object with linkCount. 2022-07-18 11:27:44 +02:00
elweyn
22602c45b9 Merge master into this branch. 2022-07-14 17:40:58 +02:00
elweyn
ab77a798f5 Add query seed for listAllContributions. 2022-07-14 16:57:25 +02:00
elweyn
46206c4752 Handled the merge conflict so that we can continue to work. 2022-07-12 10:01:26 +02:00
elweyn
c6ae5760c3 Test that the updateContribution mutation updates the contribution with the right values. 2022-07-12 09:55:03 +02:00
elweyn
5369aced43 Change mutation to include id in the result, write test to update contribution with inexistent id. 2022-07-12 09:37:06 +02:00
elweyn
3718f0dc56 Change the test so that we can test if the contribution list finds only created but not confirmed contribution 2022-07-11 11:42:24 +02:00
elweyn
03db4ed125 Add mutation to updateContribution. 2022-07-04 07:41:21 +02:00
elweyn
7d23be6901 Add query for listContributions. 2022-07-01 12:54:04 +02:00
elweyn
ba88599ca7 Change mutation to query amount and memo, check in test that amount and memo have the right values. 2022-06-29 13:31:57 +02:00
elweyn
a56908b8f5 Adding some test for the ContributionToken. 2022-06-27 17:13:30 +02:00
Wolfgang Huß
0b464591a1 Merge branch 'master' of github.com:gradido/gradido into 1881-set-role-in-admin-interface 2022-06-20 11:36:41 +02:00
Wolfgang Huß
f6f487aa7e Merge branch 'master' of github.com:gradido/gradido into 1881-set-role-in-admin-interface
# Conflicts:
#	backend/src/auth/RIGHTS.ts
2022-06-16 14:23:35 +02:00
Moriz Wahl
7bd66e8f78 true date for Dokuemnta in Seed 2022-06-16 13:13:56 +02:00
Moriz Wahl
9ca1ee3455 fix validation rules for redeem contribution link 2022-06-16 12:39:07 +02:00
Moriz Wahl
409e44f679 store contribution link id on user when regsitered with contribution link code 2022-06-16 10:44:17 +02:00
Moriz Wahl
1de8c94ba3 rename updatePendingCreation 2022-06-15 20:01:53 +02:00
Moriz Wahl
2b87cbcd18 rename confirmPendingCreation 2022-06-15 19:33:40 +02:00
Moriz Wahl
dd04f69ecc rename deletePendingCreation 2022-06-15 19:22:01 +02:00
Moriz Wahl
d95b1893cd rename getPendingCreations 2022-06-15 19:13:19 +02:00
Moriz Wahl
6623849337 Merge branch 'master' into contributions-table 2022-06-15 16:50:50 +02:00
Moriz Wahl
ad3bb58d43 createContributionLink response contains contribution id 2022-06-15 15:19:29 +02:00
Moriz Wahl
eabd14bdf3 further renaming 2022-06-15 09:04:34 +02:00
Moriz Wahl
e60f06bb9b rename mutations to create admin contributions 2022-06-15 08:32:30 +02:00
Moriz Wahl
916706a973 fix mutation for admin mass creation 2022-06-15 08:21:53 +02:00
Moriz Wahl
dcc1e9c2e7 proper type in seed 2022-06-14 19:19:12 +02:00
Moriz Wahl
92b076e8b1 Merge branch 'master' into contributions-table 2022-06-14 19:12:43 +02:00
Moriz Wahl
7640680c42 seed two ContributionLinks 2022-06-14 18:04:20 +02:00
Moriz Wahl
dc46f4e78c add update contribution link mutation 2022-06-14 15:29:34 +02:00
Moriz Wahl
fa30b871b7 delete contribution link mutation 2022-06-14 13:12:41 +02:00
Moriz Wahl
fd2f6a16b7 lsit contribution links query 2022-06-14 12:10:16 +02:00