christoph/lecture-professional-software-development
1
Fork 0
Code Activity

Exception rework: clearer message + origin

Browse Source 
Co-authored-by: [Mahgs] <maxoerter@gmx.de>
Co-authored-by: Christoph <tobi@urpost.de>
This commit is contained in:
Christoph
2020-03-18 18:49:40 +01:00
parent 2d8472bd4a
commit b1460abe48
20 changed files with 76 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/mops/gruppen2/Gruppen2Application.java
View File

@ -1,11 +1,5 @@
package mops.gruppen2;
import lombok.Setter;
import mops.gruppen2.domain.Exceptions.EventException;
import mops.gruppen2.domain.Group;
import mops.gruppen2.service.EventService;
import mops.gruppen2.service.GroupService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.Bean;
@ -18,7 +12,6 @@ import springfox.documentation.spring.web.plugins.Docket;
import springfox.documentation.swagger2.annotations.EnableSwagger2;
import java.util.Collections;
import java.util.List;
@SpringBootApplication
@EnableSwagger2

17
src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
View File

@ -2,19 +2,17 @@ package mops.gruppen2.controller;
import mops.gruppen2.config.Gruppen2Config;
import mops.gruppen2.domain.Exceptions.EventException;
import mops.gruppen2.domain.Exceptions.GroupNotFoundException;
import mops.gruppen2.domain.Group;
import mops.gruppen2.domain.Role;
import mops.gruppen2.domain.User;
import mops.gruppen2.domain.Visibility;
import mops.gruppen2.domain.event.CreateGroupEvent;
import mops.gruppen2.security.Account;
import mops.gruppen2.service.*;
import org.keycloak.adapters.springsecurity.token.KeycloakAuthenticationToken;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.client.RestTemplate;
import org.springframework.web.context.annotation.SessionScope;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.server.ResponseStatusException;
@ -33,15 +31,13 @@ public class Gruppen2Controller {
Gruppen2Config gruppen2Config;
private final KeyCloakService keyCloakService;
private final EventService eventService;
private final GroupService groupService;
private final UserService userService;
private final ControllerService controllerService;
private final InviteLinkRepositoryService inviteLinkRepositoryService;
public Gruppen2Controller(KeyCloakService keyCloakService, EventService eventService, GroupService groupService, UserService userService, ControllerService controllerService, InviteLinkRepositoryService inviteLinkRepositoryService) {
public Gruppen2Controller(KeyCloakService keyCloakService, GroupService groupService, UserService userService, ControllerService controllerService, InviteLinkRepositoryService inviteLinkRepositoryService) {
this.keyCloakService = keyCloakService;
this.eventService = eventService;
this.groupService = groupService;
this.userService = userService;
this.controllerService = controllerService;
@ -138,7 +134,8 @@ public class Gruppen2Controller {
model.addAttribute("admin", Role.ADMIN);
return "detailsMember";
}
throw new GroupNotFoundException();
throw new GroupNotFoundException(this.getClass().toString());
}
@RolesAllowed({"ROLE_orga", "ROLE_studentin", "ROLE_actuator"})
@ -162,7 +159,7 @@ public class Gruppen2Controller {
model.addAttribute("group", group);
return "detailsNoMember";
}
throw new GroupNotFoundException();
throw new GroupNotFoundException(this.getClass().toString());
}
@RolesAllowed({"ROLE_orga", "ROLE_studentin", "ROLE_actuator"})
@ -174,7 +171,7 @@ public class Gruppen2Controller {
model.addAttribute("group", group);
return "redirect:/gruppen2/detailsSearch?id=" + group.getId();
}
throw new GroupNotFoundException();
throw new GroupNotFoundException(this.getClass().toString());
}
@RolesAllowed({"ROLE_orga", "ROLE_studentin", "ROLE_actuator"})

11
src/main/java/mops/gruppen2/domain/Exceptions/EventException.java
View File

@ -3,15 +3,10 @@ package mops.gruppen2.domain.Exceptions;
import org.springframework.http.HttpStatus;
import org.springframework.web.server.ResponseStatusException;
public class EventException extends ResponseStatusException {
private String msg;
public abstract class EventException extends ResponseStatusException {
public EventException(String msg, HttpStatus status) {
super(status, msg);
public EventException(HttpStatus status, String msg, String info) {
super(status, msg + " (" + info + ")");
}
@Override
public String getMessage() {
return msg;
}
}

7
src/main/java/mops/gruppen2/domain/Exceptions/GroupIdMismatchException.java
View File

@ -3,11 +3,8 @@ package mops.gruppen2.domain.Exceptions;
import org.springframework.http.HttpStatus;
public class GroupIdMismatchException extends EventException {
public GroupIdMismatchException(String msg) {
super("Falsche Gruppe für Event." + " (" + msg + ")", HttpStatus.INTERNAL_SERVER_ERROR);
}
public GroupIdMismatchException() {
super("", HttpStatus.INTERNAL_SERVER_ERROR);
public GroupIdMismatchException(String info) {
super(HttpStatus.INTERNAL_SERVER_ERROR, "Falsche Gruppe für Event.", info);
}
}

7
src/main/java/mops/gruppen2/domain/Exceptions/GroupNotFoundException.java
View File

@ -3,11 +3,8 @@ package mops.gruppen2.domain.Exceptions;
import org.springframework.http.HttpStatus;
public class GroupNotFoundException extends EventException {
public GroupNotFoundException(String msg) {
super(msg, HttpStatus.NOT_FOUND);
}
public GroupNotFoundException() {
super("Gruppe nicht gefunden.", HttpStatus.NOT_FOUND);
public GroupNotFoundException(String info) {
super(HttpStatus.NOT_FOUND, "Gruppe wurde nicht gefunden.", info);
}
}

10
src/main/java/mops/gruppen2/domain/Exceptions/NoValueException.java Normal file
View File

@ -0,0 +1,10 @@
package mops.gruppen2.domain.Exceptions;
import org.springframework.http.HttpStatus;
public class NoValueException extends EventException {
public NoValueException(String info) {
super(HttpStatus.NO_CONTENT, "Eine Information fehlt.", info);
}
}

7
src/main/java/mops/gruppen2/domain/Exceptions/UserAlreadyExistsException.java
View File

@ -3,11 +3,8 @@ package mops.gruppen2.domain.Exceptions;
import org.springframework.http.HttpStatus;
public class UserAlreadyExistsException extends EventException {
public UserAlreadyExistsException(String msg) {
super(msg, HttpStatus.INTERNAL_SERVER_ERROR);
}
public UserAlreadyExistsException() {
super("Der User existiert bereits.", HttpStatus.INTERNAL_SERVER_ERROR);
public UserAlreadyExistsException(String info) {
super(HttpStatus.INTERNAL_SERVER_ERROR, "Der User existiert bereits.", info);
}
}

7
src/main/java/mops/gruppen2/domain/Exceptions/UserNotFoundException.java
View File

@ -3,11 +3,8 @@ package mops.gruppen2.domain.Exceptions;
import org.springframework.http.HttpStatus;
public class UserNotFoundException extends EventException {
public UserNotFoundException(String msg) {
super(msg, HttpStatus.NOT_FOUND);
}
public UserNotFoundException() {
super("Der User wurde nicht gefunden.", HttpStatus.NOT_FOUND);
public UserNotFoundException(String info) {
super(HttpStatus.NOT_FOUND, "Der User wurde nicht gefunden.", info);
}
}

10
src/main/java/mops/gruppen2/domain/Group.java
View File

@ -4,11 +4,11 @@ import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
import mops.gruppen2.domain.Exceptions.UserAlreadyExistsException;
import mops.gruppen2.domain.Exceptions.UserNotFoundException;
import mops.gruppen2.domain.event.*;
import java.util.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* Repräsentiert den aggregierten Zustand einer Gruppe.
@ -18,7 +18,7 @@ import java.util.*;
@Setter
@AllArgsConstructor
public class Group {
private long id;
private Long id;
private String title;
private String description;
private final List<User> members;

9
src/main/java/mops/gruppen2/domain/event/AddUserEvent.java
View File

@ -16,9 +16,10 @@ import mops.gruppen2.domain.User;
@AllArgsConstructor
@NoArgsConstructor
public class AddUserEvent extends Event {
String givenname;
String familyname;
String email;
private String givenname;
private String familyname;
private String email;
public AddUserEvent(Long group_id, String user_id, String givenname, String familyname, String email) {
super(group_id, user_id);
@ -32,7 +33,7 @@ public class AddUserEvent extends Event {
User user = new User(this.user_id, this.givenname, this.familyname, this.email);
if (group.getMembers().contains(user)) {
throw new UserAlreadyExistsException();
throw new UserAlreadyExistsException(this.getClass().toString());
}
group.getMembers().add(user);

1
src/main/java/mops/gruppen2/domain/event/CreateGroupEvent.java
View File

@ -11,6 +11,7 @@ import mops.gruppen2.domain.Visibility;
@AllArgsConstructor
@NoArgsConstructor
public class CreateGroupEvent extends Event {
private Visibility groupVisibility;
private Long groupParent;
private GroupType groupType;

3
src/main/java/mops/gruppen2/domain/event/DeleteUserEvent.java
View File

@ -13,6 +13,7 @@ import mops.gruppen2.domain.User;
@Getter
@NoArgsConstructor
public class DeleteUserEvent extends Event {
public DeleteUserEvent(Long group_id, String user_id) {
super(group_id, user_id);
}
@ -26,6 +27,6 @@ public class DeleteUserEvent extends Event {
return;
}
}
throw new UserNotFoundException("Der User existiert nicht");
throw new UserNotFoundException(this.getClass().toString());
}
}

25
src/main/java/mops/gruppen2/domain/event/Event.java
View File

@ -7,12 +7,9 @@ import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import mops.gruppen2.domain.Exceptions.EventException;
import mops.gruppen2.domain.Exceptions.GroupIdMismatchException;
import mops.gruppen2.domain.Group;
@Getter
@NoArgsConstructor
@AllArgsConstructor
@JsonTypeInfo(
include = JsonTypeInfo.As.PROPERTY,
use = JsonTypeInfo.Id.NAME,
@ -26,27 +23,27 @@ import mops.gruppen2.domain.Group;
@JsonSubTypes.Type(value = UpdateGroupTitleEvent.class, name = "UpdateGroupTitleEvent"),
@JsonSubTypes.Type(value = UpdateRoleEvent.class, name = "UpdateRoleEvent"),
})
@Getter
@Setter
public class Event {
Long group_id;
String user_id;
@NoArgsConstructor // Needed by Lombok in Subclasses
@AllArgsConstructor
public abstract class Event {
protected Long group_id;
protected String user_id;
public void apply(Group group) throws EventException {
checkGroupIdMatch(group.getId());
applyEvent(group);
}
protected void applyEvent(Group group) throws EventException {
}
protected abstract void applyEvent(Group group) throws EventException;
private void checkGroupIdMatch(Long group_id) {
if (this.group_id.equals(group_id)) {
if (group_id == null || this.group_id.equals(group_id)) {
return;
}
//throw new GroupIdMismatchException(this.getClass().toString());
System.out.println(group_id);
System.out.println(this.group_id);
throw new GroupIdMismatchException(this.getClass().toString());
}
}

8
src/main/java/mops/gruppen2/domain/event/UpdateGroupDescriptionEvent.java
View File

@ -3,6 +3,7 @@ package mops.gruppen2.domain.event;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import mops.gruppen2.domain.Exceptions.NoValueException;
import mops.gruppen2.domain.Group;
/**
@ -12,7 +13,8 @@ import mops.gruppen2.domain.Group;
@AllArgsConstructor
@NoArgsConstructor
public class UpdateGroupDescriptionEvent extends Event {
String newGroupDescription;
private String newGroupDescription;
public UpdateGroupDescriptionEvent(Long group_id, String user_id, String newGroupDescription) {
super(group_id, user_id);
@ -21,6 +23,10 @@ public class UpdateGroupDescriptionEvent extends Event {
@Override
public void applyEvent(Group group) {
if (this.newGroupDescription.isEmpty()) {
throw new NoValueException(this.getClass().toString());
}
group.setDescription(this.newGroupDescription);
}
}

8
src/main/java/mops/gruppen2/domain/event/UpdateGroupTitleEvent.java
View File

@ -3,6 +3,7 @@ package mops.gruppen2.domain.event;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import mops.gruppen2.domain.Exceptions.NoValueException;
import mops.gruppen2.domain.Group;
/**
@ -12,7 +13,8 @@ import mops.gruppen2.domain.Group;
@AllArgsConstructor
@NoArgsConstructor
public class UpdateGroupTitleEvent extends Event {
String newGroupTitle;
private String newGroupTitle;
public UpdateGroupTitleEvent(Long group_id, String user_id, String newGroupTitle) {
super(group_id, user_id);
@ -21,6 +23,10 @@ public class UpdateGroupTitleEvent extends Event {
@Override
public void applyEvent(Group group) {
if (this.getNewGroupTitle().isEmpty()) {
throw new NoValueException(this.getClass().toString());
}
group.setTitle(this.newGroupTitle);
}

9
src/main/java/mops/gruppen2/domain/event/UpdateRoleEvent.java
View File

@ -15,7 +15,7 @@ import mops.gruppen2.domain.Role;
@NoArgsConstructor
public class UpdateRoleEvent extends Event {
Role newRole;
private Role newRole;
public UpdateRoleEvent(Long group_id, String user_id, Role newRole) {
super(group_id, user_id);
@ -24,10 +24,11 @@ public class UpdateRoleEvent extends Event {
@Override
public void applyEvent(Group group) throws UserNotFoundException {
if (!group.getRoles().containsKey(user_id)) {
throw new UserNotFoundException();
if (group.getRoles().containsKey(user_id)) {
group.getRoles().put(this.user_id, this.newRole);
}
group.getRoles().put(this.user_id, this.newRole);
throw new UserNotFoundException(this.getClass().toString());
}
}

6
src/main/java/mops/gruppen2/service/ControllerService.java
View File

@ -1,8 +1,7 @@
package mops.gruppen2.service;
import mops.gruppen2.domain.*;
import mops.gruppen2.domain.Exceptions.EventException;
import mops.gruppen2.domain.*;
import mops.gruppen2.domain.event.*;
import mops.gruppen2.security.Account;
import org.springframework.stereotype.Service;
@ -47,12 +46,11 @@ public class ControllerService {
CreateGroupEvent createGroupEvent = new CreateGroupEvent(group_id, account.getName(), null , GroupType.SIMPLE, visibility1);
eventService.saveEvent(createGroupEvent);
User user = new User(account.getName(), account.getGivenname(), account.getFamilyname(), account.getEmail());
addUser(account, group_id);
updateTitle(account, group_id, title);
updateDescription(account, group_id, description);
updateRole(user.getUser_id(), group_id);
updateRole(account.getName(), group_id);
}
private void createInviteLink(Long group_id) {

2
src/main/java/mops/gruppen2/service/EventService.java
View File

@ -66,9 +66,11 @@ public class EventService {
*/
public Long checkGroup() {
Long maxGroupID = eventStore.getMaxGroupID();
if (maxGroupID == null) {
return 1L;
}
return maxGroupID + 1;
}

3
src/main/java/mops/gruppen2/service/GroupService.java
View File

@ -1,9 +1,8 @@
package mops.gruppen2.service;
import mops.gruppen2.domain.dto.EventDTO;
import mops.gruppen2.domain.Exceptions.EventException;
import mops.gruppen2.domain.Group;
import mops.gruppen2.domain.Visibility;
import mops.gruppen2.domain.dto.EventDTO;
import mops.gruppen2.domain.event.Event;
import mops.gruppen2.repository.EventRepository;
import mops.gruppen2.security.Account;

30
src/test/java/mops/gruppen2/service/SerializationServiceTest.java
View File

@ -1,30 +0,0 @@
package mops.gruppen2.service;
import com.fasterxml.jackson.core.JsonProcessingException;
import mops.gruppen2.domain.Role;
import mops.gruppen2.domain.event.*;
import mops.gruppen2.repository.EventRepository;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
class SerializationServiceTest {
SerializationService serializationService;
@BeforeEach
public void setUp() {
serializationService = new SerializationService(mock(EventRepository.class));
}
@Test
void serializeEventTest() throws JsonProcessingException {
Event event = new Event(1L,"1");
assertThat(serializationService.serializeEvent(event)).isEqualTo("{\"type\":\"Event\",\"group_id\":1,\"user_id\":\"1\"}");
}
}