1720 Commits

Author	SHA1	Message	Date
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
Alexander Friedland	5b892d761e	Merge branch 'master' into 1106-first-transaction-cannot-be-expanded	2022-02-15 09:22:24 +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
ogerly	5319f6de1e	remove string 'recipiant not known' to 'recipiant not known'	2022-02-11 12:10:00 +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	7b2589699c	Merge branch 'master' into 1106-first-transaction-cannot-be-expanded	2022-02-09 11:45:13 +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
Alexander Friedland	55573ea2ce	Merge branch 'master' into 1106-first-transaction-cannot-be-expanded	2022-02-08 08:31:13 +01:00
Ulf Gebhardt	8e769e7b0e	Merge branch 'master' into remove_unnecessary_repositories	2022-02-07 13:07:55 +01:00
Alexander Friedland	533de795df	Merge branch 'master' into 1106-first-transaction-cannot-be-expanded	2022-02-07 13:04:50 +01:00
ogerly	21da7f4ffb	Removed the firstTransaction property initialization in TransactionList.	2022-02-07 11:56:50 +01:00
ogerly	111894bc3e	Move case firstTransaction in case their is no previous Transaction.	2022-02-07 11:44:32 +01:00
ogerly	e22c701c88	Add firstTransaction boolean to Transaction.	2022-02-07 11:40:26 +01:00
elweyn	520cb22350	Revert "Add firstTransaction boolean to Transaction." ... This reverts commit 8c6aafcedb80e6212fe80d04c60e9340a0a762f6.	2022-02-07 11:38:46 +01:00
ogerly	d3123e00fc	Fill firstTransaction in case decay can not be created.	2022-02-07 11:32:56 +01:00
ogerly	8c6aafcedb	Add firstTransaction boolean to Transaction.	2022-02-07 11:32:09 +01:00
ogerly	27d4623137	Remove firstTransaction from TransactionList.	2022-02-07 11:31:44 +01:00
ogerly	801033138f	Add firstTransaction boolean to TransactionList.	2022-02-07 11:14:07 +01:00
elweyn	346ca8fc35	Merge conflict resolved.	2022-02-07 10:45:27 +01:00
ogerly	4dc4f30097	Add hasElopage to the UserAdmin model.	2022-02-07 10:39:01 +01:00
ogerly	3806beb01e	Add hasElopage flag to user entity for the admin user search.	2022-02-07 10:38:35 +01:00
ogerly	555420a568	Remove unused imports, extract hasElopageBuys to utility.	2022-02-07 10:36:43 +01:00