1
Commit Graph

156 Commits

Author SHA1 Message Date
e2978e10d0 fix visibility in controller 2020-03-16 12:37:45 +01:00
1ad3ad8bab Merge remote-tracking branch 'origin/UI-Improvements'
# Conflicts:
#	src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
#	src/main/resources/templates/detailsMember.html
2020-03-14 23:47:41 +01:00
d3c5ded6d0 added functionality to choose wether group is private or open 2020-03-14 11:50:52 +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
e5b69c0cc0 Merge branch 'master' into group-details 2020-03-13 16:36:13 +01:00
46985ccca7 add button elements depending on various factors 2020-03-13 16:27:34 +01:00
eeded221b4 Add method to find group by id
Add method to connect details.html to the controller
2020-03-13 14:28:16 +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
26f26a1c1a Add JavaDoc comments to SerializationService 2020-03-13 13:47:05 +01:00
6b788beb4b Refactor ControllerService and add an UpdateRoleEvent to createGroup 2020-03-13 13:46:34 +01:00
430b52b417 add new Controller to redirect 2020-03-12 16:48:08 +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
6f213af10e Merge remote-tracking branch 'origin/groups-for-user' into groups-for-user 2020-03-12 16:18:25 +01:00
80a9566d6f Add ControllerService and refactor Gruppen2Controller 2020-03-12 16:18:15 +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
a688235100 fix queries and user_id type 2020-03-12 14:59:34 +01:00
528ca1a2c0 refactor projecteventlist 2020-03-12 14:46:41 +01:00
3fcf8105f7 Merge remote-tracking branch 'origin/performance-tests' into updateGroupsAPI 2020-03-12 14:41:39 +01:00
a30d458219 Created first Api implementation 2020-03-12 14:40:07 +01:00
13e1cf0e36 Merge remote-tracking branch 'origin/performance-tests' into groups-for-user
# Conflicts:
#	src/main/java/mops/gruppen2/service/GroupService.java
2020-03-12 14:39:08 +01:00
f64bb0f578 refactor projection method 2020-03-12 14:37:32 +01:00
7b5f70745c fix Methods 2020-03-12 14:03:48 +01:00
8ddf9f2d64 Merge branch 'groups-for-user' of https://github.com/hhu-propra2/abschlussprojekt-it-bois into groups-for-user 2020-03-12 13:56:06 +01:00
a775040abe add 2 new Queries and 2 Methods for UserService 2020-03-12 13:55:10 +01:00
c6c62b07bf created first API implementation 2020-03-12 13:52:50 +01:00
d102f9b0ee fixed GroupServiceTest for new Method in GroupService 2020-03-11 13:52:26 +01:00
31f19f0199 Revert "add functionality for group_ids to User class"
This reverts commit 68789099
2020-03-11 13:47:41 +01:00
68789099be add functionality for group_ids to User class
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
2020-03-10 16:54:48 +01:00
07462fae36 Merge remote-tracking branch 'origin/GroupLogicProjection' into GroupLogicProjection 2020-03-10 16:29:38 +01:00
2f4af867e8 added deserialization tests 2020-03-10 16:29:28 +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
c0d2bbbf7f Added DeleteGroupEvent and GroupDoesNotExistException 2020-03-10 15:09:35 +01:00
3113483b31 change GroupService 2020-03-10 14:37:11 +01:00
3c410b2de4 create group with UI 2020-03-10 14:27:45 +01:00
73e7737b8c restore things lost in merge ffs 2020-03-10 13:34:19 +01:00
c7d5e02f0b Merge remote-tracking branch 'origin/event-db'
# Conflicts:
#	src/main/java/mops/gruppen2/domain/Aggregate.java
#	src/main/java/mops/gruppen2/service/GroupService.java
#	src/test/java/mops/gruppen2/domain/GroupTest.java
2020-03-10 13:24:29 +01:00
98bbc0add6 Merge branch 'event-db' into html-gruppe 2020-03-10 13:04:14 +01:00
5f8d9a8603 change SerializationServiceTest 2020-03-10 13:02:06 +01:00
a8f2fa32a7 Merge branch 'event-db' into html-gruppe 2020-03-09 23:34:34 +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
a40ef0396d Merge branch 'event-db' of /home/christoph/Documents/repos/abschlussprojekt-it-bois with conflicts. 2020-03-09 16:47:46 +01:00
b30a4d02f9 Implemented Exeption and their handling 2020-03-09 16:18:14 +01:00
0a9922b8fe Merge branch 'event-db' of /home/christoph/Documents/repos/abschlussprojekt-it-bois with conflicts. 2020-03-09 16:12:17 +01:00
aa80a3b5df add Saving Events in DB 2020-03-09 14:25:00 +01:00
2da89300e3 Jackson serialization test 2020-03-09 13:48:01 +01:00