[server] Adapt to API changes, refine permission checking for image version deletion

1 files changed, 23 insertions, 12 deletions

diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java
index 5cf28713..03bb8444 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java
@@ -7,6 +7,7 @@ import java.util.Map;
 
 import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
+import org.openslx.bwlp.sat.database.Paginator;
 import org.openslx.bwlp.sat.database.mappers.DbImage;
 import org.openslx.bwlp.sat.database.mappers.DbImagePermissions;
 import org.openslx.bwlp.sat.database.mappers.DbLecture;
@@ -56,6 +57,11 @@ public class ServerHandler implements SatelliteServer.Iface {
 		return Version.VERSION;
 	}
 
+	@Override
+	public int getPageSize() throws TException {
+		return Paginator.PER_PAGE;
+	}
+
 	/*
 	 * File Transfer
 	 */
@@ -324,22 +330,27 @@ public class ServerHandler implements SatelliteServer.Iface {
 
 	@Override
 	public LectureRead getLectureDetails(String userToken, String lectureId) throws TAuthorizationException,
-			TNotFoundException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public List<LectureSummary> getLecturesByImageVersion(String userToken, String imageVersionId)
-			throws TAuthorizationException, TNotFoundException {
-		// TODO Auto-generated method stub
-		return null;
+			TNotFoundException, TInternalServerError {
+		UserInfo user = SessionManager.getOrFail(userToken);
+		User.canSeeLectureDetailsOrFail(user);
+		try {
+			return DbLecture.getLectureDetails(user, lectureId);
+		} catch (SQLException e) {
+			throw new TInternalServerError();
+		}
 	}
 
 	@Override
 	public void deleteLecture(String userToken, String lectureId) throws TAuthorizationException,
-			TNotFoundException {
-		// TODO Auto-generated method stub
+			TNotFoundException, TInternalServerError {
+		UserInfo user = SessionManager.getOrFail(userToken);
+		User.canDeleteLectureOrFail(user, lectureId);
+		try {
+			if (!DbLecture.delete(lectureId))
+				throw new TNotFoundException();
+		} catch (SQLException e) {
+			throw new TInternalServerError();
+		}
 	}
 
 	@Override