Merge branch 'public_pool' of https://github.com/felix-schmidt/arsnova-backend into public_pool

src/main/java/de/thm/arsnova/dao/CouchDBDao.java

@@ -337,10 +337,7 @@ public class CouchDBDao implements IDatabaseDao {
 	@Override
 	public final Session saveSession(final User user, final Session session) {
 		final Document sessionDocument = new Document();
-		if (session.getPpAuthorName() != null)
-			sessionDocument.put("type", "session_public_pool");
-		else
-			sessionDocument.put("type", "session");
+		sessionDocument.put("type", "session");
 		sessionDocument.put("name", session.getName());
 		sessionDocument.put("shortName", session.getShortName());
 		sessionDocument.put("keyword", sessionService.generateKeyword());
@@ -355,6 +352,7 @@ public class CouchDBDao implements IDatabaseDao {
 		sessionDocument.put("ppLogo", session.getPpLogo());
 		sessionDocument.put("ppSubject", session.getPpSubject());
 		sessionDocument.put("ppLicense", session.getPpLicense());
+		sessionDocument.put("sessionType", session.getSessionType());
 		try {
 			database.saveDocument(sessionDocument);
 		} catch (final IOException e) {

src/main/java/de/thm/arsnova/entities/Session.java

@@ -45,6 +45,7 @@ public class Session implements Serializable {
 	private String ppLogo;
 	private String ppSubject;
 	private String ppLicense;
+	private String sessionType;
 
 	private String _id;
 	private String _rev;
@@ -209,6 +210,14 @@ public class Session implements Serializable {
 	public void setPpLicense(final String ppLicense) {
 		this.ppLicense = ppLicense;
 	}
+	
+	public String getSessionType() {
+		return sessionType;
+	}
+	
+	public void setSessionType(final String sessionType) {
+		this.sessionType = sessionType;
+	}
 
 	@Override
 	public String toString() {