From 9c734e2223fe00a62d656eee5c04c054f4fe765e Mon Sep 17 00:00:00 2001
From: agrt56 <andreas.gaertner@mni.thm.de>
Date: Thu, 6 Aug 2015 23:26:16 +0200
Subject: [PATCH] Task #15458: Broadcast FeatureChangeEvent on session feature
change
---
.../de/thm/arsnova/cache/CacheBuster.java | 4 ++
.../domain/LearningProgressFactory.java | 4 ++
.../thm/arsnova/entities/SessionFeature.java | 10 +++++
.../arsnova/events/FeatureChangeEvent.java | 38 +++++++++++++++++++
.../thm/arsnova/events/NovaEventVisitor.java | 2 +
.../thm/arsnova/services/SessionService.java | 3 ++
.../arsnova/socket/ARSnovaSocketIOServer.java | 7 ++++
7 files changed, 68 insertions(+)
create mode 100644 src/main/java/de/thm/arsnova/events/FeatureChangeEvent.java
diff --git a/src/main/java/de/thm/arsnova/cache/CacheBuster.java b/src/main/java/de/thm/arsnova/cache/CacheBuster.java
index 8a3d9fce..2335ae5e 100644
--- a/src/main/java/de/thm/arsnova/cache/CacheBuster.java
+++ b/src/main/java/de/thm/arsnova/cache/CacheBuster.java
@@ -30,6 +30,7 @@ import de.thm.arsnova.events.DeleteFeedbackForSessionsEvent;
import de.thm.arsnova.events.DeleteInterposedQuestionEvent;
import de.thm.arsnova.events.DeleteQuestionEvent;
import de.thm.arsnova.events.DeleteSessionEvent;
+import de.thm.arsnova.events.FeatureChangeEvent;
import de.thm.arsnova.events.LockQuestionEvent;
import de.thm.arsnova.events.LockQuestionsEvent;
import de.thm.arsnova.events.LockVoteEvent;
@@ -147,4 +148,7 @@ public class CacheBuster implements ICacheBuster, NovaEventVisitor {
@Override
public void visit(UnlockVotesEvent unlockVotesEvent) {}
+ @Override
+ public void visit(FeatureChangeEvent featureChangeEvent) {}
+
}
diff --git a/src/main/java/de/thm/arsnova/domain/LearningProgressFactory.java b/src/main/java/de/thm/arsnova/domain/LearningProgressFactory.java
index 4de4fa37..1f669dfc 100644
--- a/src/main/java/de/thm/arsnova/domain/LearningProgressFactory.java
+++ b/src/main/java/de/thm/arsnova/domain/LearningProgressFactory.java
@@ -34,6 +34,7 @@ import de.thm.arsnova.events.DeleteFeedbackForSessionsEvent;
import de.thm.arsnova.events.DeleteInterposedQuestionEvent;
import de.thm.arsnova.events.DeleteQuestionEvent;
import de.thm.arsnova.events.DeleteSessionEvent;
+import de.thm.arsnova.events.FeatureChangeEvent;
import de.thm.arsnova.events.LockQuestionEvent;
import de.thm.arsnova.events.LockQuestionsEvent;
import de.thm.arsnova.events.LockVoteEvent;
@@ -207,4 +208,7 @@ public class LearningProgressFactory implements NovaEventVisitor, ILearningProgr
@Override
public void visit(UnlockVotesEvent unlockVotesEvent) {}
+ @Override
+ public void visit(FeatureChangeEvent featureChangeEvent) {}
+
}
diff --git a/src/main/java/de/thm/arsnova/entities/SessionFeature.java b/src/main/java/de/thm/arsnova/entities/SessionFeature.java
index b8f59b38..a09cb402 100644
--- a/src/main/java/de/thm/arsnova/entities/SessionFeature.java
+++ b/src/main/java/de/thm/arsnova/entities/SessionFeature.java
@@ -23,6 +23,7 @@ package de.thm.arsnova.entities;
public class SessionFeature {
private boolean jitt = true;
+ private boolean lecture = true;
private boolean feedback = true;
private boolean interposed = true;
private boolean pi = true;
@@ -31,6 +32,7 @@ public class SessionFeature {
public SessionFeature(SessionFeature features) {
this();
if (features != null) {
+ this.lecture = features.lecture;
this.jitt = features.jitt;
this.feedback = features.feedback;
this.interposed = features.interposed;
@@ -41,6 +43,14 @@ public class SessionFeature {
public SessionFeature() {}
+ public boolean isLecture() {
+ return lecture;
+ }
+
+ public void setLecture(boolean lecture) {
+ this.lecture = lecture;
+ }
+
public boolean isJitt() {
return jitt;
}
diff --git a/src/main/java/de/thm/arsnova/events/FeatureChangeEvent.java b/src/main/java/de/thm/arsnova/events/FeatureChangeEvent.java
new file mode 100644
index 00000000..9e305e87
--- /dev/null
+++ b/src/main/java/de/thm/arsnova/events/FeatureChangeEvent.java
@@ -0,0 +1,38 @@
+/*
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2015 The ARSnova Team
+ *
+ * ARSnova Backend is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ARSnova Backend is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package de.thm.arsnova.events;
+
+import de.thm.arsnova.entities.Session;
+
+/**
+ * Fires whenever a new session is created.
+ */
+public class FeatureChangeEvent extends SessionEvent {
+
+ private static final long serialVersionUID = 1L;
+
+ public FeatureChangeEvent(Object source, Session session) {
+ super(source, session);
+ }
+
+ @Override
+ public void accept(NovaEventVisitor visitor) {
+ visitor.visit(this);
+ }
+
+}
diff --git a/src/main/java/de/thm/arsnova/events/NovaEventVisitor.java b/src/main/java/de/thm/arsnova/events/NovaEventVisitor.java
index 216c38f8..1f318457 100644
--- a/src/main/java/de/thm/arsnova/events/NovaEventVisitor.java
+++ b/src/main/java/de/thm/arsnova/events/NovaEventVisitor.java
@@ -78,4 +78,6 @@ public interface NovaEventVisitor {
void visit(UnlockVotesEvent unlockVotesEvent);
+ void visit(FeatureChangeEvent featureChangeEvent);
+
}
diff --git a/src/main/java/de/thm/arsnova/services/SessionService.java b/src/main/java/de/thm/arsnova/services/SessionService.java
index eb341b7b..74940d24 100644
--- a/src/main/java/de/thm/arsnova/services/SessionService.java
+++ b/src/main/java/de/thm/arsnova/services/SessionService.java
@@ -47,6 +47,7 @@ import de.thm.arsnova.entities.User;
import de.thm.arsnova.entities.transport.ImportExportSession;
import de.thm.arsnova.entities.transport.LearningProgressValues;
import de.thm.arsnova.events.DeleteSessionEvent;
+import de.thm.arsnova.events.FeatureChangeEvent;
import de.thm.arsnova.events.NewSessionEvent;
import de.thm.arsnova.events.StatusSessionEvent;
import de.thm.arsnova.exceptions.BadRequestException;
@@ -240,6 +241,7 @@ public class SessionService implements ISessionService, ApplicationEventPublishe
session.setLearningProgressOptions(lpo);
SessionFeature sf = new SessionFeature();
+ sf.setLecture(true);
sf.setFeedback(true);
sf.setInterposed(true);
sf.setJitt(true);
@@ -412,6 +414,7 @@ public class SessionService implements ISessionService, ApplicationEventPublishe
throw new UnauthorizedException();
}
session.setFeatures(features);
+ this.publisher.publishEvent(new FeatureChangeEvent(this, session));
return databaseDao.updateSession(session).getFeatures();
}
diff --git a/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java b/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java
index 1283b266..a00ebc32 100644
--- a/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java
+++ b/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java
@@ -60,6 +60,7 @@ import de.thm.arsnova.events.DeleteFeedbackForSessionsEvent;
import de.thm.arsnova.events.DeleteInterposedQuestionEvent;
import de.thm.arsnova.events.DeleteQuestionEvent;
import de.thm.arsnova.events.DeleteSessionEvent;
+import de.thm.arsnova.events.FeatureChangeEvent;
import de.thm.arsnova.events.LockQuestionEvent;
import de.thm.arsnova.events.LockQuestionsEvent;
import de.thm.arsnova.events.LockVoteEvent;
@@ -602,6 +603,12 @@ public class ARSnovaSocketIOServer implements ARSnovaSocket, NovaEventVisitor {
broadcastInSession(event.getSession().getKeyword(), "unlockVotes", questions);
}
+ @Override
+ public void visit(FeatureChangeEvent event) {
+ final String sessionKey = event.getSession().getKeyword();
+ broadcastInSession(sessionKey, "featureChange", event.getSession().getFeatures());
+ }
+
@Override
public void visit(DeleteQuestionEvent deleteQuestionEvent) {
// TODO Auto-generated method stub
--
GitLab