1
Commit Graph

191 Commits

Author SHA1 Message Date
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
40c04f5bc4 add href to group title, improve display of several groups 2020-03-12 16:06:36 +01:00
768b053a03 Merge remote-tracking branch 'origin/groups-for-user' into groups-for-user 2020-03-12 16:03:48 +01:00
1801d1652c Merge remote-tracking branch 'origin/groups-for-user' into groups-for-user 2020-03-12 15:53:07 +01:00
7ce0cd92af Merge remote-tracking branch 'origin/groups-for-user' into groups-for-user 2020-03-12 15:51:13 +01:00
ac4fc24431 Edit index.html 2020-03-12 15:49:02 +01:00
e31c9cf522 Merge remote-tracking branch 'origin/groups-for-user' into groups-for-user 2020-03-12 15:46:14 +01:00
2aeff7ef09 Edit index.html 2020-03-12 15:43:12 +01:00
d5b1ac2429 slight change to controller redirect 2020-03-12 15:31:59 +01:00
70d911c576 Add UpdateGroupTitleEvent and UpdateGroupDescriptionEvent to Gruppen2Controller 2020-03-12 15:22:10 +01:00
9f40df9d59 add Usergroups to controller 2020-03-12 15:14:46 +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
8c0975def3 fix queries 2020-03-12 14:55:32 +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
18560c1e35 Fix Architecture tests in LayeredArchitectureTest 2020-03-12 13:15:00 +01:00
9b004bef58 Create new package config and move Gruppen2Config to it 2020-03-12 13:14:22 +01:00
846eee9606 refactor tests for new events 2020-03-11 16:10:58 +01:00
b7b4485d03 add missing enums 2020-03-11 15:34:52 +01:00
e8770066f8 change create group event + new group fields 2020-03-11 15:27:56 +01:00
aaa3437eed Merge pull request #57 from hhu-propra2/GroupLogicProjection
Group logic projection
2020-03-11 14:04:23 +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
fba7136d57 Add Tests for Repository and add Repository Annotation in EventRepository 2020-03-10 16:43:25 +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
20cf11af91 Merge pull request #55 from hhu-propra2/serialization-tests
added deserialization tests
2020-03-10 15:21:25 +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
42e7cdf673 added deserialization tests 2020-03-10 14:10:18 +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