2870 Commits

Author SHA1 Message Date
elweyn
0bd3ce27df Change Tests to statusFilter. 2023-01-25 16:48:49 +01:00
elweyn
8b3423b91b Remove i18n, change state to status. 2023-01-25 16:40:32 +01:00
Moriz Wahl
d7c2e1ece5 comment unused code to raise coverage 2023-01-25 16:29:37 +01:00
Moriz Wahl
b959a64e77 remove unused TransactionType enumerator to raise coverage 2023-01-25 16:29:18 +01:00
elweyn
9e7da0f451 Add tests for filterState parameter in listAllContributions query. 2023-01-25 08:11:47 +01:00
elweyn
47eea57c09 Remove unused import. 2023-01-25 08:00:34 +01:00
elweyn
cc0fe5968d Tests that the filterState parameter in listAllContributions works as expected. 2023-01-25 07:54:17 +01:00
clauspeterhuebner
a3af2e5513
Merge branch 'master' into 2428-feature-federation-implement-multiple-apollo-graphql-endpoints 2023-01-25 02:34:29 +01:00
elweyn
2cecadded2 Add filterState to the backend test listAllContributions query. 2023-01-24 17:02:08 +01:00
Hannes Heine
14c546627a
Merge branch 'master' into 2594-filter-query-all-contributions 2023-01-24 16:14:21 +01:00
elweyn
57222d07c4 Change rejected to deny, add error test for denyContribution & remove TODO comment. 2023-01-24 15:56:58 +01:00
elweyn
4f85b8508d Fix locales. 2023-01-24 15:38:28 +01:00
elweyn
da652e6745 Rename reject to deny and rejected to denied. 2023-01-24 15:22:37 +01:00
elweyn
b940400e5b Remove unused import. 2023-01-24 14:26:43 +01:00
elweyn
d42804acfb Change type of filterState from string[] to ContributionStatus[]. 2023-01-24 12:10:53 +01:00
elweyn
1554a7d454 Remove test loggings. 2023-01-24 12:04:09 +01:00
elweyn
f4c743f7b4 Add localization, change filterState from string to array of string. 2023-01-24 11:33:29 +01:00
elweyn
574906eb76 Add filterState parameter to listAllContributions query, can be a string or null and checks in the DB for the ContributionStatus. 2023-01-24 10:27:46 +01:00
Hannes Heine
23e3e02139
Merge branch 'master' into 2332-mark-contribution-as-rejected 2023-01-24 08:39:15 +01:00
clauspeterhuebner
4c5cecb108
Merge branch 'master' into 2428-feature-federation-implement-multiple-apollo-graphql-endpoints 2023-01-20 02:41:27 +01:00
62e76e02ad
v1.17.1 2023-01-19 22:11:20 +01:00
Hannes Heine
c84fa68132
Merge branch 'master' into 2332-mark-contribution-as-rejected 2023-01-19 07:50:22 +01:00
clauspeterhuebner
0b27d09cdd
Merge branch 'master' into 2428-feature-federation-implement-multiple-apollo-graphql-endpoints 2023-01-18 22:20:23 +01:00
a3dc4c168b
v1.17.0 2023-01-18 15:54:57 +01:00
Moriz Wahl
52f9da5c0d fix(backend): admin cannot delete confirmed contribution 2023-01-18 15:06:18 +01:00
clauspeterhuebner
66b5638f41
Merge branch 'master' into 2428-feature-federation-implement-multiple-apollo-graphql-endpoints 2023-01-17 17:19:25 +01:00
Moriz Wahl
d3a78e4369
Merge branch 'master' into statistics-with-field-resolvers 2023-01-17 16:52:59 +01:00
elweyn
b8b6753677 Reviewed change requests. 2023-01-17 14:44:18 +01:00
cd203ab2c2
removed if possible comment 2023-01-17 12:31:55 +01:00
a3a69bc012
removed comment 2023-01-17 12:29:28 +01:00
82fd6a9c5b
implement moriz requirements for test 2023-01-17 12:24:41 +01:00
Moriz Wahl
b66372bd90 change name of dynamic statitics fields 2023-01-16 19:42:01 +01:00
3bf69814ca
test error cases for semaphore 2023-01-16 16:47:33 +01:00
Moriz Wahl
7781011b1a refactor(backend): field resolvers in statistics 2023-01-16 15:22:45 +01:00
466e59a550
typo 2023-01-16 11:27:30 +01:00
c3f7f15420
refactor all semaphore-locks 2023-01-16 11:21:38 +01:00
fd2563f171
Merge branch 'master' into fix-semaphore-deadlock-on-error 2023-01-16 11:16:45 +01:00
dab7fe584a
try catch around semaphore lock 2023-01-16 11:04:14 +01:00
clauspeterhuebner
db6d18da1f
Merge branch 'master' into 2428-feature-federation-implement-multiple-apollo-graphql-endpoints 2023-01-13 14:21:20 +01:00
elweyn
51abaf8a22 Last changes to make it work. 2023-01-13 13:20:00 +01:00
elweyn
7a7246cde5 Add error for already confirmed contribution. 2023-01-13 11:37:48 +01:00
elweyn
9d8c026617 Move contribution, user and moderator search in the first try block to lock the database. 2023-01-13 11:35:33 +01:00
elweyn
df4e2b419a Merge master in here. 2023-01-13 11:24:11 +01:00
elweyn
605812d777 Add error to confirmContribution mutation in case where contributionState is 'DENIED' 2023-01-13 11:15:14 +01:00
elweyn
79220ced79 Add deleted Contribution to the Contribution list in the admin interface. 2023-01-13 11:05:56 +01:00
mahula
18a2b7b6f9
Merge branch 'master' into open-creations-call 2023-01-13 10:13:32 +01:00
Claus-Peter Hübner
29109fc4c8 Merge remote-tracking branch 'origin/master' into 2428-feature-federation-implement-multiple-apollo-graphql-endpoints 2023-01-13 00:24:50 +01:00
mahula
0c65d8c4ab
Merge branch 'master' into open-creations-call 2023-01-12 20:58:15 +01:00
Claus-Peter Hübner
4c4979f8eb Merge remote-tracking branch 'origin/master' into 2428-feature-federation-implement-multiple-apollo-graphql-endpoints 2023-01-12 16:54:14 +01:00
5ceab09451
Merge branch 'master' into remove-jest-from-dependencies 2023-01-12 16:09:26 +01:00