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

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

Browse Source 
# Conflicts:
#	src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
#	src/main/java/mops/gruppen2/service/ControllerService.java
This commit is contained in:
XXNitram
2020-03-18 14:27:54 +01:00
parent 838bff1d9f e9ee776047
commit f292700c78
13 changed files with 114 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,15 +4,21 @@ import mops.gruppen2.domain.*;
import mops.gruppen2.domain.event.*;
import mops.gruppen2.security.Account;
import org.springframework.stereotype.Service;
import java.util.*;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.UUID;
@Service
public class ControllerService {
private final EventService eventService;
private final InviteLinkRepositoryService inviteLinkRepositoryService;
public ControllerService(EventService eventService) {
public ControllerService(EventService eventService, InviteLinkRepositoryService inviteLinkRepositoryService) {
this.eventService = eventService;
this.inviteLinkRepositoryService = inviteLinkRepositoryService;
}
/**
@ -32,6 +38,7 @@ public class ControllerService {
visibility1 = Visibility.PUBLIC;
} else {
visibility1 = Visibility.PRIVATE;
createInviteLink(group_id);
}
CreateGroupEvent createGroupEvent = new CreateGroupEvent(group_id, account.getName(), null , GroupType.SIMPLE, visibility1);
@ -43,6 +50,11 @@ public class ControllerService {
updateRole(account, group_id);
}
private void createInviteLink(Long group_id) {
inviteLinkRepositoryService.saveInvite(group_id, UUID.randomUUID());
}
public void addUser(Account account, Long group_id){
AddUserEvent addUserEvent = new AddUserEvent(group_id,account.getName(),account.getGivenname(),account.getFamilyname(),account.getEmail());
eventService.saveEvent(addUserEvent);

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

@ -1,8 +1,8 @@
package mops.gruppen2.service;
import com.fasterxml.jackson.core.JsonProcessingException;
import mops.gruppen2.domain.EventDTO;
import mops.gruppen2.domain.Visibility;
import mops.gruppen2.domain.dto.EventDTO;
import mops.gruppen2.domain.event.CreateGroupEvent;
import mops.gruppen2.domain.event.Event;
import mops.gruppen2.repository.EventRepository;

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

@ -1,6 +1,6 @@
package mops.gruppen2.service;
import mops.gruppen2.domain.EventDTO;
import mops.gruppen2.domain.dto.EventDTO;
import mops.gruppen2.domain.Exceptions.EventException;
import mops.gruppen2.domain.Group;
import mops.gruppen2.domain.Visibility;

26
src/main/java/mops/gruppen2/service/InviteLinkRepositoryService.java Normal file
View File

@ -0,0 +1,26 @@
package mops.gruppen2.service;
import mops.gruppen2.domain.dto.InviteLinkDTO;
import mops.gruppen2.repository.InviteLinkRepository;
import org.springframework.stereotype.Service;
import java.util.UUID;
@Service
public class InviteLinkRepositoryService {
private final InviteLinkRepository inviteLinkRepository;
public InviteLinkRepositoryService(InviteLinkRepository inviteLinkRepository) {
this.inviteLinkRepository = inviteLinkRepository;
}
public long findGroupIdByInvite(String link) {
return inviteLinkRepository.findGroupIdByLink(link);
}
public void saveInvite(Long group_id, UUID link) {
inviteLinkRepository.save(new InviteLinkDTO(null, group_id, link.toString()));
}
}

1
src/main/java/mops/gruppen2/service/SerializationService.java
View File

@ -2,7 +2,6 @@ package mops.gruppen2.service;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import mops.gruppen2.domain.EventDTO;
import mops.gruppen2.domain.event.Event;
import mops.gruppen2.repository.EventRepository;
import org.slf4j.Logger;