1720 Commits

Author SHA1 Message Date
Claus-Peter Hübner
e701f99553 rework PR comments 2022-09-23 01:11:37 +02:00
clauspeterhuebner
b0781bce88
Update backend/src/graphql/resolver/UserResolver.test.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-09-23 01:03:07 +02:00
clauspeterhuebner
62446bd2f0
Update backend/src/graphql/resolver/AdminResolver.test.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-09-23 00:56:36 +02:00
Claus-Peter Hübner
3dd66b4527 small changes in log-pattern
Merge remote-tracking branch 'origin/master' into
2220-feature-reconfigure-log4js
2022-09-23 00:31:33 +02:00
Claus-Peter Hübner
99f0905bee Merge remote-tracking branch 'origin/master' into 2220-feature-reconfigure-log4js 2022-09-22 23:42:23 +02:00
joseji
79f7ebce57 updated event working, deletion is not working properly (deeper than the event itself) 2022-09-22 17:35:41 +02:00
Hannes Heine
69b0ee7cbb
Merge branch 'master' into 2198-adminarea-more-dates-on-created-transaction 2022-09-22 14:35:49 +02:00
elweyn
61f59a2594 Remove query of contribution message resolver test since it is never used. 2022-09-22 12:34:03 +02:00
elweyn
4461ff92a5 Correct tests after changing login and logout from queries to mutations. 2022-09-22 12:22:56 +02:00
joseji
0176131c39 errors are now logged, and events are checked 2022-09-22 12:07:12 +02:00
elweyn
2d4f88ce84 Refactor logout method from query to mutation. 2022-09-22 11:53:54 +02:00
joseji
db21cf2e8d removed unused imports 2022-09-22 11:49:56 +02:00
elweyn
e844bcc925 Change login from Query to Mutation. 2022-09-22 11:47:28 +02:00
joseji
c08aac58a9 events and half log tests 2022-09-22 11:44:30 +02:00
joseji
f710fd9b45 fixed await for events redeem register 2022-09-22 11:19:32 +02:00
joseji
a8fc8b9249 solved conflicts 2022-09-22 11:01:10 +02:00
Alexander Friedland
672312a0dc
Merge branch 'master' into 2198-adminarea-more-dates-on-created-transaction 2022-09-22 10:11:08 +02:00
joseji
c822580c1a removed unused variable 2022-09-21 19:53:57 +02:00
joseji
6202ca64ad test for register through transaction link done 2022-09-21 19:50:27 +02:00
elweyn
00d0068efc Remove unused imports. 2022-09-21 13:44:42 +02:00
elweyn
5aa499a073 Change the result for the FE so that we get datas from the contribution table instead of the transaction table. 2022-09-21 13:31:19 +02:00
elweyn
6c0cb17196 Refactor sendTransactionLinkredeemed
.
2022-09-21 12:41:25 +02:00
elweyn
3a36e09e8f Merge branch '2202-refactor-creations-query' of https://github.com/gradido/gradido into 2202-refactor-creations-query 2022-09-21 11:47:31 +02:00
elweyn
e097c30003 Add denied_at is null to query, change variable name of query. 2022-09-21 11:47:24 +02:00
Claus-Peter Hübner
6c88713f34 start inserting logger.addContext for userid 2022-09-20 16:20:52 +02:00
Hannes Heine
228017184a
Merge branch 'master' into 2202-refactor-creations-query 2022-09-20 10:45:57 +02:00
Moriz Wahl
5378a17daf
Merge branch 'master' into events-and-logs-user-resolver 2022-09-19 19:31:51 +02:00
joseji
1203dada61 ids are now checked in event creation 2022-09-19 19:18:06 +02:00
jjimenezgarcia
5f94cfca88
Update backend/src/graphql/resolver/UserResolver.test.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-09-19 15:40:59 +02:00
elweyn
4e72aafe4d Change the query so that we only look on the contributions table. 2022-09-18 11:22:25 +02:00
Claus-Peter Hübner
86b12f98ed set overall resolvers the isolationlevel to REPEATABLE READ 2022-09-16 15:20:51 +02:00
Claus-Peter Hübner
3fcc62539a changes after merge from master 2022-09-16 15:14:51 +02:00
joseji
cfdec3d122 Fixed wrong handling of dates in tests failing depending on the day you execute them 2022-09-16 13:45:20 +02:00
joseji
b8442e1725 added redeem register event test, transaction link execution failing 2022-09-16 13:42:45 +02:00
joseji
390bb1db3d IDs also tested while event saving, added ActivateAccount event when setting password 2022-09-16 12:22:32 +02:00
clauspeterhuebner
d592c57024
Merge branch 'master' into 1798-feature-gradidoid-1-adapt-and-migrate-database-schema 2022-09-15 17:56:21 +02:00
Hannes Heine
e3c6918436
Merge branch 'master' into 2095-send-email-contribution-confirmed 2022-09-15 16:33:16 +02:00
Hannes Heine
f261e76a38
Merge branch 'master' into 2134-send-email-when-admin-writes-message-to-contribution 2022-09-15 16:02:37 +02:00
joseji
ded649f342 Events and logs completed in User Resolver 2022-09-15 11:42:03 +02:00
Claus-Peter Hübner
4e07aeaff1 Merge branch '1798-feature-gradidoid-1-adapt-and-migrate-database-schema' of github.com:gradido/gradido into 1798-feature-gradidoid-1-adapt-and-migrate-database-schema 2022-09-15 02:43:18 +02:00
Claus-Peter Hübner
411e03c843 rework PR comments 2022-09-15 02:40:59 +02:00
clauspeterhuebner
64aab998e2
Update backend/src/graphql/resolver/UserResolver.test.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-09-14 23:57:53 +02:00
Claus-Peter Hübner
13d79fd8b7 remove multi-line comments 2022-09-14 23:00:47 +02:00
elweyn
6d15ea5c2b Remove unused import. 2022-09-14 11:20:50 +02:00
elweyn
3b810b2add Tests that sendContributionConfirmedEmail is called, removed contributionAmount since it can not be checked. 2022-09-14 09:31:39 +02:00
elweyn
0820d8d529 Tests that the method sendAddedContributionMessageEmail is called. 2022-09-14 09:04:39 +02:00
elweyn
d65bd827ca Change search to get the contribution.user instead of queriing it after wards. 2022-09-14 09:03:28 +02:00
Claus-Peter Hübner
d9313b68db init moderator in UnconfirmedContribution 2022-09-12 19:26:59 +02:00
Claus-Peter Hübner
7cd5ecb463 linting 2022-09-12 19:02:12 +02:00
Claus-Peter Hübner
e6155d52e1 solve error 2022-09-12 18:34:21 +02:00