193 Commits

Author	SHA1	Message	Date
Ulf Gebhardt	7644bf1834	backend compiles	2022-02-26 03:42:20 +01:00
Ulf Gebhardt	c2dfd50654	make transaction a const	2022-02-24 12:51:47 +01:00
Ulf Gebhardt	32d5eacd13	lint fixes	2022-02-24 00:52:54 +01:00
Ulf Gebhardt	3a35cbfee5	fixed backend for new migration ... properly write linked Transactions when sendCoin	2022-02-24 00:41:44 +01:00
Ulf Gebhardt	4ada6ea182	Merge branch 'master' into combine_transaction_tables2	2022-02-23 22:35:57 +01:00
Ulf Gebhardt	7a837be7b2	backend is building	2022-02-23 21:46:40 +01:00
Moriz Wahl	5fccc66126	Merge branch 'master' into test-softdeleted	2022-02-23 18:13:07 +01:00
Alexander Friedland	937ccfbb9d	Update backend/src/graphql/resolver/AdminResolver.ts ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-02-23 09:24:58 +01:00
Moriz Wahl	9c4d418384	fix merging problems	2022-02-23 08:34:59 +01:00
Moriz Wahl	57e9e825f1	fix: Possible SQL Exception in User Search	2022-02-23 08:18:06 +01:00
Alexander Friedland	947cbb659b	Merge branch 'master' into test-softdeleted	2022-02-22 20:31:47 +01:00
ogerly	510ee8a8df	yarn lint --fix	2022-02-22 20:23:57 +01:00
ogerly	1b4f0d4b60	change Mutation in Date, nullable: true in DELETE_USER, UNDELETE_USER	2022-02-22 20:09:27 +01:00
Moriz Wahl	b8c3deac3e	fix: Return Empty Array When No Pending Creations Are Present	2022-02-22 18:49:24 +01:00
Moriz Wahl	2ce19c9c80	improve error messages, test for valid creation on confirmation	2022-02-22 17:45:25 +01:00
Moriz Wahl	dcf2e1a19e	fix wrong id in find statement	2022-02-22 16:38:57 +01:00
Moriz Wahl	cd7a9bf361	do not use moment anymore	2022-02-22 15:49:58 +01:00
ogerly	3b656898e1	add isDeleted in backend, delete and undelete is activ by return	2022-02-22 14:45:43 +01:00
Moriz Wahl	55211f0940	use enum as creation type, date criteria as variable	2022-02-22 14:43:03 +01:00
Moriz Wahl	c0c5510903	less db calls for get pending creations	2022-02-22 14:24:07 +01:00
Moriz Wahl	99f641f1f9	replace any	2022-02-22 13:49:42 +01:00
Moriz Wahl	2bdcea15f0	use only one query to get the open creations	2022-02-22 13:25:26 +01:00
Ulf Gebhardt	99c2636772	fixed missing deletedAt field in search query	2022-02-22 13:05:05 +01:00
Moriz Wahl	7be2fb68b4	refactor: Get User Creations	2022-02-22 12:27:47 +01:00
ogerly	fc3d7e2cbb	add in backend function unDeleteUser()	2022-02-22 12:18:07 +01:00
ogerly	fed3562e4d	add in backend function deleteUser()	2022-02-22 12:18:06 +01:00
ogerly	0de018b296	Merge branch 'user_soft_delete_backend' into test-softdeleted	2022-02-22 12:18:06 +01:00
einhornimmond	e64705d906	Merge branch 'master' into admin_user_search_optimization	2022-02-21 17:10:44 +01:00
einhornimmond	c3d3929ac6	Update backend/src/graphql/resolver/AdminResolver.ts ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2022-02-21 13:23:04 +01:00
Ulf Gebhardt	2158728752	enum instead of value definition	2022-02-21 12:41:11 +01:00
einhornimmond	00d040eeb1	Merge branch 'master' into admin_user_search_optimization	2022-02-21 12:05:05 +01:00
Einhornimmond	b3523b4c63	generic filtering, prevent overfetching from db	2022-02-21 12:03:19 +01:00
Ulf Gebhardt	ea3ecbc679	admin resolver: make sure to write userId only when we create a new balance	2022-02-21 12:00:17 +01:00
Ulf Gebhardt	3040992c51	fix query to use proper field	2022-02-21 01:46:01 +01:00
Ulf Gebhardt	9574af9278	removed balance & transaction repository since its no longer needed	2022-02-21 00:38:39 +01:00
Ulf Gebhardt	0c15bed74e	backend is buildable	2022-02-20 04:46:36 +01:00
Ulf Gebhardt	ed09e998b9	admin: have a specific error message when trying to add a pending creation on a deleted user	2022-02-18 12:59:55 +01:00
Ulf Gebhardt	4a51231bf9	admin resolver ... - use entity instead of repository - include deleted users in our query for pending transactions - throw an error when trying to add or confirm a pending transaction for a deleted user	2022-02-18 12:44:35 +01:00
ogerly	3bd9e66079	add in backend deletedAt in UserAdmin.ts and AdminResolver.ts and in AdminFrontend add deletedAt in searchUser.js	2022-02-18 12:06:18 +01:00
Alexander Friedland	912e35090a	Merge branch 'master' into static_decay_block	2022-02-16 11:51:01 +01:00
Moriz Wahl	488a113ae7	Merge branch 'master' into admin_user_search_optimization	2022-02-15 14:13:33 +01:00
Ulf Gebhardt	f3b3fa2eba	do not query on email opt in type, since we have different ones and legacy types. Furthermore order the result of the query.	2022-02-14 13:45:48 +01:00
Einhornimmond	692433ce51	try fix linting	2022-02-13 09:22:05 +01:00
Moriz Wahl	a347b337c6	take createdAt if updatedAt is not present	2022-02-11 14:55:31 +01:00
Einhornimmond	6e63bacba7	let handle mysql the paging	2022-02-11 10:15:09 +01:00
Moriz Wahl	0a545c5fbe	fix missing negator	2022-02-10 08:14:58 +01:00
Moriz Wahl	b3be4f664a	add date of last email confirmation send to admin user	2022-02-10 08:05:25 +01:00
Moriz Wahl	2c88bc0383	remove query for checkEmail as it is included in the user model now	2022-02-10 07:32:39 +01:00
Alexander Friedland	af3dd430e7	Merge branch 'master' into 1401-Admin-interface-does-user-have-member-area	2022-02-08 15:56:31 +01:00
elweyn	346ca8fc35	Merge conflict resolved.	2022-02-07 10:45:27 +01:00