Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SAK-50348 Microsoft Integration: Visual and logical improvements #12781

Merged
merged 1 commit into from
Dec 11, 2024
Merged

SAK-50348 Microsoft Integration: Visual and logical improvements #12781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
439 changes: 270 additions & 169 deletions .../admin-tool/src/main/java/org/sakaiproject/microsoft/controller/AutoConfigController.java
View file
Open in desktop

Large diffs are not rendered by default.

169 changes: 102 additions & 67 deletions ...l/src/main/java/org/sakaiproject/microsoft/controller/GroupSynchronizationController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,13 @@
*/
package org.sakaiproject.microsoft.controller;

import java.text.MessageFormat;
import java.util.List;
import java.util.function.Function;
import java.util.stream.Collectors;

import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.sakaiproject.microsoft.api.MicrosoftCommonService;
import org.sakaiproject.microsoft.api.MicrosoftConfigurationService;
import org.sakaiproject.microsoft.api.MicrosoftSynchronizationService;
import org.sakaiproject.microsoft.api.SakaiProxy;
import org.sakaiproject.microsoft.api.data.MicrosoftChannel;
import org.sakaiproject.microsoft.api.exceptions.MicrosoftGenericException;
import org.sakaiproject.microsoft.api.model.GroupSynchronization;
import org.sakaiproject.microsoft.api.model.SiteSynchronization;
Expand All @@ -38,10 +36,18 @@
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;

import lombok.extern.slf4j.Slf4j;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
import java.util.stream.Collectors;

import static org.sakaiproject.microsoft.api.MicrosoftCommonService.MAX_CHANNELS;


/**
Expand All @@ -64,104 +70,133 @@ public class GroupSynchronizationController {

@Autowired
MicrosoftConfigurationService microsoftConfigurationService;


@Autowired
SakaiProxy sakaiProxy;

private static final String REDIRECT_INDEX = "redirect:/index";
private static final String REDIRECT_EDIT_GROUP_SYNCH = "redirect:/editGroupSynchronization";
private static final String EDIT_GROUP_SYNCH_TEMPLATE = "editGroupSynchronization";

private static final String NEW = "NEW";

@GetMapping(value = {"/editGroupSynchronization/{siteSynchronizationId}"})
public String editGroupSynchronization(@PathVariable String siteSynchronizationId, Model model, RedirectAttributes redirectAttributes) throws MicrosoftGenericException {
SiteSynchronization ss = microsoftSynchronizationService.getSiteSynchronization(SiteSynchronization.builder().id(siteSynchronizationId).build(), true);
if(ss != null) {
model.addAttribute("siteSynchronizationId", siteSynchronizationId);
model.addAttribute("groupsMap", ss.getSite().getGroups().stream().collect(Collectors.toMap(Group::getId, Function.identity())));
model.addAttribute("channelsMap", microsoftCommonService.getTeamPrivateChannels(ss.getTeamId()));
model.addAttribute("siteTitle", ss.getSite().getTitle());
model.addAttribute("teamTitle", microsoftCommonService.getTeam(ss.getTeamId()).getName());

List<GroupSynchronization> list = microsoftSynchronizationService.getAllGroupSynchronizationsBySiteSynchronizationId(siteSynchronizationId);
if(list != null && list.size() > 0) {
model.addAttribute("groupSynchronizations", list);
}


return EDIT_GROUP_SYNCH_TEMPLATE;

if (ss == null) {
redirectAttributes.addFlashAttribute("exception_error", rb.getString("error.site_synchronization_not_found"));
return REDIRECT_INDEX;
}

List<Group> groups = (List<Group>) sakaiProxy.getSite(ss.getSiteId()).getGroups();

model.addAttribute("siteSynchronizationId", siteSynchronizationId);
model.addAttribute("groupsMap", groups.stream().collect(Collectors.toMap(Group::getId, Function.identity())));
model.addAttribute("channelsMap", microsoftCommonService.getTeamPrivateChannels(ss.getTeamId()));
model.addAttribute("siteTitle", ss.getSite().getTitle());
model.addAttribute("teamTitle", microsoftCommonService.getTeam(ss.getTeamId()).getName());

List<GroupSynchronization> list = microsoftSynchronizationService.getAllGroupSynchronizationsBySiteSynchronizationId(siteSynchronizationId);
groups.stream()
.filter(g -> list.stream().noneMatch(item -> item.getGroupId().equals(g.getId())))
.map(g -> GroupSynchronization.builder()
.groupId(g.getId())
.channelId("")
.siteSynchronization(ss)
.build())
.forEach(list::add);

List<GroupSynchronization> sortedList = new ArrayList<>();
groups.forEach(
g -> sortedList.addAll(
list.stream().filter(element -> element.getGroupId().equals(g.getId())).collect(Collectors.toList())
)
);

if (list.size() > 0) {
model.addAttribute("groupSynchronizations", sortedList);
}

redirectAttributes.addFlashAttribute("exception_error", rb.getString("error.site_synchronization_not_found"));
return REDIRECT_INDEX;

return EDIT_GROUP_SYNCH_TEMPLATE;
}

@PostMapping(path = {"/add-groupSynchronization/{siteSynchronizationId}"}, consumes = {MediaType.APPLICATION_FORM_URLENCODED_VALUE})
public String saveGroupSynchronization(@PathVariable String siteSynchronizationId, @ModelAttribute GroupSynchronizationRequest payload, Model model, RedirectAttributes redirectAttributes) throws MicrosoftGenericException {
String createdChannelId = null;
//get parent object
public String saveGroupSynchronization(@PathVariable String siteSynchronizationId, @ModelAttribute GroupSynchronizationRequest payload, Model model, RedirectAttributes redirectAttributes) throws MicrosoftGenericException {
SiteSynchronization ss = microsoftSynchronizationService.getSiteSynchronization(SiteSynchronization.builder().id(siteSynchronizationId).build());
if(ss != null) {
if(StringUtils.isNotBlank(payload.getSelectedGroupId()) && StringUtils.isNotBlank(payload.getSelectedChannelId())) {
if (ss != null) {
Map<String, MicrosoftChannel> channelsMap = microsoftCommonService.getTeamPrivateChannels(ss.getTeamId());
model.addAttribute("channelsMap", channelsMap);

if (StringUtils.isNotBlank(payload.getSelectedGroupId()) && StringUtils.isNotBlank(payload.getSelectedChannelId())) {
String groupId = payload.getSelectedGroupId();
String channelId = payload.getSelectedChannelId();

//TODO: do the same to create a site???
if(channelId.equals(NEW) && createdChannelId == null) {
//create new channel
if(StringUtils.isBlank(payload.getNewChannelName())) {
redirectAttributes.addFlashAttribute("exception_error", rb.getString("error.new_channel_empty"));

return REDIRECT_EDIT_GROUP_SYNCH + "/" + siteSynchronizationId;
}
createdChannelId = microsoftCommonService.createChannel(ss.getTeamId(), payload.getNewChannelName(), microsoftConfigurationService.getCredentials().getEmail());

if(createdChannelId == null) {
redirectAttributes.addFlashAttribute("exception_error", MessageFormat.format(rb.getString("error.creating_channel"), payload.getNewChannelName()));

return REDIRECT_EDIT_GROUP_SYNCH + "/" + siteSynchronizationId;
}
}


GroupSynchronization gs = GroupSynchronization.builder()
.siteSynchronization(ss)
.groupId(groupId)
.channelId(channelId.equals(NEW) ? createdChannelId : channelId)
.build();
.siteSynchronization(ss)
.groupId(groupId)
.channelId(channelId)
.build();

GroupSynchronization aux_gs = microsoftSynchronizationService.getGroupSynchronization(gs);
if(aux_gs != null) {
if (aux_gs != null) {
redirectAttributes.addFlashAttribute("exception_error", rb.getString("error.group_synchronization_already_exists"));

return REDIRECT_EDIT_GROUP_SYNCH + "/" + siteSynchronizationId;
}

//check if parent is forced and selected channel is duplicated
//TODO: at this point, if parent is not forcing, we will allow this relationship. But we don't check if the parent starts forcing after that
if(ss.isForced() && microsoftSynchronizationService.countGroupSynchronizationsByChannelId(gs.getChannelId()) > 0) {
if (ss.isForced() && microsoftSynchronizationService.countGroupSynchronizationsByChannelId(gs.getChannelId()) > 0) {
redirectAttributes.addFlashAttribute("exception_error", rb.getString("error.group_synchronization_already_forced"));

return REDIRECT_EDIT_GROUP_SYNCH + "/" + siteSynchronizationId;
}
log.debug("saving: groupId={}, channelId={}", groupId, channelId.equals(NEW) ? createdChannelId : channelId);

log.debug("saving: groupId={}, channelId={}", groupId, channelId);
microsoftSynchronizationService.saveOrUpdateGroupSynchronization(gs);
}
} else {
redirectAttributes.addFlashAttribute("exception_error", rb.getString("error.site_synchronization_not_found"));
redirectAttributes.addFlashAttribute("exception_error", rb.getString("error.channel_number_more_than_30"));
}

return REDIRECT_EDIT_GROUP_SYNCH + "/" + siteSynchronizationId;
}


@GetMapping(path = {"/delete-groupSynchronization/{groupSynchronizationId}"}, produces = MediaType.APPLICATION_JSON_VALUE)
@ResponseBody
public Boolean deleteGroupSynchronization(@PathVariable String groupSynchronizationId, Model model, RedirectAttributes redirectAttributes) throws MicrosoftGenericException {
boolean ok = false;
GroupSynchronization gs = microsoftSynchronizationService.getGroupSynchronization(GroupSynchronization.builder().id(groupSynchronizationId).build());
if(gs != null) {
if (gs != null) {
ok = microsoftSynchronizationService.deleteGroupSynchronization(groupSynchronizationId);
}

return ok;
}

@PostMapping(value = {"/channel"})
public String createNewChannel(@RequestParam String siteId, @RequestParam String name, RedirectAttributes redirectAttributes) throws MicrosoftGenericException {
log.debug("NEW channel creating");
SiteSynchronization ss = microsoftSynchronizationService.getSiteSynchronization(SiteSynchronization.builder().id(siteId).build());
try {
Map<String, MicrosoftChannel> channelsMap = microsoftCommonService.getTeamPrivateChannels(ss.getTeamId());
Collection<MicrosoftChannel> channels = channelsMap.values();
boolean channelExists = channels.stream()
.anyMatch(channel -> channel.getName().equalsIgnoreCase(name));
if (!channelExists) {
if (channels.size() < MAX_CHANNELS) {
microsoftCommonService.createChannel(ss.getTeamId(), name, microsoftConfigurationService.getCredentials().getEmail());
} else {
redirectAttributes.addFlashAttribute("exception_error", rb.getString("error.channel_number_more_than_30"));
}
} else {
redirectAttributes.addFlashAttribute("exception_error", rb.getString("error.new_channel_with_same_name"));
}
} catch (NullPointerException e) {
log.error("MicrosoftCredentialsException in confirm thread");
}
return REDIRECT_EDIT_GROUP_SYNCH + "/" + siteId;
}
}
Loading
Loading