347 Commits

Author SHA1 Message Date
elweyn
186e6711f5 Remove unused import. 2022-09-26 09:10:58 +02:00
elweyn
209c61e5d8 Change call from Contribution to DbContribution and use Contribution as model. 2022-09-26 08:48:04 +02:00
Hannes Heine
9bab013847
Merge branch 'master' into 2198-adminarea-more-dates-on-created-transaction 2022-09-26 08:27:22 +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
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
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
Claus-Peter Hübner
411e03c843 rework PR comments 2022-09-15 02:40:59 +02:00
Claus-Peter Hübner
13d79fd8b7 remove multi-line comments 2022-09-14 23:00:47 +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
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
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
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
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
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
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
228451574d adapt backend on database migration of UserContacts 2022-08-26 02:28:04 +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
cdb306dc85 Change the query to get the messages and the user of a message. 2022-08-25 09:52:33 +02:00
elweyn
0271a42741 Use user entity instead of user model. 2022-08-24 10:56:19 +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
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
Moriz Wahl
f2f8989746 save contribution when setting status DELETED before softDelete 2022-08-15 19:06:59 +02:00
Moriz Wahl
c417bc7a10 add contribution status enum and set it 2022-08-15 19:02:06 +02:00
Moriz Wahl
daa8d48ca6 add contribution type enum and set contribution type on creation 2022-08-15 18:50:25 +02:00
elweyn
f42ba05572 Change call of checkOptInCode since signature changed. 2022-08-04 11:35:34 +02:00
elweyn
8aa6bc540e Change CONTRIBUTIONLINK_MEMO_..._CHARS to MEMO_..._CHARS and using it on ContributionResolver, TransactionResolver and AdminResolver. 2022-07-25 12:41:11 +02:00
elweyn
801e223cfd Implement that adminUpdateContribution is not allowed when moderator is null. 2022-07-13 08:27:05 +02:00
elweyn
18ff51aacf Merge master into this branch. 2022-07-06 10:51:35 +02:00
elweyn
103928518c Change utils file isContributionValid to contributions and changed method isContributionValid to validateContribution. 2022-07-05 11:35:50 +02:00
elweyn
61d4c138e1 Remove unused import. 2022-07-05 09:17:48 +02:00
elweyn
b580f8755d Refactor updateCreations. 2022-07-04 07:40:10 +02:00
elweyn
6e5540b863 Move all util methods to isContributionValid file, add const file for Resolvers. 2022-06-29 10:49:53 +02:00
elweyn
0c819522a1 Merge changes from master and this branch. 2022-06-28 11:17:06 +02:00
elweyn
d062a10a34 Fix linting. 2022-06-27 13:37:03 +02:00
elweyn
b95a8081fc Refactored getUserCreation & isContributionValid method to own files. 2022-06-24 12:17:28 +02:00
clauspeterhuebner
e1fd44a295
Merge branch 'master' into origin/1921-rebase_from_master 2022-06-23 02:45:49 +02:00
Claus-Peter Hübner
47772a37b2 rework PR-comments 2022-06-23 02:42:20 +02:00
Claus-Peter Hübner
0edd295dbb rework PR-Comments 2022-06-20 23:47:41 +02:00