[server] Finish implementing uploads (no hash checking yet)

1 files changed, 13 insertions, 6 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 7f9f9bbc..45373ae4 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
@@ -72,7 +72,13 @@ public class ServerHandler implements SatelliteServer.Iface {
 			TInternalServerError, TNotFoundException {
 		UserInfo user = SessionManager.getOrFail(userToken);
 		User.canEditBaseImageOrFail(user, imageBaseId);
-		String transferId = fileServer.createNewUserUpload(user, fileSize, blockHashes);
+		ImageDetailsRead image;
+		try {
+			image = DbImage.getImageDetails(user, imageBaseId);
+		} catch (SQLException e) {
+			throw new TInternalServerError();
+		}
+		String transferId = fileServer.createNewUserUpload(user, image, fileSize, blockHashes);
 		return new TransferInformation(transferId, fileServer.getPlainPort(), fileServer.getSslPort());
 	}
 
@@ -86,8 +92,10 @@ public class ServerHandler implements SatelliteServer.Iface {
 
 	@Override
 	public TransferStatus queryUploadStatus(String uploadToken) throws TInvalidTokenException {
-		// TODO Auto-generated method stub
-		return null;
+		ActiveUpload upload = fileServer.getUploadByToken(uploadToken);
+		if (upload == null)
+			throw new TInvalidTokenException();
+		return upload.getStatus();
 	}
 
 	@Override
@@ -143,9 +151,8 @@ public class ServerHandler implements SatelliteServer.Iface {
 	@Override
 	public List<ImageSummaryRead> getImageList(String userToken, List<String> tagSearch, int page)
 			throws TAuthorizationException, TInternalServerError {
-		//UserInfo user = SessionManager.getOrFail(userToken);
-		//User.canListImagesOrFail(user);
-		UserInfo user = new UserInfo("bla", "bla", "bla", "bla", "bla");
+		UserInfo user = SessionManager.getOrFail(userToken);
+		User.canListImagesOrFail(user);
 		try {
 			return DbImage.getAllVisible(user, tagSearch, page);
 		} catch (SQLException e) {