1
Commit Graph

26 Commits

Author SHA1 Message Date
849c94481c Merge branch 'refactoring' into error-handling
# Conflicts:
#	src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
#	src/main/java/mops/gruppen2/domain/Exceptions/UserAlreadyExistsException.java
#	src/main/java/mops/gruppen2/domain/Exceptions/UserNotFoundException.java
#	src/main/java/mops/gruppen2/domain/Group.java
#	src/main/java/mops/gruppen2/domain/event/AddUserEvent.java
#	src/main/java/mops/gruppen2/domain/event/CreateGroupEvent.java
#	src/main/java/mops/gruppen2/domain/event/DeleteUserEvent.java
#	src/main/java/mops/gruppen2/domain/event/Event.java
#	src/main/java/mops/gruppen2/domain/event/UpdateGroupDescriptionEvent.java
#	src/main/java/mops/gruppen2/domain/event/UpdateGroupTitleEvent.java
#	src/main/java/mops/gruppen2/domain/event/UpdateRoleEvent.java
#	src/main/java/mops/gruppen2/domain/exception/EventException.java
#	src/main/java/mops/gruppen2/domain/exception/GroupIdMismatchException.java
#	src/main/java/mops/gruppen2/domain/exception/GroupNotFoundException.java
#	src/main/java/mops/gruppen2/domain/exception/NoValueException.java
#	src/main/java/mops/gruppen2/service/ControllerService.java
#	src/main/java/mops/gruppen2/service/GroupService.java
#	src/main/java/mops/gruppen2/service/UserService.java
#	src/main/resources/templates/errorRenameLater.html
2020-03-18 23:40:39 +01:00
a05ffe9e4c Fix Checkstyle Errors :(
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-18 23:17:57 +01:00
08717611d5 Rename SerializationService to JsonService
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-18 21:46:14 +01:00
e1a630ae1a adapt tests
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-18 21:45:33 +01:00
e4d8fb05cb removed unneccessary fields, decreased field visibility
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-18 21:32:05 +01:00
2ba913f2c8 Formatting
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-18 20:18:03 +01:00
b1460abe48 Exception rework: clearer message + origin
Co-authored-by: [Mahgs] <maxoerter@gmx.de>
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-18 18:49:40 +01:00
b236e3bb9d changed checkGroup Method to a Query 2020-03-18 14:09:30 +01:00
e045dc54ee Add InviteLinkDTO + add dto folder
Co-authored-by: [Mahgs] <maxoerter@gmx.de>
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-17 13:33:02 +01:00
7e2c1dec81 tested APIController
Co-authored-by: AndiBuls <andreas.buls@uni-duesseldorf.de>
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-16 16:16:46 +01:00
3f144d14e4 update KeyCloakConfig like in the KeycloakDemo
Co-authored-by: LukasEttel <lukas.ettie@yahoo.de>
Co-authored-by: AndiBuls <andreas.buls@uni-duesseldorf.de>
2020-03-16 15:16:43 +01:00
434a69f93d Merge branch 'master' into change_DTO 2020-03-14 09:28:39 +01:00
fa79b3f136 change EventDTO, add AddUserEventController, add the search function in UI and backend 2020-03-14 09:17:32 +01:00
b8fe1bf29a Merge remote-tracking branch 'origin/master' into updateGroupsAPI
# Conflicts:
#	src/main/java/mops/gruppen2/service/EventService.java
2020-03-13 13:52:53 +01:00
d1f296129d Impletended SwaggerApi with all provisionally funktiontionallitys 2020-03-13 13:50:49 +01:00
6b788beb4b Refactor ControllerService and add an UpdateRoleEvent to createGroup 2020-03-13 13:46:34 +01:00
1754486625 Merge remote-tracking branch 'origin/master' into updateGroupsAPI
# Conflicts:
#	src/main/java/mops/gruppen2/repository/EventRepository.java
2020-03-12 16:31:23 +01:00
9795c10c14 Impletended the updategroup(status) method in the API 2020-03-12 16:11:32 +01:00
77b6ba247d add comments 2020-03-12 15:13:56 +01:00
a30d458219 Created first Api implementation 2020-03-12 14:40:07 +01:00
7b5f70745c fix Methods 2020-03-12 14:03:48 +01:00
c6c62b07bf created first API implementation 2020-03-12 13:52:50 +01:00
c553bdd9cc refactored a few Methods in EventService 2020-03-10 16:17:31 +01:00
d229b2089a add eventdto -> event conversion 2020-03-10 16:01:27 +01:00
66a6b9a137 added deserialization tests 2020-03-10 15:59:09 +01:00
61e2d0edba added Creating Groups to frontend and saving them in Database. Also prepared some Methods for Snapshot db 2020-03-09 23:21:29 +01:00