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

remove obsolete code + fix copylink

Browse Source
This commit is contained in:
Christoph
2020-04-16 16:00:35 +02:00
parent 319b073e66
commit 4bc29b616c
19 changed files with 45 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,7 +36,7 @@ public abstract class Event {
protected UUID groupid;
@JsonProperty("version")
protected long version;
protected long version; // Group-Version
@JsonProperty("exec")
protected String exec;
@ -68,8 +68,8 @@ public abstract class Event {
}
checkGroupIdMatch(group.getId());
group.updateVersion(version);
updateCache(cache, group);
group.updateVersion(version);
applyEvent(group);
}

18
src/main/java/mops/gruppen2/domain/model/group/Group.java
View File

@ -1,7 +1,9 @@
package mops.gruppen2.domain.model.group;
import lombok.AccessLevel;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.extern.log4j.Log4j2;
import mops.gruppen2.domain.exception.BadArgumentException;
import mops.gruppen2.domain.exception.GroupFullException;
@ -35,6 +37,7 @@ import java.util.stream.Collectors;
* Muss beim Start gesetzt werden: groupid, meta
*/
@Log4j2
@NoArgsConstructor(access = AccessLevel.PRIVATE)
@EqualsAndHashCode(onlyExplicitlyIncluded = true)
public class Group {
@ -55,9 +58,6 @@ public class Group {
private GroupOptions options = GroupOptions.DEFAULT();
//@ToString.Exclude
//private LocalDateTime age;
// Inhalt
private Title title = Title.EMPTY();
@ -112,6 +112,12 @@ public class Group {
memberships.remove(target);
}
public boolean memberHasRole(String target, Role role) {
ValidationHelper.throwIfNoMember(this, target);
return memberships.get(target).getRole() == role;
}
public void memberPutRole(String target, Role role) throws UserNotFoundException, LastAdminException {
ValidationHelper.throwIfNoMember(this, target);
if (role == Role.REGULAR) {
@ -121,12 +127,6 @@ public class Group {
memberships.put(target, memberships.get(target).setRole(role));
}
public boolean memberHasRole(String target, Role role) {
ValidationHelper.throwIfNoMember(this, target);
return memberships.get(target).getRole() == role;
}
public boolean isMember(String target) {
return memberships.containsKey(target);
}

10
src/main/java/mops/gruppen2/domain/model/group/GroupMeta.java
View File

@ -11,13 +11,13 @@ import java.time.LocalDateTime;
@Log4j2
@Value
@ToString
public class GroupMeta {
class GroupMeta {
long version;
String creator;
LocalDateTime creationDate;
public GroupMeta setVersion(long version) throws IdMismatchException {
GroupMeta setVersion(long version) throws IdMismatchException {
if (this.version >= version) {
throw new IdMismatchException("Die Gruppe ist bereits auf einem neueren Stand.");
}
@ -25,7 +25,7 @@ public class GroupMeta {
return new GroupMeta(version, creator, creationDate);
}
public GroupMeta setCreator(String userid) throws BadArgumentException {
GroupMeta setCreator(String userid) throws BadArgumentException {
if (creator != null) {
throw new BadArgumentException("Gruppe hat schon einen Ersteller.");
}
@ -33,7 +33,7 @@ public class GroupMeta {
return new GroupMeta(version, userid, creationDate);
}
public GroupMeta setCreationDate(LocalDateTime date) throws BadArgumentException {
GroupMeta setCreationDate(LocalDateTime date) throws BadArgumentException {
if (creationDate != null) {
throw new BadArgumentException("Gruppe hat schon ein Erstellungsdatum.");
}
@ -41,7 +41,7 @@ public class GroupMeta {
return new GroupMeta(version, creator, date);
}
public static GroupMeta EMPTY() {
static GroupMeta EMPTY() {
return new GroupMeta(0, null, null);
}
}

8
src/main/java/mops/gruppen2/domain/model/group/SortHelper.java
View File

@ -22,6 +22,14 @@ public final class SortHelper {
return 1;
}
if (g1.getType() == Type.PUBLIC) {
return -1;
}
if (g2.getType() == Type.PUBLIC) {
return 1;
}
return 0;
});
}

16
src/main/java/mops/gruppen2/domain/service/EventStoreService.java
View File

@ -39,20 +39,6 @@ public class EventStoreService {
}
}
/**
* Speichert alle Events aus der übergebenen Liste in der DB.
*
* @param events Liste an Events die gespeichert werden soll
*/
@SafeVarargs
public final void saveAll(List<Event>... events) {
for (List<Event> eventlist : events) {
for (Event event : eventlist) {
eventStore.save(getDTOFromEvent(event));
}
}
}
//########################################### DTOs ###########################################
@ -105,7 +91,7 @@ public class EventStoreService {
// #################################### SIMPLE QUERIES #######################################
public List<Event> findAllEvents() {
return getEventsFromDTOs(eventStore.findAllEvents());
}

5
src/main/java/mops/gruppen2/domain/service/GroupService.java
View File

@ -24,7 +24,6 @@ import mops.gruppen2.domain.model.group.wrapper.Limit;
import mops.gruppen2.domain.model.group.wrapper.Link;
import mops.gruppen2.domain.model.group.wrapper.Parent;
import mops.gruppen2.domain.model.group.wrapper.Title;
import mops.gruppen2.domain.service.helper.ValidationHelper;
import mops.gruppen2.infrastructure.GroupCache;
import org.springframework.stereotype.Service;
@ -139,7 +138,7 @@ public class GroupService {
Event event = new CreateGroupEvent(groupid,
exec,
date);
Group group = new Group();
Group group = Group.EMPTY();
applyAndSave(group, event);
return group;
@ -171,7 +170,7 @@ public class GroupService {
public void kickMember(Group group, String exec, String target) {
applyAndSave(group, new KickMemberEvent(group.getId(), exec, target));
if (ValidationHelper.checkIfGroupEmpty(group)) {
if (group.isEmpty()) {
deleteGroup(group, exec);
}
}

8
src/main/java/mops/gruppen2/domain/service/helper/APIHelper.java
View File

@ -3,17 +3,13 @@ package mops.gruppen2.domain.service.helper;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import lombok.extern.log4j.Log4j2;
import mops.gruppen2.domain.model.group.Group;
import mops.gruppen2.infrastructure.api.GroupRequestWrapper;
import java.util.List;
//TODO: sinnvolles format
@Log4j2
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class APIHelper {
public static GroupRequestWrapper wrap(long status, List<Group> groupList) {
/*public static GroupRequestWrapper wrap(long status, List<Group> groupList) {
return new GroupRequestWrapper(status, groupList);
}
}*/
}

25
src/main/java/mops/gruppen2/domain/service/helper/CommonHelper.java
View File

@ -3,39 +3,14 @@ package mops.gruppen2.domain.service.helper;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import lombok.extern.log4j.Log4j2;
import mops.gruppen2.domain.event.EventType;
import java.util.List;
import java.util.UUID;
import java.util.stream.Collectors;
@Log4j2
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class CommonHelper {
public static String[] eventTypesToString(EventType... types) {
String[] stringtypes = new String[types.length];
for (int i = 0; i < types.length; i++) {
stringtypes[i] = types[i].toString();
}
return stringtypes;
}
public static List<String> uuidsToString(List<UUID> ids) {
return ids.stream()
.map(UUID::toString)
.collect(Collectors.toList());
}
public static boolean uuidIsEmpty(UUID uuid) {
return "00000000-0000-0000-0000-000000000000".equals(uuid.toString());
}
public static List<UUID> stringsToUUID(List<String> groupids) {
return groupids.stream()
.map(UUID::fromString)
.collect(Collectors.toList());
}
}

2
src/main/java/mops/gruppen2/domain/service/helper/ProjectionHelper.java
View File

@ -41,7 +41,7 @@ public final class ProjectionHelper {
*/
private static Group getOrCreateGroup(Map<UUID, Group> groups, UUID groupId) {
if (!groups.containsKey(groupId)) {
groups.put(groupId, new Group());
groups.put(groupId, Group.EMPTY());
}
return groups.get(groupId);

31
src/main/java/mops/gruppen2/domain/service/helper/ValidationHelper.java
View File

@ -17,36 +17,15 @@ import org.keycloak.adapters.springsecurity.token.KeycloakAuthenticationToken;
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class ValidationHelper {
/**
* Überprüft, ob ein User in einer Gruppe teilnimmt.
*/
public static boolean checkIfMember(Group group, String userid) {
return group.isMember(userid);
}
public static boolean checkIfLastMember(Group group, String userid) {
return checkIfMember(group, userid) && group.size() == 1;
}
/**
* Überprüft, ob eine Gruppe voll ist.
*/
public static boolean checkIfGroupFull(Group group) {
return group.isFull();
}
/**
* Überprüft, ob eine Gruppe leer ist.
*/
public static boolean checkIfGroupEmpty(Group group) {
return group.isEmpty();
return group.isMember(userid) && group.size() == 1;
}
/**
* Überprüft, ob ein User in einer Gruppe Admin ist.
*/
public static boolean checkIfAdmin(Group group, String userid) {
if (checkIfMember(group, userid)) {
if (group.isMember(userid)) {
return group.isAdmin(userid);
}
return false;
@ -61,14 +40,14 @@ public final class ValidationHelper {
public static void throwIfMember(Group group, String userid) throws UserAlreadyExistsException {
if (checkIfMember(group, userid)) {
if (group.isMember(userid)) {
log.error("Benutzer {} ist schon in Gruppe {}", userid, group);
throw new UserAlreadyExistsException(userid);
}
}
public static void throwIfNoMember(Group group, String userid) throws UserNotFoundException {
if (!checkIfMember(group, userid)) {
if (!group.isMember(userid)) {
log.error("Benutzer {} ist nicht in Gruppe {}!", userid, group);
throw new UserNotFoundException(userid);
}
@ -91,7 +70,7 @@ public final class ValidationHelper {
}
public static void throwIfGroupFull(Group group) throws GroupFullException {
if (checkIfGroupFull(group)) {
if (group.isFull()) {
log.error("Die Gruppe {} ist voll!", group);
throw new GroupFullException(group.getId().toString());
}

2
src/main/java/mops/gruppen2/infrastructure/GroupCache.java
View File

@ -35,7 +35,7 @@ public class GroupCache {
// ######################################## CACHE ###########################################
public void init() {
void init() {
ProjectionHelper.project(groups, eventStoreService.findAllEvents(), this);
}

2
src/main/java/mops/gruppen2/infrastructure/ModelAttributeControllerAdvice.java
View File

@ -14,8 +14,6 @@ import org.springframework.web.bind.annotation.ModelAttribute;
@ControllerAdvice
public class ModelAttributeControllerAdvice {
private final GroupCache groupCache;
// Add modelAttributes before each @RequestMapping
@ModelAttribute
public void modelAttributes(KeycloakAuthenticationToken token,

7
src/main/java/mops/gruppen2/infrastructure/api/GroupRequestWrapper.java
View File

@ -1,8 +1,6 @@
package mops.gruppen2.infrastructure.api;
import lombok.AllArgsConstructor;
import lombok.Getter;
import mops.gruppen2.domain.model.group.Group;
import java.util.List;
@ -10,9 +8,8 @@ import java.util.List;
* Kombiniert den Status und die Gruppenliste zur ausgabe über die API.
*/
@AllArgsConstructor
@Getter
public class GroupRequestWrapper {
private final long status;
private final List<Group> groupList;
private final long version;
private final List<GroupWrapper> groups;
}

4
src/main/java/mops/gruppen2/infrastructure/controller/GroupDetailsController.java
View File

@ -57,7 +57,7 @@ public class GroupDetailsController {
model.addAttribute("parent", parent);
// Detailseite für nicht-Mitglieder
if (!ValidationHelper.checkIfMember(group, principal)) {
if (!group.isMember(principal)) {
return "preview";
}
@ -72,7 +72,7 @@ public class GroupDetailsController {
String principal = token.getName();
Group group = groupCache.group(UUID.fromString(groupId));
if (ValidationHelper.checkIfMember(group, principal)) {
if (group.isMember(principal)) {
return "redirect:/gruppen2/details/" + groupId;
}

5
src/main/java/mops/gruppen2/infrastructure/controller/GruppenfindungController.java
View File

@ -28,11 +28,6 @@ public class GruppenfindungController {
return "redirect:/gruppen2";
}
@GetMapping("/login")
public String login() {
return "redirect:/gruppen2";
}
@TraceMethodCall
@RolesAllowed({"ROLE_orga", "ROLE_studentin"})
@GetMapping("/gruppen2")

3
src/main/java/mops/gruppen2/infrastructure/controller/SearchAndInviteController.java
View File

@ -6,7 +6,6 @@ import mops.gruppen2.aspect.annotation.TraceMethodCalls;
import mops.gruppen2.domain.model.group.Group;
import mops.gruppen2.domain.model.group.Type;
import mops.gruppen2.domain.service.SearchService;
import mops.gruppen2.domain.service.helper.ValidationHelper;
import mops.gruppen2.infrastructure.GroupCache;
import org.keycloak.adapters.springsecurity.token.KeycloakAuthenticationToken;
import org.springframework.stereotype.Controller;
@ -72,7 +71,7 @@ public class SearchAndInviteController {
}
// Bereits Mitglied
if (ValidationHelper.checkIfMember(group, principal)) {
if (group.isMember(principal)) {
return "redirect:/gruppen2/details/" + group.getId();
}

4
src/main/java/mops/gruppen2/persistance/dto/EventDTO.java
View File

@ -11,10 +11,10 @@ import org.springframework.data.relational.core.mapping.Table;
public class EventDTO {
@Id
Long event_id;
Long event_id; // Cache-Version
String group_id;
long group_version;
long group_version; // Group-Version
String exec_id;
String target_id;

2
src/main/resources/static/js/script.js
View File

@ -9,7 +9,7 @@ function enable(id) {
}
function copyLink() {
const copyText = document.getElementById("groupLink");
const copyText = document.getElementById("linkview");
copyText.select();
copyText.setSelectionRange(0, 99999);

2
src/main/resources/templates/edit.html
View File

@ -34,7 +34,7 @@
<div class="input-group-prepend">
<span class="input-group-text">Einladungslink:</span>
</div>
<input class="form-control" readonly th:value="${link}" type="text">
<input class="form-control" id="linkview" readonly th:value="${link}" type="text">
<div class="input-group-append">
<button type="button" class="btn btn-secondary"
onclick="copyLink()">Link kopieren