187 Commits

Author SHA1 Message Date
21b6e35391
Merge branch 'master' into combine_listTransactionLinks_and_listTransactionLinksAdmin 2023-02-27 15:53:59 +01:00
Moriz Wahl
3cc5494736 refactor(backend): remove admin create contributions 2023-02-20 14:24:42 +01:00
66a5175dc1
combine logic for both listTransactionLinks and listTransactionLinksAdmin 2023-02-14 21:28:58 +01:00
Hannes Heine
c84fa68132
Merge branch 'master' into 2332-mark-contribution-as-rejected 2023-01-19 07:50:22 +01:00
Moriz Wahl
b66372bd90 change name of dynamic statitics fields 2023-01-16 19:42:01 +01:00
Moriz Wahl
7781011b1a refactor(backend): field resolvers in statistics 2023-01-16 15:22:45 +01:00
elweyn
df4e2b419a Merge master in here. 2023-01-13 11:24:11 +01:00
Moriz Wahl
3a63e2721d remove creations from graphql user object 2023-01-11 22:32:50 +01:00
Moriz Wahl
dc33427cd0 add openCreation graphqlModel and resolver 2023-01-11 15:15:26 +01:00
elweyn
ea30fed068 Merge branch 'master' into 2332-mark-contribution-as-rejected 2023-01-10 16:07:24 +01:00
elweyn
2010a1b059 Add hideAmountGDD and hideAmountGDT to the login mutations and the verifyLogin queries 2023-01-03 12:24:49 +01:00
elweyn
853bfabd57 Finish denie logic, add deniedAt IsNull() to queries. 2022-12-20 12:09:59 +01:00
elweyn
d52f7f9590 change transactionLinkId to linkId. 2022-12-06 12:20:21 +01:00
elweyn
46014adc6d Database join contribution to transaction table, add new join to query. 2022-12-01 12:07:25 +01:00
Hannes Heine
9bab013847
Merge branch 'master' into 2198-adminarea-more-dates-on-created-transaction 2022-09-26 08:27:22 +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
3fcc62539a changes after merge from master 2022-09-16 15:14:51 +02:00
Claus-Peter Hübner
d9313b68db init moderator in UnconfirmedContribution 2022-09-12 19:26:59 +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
73db7707ce Remove nullable from graphql Field isModerator. 2022-09-06 14:39:44 +02:00
elweyn
96015a9b1b Add isModerator to the graphql ContributionMessage model. 2022-09-06 11:27:27 +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
7269b4b67b solve problems reading user with emailcontact 2022-08-30 00:57:57 +02:00
elweyn
423989777b Remove leftJoin on user, changed ContributionMessage array to count of ContributionMessage. 2022-08-29 12:19:25 +02:00
Claus-Peter Hübner
1d1de2011a failed try to load OneToOne relation of user to userConmtact as
emailConact-attribut...  grrrrrr...
2022-08-26 20:00:29 +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
c27d64245b Add moderatorId to the object. 2022-08-25 13:51:38 +02:00
elweyn
0163eac52f Add contribution state and contribution messages to the model 2022-08-25 09:51:58 +02:00
elweyn
4b9bdb0f15 Add userId to the ContributionMessage model. 2022-08-25 09:11:24 +02:00
elweyn
d2790588ba Add new model ContributionMessageListResult. 2022-08-25 09:09:13 +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
bda04f87d2 Add messages and state to the contribution model. 2022-08-24 10:57:03 +02:00
elweyn
0271a42741 Use user entity instead of user model. 2022-08-24 10:56:19 +02:00
elweyn
1c433e2d57 Add graphql object that will be returned instead of dbEntity. 2022-08-23 11:53:19 +02:00
Claus-Peter Hübner
e946d96efe Merge remote-tracking branch 'origin/master' into
1798-feature-gradidoid-1-adapt-and-migrate-database-schema
2022-08-18 19:07:33 +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
Hannes Heine
3e7973b513
Merge branch 'master' into 2116-retrieve-admin-and-moderators 2022-08-17 10:01:41 +02:00
elweyn
d3238fd486 Fix linting. 2022-08-15 11:05:11 +02:00
elweyn
304732bdad Add model for AdminUser 2022-08-10 11:27:27 +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
Claus-Peter Hübner
fadbc7068e start adaptions of users changes in backend 2022-08-09 03:56:22 +02:00
Alexander Friedland
58512a9e32
Merge branch 'master' into statistics-resolver 2022-08-06 11:14:58 +02:00
elweyn
c8267cf774 Add contributionDate to the Contribution object. 2022-07-20 10:42:24 +02:00
elweyn
495fbfd05c Change linkCount to contributionCount and linkList to contributionList. 2022-07-18 11:31:04 +02:00
elweyn
fdea5f68ef Add confirmedBy and confirmedAt for the contribution query. 2022-07-14 16:43:20 +02:00
elweyn
c02f575780 Withdrew userid from contribution object. 2022-07-14 12:59:21 +02:00
elweyn
2f90bd9811 Withdrew User from Contribution object and replaced it with userId, firstName and lastName. 2022-07-14 12:58:01 +02:00
elweyn
7c698de325 Add constructor to ContributionListResult. 2022-07-14 12:25:45 +02:00