1
Commit Graph

130 Commits

Author SHA1 Message Date
0a9922b8fe Merge branch 'event-db' of /home/christoph/Documents/repos/abschlussprojekt-it-bois with conflicts. 2020-03-09 16:12:17 +01:00
006822b57d Merge remote-tracking branch 'origin/event-db' into html-gruppe 2020-03-09 16:04:19 +01:00
4186e7c09c Change Lombok annotations to enable Jackson deserializing 2020-03-09 15:47:17 +01:00
e0630478a0 Add template for search.html 2020-03-09 15:28:08 +01:00
05d599ad0f add Mapping for search.html and create.html in Controller 2020-03-09 15:06:14 +01:00
72c8d2b9b0 added Tests and fix addUserEvent 2020-03-09 14:39:46 +01:00
a1ec6b28d4 Merge branch 'event-db' into html-gruppe
# Conflicts:
#	src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
#	src/main/java/mops/gruppen2/entities/Teilnehmer.java
2020-03-09 14:34:02 +01:00
2d8d91c206 disable test method 2020-03-09 14:26:06 +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
1a3b1c52b3 add eventDTO 2020-03-09 13:25:54 +01:00
af4a12c892 refactor aggregate build process 2020-03-09 13:25:38 +01:00
7379330a86 add template for index 2020-03-09 13:24:11 +01:00
86a4975c00 fix tests after refactor 2020-03-09 12:46:29 +01:00
c7f9c0b985 removed final modifier from aggregate-id 2020-03-09 12:28:46 +01:00
6d32092dcf refine swagger example 2020-03-07 17:21:17 +01:00
b94432eec6 refactor UpdateRoleEvent-handler 2020-03-06 22:18:44 +01:00
cc174b3269 general style improvements + javadoc 2020-03-06 22:18:11 +01:00
e05c6f4e3a decreased visibility of group-fields -> adapted tests and GroupService 2020-03-06 21:30:58 +01:00
fb3a94cf04 changed role representation to enum 2020-03-06 20:58:57 +01:00
17ae13c1e8 made events immutable, removed group-setters -> changed tests to work without setters. 2020-03-06 20:55:29 +01:00
0537f27333 try to make naming more consistent 2020-03-06 20:23:39 +01:00
0e1e79d51a slight changes to package structure + naming 2020-03-06 20:10:23 +01:00
64f54ada27 slight changes to package structure 2020-03-06 20:03:15 +01:00
47b2a734fa created createGroup - test 2020-03-06 16:43:16 +01:00
e905aa37aa fix DeleteUserEvent 2020-03-06 16:11:41 +01:00
05feef8356 Merge remote-tracking branch 'origin/Services' into Services
# Conflicts:
#	src/main/java/mops/gruppen2/entities/Gruppe.java
#	src/main/java/mops/gruppen2/services/GruppenService.java
2020-03-06 16:03:21 +01:00
b1d266d7bf change user_id to String + add updateRoleEvent 2020-03-06 15:58:35 +01:00
02456e9a88 added DeleteUserEvent 2020-03-06 15:52:15 +01:00
32bdbeec51 add Event Adduser 2020-03-06 15:25:42 +01:00
60446f4789 Add UpdateGroupTitleEvent and UpdateGroupDescriptionEvent 2020-03-06 15:12:39 +01:00
2645e4dd84 change create.html index.html and search.html 2020-03-06 14:58:31 +01:00
e4d91e53f5 Merge branch 'Services' into html-gruppe 2020-03-06 14:47:54 +01:00
1ddfab0091 rename events package, add aggregat superclass 2020-03-06 14:40:55 +01:00
5029f01ece Merge remote-tracking branch 'origin/html-gruppe' into html-gruppe
# Conflicts:
#	src/main/java/mops/gruppen2/controllers/Gruppen2Controller.java
2020-03-06 14:32:20 +01:00
bdd2fc37a9 changed name for html file 2020-03-06 14:30:56 +01:00
b499ae6c06 Merge branch 'Services' into html-gruppe
# Conflicts:
#	src/main/java/mops/gruppen2/controllers/Gruppen2Controller.java
#	src/main/java/mops/gruppen2/entities/Admin.java
#	src/main/java/mops/gruppen2/entities/Gruppe.java
#	src/main/java/mops/gruppen2/entities/GruppeRepository.java
#	src/main/java/mops/gruppen2/entities/Student.java
#	src/main/java/mops/gruppen2/entities/TeilnehmerRepository.java
2020-03-06 14:29:37 +01:00
c5b970ffc9 change index.html 2020-03-06 14:21:43 +01:00
166e3bb5fb Merge branch 'Services' of https://github.com/hhu-propra2/abschlussprojekt-it-bois into Services 2020-03-06 14:21:35 +01:00
75143b33c0 add Event related stuff and Group example 2020-03-06 14:20:04 +01:00
8da29d3749 Merge remote-tracking branch 'origin/Services' into Services 2020-03-06 13:36:00 +01:00
761727c8f0 add gruppen2/ prefix to url 2020-03-06 13:35:37 +01:00
cac32dc672 move createAccountFromPrincipal to service 2020-03-06 13:32:59 +01:00
2ba8176500 add GruppenService and EventRepository and Event object 2020-03-06 13:28:09 +01:00
18412accf8 change index.html 2020-03-06 13:18:53 +01:00
7dc7fafed7 change index.html 2020-03-05 19:04:27 +01:00
4b51e29edb fix html 2020-03-05 16:36:21 +01:00
0a751c58b6 added index.html 2020-03-05 14:18:17 +01:00
babac2279d Merge pull request #29 from hhu-propra2/adapt-spring-security-to-h2-console
disable csrf + headers.frameoptions, permit /h2-console/**
2020-03-05 14:09:35 +01:00
3842ee1739 disable csrf + headers.frameoptions, permit /h2-console/** 2020-03-05 14:07:41 +01:00