681 Commits

Author	SHA1	Message	Date
ogerly	09258eb57a	rename disabled to deleted	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
Moriz Wahl	38d5eda9d2	set timeoute to 10000	2022-02-21 15:24:36 +01:00
Moriz Wahl	1f3c9d3908	get user resolver test running again	2022-02-21 14:57:16 +01:00
Moriz Wahl	970216b2fc	Merge branch 'master' into backend-tests-running-again	2022-02-21 13:24:42 +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	a344011403	lint fix	2022-02-21 13:02:15 +01:00
Ulf Gebhardt	bf64de06b1	reverse is destructing	2022-02-21 13:00:20 +01:00
Ulf Gebhardt	2158728752	enum instead of value definition	2022-02-21 12:41:11 +01:00
Ulf Gebhardt	314a1b1ed4	add todo	2022-02-21 12:08:37 +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	d715fd9c2f	also set user.id as involved User on a creation	2022-02-21 01:49:53 +01:00
Ulf Gebhardt	3040992c51	fix query to use proper field	2022-02-21 01:46:01 +01:00
Ulf Gebhardt	270ccbf1cf	removed unused symbol	2022-02-21 01:23:58 +01:00
Ulf Gebhardt	acc49581cb	more refactors, fixed some todos and simplified things	2022-02-21 01:16:15 +01:00
Ulf Gebhardt	2d0d02c7f6	lots of refacoting in TransactionResolver	2022-02-21 01:01:57 +01:00
Ulf Gebhardt	9574af9278	removed balance & transaction repository since its no longer needed	2022-02-21 00:38:39 +01:00
Ulf Gebhardt	e1034cb1fd	fixed data conversion error on sendCoins	2022-02-21 00:18:08 +01:00
Ulf Gebhardt	70a0a2664b	properly use js array operators (find)	2022-02-20 13:21:12 +01:00
Ulf Gebhardt	0c15bed74e	backend is buildable	2022-02-20 04:46:36 +01:00
Ulf Gebhardt	e27dcb27c6	Merge branch 'master' into refactor_user_resolver	2022-02-18 17:23:50 +01:00
Ulf Gebhardt	09d15a2359	Merge branch 'master' into refactor_user_resolver	2022-02-18 17:17:57 +01:00
Ulf Gebhardt	264270524b	some small refactors for the user resolver: ... - stop using repositories where its not needed - removed unused function	2022-02-18 13:26:57 +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	90bdca04a6	UserResolver ... - on login have a specific message for deleted users - when trying to register also check for deleted users and prevent registration	2022-02-18 12:49:05 +01:00
Ulf Gebhardt	8eaed23af4	transactionResolver ... - remove unnecessary function - use of the enity model directly - corrected spelling - show specific error when sending to a deleted user	2022-02-18 12:47:33 +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
Moriz Wahl	48435f0d8b	Merge branch 'backend-tests-running-again' of github.com:gradido/gradido into backend-tests-running-again	2022-02-17 12:33:10 +01:00
Moriz Wahl	4a5d1980a5	afterAll at top	2022-02-17 12:32:51 +01:00
Ulf Gebhardt	0683ff1999	fixed backend deletedAt instead of disabled	2022-02-17 10:53:49 +01:00
Moriz Wahl	631346b63c	remove deleted entities	2022-02-16 13:19:27 +01:00
Moriz Wahl	1335bb8e26	activate UserResolver test again	2022-02-16 13:18:59 +01:00
Ulf Gebhardt	a37b479158	fixed sendCoins	2022-02-16 12:29:16 +01:00
Alexander Friedland	912e35090a	Merge branch 'master' into static_decay_block	2022-02-16 11:51:01 +01:00
Moriz Wahl	2294997734	throw again when GDT server is not reachable	2022-02-16 09:39:42 +01:00
Moriz Wahl	efaef025ee	do not throw error when GDT server is not reachable	2022-02-16 09:32:24 +01:00
Moriz Wahl	283cfcc84a	GDT server not reachable error thrown	2022-02-16 09:23:58 +01:00
Moriz Wahl	58ee714e17	allow gdtSum to be null	2022-02-16 09:05:42 +01:00
Moriz Wahl	488a113ae7	Merge branch 'master' into admin_user_search_optimization	2022-02-15 14:13:33 +01:00
Moriz Wahl	8fddffd466	Merge branch 'master' into do-not-throw-gdt-errors	2022-02-15 07:51:50 +01:00
Moriz Wahl	22c408f633	fix: Catch GDT Server Errors	2022-02-14 14:34:43 +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
Moriz Wahl	a79f1067ef	Merge branch 'master' into admin_user_search_optimization	2022-02-13 15:08:14 +01:00
Einhornimmond	692433ce51	try fix linting	2022-02-13 09:22:05 +01:00
Moriz Wahl	15a9af4552	Merge branch 'master' into admin-email-confirmation	2022-02-11 16:29:05 +01:00
Moriz Wahl	a347b337c6	take createdAt if updatedAt is not present	2022-02-11 14:55:31 +01:00