From 591f800c43b1bd095bb2035def8febd22e6931fd Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?=
 <daniel.vasary@userrendszerhaz.hu>
Date: Mon, 25 Nov 2019 20:31:59 +0000
Subject: [PATCH] git-tfs-id:
 [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31645

---
 .../server/steps/HSMMigrateStep.java          | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/HSMMigrateStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/HSMMigrateStep.java
index 3dcaeb11..ed6fc097 100644
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/HSMMigrateStep.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/HSMMigrateStep.java
@@ -28,8 +28,12 @@ import com.ibm.nosql.json.api.DB;
 import com.ibm.nosql.json.api.DBCollection;
 import com.ibm.nosql.json.api.QueryBuilder;
 
+import user.commons.IEntityBase;
 import user.commons.MediaCubeMarker;
 import user.commons.nosql.NoSQLUtils;
+import user.jobengine.db.IItemManager;
+import user.jobengine.db.MediaFile;
+import user.jobengine.db.MediaFileDAO;
 import user.mediacube.metadata.interfaces.IMetadata;
 import user.mediacube.metadata.interfaces.IMetadataProvider;
 import user.mediacube.metadata.interfaces.IMetadataProviderFactory;
@@ -227,15 +231,23 @@ public class HSMMigrateStep extends JobStep {
 	//true if need copy
 	public boolean prepareCopy(String hsmFileName, Path source, Path target) throws IOException {
 		boolean result = true;
-		File sourceFile = source.toFile();
-		File targetFile = target.toFile();
-
 		BasicDBObject excludeResult = queryExclude(hsmFileName);
 		if (excludeResult != null) {
-			logger.warn(marker, "Kivételként megjelölt: {}", hsmFileName, excludeResult.get("name"));
+			logger.warn(marker, "Kivételként megjelölt: {}", hsmFileName);
 			return false;
 		}
 
+		IItemManager manager = (IItemManager) jobRuntime.getPersister();
+		MediaFileDAO mfDAO = (MediaFileDAO) manager.getBaseDAO(MediaFile.class);
+		List<IEntityBase> mediaFiles = mfDAO.getByHouseId(source.getFileName().toString());
+		if (mediaFiles != null && mediaFiles.size() > 0) {
+			logger.warn(marker, "Már archivált: {}", hsmFileName);
+			return false;
+		}
+
+		File sourceFile = source.toFile();
+		File targetFile = target.toFile();
+
 		if (!sourceFile.exists()) {
 			logger.warn(marker, "A forrás nem elérhető: {}", source);
 			return false;
-- 
2.54.0