diff --git a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java index e5ac048..91e9e30 100644 --- a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java +++ b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java @@ -1,22 +1,29 @@ package mops.gruppen2.controller; +import mops.gruppen2.domain.event.CreateGroupEvent; +import mops.gruppen2.service.EventService; +import mops.gruppen2.service.GroupService; import mops.gruppen2.service.KeyCloakService; import org.keycloak.adapters.springsecurity.token.KeycloakAuthenticationToken; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.*; import javax.annotation.security.RolesAllowed; +import javax.swing.*; @Controller @RequestMapping("/gruppen2") public class Gruppen2Controller { private final KeyCloakService keyCloakService; + private final EventService eventService; + private final GroupService groupService; - public Gruppen2Controller(KeyCloakService keyCloakService) { + public Gruppen2Controller(KeyCloakService keyCloakService, EventService eventService, GroupService groupService) { this.keyCloakService = keyCloakService; + this.eventService = eventService; + this.groupService = groupService; } /**Zeigt die index.html an. @@ -31,4 +38,32 @@ public class Gruppen2Controller { model.addAttribute("account", keyCloakService.createAccountFromPrincipal(token)); return "index"; } + + @RolesAllowed({"ROLE_orga", "ROLE_studentin", "ROLE_actuator)"}) + @GetMapping("/createGroup") + public String createGroup(KeycloakAuthenticationToken token, Model model) { + model.addAttribute("account", keyCloakService.createAccountFromPrincipal(token)); + return "create"; + } + + @RolesAllowed({"ROLE_orga", "ROLE_studentin", "ROLE_actuator)"}) + @GetMapping("/findGroup") + public String findGroup(KeycloakAuthenticationToken token, Model model) { + model.addAttribute("account", keyCloakService.createAccountFromPrincipal(token)); + return "search"; + } + + @PostMapping("/createGroup") + public String pCreateGroup(KeycloakAuthenticationToken token, + @RequestParam(value = "title") String title, + @RequestParam(value = "beschreibung") String beschreibung) { + + //Hier muss alles in eine separate Klasse + CreateGroupEvent createGroupEvent = new CreateGroupEvent(eventService.checkGroup(), "faker", title, beschreibung); + eventService.saveEvent(createGroupEvent); + groupService.buildGroupFromEvent(createGroupEvent); + + return "redirect:/"; + } + } diff --git a/src/main/java/mops/gruppen2/domain/EventDTO.java b/src/main/java/mops/gruppen2/domain/EventDTO.java index c7ceda5..df78071 100644 --- a/src/main/java/mops/gruppen2/domain/EventDTO.java +++ b/src/main/java/mops/gruppen2/domain/EventDTO.java @@ -1,7 +1,6 @@ package mops.gruppen2.domain; import lombok.Data; -import lombok.Value; import org.springframework.data.annotation.Id; import org.springframework.data.relational.core.mapping.Table; @@ -9,8 +8,8 @@ import org.springframework.data.relational.core.mapping.Table; @Data public class EventDTO { @Id - long event_id; - long group_id; + Long event_id; + Long group_id; String user_id; String event_payload; } diff --git a/src/main/java/mops/gruppen2/domain/event/AddUserEvent.java b/src/main/java/mops/gruppen2/domain/event/AddUserEvent.java index f4ab0cc..1fd066d 100644 --- a/src/main/java/mops/gruppen2/domain/event/AddUserEvent.java +++ b/src/main/java/mops/gruppen2/domain/event/AddUserEvent.java @@ -16,14 +16,14 @@ public class AddUserEvent extends Event { String familyname; String email; - public AddUserEvent(long event_id, long group_id, String user_id, String givenname, String familyname, String email) { + public AddUserEvent(Long event_id, Long group_id, String user_id, String givenname, String familyname, String email) { super(event_id, group_id, user_id); this.givenname = givenname; this.familyname = familyname; this.email = email; } - public AddUserEvent(long event_id, long group_id, User user) { + public AddUserEvent(Long event_id, Long group_id, User user) { super(event_id, group_id, user.getUser_id()); this.givenname = user.getGivenname(); this.familyname = user.getFamilyname(); diff --git a/src/main/java/mops/gruppen2/domain/event/CreateGroupEvent.java b/src/main/java/mops/gruppen2/domain/event/CreateGroupEvent.java index bef0e9d..eaef7ff 100644 --- a/src/main/java/mops/gruppen2/domain/event/CreateGroupEvent.java +++ b/src/main/java/mops/gruppen2/domain/event/CreateGroupEvent.java @@ -11,9 +11,14 @@ public class CreateGroupEvent extends Event { String groupTitle; String groupDescription; - public CreateGroupEvent(long event_id, long group_id, String user_id, String groupTitle, String groupDescription) { + public CreateGroupEvent(long event_id, Long group_id, String user_id, String groupTitle, String groupDescription) { super(event_id, group_id, user_id); this.groupTitle = groupTitle; this.groupDescription = groupDescription; } + public CreateGroupEvent(Long group_id, String user_id, String groupTitle, String groupDescription) { + super(group_id, user_id); + this.groupTitle = groupTitle; + this.groupDescription = groupDescription; + } } diff --git a/src/main/java/mops/gruppen2/domain/event/DeleteUserEvent.java b/src/main/java/mops/gruppen2/domain/event/DeleteUserEvent.java index 79b112b..080004a 100644 --- a/src/main/java/mops/gruppen2/domain/event/DeleteUserEvent.java +++ b/src/main/java/mops/gruppen2/domain/event/DeleteUserEvent.java @@ -8,7 +8,7 @@ import lombok.*; @Getter public class DeleteUserEvent extends Event { - public DeleteUserEvent(long event_id, long group_id, String user_id) { + public DeleteUserEvent(Long event_id, Long group_id, String user_id) { super(event_id, group_id, user_id); } } diff --git a/src/main/java/mops/gruppen2/domain/event/Event.java b/src/main/java/mops/gruppen2/domain/event/Event.java index fca7880..be5b292 100644 --- a/src/main/java/mops/gruppen2/domain/event/Event.java +++ b/src/main/java/mops/gruppen2/domain/event/Event.java @@ -17,14 +17,19 @@ import lombok.NoArgsConstructor; ) @JsonSubTypes({ @JsonSubTypes.Type(value = AddUserEvent.class, name = "AddUserEvent"), - @JsonSubTypes.Type(value = AddUserEvent.class, name = "CreateGroupEvent"), - @JsonSubTypes.Type(value = AddUserEvent.class, name = "DeleteUserEvent"), - @JsonSubTypes.Type(value = AddUserEvent.class, name = "UpdateGroupDescriptionEvent"), - @JsonSubTypes.Type(value = AddUserEvent.class, name = "UpdateGroupTitleEvent"), - @JsonSubTypes.Type(value = AddUserEvent.class, name = "UpdateRoleEvent"), + @JsonSubTypes.Type(value = CreateGroupEvent.class, name = "CreateGroupEvent"), + @JsonSubTypes.Type(value = DeleteUserEvent.class, name = "DeleteUserEvent"), + @JsonSubTypes.Type(value = UpdateGroupDescriptionEvent.class, name = "UpdateGroupDescriptionEvent"), + @JsonSubTypes.Type(value = UpdateGroupTitleEvent.class, name = "UpdateGroupTitleEvent"), + @JsonSubTypes.Type(value = UpdateRoleEvent.class, name = "UpdateRoleEvent"), }) public class Event { - long event_id; - long group_id; + Long event_id; + Long group_id; String user_id; + + public Event(Long group_id,String user_id){ + this.group_id = group_id; + this.user_id = user_id; + } } diff --git a/src/main/java/mops/gruppen2/domain/event/UpdateGroupDescriptionEvent.java b/src/main/java/mops/gruppen2/domain/event/UpdateGroupDescriptionEvent.java index f8139d3..6387a7d 100644 --- a/src/main/java/mops/gruppen2/domain/event/UpdateGroupDescriptionEvent.java +++ b/src/main/java/mops/gruppen2/domain/event/UpdateGroupDescriptionEvent.java @@ -13,7 +13,7 @@ import lombok.NoArgsConstructor; public class UpdateGroupDescriptionEvent extends Event { String newGroupDescription; - public UpdateGroupDescriptionEvent(long event_id, long group_id, String user_id, String newGroupDescription) { + public UpdateGroupDescriptionEvent(Long event_id, Long group_id, String user_id, String newGroupDescription) { super(event_id, group_id, user_id); this.newGroupDescription = newGroupDescription; } diff --git a/src/main/java/mops/gruppen2/domain/event/UpdateGroupTitleEvent.java b/src/main/java/mops/gruppen2/domain/event/UpdateGroupTitleEvent.java index dc443e9..d57b609 100644 --- a/src/main/java/mops/gruppen2/domain/event/UpdateGroupTitleEvent.java +++ b/src/main/java/mops/gruppen2/domain/event/UpdateGroupTitleEvent.java @@ -13,7 +13,7 @@ import lombok.NoArgsConstructor; public class UpdateGroupTitleEvent extends Event { String newGroupTitle; - public UpdateGroupTitleEvent(long event_id, long group_id, String user_id, String newGroupTitle) { + public UpdateGroupTitleEvent(Long event_id, Long group_id, String user_id, String newGroupTitle) { super(event_id, group_id, user_id); this.newGroupTitle = newGroupTitle; } diff --git a/src/main/java/mops/gruppen2/domain/event/UpdateRoleEvent.java b/src/main/java/mops/gruppen2/domain/event/UpdateRoleEvent.java index 76d18c5..a4301de 100644 --- a/src/main/java/mops/gruppen2/domain/event/UpdateRoleEvent.java +++ b/src/main/java/mops/gruppen2/domain/event/UpdateRoleEvent.java @@ -13,7 +13,7 @@ public class UpdateRoleEvent extends Event { Role newRole; - public UpdateRoleEvent(long event_id, long group_id, String user_id, Role newRole) { + public UpdateRoleEvent(Long event_id, Long group_id, String user_id, Role newRole) { super(event_id, group_id, user_id); this.newRole = newRole; diff --git a/src/main/java/mops/gruppen2/service/EventService.java b/src/main/java/mops/gruppen2/service/EventService.java new file mode 100644 index 0000000..0c1e879 --- /dev/null +++ b/src/main/java/mops/gruppen2/service/EventService.java @@ -0,0 +1,51 @@ +package mops.gruppen2.service; + +import com.fasterxml.jackson.core.JsonProcessingException; +import mops.gruppen2.domain.EventDTO; +import mops.gruppen2.domain.event.Event; +import mops.gruppen2.repository.EventRepository; +import org.springframework.stereotype.Service; + +@Service +public class EventService { + private final SerializationService serializationService; + private final EventRepository eventStore; + + public EventService(SerializationService serializationService, EventRepository eventStore) { + this.serializationService = serializationService; + this.eventStore = eventStore; + } + + + public void saveEvent(Event event){ + EventDTO eventDTO = getDTO(event); + eventStore.save(eventDTO); + + } + + public EventDTO getDTO(Event event){ + EventDTO eventDTO = new EventDTO(); + eventDTO.setGroup_id(event.getGroup_id()); + eventDTO.setUser_id(event.getUser_id()); + try { + eventDTO.setEvent_payload(serializationService.serializeEvent(event)); + } catch (JsonProcessingException e) { + e.printStackTrace(); + } + return eventDTO; + } + + public Long checkGroup() { + Long tmpId = 1L; + Iterable eventDTOS = eventStore.findAll(); + for (EventDTO event : eventDTOS) { + if (event.getGroup_id() == null) { + return tmpId; + } + if (tmpId <= event.getGroup_id()) { + tmpId++; + } + } + return tmpId; + } +} diff --git a/src/main/java/mops/gruppen2/service/GroupService.java b/src/main/java/mops/gruppen2/service/GroupService.java index c018e76..93679b0 100644 --- a/src/main/java/mops/gruppen2/service/GroupService.java +++ b/src/main/java/mops/gruppen2/service/GroupService.java @@ -4,6 +4,7 @@ import mops.gruppen2.domain.Group; import mops.gruppen2.domain.event.Event; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; @Service @@ -15,9 +16,17 @@ public class GroupService { * @param eventList Die Events für diese Gruppe * @return Gruppe auf aktuellem Stand */ - Group buildGroupFromEvents(List eventList) { + public Group buildGroupFromEvents(List eventList) { Group newGroup = new Group(); newGroup.apply(eventList); return newGroup; } + + public Group buildGroupFromEvent(Event event){ + Group newGroup = new Group(); + List eventList = new ArrayList<>(); + eventList.add(event); + newGroup.apply(eventList); + return newGroup; + } } diff --git a/src/main/java/mops/gruppen2/service/SerializationService.java b/src/main/java/mops/gruppen2/service/SerializationService.java index cfc8a0e..1737ccc 100644 --- a/src/main/java/mops/gruppen2/service/SerializationService.java +++ b/src/main/java/mops/gruppen2/service/SerializationService.java @@ -26,22 +26,7 @@ public class SerializationService { ObjectMapper mapper = new ObjectMapper(); return mapper.writeValueAsString(event); } - - - // create DTO methode schreiben also kurz auslagern - public void saveEvent(Event event){ - try { - EventDTO eventDTO = new EventDTO(); - eventDTO.setGroup_id(event.getGroup_id()); - eventDTO.setUser_id(event.getUser_id()); - eventDTO.setEvent_payload(serializeEvent(event)); - eventStore.save(eventDTO); - } catch (JsonProcessingException e) { - e.printStackTrace(); - } - - } - + public Event deserializeEvent(String json) throws JsonProcessingException { ObjectMapper mapper = new ObjectMapper(); return mapper.readValue(json, Event.class); diff --git a/src/main/resources/templates/create.html b/src/main/resources/templates/create.html new file mode 100644 index 0000000..5f28fb5 --- /dev/null +++ b/src/main/resources/templates/create.html @@ -0,0 +1,50 @@ + + + + + Name des Subsystems + + + + + +
+ +
+
+

Gruppenerstellung

+
+
+
+
+ + +
+
+ + +
+
+ +
+
+
+
+
+ + \ No newline at end of file diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index b9f629d..20ff1c4 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -1,6 +1,6 @@ + th:replace="~{mopslayout :: html(name='Gruppenbildung', headcontent=~{:: headcontent}, navigation=~{:: navigation}, bodycontent=~{:: bodycontent})}"> Name des Subsystems @@ -10,12 +10,30 @@
- +
- +

Meine Gruppen

+
+
+
+

Titel der Gruppe

+

Beschreibung der Gruppe ...

+
+
+
\ No newline at end of file diff --git a/src/main/resources/templates/search.html b/src/main/resources/templates/search.html new file mode 100644 index 0000000..c722a7d --- /dev/null +++ b/src/main/resources/templates/search.html @@ -0,0 +1,81 @@ + + + + + Name des Subsystems + + + + + +
+ +
+
+
+
+

Gruppensuche

+
+
+
+
+ + +
+
+ Öffentliche Gruppen + Private Gruppen +
+ Suchbegriff im Namen + Suchbegriff in der Beschreibung + Suchbegriff in der Veranstaltung +
+
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
GruppennameBeschreibungÖffentlich/PrivatMitgliederanzahl
LA1 KursgruppeGruppe für den Kurs LA1Öffentlich318
Lerngruppe LA1Lerngruppe zur Bearbeitung von ÜbungszettelnPrivat6
+
+
+
+
+ + \ No newline at end of file diff --git a/src/test/java/mops/gruppen2/domain/GroupTest.java b/src/test/java/mops/gruppen2/domain/GroupTest.java index 192e7b6..c00a237 100644 --- a/src/test/java/mops/gruppen2/domain/GroupTest.java +++ b/src/test/java/mops/gruppen2/domain/GroupTest.java @@ -23,25 +23,25 @@ class GroupTest { @Test void createSingleGroup() { - CreateGroupEvent createGroupEvent = new CreateGroupEvent(1,2, "asd", "hello", "foo"); + CreateGroupEvent createGroupEvent = new CreateGroupEvent(1,2L, "asd", "hello", "foo"); Group group = new Group(); group.apply(createGroupEvent); assertThat(group.getDescription()).isEqualTo("foo"); assertThat(group.getTitle()).isEqualTo("hello"); - assertThat(group.getId()).isEqualTo(2); + assertThat(group.getId()).isEqualTo(2L); } // Verwendet CreateGroupEvent @Test void addSingleUser() { - CreateGroupEvent createGroupEvent = new CreateGroupEvent(1,1,"prof1", "hi", "foo"); + CreateGroupEvent createGroupEvent = new CreateGroupEvent(1L,1L,"prof1", "hi", "foo"); Group group = new Group(); group.apply(createGroupEvent); User user = new User("prof", "jens", "bendi", "hi@gmail.com"); - AddUserEvent addUserEvent = new AddUserEvent(1,1, user); + AddUserEvent addUserEvent = new AddUserEvent(1L,1L, user); group.apply(addUserEvent); assertThat(group.getMembers().get(0)).isEqualTo(user); diff --git a/src/test/java/mops/gruppen2/service/EventServiceTest.java b/src/test/java/mops/gruppen2/service/EventServiceTest.java new file mode 100644 index 0000000..7506c3b --- /dev/null +++ b/src/test/java/mops/gruppen2/service/EventServiceTest.java @@ -0,0 +1,7 @@ +package mops.gruppen2.service; + +import static org.junit.jupiter.api.Assertions.*; + +class EventServiceTest { + +} \ No newline at end of file diff --git a/src/test/java/mops/gruppen2/service/SerializationServiceTest.java b/src/test/java/mops/gruppen2/service/SerializationServiceTest.java index 75dcdd8..bcb95df 100644 --- a/src/test/java/mops/gruppen2/service/SerializationServiceTest.java +++ b/src/test/java/mops/gruppen2/service/SerializationServiceTest.java @@ -22,8 +22,10 @@ class SerializationServiceTest { @Test void serializeEventTest() { - Event event = new Event(1,1,"1"); - SerializationService serializationService = new SerializationService(mock(EventRepository.class)); + event = new Event(1L,1L,"1"); + + SerializationService serializationService = new SerializationService(eventRepository); + try { assertThat(serializationService.serializeEvent(event)).isEqualTo("{\"type\":\"Event\",\"event_id\":1,\"group_id\":1,\"user_id\":\"1\"}"); } catch (JsonProcessingException e) {