1391 Commits

Author SHA1 Message Date
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
elweyn
a44bcc00e2 Remove unused code. 2022-08-17 10:09:12 +02:00
elweyn
beb563ac5c Fix changes. 2022-08-17 10:05:56 +02:00
Hannes Heine
3e7973b513
Merge branch 'master' into 2116-retrieve-admin-and-moderators 2022-08-17 10:01:41 +02:00
Claus-Peter Hübner
72e1de9f78 Merge remote-tracking branch 'origin/master' into
2125-feature-gradido-id-new-column-gradidoid-in-users-table
2022-08-16 17:10:15 +02:00
Claus-Peter Hübner
e876f32ad5 initialize gradidoID of fakedUser per uuidv4() instead of constant 2022-08-16 17:05:31 +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
d3238fd486 Fix linting. 2022-08-15 11:05:11 +02:00
elweyn
b41f34a3dd Merge master into this branch. 2022-08-15 11:03:58 +02:00
Hannes Heine
24ce920ecc
Merge branch 'master' into 2105-add-emailChecked-to-opt-in-check 2022-08-11 14:56:36 +02:00
Hannes Heine
186eaf238a
Merge branch 'master' into 2117-list-contribution-links-for-all-users 2022-08-11 11:17:29 +02:00
elweyn
c46f2f241e Create resolver method to query admin and moderator users. 2022-08-10 11:28:21 +02:00
elweyn
304732bdad Add model for AdminUser 2022-08-10 11:27:27 +02:00
Claus-Peter Hübner
cd71bf7661 linting 2022-08-09 23:59:13 +02:00
Claus-Peter Hübner
2b4e94ef66 add gradidoID-Test during createUser 2022-08-09 23:41:39 +02:00
Claus-Peter Hübner
35da60c572 change User to create a gradidoID as uuidv4 during createUser 2022-08-09 23:36:00 +02:00
elweyn
9a7073415c Add TODO for listContributionLinks test of user without admin rights. 2022-08-08 11:14:11 +02:00
elweyn
5fb491572d Change test for listCOntributionLinks to get empty object as user without admin rights. 2022-08-08 11:04:24 +02:00
elweyn
7201fb6fc3 A User has now the right to get listContributionLinks. 2022-08-08 10:57:56 +02:00
ogerly
56bd17a265 fix test for backend 2022-08-07 23:08:44 +02:00
ogerly
dec15c24ca refactor UserResolver.ts 2022-08-07 22:41:57 +02:00
Alexander Friedland
58512a9e32
Merge branch 'master' into statistics-resolver 2022-08-06 11:14:58 +02:00
elweyn
f42ba05572 Change call of checkOptInCode since signature changed. 2022-08-04 11:35:34 +02:00
elweyn
3a183918c5 Change checkOptInCode to check if emailChecked before changing optInState. 2022-08-04 11:34:46 +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
bcb0882a06 Add test to updateContribution check if error is thrown when memo length is smaller than 5 or greater than 255 characters. 2022-07-25 11:23:28 +02:00
elweyn
180e4ef27d Add test to createContribution that error is thrown when memo length smaller than 5 and greater than 255 2022-07-25 11:17:10 +02:00
elweyn
c8267cf774 Add contributionDate to the Contribution object. 2022-07-20 10:42:24 +02:00
elweyn
ccc16b4083 Test that an already confirmed contribution can not be deleted. 2022-07-19 13:09:44 +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
Hannes Heine
ab6db2e0a6
Merge branch 'master' into add_count_to_list_contributions 2022-07-19 01:50:39 +02:00
clauspeterhuebner
5a77247c79
Merge branch 'master' into 1794-feature-event-protocol-1-implement-the-basics-of-the-business-event-protocol 2022-07-18 19:31:47 +02:00
elweyn
e84061c412 Added tests for deleteContribution 2022-07-18 13:08:27 +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
42b8d625da Change query fields to new names. 2022-07-18 11:38:58 +02:00
elweyn
495fbfd05c Change linkCount to contributionCount and linkList to contributionList. 2022-07-18 11:31:04 +02:00
elweyn
93c2d6814a Change the listContribution query to give back ContributionListResult object with linkCount. 2022-07-18 11:27:44 +02:00
clauspeterhuebner
77813317f5
Merge branch 'master' into 1794-feature-event-protocol-1-implement-the-basics-of-the-business-event-protocol 2022-07-15 15:34:24 +02:00
elweyn
843993e340 Fix linting. 2022-07-15 14:34:47 +02:00
elweyn
382211f3ca Adapt test so that we check findAllContributions. 2022-07-15 14:14:55 +02:00