Merge remote-tracking branch 'origin/master' into feature-orga-csv

# Conflicts:
#	src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
#	src/main/java/mops/gruppen2/service/ControllerService.java

src/main/resources/application-dev.properties

@@ -1,23 +1,21 @@
 server.port=8080
 application.name=gruppen2
-
 logging.pattern.console=[${application.name}],%magenta(%-5level), %d{dd-MM-yyyy HH:mm:ss.SSS}, %highlight(%msg),%thread,%logger.%M%n
-
 spring.datasource.url=jdbc:h2:mem:blogdb
 spring.datasource.driverClassName=org.h2.Driver
 spring.datasource.username=sa
 spring.datasource.password=
 spring.jpa.database-platform=org.hibernate.dialect.H2Dialect
-
+spring.h2.console.enabled=true
+logging.level.org.springframework.jdbc.core=DEBUG
 keycloak.principal-attribute=preferred_username
 keycloak.auth-server-url=https://keycloak.cs.hhu.de/auth
 keycloak.realm=MOPS
-
 hhu_keycloak.token-uri=https://keycloak.cs.hhu.de/auth/realms/MOPS/protocol/openid-connect/token
 keycloak.resource=gruppenfindung
-keycloak.credentials.secret= fc6ebf10-8c63-4e71-a667-4eae4e8209a1
+keycloak.credentials.secret=fc6ebf10-8c63-4e71-a667-4eae4e8209a1
 keycloak.verify-token-audience=true
 keycloak.use-resource-role-mappings=true
 
 keycloak.autodetect-bearer-only=true
-keycloak.confidential-port= 443
+keycloak.confidential-port= 443

src/main/resources/schema.sql

@@ -10,3 +10,12 @@ CREATE TABLE event
     event_payload VARCHAR(255),
     visibility BOOLEAN
 );
+
+DROP TABLE IF EXISTS invite;
+
+CREATE TABLE invite
+(
+    link_id INT PRIMARY KEY AUTO_INCREMENT,
+    group_id INT NOT NULL,
+    invite_link varchar(255) NOT NULL
+);