[server] Refine mail template parsing; fix too many mails being sent for invalid lectures

1 files changed, 7 insertions, 4 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 8a8f6bd9..147b6b8a 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
@@ -250,9 +250,12 @@ public class DbLecture {
 	}
 
 	protected static List<LectureSummary> getAllUsingImageVersion(MysqlConnection connection,
-			String imageVersionId) throws SQLException {
-		MysqlStatement stmt = connection.prepareStatement(summaryBaseSql
-				+ " WHERE imageversionid = :imageversionid");
+			String imageVersionId, boolean enabledOnly) throws SQLException {
+		String query = summaryBaseSql + " WHERE i.imageversionid = :imageversionid";
+		if (enabledOnly) {
+			query += " AND l.isenabled = 1";
+		}
+		MysqlStatement stmt = connection.prepareStatement(query);
 		stmt.setString("imageversionid", imageVersionId);
 		stmt.setString("userid", "-");
 		ResultSet rs = stmt.executeQuery();
@@ -398,7 +401,7 @@ public class DbLecture {
 				|| (newVersion != null && newVersion.imageVersionId.equals(oldVersion.imageVersionId)))
 			return;
 		// First, get list of lectures using the image version to switch away from
-		List<LectureSummary> lectures = getAllUsingImageVersion(connection, oldVersion.imageVersionId);
+		List<LectureSummary> lectures = getAllUsingImageVersion(connection, oldVersion.imageVersionId, true);
 		if (lectures.isEmpty())
 			return;
 		MysqlStatement stmt;