162 Commits

Author SHA1 Message Date
1f0b07b708
Merge branch 'master' into events-unify-names 2023-03-29 09:47:40 +02:00
eefdf5ae58
Merge branch 'master' into eslint-plugin-jest-fixes 2023-03-28 00:39:18 +02:00
b23030e612
Merge branch 'master' into events-contribution 2023-03-24 11:50:15 +01:00
7e8b1ba6a3
Merge branch 'master' into seperate-events-in-own-files 2023-03-23 12:21:55 +01:00
1577667c1a
Merge branch 'master' into rename-evenProtocolType-to-eventType 2023-03-23 12:00:39 +01:00
Moriz Wahl
b27db4eeaf Merge branch 'master' into refactor-find-contribtiions 2023-03-21 14:37:07 +01:00
b3c48af3c4
Merge branch 'master' into event_refactor_database 2023-03-14 16:08:41 +01:00
6241119885
fix skip tests 2023-03-12 02:18:13 +01:00
Moriz Wahl
d4d38e29b6 Merge branch 'master' into refactor-find-contribtiions 2023-03-10 14:42:43 +01:00
04a87be90d
fix eslint jest errors 2023-03-10 13:09:35 +01:00
19adc53ed7
fix newly introduced errors 2023-03-09 14:37:25 +01:00
827c829306
fixes based on the unit tests 2023-03-09 14:37:25 +01:00
3391b3a9ee
merge 2023-03-09 14:37:17 +01:00
d989e5c489
rename events 2023-03-09 13:29:46 +01:00
elweyn
775d29fb68 Add messageCount value to the contributions that got messages, order the objects in the same order as they are found. 2023-03-08 14:29:25 +01:00
Moriz Wahl
e48bbd7b47 rename admin list all contributions query 2023-03-07 17:33:18 +01:00
Moriz Wahl
74138dbef3 Merge branch 'use-find-contributions-for-list-contributions' 2023-03-07 17:04:12 +01:00
920f16aad5
corrected test name, some code style fixes 2023-03-07 13:33:08 +01:00
630a37cc51
rename event CONTRIBUTION_CONFIRM to ADMIN_CONTRIBUTION_CONFIRM, clean Eventtypes enum 2023-03-07 12:29:59 +01:00
17992d75ef
separate events into their own file, some nameing conventions 2023-03-07 12:29:59 +01:00
d204e79cd5
rename eventProtocolType to eventType 2023-03-07 12:29:02 +01:00
Moriz Wahl
12f4e9fda1
Merge branch 'master' into use-find-contributions-for-list-contributions 2023-03-06 16:47:18 +01:00
4379668268
Merge branch 'master' into event_refactor_database 2023-03-03 23:55:24 +01:00
Hannes Heine
d2afaad938
Merge branch 'master' into 2689-test-email-send-deny-deleted-contribution 2023-03-01 17:06:09 +01:00
elweyn
9fc1e45ed0 Merge branch '2689-test-email-send-deny-deleted-contribution' of https://github.com/gradido/gradido into 2689-test-email-send-deny-deleted-contribution 2023-03-01 05:21:03 +01:00
elweyn
3a6b701d3b Reduce mock of emails sendEmailVariant. 2023-03-01 05:16:37 +01:00
Hannes Heine
bfbf7954e3
Merge branch 'master' into 2689-test-email-send-deny-deleted-contribution 2023-03-01 05:03:44 +01:00
Moriz Wahl
e4a9533802 refactor(backend): use find contributions helper in list contributions 2023-02-28 20:36:23 +01:00
Moriz Wahl
be048be032 fix(backend): possible flaky test 2023-02-28 19:53:35 +01:00
elweyn
cc6d781c22 Add tests that emails are send for denied and deleted contributions. 2023-02-24 08:36:06 +01:00
Moriz Wahl
bee05397d2 fix test 2023-02-21 15:28:18 +01:00
Moriz Wahl
6e88068a88 Merge branch 'master' into remove-adminCreateContributions 2023-02-21 15:20:45 +01:00
Hannes Heine
1e7d4a779a
Update backend/src/graphql/resolver/ContributionResolver.test.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2023-02-21 04:02:55 +01:00
Moriz Wahl
72165ac99d fix test 2023-02-20 14:39:05 +01:00
8744ff919e
fix contributionResolver tests 2023-02-18 02:01:31 +01:00
41569ad0f1
refactor events - first step to get backend working 2023-02-18 01:08:06 +01:00
elweyn
84c724daea Change to suggestion 2023-02-17 15:51:45 +01:00
elweyn
9ddef04f56 Change test name. 2023-02-17 15:46:53 +01:00
elweyn
a54f171154 Remove console.log statement to test. 2023-02-17 13:57:02 +01:00
elweyn
62284bd016 Set test for adminListAllContributions at the end of the admin szenario. 2023-02-17 13:54:39 +01:00
Hannes Heine
a15b3265de
Merge branch 'master' into refactor-listUnconfirmedContribution-to-adminListAllContribution 2023-02-17 11:33:29 +01:00
elweyn
b1b3a060cb Merge master in refactor adminListContributions. 2023-02-17 11:20:43 +01:00
9fbce956df
missing merge change 2023-02-16 18:22:47 +01:00
aa0b3ad671
Merge branch 'master' into logger_creations 2023-02-16 18:19:40 +01:00
elweyn
40b2944b24 Check toEqual. 2023-02-16 15:41:04 +01:00
elweyn
b9c46d2238 Correct spelling error. 2023-02-15 12:33:13 +01:00
elweyn
00a45d7805 Corrected the expected amount from the ADMIN_CONTRIBUTION_DELETE event. 2023-02-15 12:17:17 +01:00
elweyn
11f19262b0 Add expected data to Protocols tests. 2023-02-15 11:40:02 +01:00
elweyn
d32b520145 Change test description to better naming. 2023-02-15 10:00:30 +01:00
elweyn
34fe6b4e90 Rework reviews, add the properties used in the ui for listContributions. 2023-02-15 09:44:00 +01:00