From b51f5dc15c900c703bb6902bfb413c8a02ff29dd Mon Sep 17 00:00:00 2001 From: tekay <tom.kaesler@mni.thm.de> Date: Mon, 7 Mar 2016 21:09:02 +0100 Subject: [PATCH] export/import session features aswell --- src/main/java/de/thm/arsnova/dao/CouchDBDao.java | 1 + .../entities/transport/ImportExportSession.java | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java index bc4d9666f..dfb813e00 100644 --- a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java +++ b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java @@ -2108,6 +2108,7 @@ public class CouchDBDao implements IDatabaseDao, ApplicationEventPublisherAware @Override public SessionInfo importSession(User user, ImportExportSession importSession) { final Session session = this.saveSession(user, importSession.generateSessionEntity(user)); + sessionService.changeSessionFeatures(session.getKeyword(), importSession.getSessionFeature()); List<Document> questions = new ArrayList<Document>(); // We need to remember which answers belong to which question. // The answers need a questionId, so we first store the questions to get the IDs. diff --git a/src/main/java/de/thm/arsnova/entities/transport/ImportExportSession.java b/src/main/java/de/thm/arsnova/entities/transport/ImportExportSession.java index 93b24d26d..6d9d669e1 100644 --- a/src/main/java/de/thm/arsnova/entities/transport/ImportExportSession.java +++ b/src/main/java/de/thm/arsnova/entities/transport/ImportExportSession.java @@ -23,6 +23,7 @@ import de.thm.arsnova.entities.Session; import de.thm.arsnova.entities.User; import de.thm.arsnova.entities.Motd; import de.thm.arsnova.entities.SessionInfo; +import de.thm.arsnova.entities.SessionFeature; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import org.springframework.context.annotation.Import; @@ -44,12 +45,15 @@ public class ImportExportSession { private List<Motd> motds; + private SessionFeature sessionFeature; + private SessionInfo sessionInfo; public ImportExportSession() { questions = new ArrayList<ImportExportQuestion>(); feedbackQuestions = new ArrayList<InterposedQuestion>(); motds = new ArrayList<Motd>(); + sessionFeature = null; sessionInfo = null; } @@ -88,6 +92,14 @@ public class ImportExportSession { this.motds = mL; } + public SessionFeature getSessionFeature() { + return sessionFeature; + } + + public void setSessionFeature(SessionFeature sF) { + sessionFeature = sF; + } + public SessionInfo getSessionInfo() { return sessionInfo; } @@ -104,6 +116,7 @@ public class ImportExportSession { PublicPool p = new PublicPool(); p.setPpFromSession(s); iesession.setPublicPool(p); + sessionFeature = s.getFeatures(); session = iesession; } -- GitLab