172 Commits

Author	SHA1	Message	Date
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
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
Moriz Wahl	7be2fb68b4	refactor: Get User Creations	2022-02-22 12:27:47 +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
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
ogerly	3806beb01e	Add hasElopage flag to user entity for the admin user search.	2022-02-07 10:38:35 +01:00
Hannes Heine	80956bcee9	Merge branch 'master' into 1401-Admin-interface-does-user-have-member-area	2022-02-05 17:23:02 +01:00
Ulf Gebhardt	c21f7da5ce	lint fixes	2022-02-04 15:50:24 +01:00
elweyn	14d9366ad6	Merge branch 'remove_unnecessary_repositories' of https://github.com/gradido/gradido into remove_unnecessary_repositories	2022-02-04 15:49:21 +01:00
Ulf Gebhardt	545aca8ffb	lint fix	2022-02-04 15:48:04 +01:00
Ulf Gebhardt	c63a42009e	removed references and implemented implicit active record queries	2022-02-04 15:48:04 +01:00
Ulf Gebhardt	a334c916fd	fixed business logic with only one user	2022-02-03 21:35:15 +01:00
ogerly	4c3c49c9aa	add hasElopage status in AdminResolver.ts	2022-02-03 11:43:07 +01:00
Ulf Gebhardt	8005b700c3	removed references and implemented implicit active record queries	2022-02-02 19:54:47 +01:00
Ulf Gebhardt	736310f5d5	fix build error - type errors	2022-02-02 19:48:20 +01:00
Ulf Gebhardt	07299299a7	remove explicit write on removed column blockchainTypeId ... removed test result comment from code	2022-02-02 17:18:28 +01:00
Ulf Gebhardt	28e6522052	redo the remove repository change for AdminResolver and AdminPendingCreations since the Filename changed and git could not resolve this	2022-02-02 16:40:08 +01:00
Ulf Gebhardt	71551153c4	backend changes to rename login_pending_tasks_admin table to admin_pending_creations	2022-02-02 16:25:15 +01:00
Ulf Gebhardt	5bc23a4857	remove typeorm from backend project and reference the one installed in database. This way the default connection of the enteties can be used - this was not possible before since the connection waa created in the backend typeorm, but the entities are defined in the database installation. ... We now remove the typeorm from backend and rely solely on the database typeorm. We now can use both activeRecord and dataMapper pattern.	2022-02-01 04:14:54 +01:00
Alexander Friedland	cce9e2af67	Merge branch 'master' into fix-creation-for-not-checked-email	2022-01-27 14:09:25 +01:00
elweyn	6c81673a4b	Update creations of a user only if the old pending creation has the same month as the updated month. Throw exception before end of file.	2022-01-27 11:04:32 +01:00
elweyn	9e4d2498ca	Throw exception before continuing the bussiness logic.	2022-01-27 10:38:35 +01:00
elweyn	a12378ed8b	Checks if User has activated his Email before saving a open creation.	2022-01-27 10:33:06 +01:00
elweyn	d938814f1a	Check if user account is not disabled to make a creation.	2022-01-27 10:24:03 +01:00
elweyn	afbc52c2aa	Implemented a method to add back the summ to the creations array.	2022-01-26 20:10:11 +01:00
elweyn	190038eaa1	fix updatePendingCreation method logic, now it checks if the updated datas are allowed so that no user can get more than 1000 GDD per month.	2022-01-26 15:54:19 +01:00