Merge remote-tracking branch 'origin/invite-link-update' into invite-link-update

src/main/java/mops/gruppen2/controller/WebController.java

@@ -296,7 +296,9 @@ public class WebController {
     public String postAcceptInvite(KeycloakAuthenticationToken token,
                                    @RequestParam("id") String groupId) {
 
-        User user = new User(keyCloakService.createAccountFromPrincipal(token));
+        Account acc = keyCloakService.createAccountFromPrincipal(token);
+
+        User user = new User(acc.getName(), acc.getGivenname(), acc.getFamilyname(), acc.getEmail());
 
         if (!validationService.checkIfUserInGroup(userService.getGroupById(UUID.fromString(groupId)), user)) {
             controllerService.addUser(keyCloakService.createAccountFromPrincipal(token), UUID.fromString(groupId));

src/main/java/mops/gruppen2/domain/User.java

@@ -4,7 +4,6 @@ import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import mops.gruppen2.security.Account;
 
 @Getter
 @AllArgsConstructor
@@ -16,11 +15,4 @@ public class User {
     private String givenname;
     private String familyname;
     private String email;
-
-    public User(Account account) {
-        this.id = account.getName();
-        this.givenname = account.getGivenname();
-        this.familyname = account.getFamilyname();
-        this.email = account.getEmail();
-    }
 }

src/main/java/mops/gruppen2/repository/InviteRepository.java

@@ -4,7 +4,9 @@ import mops.gruppen2.domain.dto.InviteLinkDTO;
 import org.springframework.data.jdbc.repository.query.Query;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
 
+@Repository
 public interface InviteRepository extends CrudRepository<InviteLinkDTO, Long> {
 
     @Query("SELECT group_id FROM invite WHERE invite_link = :link")

src/main/resources/application-dev.properties

@@ -20,3 +20,4 @@ keycloak.autodetect-bearer-only=true
 keycloak.confidential-port=443
 server.error.include-stacktrace=always
 management.endpoints.web.exposure.include=info,health
+spring.cache.type=NONE

src/main/resources/schema-h2.sql

@@ -9,6 +9,8 @@ CREATE TABLE event
     event_payload VARCHAR(2500)
 );
 
+DROP TABLE IF EXISTS invite;
+
 CREATE TABLE invite
 (
     invite_id   INT PRIMARY KEY AUTO_INCREMENT,

src/test/java/mops/gruppen2/service/EventServiceTest.java

@@ -40,6 +40,7 @@ class EventServiceTest {
     @BeforeEach
     void setUp() {
         eventService = new EventService(jsonService, eventRepository);
+        eventRepository.deleteAll();
     }
 
     @Test

src/test/java/mops/gruppen2/service/GroupServiceTest.java

@@ -48,6 +48,7 @@ class GroupServiceTest {
     @BeforeEach
     void setUp() {
         groupService = new GroupService(eventService, eventRepository);
+        eventRepository.deleteAll();
     }
 
     //TODO: Wofür ist dieser Test?
@@ -116,7 +117,7 @@ class GroupServiceTest {
         Group group = TestBuilder.apply(test1, test2);
 
         assertThat(group.getType()).isEqualTo(null);
-        assertThat(groupService.getAllGroupWithVisibilityPublic("test1")).isEmpty();
+        assertThat(groupService.getAllGroupWithVisibilityPublic("errer")).isEmpty();
     }
 
     @Test