[server] Add log table; add log messages to relevant actions and events

1 files changed, 32 insertions, 8 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 fc767460..b9bc9ab4 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
@@ -15,6 +15,7 @@ import org.openslx.bwlp.sat.database.mappers.DbImagePermissions;
 import org.openslx.bwlp.sat.database.mappers.DbLecture;
 import org.openslx.bwlp.sat.database.mappers.DbLecturePermissions;
 import org.openslx.bwlp.sat.database.mappers.DbLocation;
+import org.openslx.bwlp.sat.database.mappers.DbLog;
 import org.openslx.bwlp.sat.database.mappers.DbUser;
 import org.openslx.bwlp.sat.database.models.ImageVersionMeta;
 import org.openslx.bwlp.sat.database.models.LocalImageVersion;
@@ -366,8 +367,8 @@ public class ServerHandler implements SatelliteServer.Iface {
 					DbImage.getBaseIdForVersionId(imageVersionId));
 			DbImage.markForDeletion(imageVersionId);
 			DbImage.setDeletion(DeleteState.WANT_DELETE, imageVersionId);
-			LOGGER.info(Formatter.userFullName(user) + " (" + user.userId + ") deleted Version "
-					+ imageVersionId + " of " + imageSummary.imageName + " (" + imageSummary.imageBaseId
+			DbLog.log(user, imageSummary.imageBaseId, Formatter.userFullName(user) + " deleted Version "
+					+ imageVersionId + " of '" + imageSummary.imageName + "' (" + imageSummary.imageBaseId
 					+ ")");
 		} catch (SQLException e) {
 			throw new TInvocationException();
@@ -402,9 +403,8 @@ public class ServerHandler implements SatelliteServer.Iface {
 			}
 			DeleteOldImages.hardDeleteImages();
 		}
-		LOGGER.info(Formatter.userFullName(user) + " (" + user.userId + ") deleted Image "
-				+ imageDetails.imageName + " (" + imageDetails.imageBaseId + ") with all its versions ("
-				+ index + ")");
+		DbLog.log(user, null, Formatter.userFullName(user) + " deleted Image '" + imageDetails.imageName
+				+ "' (" + imageDetails.imageBaseId + ") with all its versions (" + index + ")");
 		try {
 			DbImage.deleteBasePermanently(imageBaseId);
 		} catch (SQLException e) {
@@ -449,6 +449,11 @@ public class ServerHandler implements SatelliteServer.Iface {
 						"Cannot change owner of image that gets downloaded from master server");
 			}
 			DbImage.setImageOwner(imageBaseId, newOwnerId, user);
+			UserInfo newOwner = DbUser.getOrNull(newOwnerId);
+			DbLog.log(user, imageBaseId, Formatter.userFullName(user) + " changed owner of '"
+					+ imageSummary.imageName + "' to " + Formatter.userFullName(newOwner));
+			DbLog.log(user, newOwnerId, Formatter.userFullName(newOwner) + " was declared new owner of '"
+					+ imageSummary.imageName + "' by " + Formatter.userFullName(user));
 		} catch (SQLException e) {
 			throw new TInvocationException();
 		}
@@ -522,7 +527,11 @@ public class ServerHandler implements SatelliteServer.Iface {
 					"Could not write to local DB");
 		}
 		imagePublishData.uploader = user;
-		return SyncTransferHandler.requestImageDownload(userToken, imagePublishData);
+		String transferId = SyncTransferHandler.requestImageDownload(userToken, imagePublishData);
+		DbLog.log(user, imagePublishData.imageBaseId, Formatter.userFullName(user)
+				+ " triggered download from master server of version " + imageVersionId + " of '"
+				+ imagePublishData.imageName + "'");
+		return transferId;
 	}
 
 	@Override
@@ -542,7 +551,11 @@ public class ServerHandler implements SatelliteServer.Iface {
 		}
 		User.canUploadToMasterOrFail(user, imgBase);
 		try {
-			return SyncTransferHandler.requestImageUpload(userToken, imgBase, imgVersion);
+			String transferId = SyncTransferHandler.requestImageUpload(userToken, imgBase, imgVersion);
+			DbLog.log(user, imgBase.imageBaseId, Formatter.userFullName(user)
+					+ " triggered upload to master server of version " + imageVersionId + " of '"
+					+ imgBase.imageName + "'");
+			return transferId;
 		} catch (TTransferRejectedException e) {
 			LOGGER.warn("Master server rejected upload of image version " + imgVersion.imageVersionId);
 			throw e;
@@ -665,9 +678,20 @@ public class ServerHandler implements SatelliteServer.Iface {
 	public void setLectureOwner(String userToken, String lectureId, String newOwnerId)
 			throws TAuthorizationException, TNotFoundException, TInvocationException, TException {
 		UserInfo user = SessionManager.getOrFail(userToken);
-		User.canChangeLectureOwnerOrFail(user, lectureId);
+		LectureSummary lecture;
+		try {
+			lecture = DbLecture.getLectureSummary(user, lectureId);
+		} catch (SQLException e1) {
+			throw new TInvocationException();
+		}
+		User.canChangeLectureOwnerOrFail(user, lecture);
 		try {
 			DbLecture.setOwner(user, lectureId, newOwnerId);
+			UserInfo newOwner = DbUser.getOrNull(newOwnerId);
+			DbLog.log(user, lectureId, Formatter.userFullName(user) + " changed owner of '"
+					+ lecture.lectureName + "' to " + Formatter.userFullName(newOwner));
+			DbLog.log(user, newOwnerId, Formatter.userFullName(newOwner) + " was declared new owner of '"
+					+ lecture.lectureName + "' by " + Formatter.userFullName(user));
 		} catch (SQLException e) {
 			throw new TInvocationException();
 		}