313 Commits

Author SHA1 Message Date
Moriz Wahl
e8625cb5af remove console log 2022-03-17 11:32:52 +01:00
Moriz Wahl
f21e0ed038 only creations transaction list with admin rights 2022-03-17 11:20:26 +01:00
Moriz Wahl
fd9292b3d5 user context in admin interface 2022-03-17 09:57:19 +01:00
Moriz Wahl
0136a22f0c resolve relative paths in resolvers 2022-03-07 21:35:50 +01:00
22c65aa929
renamed TypeId to TransactiontypeId
fixed admin creation (backend part)
2022-03-04 15:12:51 +01:00
ae4ad937aa
fix transaction type id - too much change 2022-03-04 14:50:20 +01:00
91fda4c097
Merge branch 'master' into refactor_arithmetic_transactionlist_adminarea 2022-03-04 14:43:39 +01:00
008331d43f
renamed lastUserTransaction to lastTransaction 2022-03-04 12:32:05 +01:00
Alexander Friedland
bb547a211e
Merge branch 'master' into refactor_arithmetic_transactionlist_adminarea 2022-03-04 10:09:45 +01:00
850060d057
Merge branch 'master' into refactor_arithmetic 2022-03-03 17:25:57 +01:00
Moriz Wahl
c663843758 type_id in raw sql query 2022-03-03 16:54:34 +01:00
ogerly
38d53e61c0 TransactionTypeId to TypeId changed, *10000 removed, graphql refactor 2022-03-01 09:32:16 +01:00
50d13b10ab
Merge branch 'combine_transaction_tables2' into refactor_arithmetic
# Conflicts:
#	backend/src/config/index.ts
#	backend/src/graphql/model/Transaction.ts
#	backend/src/graphql/resolver/AdminResolver.ts
#	backend/src/graphql/resolver/TransactionResolver.ts
#	database/entity/Transaction.ts
#	database/src/interface/TransactionContext.ts
#	database/src/seeds/helpers/user-helpers.ts
2022-02-28 12:58:23 +01:00
4e017e4017
make transaction a const 2022-02-28 12:28:13 +01:00
b0b669ac34
lint fixes 2022-02-28 12:28:13 +01:00
dd0d4a19a2
fixed backend for new migration
properly write linked Transactions when sendCoin
2022-02-28 12:28:13 +01:00
33ce8a0799
Merge branch 'master' into combine_transaction_tables2 2022-02-28 12:21:54 +01:00
e988cf9371
defining precision in config seems to work properly afterall 2022-02-27 13:05:27 +01:00
9c27568f77
include decimal with precision definition 2022-02-27 03:09:18 +01:00
7644bf1834
backend compiles 2022-02-26 03:42:20 +01:00
c2dfd50654
make transaction a const 2022-02-24 12:51:47 +01:00
Moriz Wahl
ec143bd18f fix: No Creations for Deleted Users 2022-02-24 11:08:30 +01:00
32d5eacd13
lint fixes 2022-02-24 00:52:54 +01:00
3a35cbfee5
fixed backend for new migration
properly write linked Transactions when sendCoin
2022-02-24 00:41:44 +01:00
4ada6ea182
Merge branch 'master' into combine_transaction_tables2 2022-02-23 22:35:57 +01:00
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
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
2158728752
enum instead of value definition 2022-02-21 12:41:11 +01:00