151 Commits

Author SHA1 Message Date
3391b3a9ee
merge 2023-03-09 14:37:17 +01:00
Moriz Wahl
e4a9533802 refactor(backend): use find contributions helper in list contributions 2023-02-28 20:36:23 +01:00
21b6e35391
Merge branch 'master' into combine_listTransactionLinks_and_listTransactionLinksAdmin 2023-02-27 15:53:59 +01:00
dec47d6dc5
Merge branch 'master' into combine_listTransactionLinks_and_listTransactionLinksAdmin 2023-02-23 22:07:08 +01:00
Moriz Wahl
6e88068a88 Merge branch 'master' into remove-adminCreateContributions 2023-02-21 15:20:45 +01:00
Moriz Wahl
23abbfa658 remove adminCreateContributions mutation 2023-02-20 14:59:57 +01:00
9de2149c8f
Merge branch 'master' into combine_listTransactionLinks_and_listTransactionLinksAdmin 2023-02-17 14:10:51 +01:00
elweyn
b1b3a060cb Merge master in refactor adminListContributions. 2023-02-17 11:20:43 +01:00
elweyn
34fe6b4e90 Rework reviews, add the properties used in the ui for listContributions. 2023-02-15 09:44:00 +01:00
Hannes Heine
38b7234d96
Merge branch 'master' into refactor-deny-contribution-unit-test 2023-02-15 09:23:08 +01:00
66a5175dc1
combine logic for both listTransactionLinks and listTransactionLinksAdmin 2023-02-14 21:28:58 +01:00
a88585086c
test sendActivationEmail 2023-02-13 13:12:58 +01:00
elweyn
bcf63ec334 Deconstruct test for listContributions. 2023-02-09 15:02:53 +01:00
elweyn
ad16aff1ea Change listUnconfirmedContributions to adminListAllContributions. 2023-02-06 15:06:58 +01:00
elweyn
8c00fcd6cc Merge new unit tests for ContributionResolver. 2023-02-06 14:34:40 +01:00
Hannes Heine
d40114df69
Merge branch 'master' into refactor-deny-contribution-unit-test 2023-02-02 15:19:56 +01:00
elweyn
08d8c008f6 Add denyContribution mutation to the seeds. 2023-01-31 13:07:41 +01:00
elweyn
75d47d016d Remove the default null of statusFilter or the test query. 2023-01-31 11:19:43 +01:00
elweyn
0bd3ce27df Change Tests to statusFilter. 2023-01-25 16:48:49 +01:00
elweyn
cc0fe5968d Tests that the filterState parameter in listAllContributions works as expected. 2023-01-25 07:54:17 +01:00
elweyn
2cecadded2 Add filterState to the backend test listAllContributions query. 2023-01-24 17:02:08 +01:00
elweyn
95e1cd4b6d Merge branch 'master' into add_hide_amount_to_users 2023-01-10 14:00:47 +01:00
elweyn
d71a73ec3b Add new mutation variables to the tests mutation in backend. 2023-01-10 10:56:08 +01:00
Moriz Wahl
e009fcb87d
Merge branch 'master' into seed-contributions 2023-01-09 14:49:21 +01:00
Moriz Wahl
c4214eb2c6 remove timeouts in seeds 2022-12-22 14:10:34 +01:00
Moriz Wahl
06b5fa4295 refactor(backend): seed contributions as user 2022-12-12 14:05:15 +01:00
Moriz Wahl
e4e308cdb4 fix seeds 2022-11-15 14:34:20 +01:00
Wolfgang Huß
80fdc8d30a Merge branch 'master' of github.com:gradido/gradido into daily-rule-for-contribution-links-frontend
# Conflicts:
#	backend/src/seeds/graphql/mutations.ts
2022-10-13 12:01:06 +02:00
Moriz Wahl
686c24a57d add tests for daily contribution link 2022-10-12 17:17:10 +02:00
Wolfgang Huß
6d06c0f2d8 Merge branch 'master' of github.com:gradido/gradido into 2218-refactor-logout-to-mutation
# Conflicts:
#	backend/src/graphql/resolver/UserResolver.test.ts
#	backend/src/seeds/factory/contributionLink.ts
#	backend/src/seeds/factory/creation.ts
2022-10-12 16:23:04 +02:00
elweyn
4461ff92a5 Correct tests after changing login and logout from queries to mutations. 2022-09-22 12:22:56 +02:00
Claus-Peter Hübner
bb8fc6a16e change using findUserByEmail() instead of raw queries 2022-09-15 17:48:22 +02:00
Claus-Peter Hübner
411e03c843 rework PR comments 2022-09-15 02:40:59 +02:00
Claus-Peter Hübner
7cd5ecb463 linting 2022-09-12 19:02:12 +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
Claus-Peter Hübner
97dee4d67c adapt tests to work with User and UserContact 2022-09-02 02:34:45 +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
852c4e6499 change seeding now with UserContacts entry 2022-08-31 01:12:12 +02:00
elweyn
7156f1afd5 Setup Test file for ContributionMessageResolver. 2022-08-29 12:58:01 +02:00
elweyn
f96fb5aa63 Add searchAdminUsers query to mocks. 2022-08-17 10:21:40 +02:00
Moriz Wahl
af9d874fea fix: Update contribution_date when Moved by Seed 2022-07-25 13:29:45 +02:00
Hannes Heine
d5a2c24d7e
Merge branch 'master' into 2000-contribution-delete 2022-07-19 12:25:12 +02:00
elweyn
4c33d3784b Added mutation for deleteContribution 2022-07-18 13:07:44 +02:00
elweyn
11dacd40be Change query listAllContributions now gets contributionCount and contributionList instead of linkCount and linkList. 2022-07-18 11:34:30 +02:00
elweyn
3a8fb6b353 Change query of listContribution to get contributionCount and contributionList instead of link... 2022-07-18 11:31:39 +02:00
elweyn
93c2d6814a Change the listContribution query to give back ContributionListResult object with linkCount. 2022-07-18 11:27:44 +02:00
elweyn
22602c45b9 Merge master into this branch. 2022-07-14 17:40:58 +02:00
elweyn
ab77a798f5 Add query seed for listAllContributions. 2022-07-14 16:57:25 +02:00
elweyn
46206c4752 Handled the merge conflict so that we can continue to work. 2022-07-12 10:01:26 +02:00