[server] Update lectures and images when image versions change or get deleted

1 files changed, 14 insertions, 2 deletions

diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java
index cbc4c690..c44d40ed 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java
@@ -308,6 +308,15 @@ public class DbLecture {
 		return affected == 1;
 	}
 
+	/**
+	 * Called when a new version for an image is uploaded. Update all lectures
+	 * using the same base image which have the autoUpdate-flag set.
+	 * 
+	 * @param connection
+	 * @param imageBaseId
+	 * @param imageVersionId
+	 * @throws SQLException
+	 */
 	protected static void autoUpdateUsedImage(MysqlConnection connection, String imageBaseId,
 			String imageVersionId) throws SQLException {
 		// TODO: select first so we can email
@@ -324,9 +333,12 @@ public class DbLecture {
 	 * Called when an image version is deleted or marked for deletion, so that
 	 * linking lectures switch over to other available versions.
 	 */
-	protected static void autoSwitchUsedImage(MysqlConnection connection, ImageVersionDetails oldVersion,
+	protected static void forcefullySwitchUsedImage(MysqlConnection connection, ImageVersionDetails oldVersion,
 			ImageVersionDetails newVersion) throws TNotFoundException, SQLException {
-		// First, get list of lectures using the image version to switch away to
+		if (oldVersion == newVersion
+				|| (newVersion != null && newVersion.versionId.equals(oldVersion.versionId)))
+			return;
+		// First, get list of lectures using the image version to switch away from
 		List<String> lectures = getAllUsingImageVersion(connection, oldVersion.versionId);
 		if (lectures.isEmpty())
 			return;