63 Commits

Author SHA1 Message Date
Hannes Heine
2827f30d08
Merge branch 'master' into 2139-add-deleted-by-to-contributions 2022-10-20 13:36:43 +02:00
elweyn
1e25bde9c5 Change database version for the feature, resolve merge conflicts. 2022-10-20 13:36:25 +02:00
ogerly
2d7bef3e7e dleted contributions are displayed to the user 2022-10-20 10:00:53 +02:00
joseji
7d17735d7f decimals from db tested propperly and merged master 2022-10-14 13:05:00 +02:00
elweyn
eb18bb8e7c Add deletedBy value on deleteContribution mutation. 2022-10-13 17:18:56 +02:00
Moriz Wahl
bc2889a9f8 fix: Disable Change of Month for Update Contribution (wallet and admin) 2022-10-11 20:44:41 +02:00
joseji
bb3d1caa73 fixed amount not being initialized in databsae while storing events 2022-10-04 20:33:50 +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
joseji
0176131c39 errors are now logged, and events are checked 2022-09-22 12:07:12 +02:00
joseji
c08aac58a9 events and half log tests 2022-09-22 11:44:30 +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
84ee364051 Revert "Fix imports."
This reverts commit f3f0c27063053bed076e76442f98cfc10973a18d.
2022-08-25 15:00:21 +02:00
elweyn
f3f0c27063 Fix imports. 2022-08-25 09:12:49 +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
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
Moriz Wahl
6f081c4cc9 fix: Use Inner Join for Contribution and User 2022-07-28 11:12:17 +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
6f5945f991 createContribution & updateContribution checks if memo length is correct. 2022-07-25 11:24:05 +02:00
elweyn
b4a4a9e126 Throw error if confirmedAt is present. 2022-07-19 13:09:03 +02:00
Hannes Heine
d5a2c24d7e
Merge branch 'master' into 2000-contribution-delete 2022-07-19 12:25:12 +02:00
elweyn
da3574edb8 Fix merge conflict and reviewed name changes. 2022-07-18 12:35:42 +02:00
elweyn
7a337f027d Fix merge conflict. 2022-07-18 12:32:24 +02:00
elweyn
ae04024dd3 Remove unused import. 2022-07-18 11:39:17 +02:00
elweyn
93c2d6814a Change the listContribution query to give back ContributionListResult object with linkCount. 2022-07-18 11:27:44 +02:00
elweyn
5f5c19e6ba Change find to much more efficient code. 2022-07-15 14:14:15 +02:00
elweyn
ed75dce369 Merge branch 'master' into 2051-list-all-confirmed-contribution 2022-07-15 13:46:46 +02:00
Alexander Friedland
8f742ce1d1
Merge branch 'master' into 2051-list-contribution-add-deleted 2022-07-15 07:37:37 +02:00
elweyn
b86ddbf8b0 Fix linting. 2022-07-14 18:08:51 +02:00
elweyn
22602c45b9 Merge master into this branch. 2022-07-14 17:40:58 +02:00
elweyn
cbbe0ffad2 Change the method name from listAllConfirmedContributions to listAllContributions. 2022-07-14 16:45:19 +02:00
elweyn
8c6ec08e88 Gives a list of allCreations and calls the User one time in the creation. 2022-07-14 16:42:55 +02:00
elweyn
99c4e83670 Add deleted contribution to the list of contribution. 2022-07-13 11:26:18 +02:00
elweyn
46206c4752 Handled the merge conflict so that we can continue to work. 2022-07-12 10:01:26 +02:00
elweyn
339b32a02f Change FindOperator<any> to <number> 2022-07-11 17:16:31 +02:00
elweyn
70db65044c Fix linting. 2022-07-11 14:09:40 +02:00
elweyn
f8cdad7e58 Change the where clause to a defined object. 2022-07-11 14:07:57 +02:00
elweyn
2113061629 Change the imports to the standard. 2022-07-11 14:05:57 +02:00
elweyn
ae52b520dd Withdrew where clause to an variable with inline condition. 2022-07-11 12:04:46 +02:00
elweyn
a2eccb12ed Change the variable name contribution to contributions. 2022-07-11 11:42:39 +02:00
elweyn
18ff51aacf Merge master into this branch. 2022-07-06 10:51:35 +02:00
Hannes Heine
e834d06704
Merge branch 'master' into 2000-contribution-list 2022-07-06 10:48:28 +02:00
Hannes Heine
e2b7c9dece
Merge branch 'master' into 2000-contribution-delete 2022-07-06 10:15:03 +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
9bd5710933 Add check if user is owner of the contribution before deleting. 2022-07-05 09:37:41 +02:00