OO-4630: Calendar sync and email notification of appointment findings

src/main/java/org/olat/course/nodes/appointments/AppointmentsService.java

@@ -124,7 +124,7 @@ public interface AppointmentsService {
 
 	public void deleteParticipation(Participation participation);
 	
-	public void deleteParticipations(Collection<? extends ParticipationRef> participationRefs);
+	public void deleteParticipations(Collection<? extends ParticipationRef> participationRefs, boolean sendEmail);
 
 	public Long getParticipationCount(ParticipationSearchParams params);
 

src/main/java/org/olat/course/nodes/appointments/ParticipationSearchParams.java

@@ -112,6 +112,10 @@ public class ParticipationSearchParams {
 		return participationKeys;
 	}
 	
+	public void setParticipation(Participation participation) {
+		this.participationKeys = Collections.singletonList(participation.getKey());
+	}
+	
 	public void setParticipations(Collection<? extends ParticipationRef> participations) {
 		this.participationKeys = participations.stream()
 				.map(ParticipationRef::getKey)

src/main/java/org/olat/course/nodes/appointments/manager/AppointmentsMailing.java

@@ -23,6 +23,7 @@ import static java.util.Collections.singletonList;
 
 import java.text.DateFormat;
 import java.text.MessageFormat;
+import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 import java.util.stream.Collectors;
@@ -31,6 +32,7 @@ import org.apache.logging.log4j.Logger;
 import org.olat.core.gui.translator.Translator;
 import org.olat.core.id.Identity;
 import org.olat.core.logging.Tracing;
+import org.olat.core.util.DateUtils;
 import org.olat.core.util.StringHelper;
 import org.olat.core.util.Util;
 import org.olat.core.util.i18n.I18nManager;
@@ -161,6 +163,78 @@ public class AppointmentsMailing {
 		}
 	}
 	
+	void sendParticipationCreated(Participation participation) {
+		ParticipationSearchParams participationParams = new ParticipationSearchParams();
+		participationParams.setParticipation(participation);
+		participationParams.setFetchAppointments(true);
+		participationParams.setFetchTopics(true);
+		participationParams.setFetchIdentities(true);
+		participationParams.setFetchUser(true);
+		List<Participation> reloadedParticipations = participationDao.loadParticipations(participationParams);
+		if (reloadedParticipations.isEmpty()) return;
+		
+		Participation reloadedParticipation = reloadedParticipations.get(0);
+		Appointment appointment = reloadedParticipation.getAppointment();
+		Identity identity = reloadedParticipation.getIdentity();
+		Locale locale = I18nManager.getInstance().getLocaleOrDefault(identity.getUser().getPreferences().getLanguage());
+		Translator translator = Util.createPackageTranslator(AppointmentsRunController.class, locale);
+				
+		String subject = translator.translate("mail.participation.created.subject", 
+				new String[] {appointment.getTopic().getTitle() });
+		String body = translator.translate("mail.participation.created.body", new String[] {
+				userManager.getUserDisplayName(identity.getKey()),
+				createFormatedAppointments(Collections.singletonList(appointment), translator)
+		});
+		
+		MailerResult result = new MailerResult();
+		MailBundle bundle = new MailBundle();
+		bundle.setToId(identity);
+		bundle.setContent(subject, body);
+		bundle.setContext(getMailContext(appointment.getTopic()));
+		
+		result = mailManager.sendMessage(bundle);
+		if (!result.isSuccessful()) {
+			log.warn(MessageFormat.format("Sending participation created [keys={0}] to {1} failed: {2}",
+					reloadedParticipation.getKey(), identity, result.getErrorMessage()));
+		}
+	}
+	
+	void sendParticipationDeleted(Participation participation) {
+		ParticipationSearchParams participationParams = new ParticipationSearchParams();
+		participationParams.setParticipation(participation);
+		participationParams.setFetchAppointments(true);
+		participationParams.setFetchTopics(true);
+		participationParams.setFetchIdentities(true);
+		participationParams.setFetchUser(true);
+		List<Participation> reloadedParticipations = participationDao.loadParticipations(participationParams);
+		if (reloadedParticipations.isEmpty()) return;
+		
+		Participation reloadedParticipation = reloadedParticipations.get(0);
+		Appointment appointment = reloadedParticipation.getAppointment();
+		Identity identity = reloadedParticipation.getIdentity();
+		Locale locale = I18nManager.getInstance().getLocaleOrDefault(identity.getUser().getPreferences().getLanguage());
+		Translator translator = Util.createPackageTranslator(AppointmentsRunController.class, locale);
+				
+		String subject = translator.translate("mail.participation.deleted.subject", 
+				new String[] {appointment.getTopic().getTitle() });
+		String body = translator.translate("mail.participation.deleted.body", new String[] {
+				userManager.getUserDisplayName(identity.getKey()),
+				createFormatedAppointments(Collections.singletonList(appointment), translator)
+		});
+		
+		MailerResult result = new MailerResult();
+		MailBundle bundle = new MailBundle();
+		bundle.setToId(identity);
+		bundle.setContent(subject, body);
+		bundle.setContext(getMailContext(appointment.getTopic()));
+		
+		result = mailManager.sendMessage(bundle);
+		if (!result.isSuccessful()) {
+			log.warn(MessageFormat.format("Sending participation deleted [keys={0}] to {1} failed: {2}",
+					reloadedParticipation.getKey(), identity, result.getErrorMessage()));
+		}
+	}
+	
 	void sendRebook(Appointment toAppointment, List<Participation> fromParticipations) {
 		if (toAppointment == null || fromParticipations == null || fromParticipations.isEmpty()) return;
 		
@@ -213,13 +287,19 @@ public class AppointmentsMailing {
 	}
 
 	private void appendFormatedAppointment(StringBuilder sb, Appointment appointment, Translator translator) {
-		DateFormat dateFormat = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT, translator.getLocale());
 		sb.append(translator.translate("mail.topic", new String[] { appointment.getTopic().getTitle() }));
 		sb.append("<br>");
-		sb.append(translator.translate("mail.start", new String[] { dateFormat.format(appointment.getStart()) }));
-		sb.append("<br>");
-		sb.append(translator.translate("mail.end", new String[] { dateFormat.format(appointment.getEnd()) }));
-		sb.append("<br>");
+		if (DateUtils.isSameDate(appointment.getStart(), appointment.getEnd())) {
+			DateFormat dateFormat = DateFormat.getDateInstance(DateFormat.SHORT, translator.getLocale());
+			sb.append(translator.translate("mail.day", new String[] { dateFormat.format(appointment.getStart()) }));
+			sb.append("<br>");
+		} else {
+			DateFormat dateFormat = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT, translator.getLocale());
+			sb.append(translator.translate("mail.start", new String[] { dateFormat.format(appointment.getStart()) }));
+			sb.append("<br>");
+			sb.append(translator.translate("mail.end", new String[] { dateFormat.format(appointment.getEnd()) }));
+			sb.append("<br>");
+		}
 		if (StringHelper.containsNonWhitespace(appointment.getLocation())) {
 			sb.append(translator.translate("mail.location", new String[] { appointment.getLocation() }));
 			sb.append("<br>");

src/main/java/org/olat/course/nodes/appointments/manager/AppointmentsServiceImpl.java

@@ -28,6 +28,7 @@ import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.stream.Collectors;
 
 import org.olat.basesecurity.BaseSecurityManager;
@@ -53,6 +54,7 @@ import org.olat.course.nodes.appointments.ParticipationRef;
 import org.olat.course.nodes.appointments.ParticipationResult;
 import org.olat.course.nodes.appointments.ParticipationSearchParams;
 import org.olat.course.nodes.appointments.Topic;
+import org.olat.course.nodes.appointments.Topic.Type;
 import org.olat.course.nodes.appointments.TopicRef;
 import org.olat.course.nodes.appointments.TopicToGroup;
 import org.olat.repository.RepositoryEntry;
@@ -101,8 +103,10 @@ public class AppointmentsServiceImpl implements AppointmentsService {
 	public Topic updateTopic(Topic topic) {
 		AppointmentSearchParams params = new AppointmentSearchParams();
 		params.setTopic(topic);
-		params.setStatus(Status.confirmed);
 		params.setFetchTopic(true);
+		if (Type.finding == topic.getType()) {
+			params.setStatus(Status.confirmed);
+		}
 		List<Appointment> appointments = appointmentDao.loadAppointments(params);
 		
 		if (!appointments.isEmpty()) {
@@ -130,13 +134,23 @@ public class AppointmentsServiceImpl implements AppointmentsService {
 			params.setSubIdent(subIdent);
 		}
 		params.setStartAfter(new Date());
-		params.setStatus(Status.confirmed);
 		params.setFetchTopic(true);
 		List<Appointment> appointments = appointmentDao.loadAppointments(params);
-		appointmentsMailing.sendAppointmentDeleted(appointments);
 		
-		List<Organizer> organizers = organizerDao.loadOrganizers(entry, subIdent);
-		appointmentsMailing.sendAppointmentsDeleted(appointments, organizers);
+		if (!appointments.isEmpty()) {
+			Map<Topic, List<Appointment>> topicToAppointments = appointments.stream()
+					.collect(Collectors.groupingBy(a -> a.getTopic()));
+			for (Entry<Topic, List<Appointment>> topicAppointments : topicToAppointments.entrySet()) {
+				calendarSyncher.unsyncCalendars(topicAppointments.getKey(), topicAppointments.getValue());
+			}	
+			
+			List<Appointment> confimredAppointments = appointments.stream()
+					.filter(a -> a.getStatus() == Status.confirmed)
+					.collect(Collectors.toList());
+			appointmentsMailing.sendAppointmentDeleted(confimredAppointments);
+			List<Organizer> organizers = organizerDao.loadOrganizers(entry, subIdent);
+			appointmentsMailing.sendAppointmentsDeleted(confimredAppointments, organizers);
+		}
 		
 		List<Topic> topics = topicDao.loadTopics(entry, subIdent);
 		for (Topic topic : topics) {
@@ -154,13 +168,19 @@ public class AppointmentsServiceImpl implements AppointmentsService {
 		AppointmentSearchParams params = new AppointmentSearchParams();
 		params.setTopic(topicRef);
 		params.setStartAfter(new Date());
-		params.setStatus(Status.confirmed);
 		params.setFetchTopic(true);
 		List<Appointment> appointments = appointmentDao.loadAppointments(params);
-		appointmentsMailing.sendAppointmentDeleted(appointments);
 		
-		List<Organizer> organizers = organizerDao.loadOrganizers(topicRef);
-		appointmentsMailing.sendAppointmentsDeleted(appointments, organizers);
+		if (!appointments.isEmpty()) {
+			List<Appointment> confimredAppointments = appointments.stream()
+					.filter(a -> a.getStatus() == Status.confirmed)
+					.collect(Collectors.toList());
+			appointmentsMailing.sendAppointmentDeleted(confimredAppointments);
+			List<Organizer> organizers = organizerDao.loadOrganizers(topicRef);
+			appointmentsMailing.sendAppointmentsDeleted(confimredAppointments, organizers);
+			
+			calendarSyncher.unsyncCalendars(appointments.get(0).getTopic(), appointments);
+		}
 		
 		Topic topic = topicDao.loadByKey(topicRef.getKey());
 		deleteTopicGroup(topic);
@@ -185,8 +205,10 @@ public class AppointmentsServiceImpl implements AppointmentsService {
 		
 		AppointmentSearchParams params = new AppointmentSearchParams();
 		params.setTopic(topic);
-		params.setStatus(Status.confirmed);
 		params.setFetchTopic(true);
+		if (Type.finding == topic.getType()) {
+			params.setStatus(Status.confirmed);
+		}
 		List<Appointment> appointments = appointmentDao.loadAppointments(params);
 		calendarSyncher.syncCalendar(appointments, identity);
 		
@@ -304,7 +326,9 @@ public class AppointmentsServiceImpl implements AppointmentsService {
 	@Override
 	public Appointment saveAppointment(Appointment appointment) {
 		Appointment saveAppointment = appointmentDao.saveAppointment(appointment);
-		calendarSyncher.syncCalendars(appointment.getTopic(), singletonList(appointment));
+		if (Status.confirmed == appointment.getStatus() || Type.finding != appointment.getTopic().getType()) {
+			calendarSyncher.syncCalendars(appointment.getTopic(), singletonList(appointment));
+		}
 		return saveAppointment;
 	}
 
@@ -351,7 +375,11 @@ public class AppointmentsServiceImpl implements AppointmentsService {
 			Appointment reloaded = appointments.get(0);
 			if (Status.confirmed == reloaded.getStatus()) {
 				appointmentDao.updateStatus(reloaded, Status.planned);
-				calendarSyncher.syncCalendars(reloaded.getTopic(), singletonList(reloaded));
+				if (Type.finding == reloaded.getTopic().getType()) {
+					calendarSyncher.unsyncCalendars(reloaded.getTopic(), singletonList(reloaded));
+				} else {
+					calendarSyncher.syncCalendars(reloaded.getTopic(), singletonList(reloaded));
+				}
 				appointmentsMailing.sendAppointmentUnconfirmed(reloaded);
 			}
 		}
@@ -360,7 +388,9 @@ public class AppointmentsServiceImpl implements AppointmentsService {
 	@Override
 	public void deleteAppointment(Appointment appointment) {
 		calendarSyncher.unsyncCalendars(appointment.getTopic(), singletonList(appointment));
-		appointmentsMailing.sendAppointmentDeleted(singletonList(appointment));
+		if (Status.confirmed == appointment.getStatus() || Type.finding != appointment.getTopic().getType()) {
+			appointmentsMailing.sendAppointmentDeleted(singletonList(appointment));
+		}
 		appointmentDao.delete(appointment);
 	}
 	
@@ -428,7 +458,12 @@ public class AppointmentsServiceImpl implements AppointmentsService {
 			
 			Participation participation = participationDao.createParticipation(reloadedAppointment, identity, createdBy);
 			participations.add(participation);
-			calendarSyncher.syncCalendar(reloadedAppointment, identity);
+			if (Status.confirmed == appointment.getStatus() || Type.finding != appointment.getTopic().getType()) {
+				calendarSyncher.syncCalendar(reloadedAppointment, identity);
+			}
+			if (Status.confirmed == appointment.getStatus()) {
+				appointmentsMailing.sendParticipationCreated(participation);
+			}
 		}
 		
 		if (autoConfirmation) {
@@ -489,7 +524,10 @@ public class AppointmentsServiceImpl implements AppointmentsService {
 			Identity identity = fromParticipation.getIdentity();
 			Participation participation = participationDao.createParticipation(toAppointment, identity, rebookedBy);
 			participations.add(participation);
-			calendarSyncher.syncCalendar(toAppointment, identity);
+
+			if (Status.confirmed == toAppointment.getStatus() || Type.finding != toAppointment.getTopic().getType()) {
+				calendarSyncher.syncCalendar(toAppointment, identity);
+			}
 		}
 		appointmentsMailing.sendRebook(toAppointment, fromParticipations);
 
@@ -506,19 +544,28 @@ public class AppointmentsServiceImpl implements AppointmentsService {
 	}
 	
 	@Override
-	public void deleteParticipations(Collection<? extends ParticipationRef> participationRefs) {
+	public void deleteParticipations(Collection<? extends ParticipationRef> participationRefs, boolean sendEmail) {
 		ParticipationSearchParams participationParams = new ParticipationSearchParams();
 		participationParams.setParticipations(participationRefs);
 		participationParams.setFetchAppointments(true);
 		participationParams.setFetchIdentities(true);
 		List<Participation> loadParticipations = participationDao.loadParticipations(participationParams);
-		loadParticipations.forEach(participation -> deleteParticipation(participation));
+		loadParticipations.forEach(participation -> deleteParticipation(participation, sendEmail));
 	}
 
 	@Override
 	public void deleteParticipation(Participation participation) {
-		calendarSyncher.unsyncCalendar(participation.getAppointment(), participation.getIdentity());
+		deleteParticipation(participation, false);
+	}
+	
+	public void deleteParticipation(Participation participation, boolean sendEmail) {
+		Appointment appointment = participation.getAppointment();
+		calendarSyncher.unsyncCalendar(appointment, participation.getIdentity());
+		if (sendEmail && Status.confirmed == appointment.getStatus()) {
+			appointmentsMailing.sendParticipationDeleted(participation);
+		}
 		participationDao.delete(participation);
+		
 	}
 
 	@Override

src/main/java/org/olat/course/nodes/appointments/ui/AbstractParticipationRemoveController.java

@@ -301,7 +301,7 @@ public abstract class AbstractParticipationRemoveController extends FormBasicCon
 				return;
 			}
 		} else {
-			appointmentsService.deleteParticipations(participationRefs);
+			appointmentsService.deleteParticipations(participationRefs, true);
 		}
 		
 		onAfterRemoving();

src/main/java/org/olat/course/nodes/appointments/ui/AppointmentListController.java

@@ -199,11 +199,9 @@ public abstract class AppointmentListController extends FormBasicController impl
 			DefaultFlexiColumnModel addUserModel = new DefaultFlexiColumnModel(AppointmentCols.addUser);
 			addUserModel.setExportable(false);
 			columnsModel.addFlexiColumnModel(addUserModel);
-			if (Type.finding != topic.getType()) {
-				DefaultFlexiColumnModel removeModel = new DefaultFlexiColumnModel(AppointmentCols.removeUser);
-				removeModel.setExportable(false);
-				columnsModel.addFlexiColumnModel(removeModel);
-			}
+			DefaultFlexiColumnModel removeModel = new DefaultFlexiColumnModel(AppointmentCols.removeUser);
+			removeModel.setExportable(false);
+			columnsModel.addFlexiColumnModel(removeModel);
 			DefaultFlexiColumnModel confirmModel = new DefaultFlexiColumnModel(AppointmentCols.confirm);
 			confirmModel.setExportable(false);
 			columnsModel.addFlexiColumnModel(confirmModel);

src/main/java/org/olat/course/nodes/appointments/ui/FindingConfirmationController.java

@@ -206,7 +206,7 @@ public class FindingConfirmationController extends FormBasicController {
 				unselectedParticipations.add(participation);
 			}
 		}
-		appointmentsService.deleteParticipations(unselectedParticipations);
+		appointmentsService.deleteParticipations(unselectedParticipations, false);
 		
 		appointmentsService.confirmAppointment(appointment);
 		

src/main/java/org/olat/course/nodes/appointments/ui/_i18n/LocalStrings_de.properties

@@ -95,10 +95,15 @@ mail.appointments.deleted.body=Liebe/r {0} <br><br>Folgende Termine wurden abges
 mail.appointments.deleted.subject=Termine abgesagt
 mail.confirmed.body=Liebe/r {0} <br><br>Folgender Termin wurde best\u00e4tigt.<br><br>{1}
 mail.confirmed.subject=Termin "{0}" best\u00e4tigt
+mail.day=Datum: {0} (ganzer Tag)
 mail.deleted.body=Liebe/r {0} <br><br>Folgender Termin wurde abgesagt.<br><br>{1}
 mail.deleted.subject=Termin "{0}" abgesagt
 mail.end=Ende: {0}
 mail.location=Ort: {0}
+mail.participation.created.body=Liebe/r {0} <br><br>Sie wurden zu folgendem Termin hinzugef\u00fcgt.<br><br>{1}
+mail.participation.created.subject=Zu Termin "{0}" hinzugef\u00fcgt
+mail.participation.deleted.body=Liebe/r {0} <br><br>Sie wurden aus folgendem Termin entfernt.<br><br>{1}
+mail.participation.deleted.subject=Aus Termin "{0}" entfernt
 mail.rebooked.subject=Termin umgebucht
 mail.rebooked.body=Liebe/r {0} <br><br>Folgender Termin wurde umbgebucht.<br><br><b>Bisheriger Termin</b><br>{1}<br><b>Neuer Termin</b><br>{2}
 mail.start=Start: {0}

src/main/java/org/olat/course/nodes/appointments/ui/_i18n/LocalStrings_en.properties

@@ -94,10 +94,15 @@ mail.appointments.deleted.body=Dear {0} <br><br>The following appointments were
 mail.appointments.deleted.subject=Appointments deleted
 mail.confirmed.body=Dear {0} <br><br>The following appointment was confirmed.<br><br>{1}
 mail.confirmed.subject=Appointment "{0}" confirmed
+mail.day=Date: {0} (full day)
 mail.deleted.body=Dear {0} <br><br>The following appointment was declined.<br><br>{1}
 mail.deleted.subject=Appointment "{0}" declined
 mail.end=End: {0}
 mail.location=Location: {0}
+mail.participation.created.body=Dear {0} <br><br>You were added to the following appointment.<br><br>{1}
+mail.participation.created.subject=Added to appointment "{0}"
+mail.participation.deleted.body=Dear {0} <br><br>You were removed from the following appointment.<br><br>{1}
+mail.participation.deleted.subject=Removed from appointment "{0}"
 mail.rebooked.subject=Appointment rebooked
 mail.rebooked.body=Dear {0} <br><br>The following appointment was rebooked.<br><br><b>Previous appointment</b><br>{1}<br><b>New appointment</b><br>{2}
 mail.start=Start: {0}