1142 Commits

Author SHA1 Message Date
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
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
elweyn
7ab7380f09 Call new method to send confirmedContribution EMail to the user. 2022-09-12 11:36:24 +02:00
elweyn
93e7684eda Change import to the new file. 2022-09-09 14:44:00 +02:00
elweyn
663097c378 Fix data with named contributionMemo instead. 2022-09-09 07:52:04 +02:00
elweyn
d73143cfdf Call method to send Email when an admin add a new contributionmessage. 2022-09-09 07:42:27 +02:00
Hannes Heine
039840139c
Merge branch 'master' into 2010-send-email-to-transaction-link-sender 2022-09-08 07:51:23 +02:00
Hannes Heine
4bb8ced489
Merge branch 'master' into add-is-moderator-to-contribution-message 2022-09-06 15:18:08 +02:00
elweyn
ecc42b49fa Add isModerator to the createContributionMessage calls. 2022-09-06 11:23:57 +02:00
elweyn
aa9d60c78c Add test that admin can not call adminCreateContributionMessage on own contribution 2022-09-06 11:07:23 +02:00
elweyn
ced14bd752 Change error message Admin can not answer on own contribution. 2022-09-06 10:59:32 +02:00
elweyn
04b96bac2f Throw error if moderator tries to answer his own contribution in adminCreateContributionMessage. 2022-09-06 10:39:20 +02:00
Moriz Wahl
eb8a245c2d fix resolver args 2022-09-01 16:26:57 +02:00
Moriz Wahl
de2bd1113e refactor: Improve Statistics Query 2022-09-01 15:38:05 +02:00
elweyn
2177c501c3 Remove cleanDB in most afterAll so we don't need to seed contribution and contribution messages again in later tests. 2022-09-01 10:24:42 +02:00
elweyn
d402b871e4 Test that adminCreateContributionMessage, createContributionMessage & listContributionMessages gives the right values back. 2022-08-31 12:26:29 +02:00
elweyn
4ce8ec5bed Change error message from createContributionMessage, remove describe block without tests. 2022-08-29 13:25:42 +02:00
elweyn
ac4f7dc04a Add test with non existing contributionId. 2022-08-29 13:16:44 +02:00
elweyn
8b62696c91 Add test that listContributionMessages throws error for non authenticated user. 2022-08-29 13:07:24 +02:00
elweyn
7156f1afd5 Setup Test file for ContributionMessageResolver. 2022-08-29 12:58:01 +02:00
elweyn
423989777b Remove leftJoin on user, changed ContributionMessage array to count of ContributionMessage. 2022-08-29 12:19:25 +02:00
elweyn
894140b418 Remove unused imports. 2022-08-26 08:50:08 +02:00
elweyn
e510c2ddbf Change import for enum. 2022-08-25 15:27:12 +02:00
elweyn
ead31344f5 Remove leftJoin on user and remove messages from UnconfirmedContribution model added messageCount instead to the model. 2022-08-25 15:16:44 +02:00
elweyn
84ee364051 Revert "Fix imports."
This reverts commit f3f0c27063053bed076e76442f98cfc10973a18d.
2022-08-25 15:00:21 +02:00
elweyn
cdb306dc85 Change the query to get the messages and the user of a message. 2022-08-25 09:52:33 +02:00
elweyn
f3f0c27063 Fix imports. 2022-08-25 09:12:49 +02:00
elweyn
3fbf8b6444 Query ContributionMessages for a specific contributionId. 2022-08-25 09:10:13 +02:00
elweyn
4dbcabf96d Add where clause. 2022-08-24 16:52:42 +02:00
elweyn
057816e4c0 Change innerJoin to leftJoin, so that every contribution is shown not only the one with messages. 2022-08-24 16:43:32 +02:00
elweyn
59df924e1d Add User to Contribution link, query the messages user in the listContributions query. 2022-08-24 16:27:28 +02:00
elweyn
0271a42741 Use user entity instead of user model. 2022-08-24 10:56:19 +02:00
elweyn
41fb0d2a9f Change export name of ContributionMessageResolver class. 2022-08-23 13:46:55 +02:00
elweyn
2c459a8fae Changed the Contribution.find so that we can throw a specific error, added an GraphQL Model as return value instead of DbEntity. 2022-08-23 11:55:34 +02:00
elweyn
e70a18c6bb Change thrown error message. 2022-08-23 11:09:41 +02:00
elweyn
27fd42f097 Change import for enum. 2022-08-22 12:27:46 +02:00
elweyn
5ca422c6d3 Change import for enum and arg. 2022-08-22 12:27:06 +02:00
elweyn
710d47b594 Add adminCreateContributionMessage. 2022-08-22 12:21:38 +02:00
elweyn
c5b84694d0 Withdrew admin part of user createContributionMessage. 2022-08-22 12:16:20 +02:00
elweyn
281f6cde3f Update contributionStatus to new state. 2022-08-22 10:39:56 +02:00
elweyn
0376cffb19 First steps createContributionMessage method of ContributionMessageResolver. 2022-08-22 10:30:48 +02:00
Alexander Friedland
46626441d4
Merge branch 'master' into 2135-add-the-languages-french-and-dutch 2022-08-18 08:09:56 +02:00
Moriz Wahl
69f4b98473 Merge branch 'master' into statistics-resolver 2022-08-17 15:22:57 +02:00
Alexander Friedland
632141ffca
Merge branch 'master' into statistics-resolver 2022-08-17 12:44:31 +02:00
elweyn
1c301d34a2 Test for searchAdminUsers. 2022-08-17 11:37:13 +02:00
elweyn
6c707eae59 Start tests for searchAdminUsers. 2022-08-17 10:22:08 +02:00