From d9d1e64fef7bbab71958d2e0f62714817676e859 Mon Sep 17 00:00:00 2001
From: "vasary.daniel" <TFS\vasary.daniel>
Date: Thu, 31 Mar 2022 11:10:25 +0000
Subject: [PATCH] git-tfs-id:
 [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C33128

---
 .../executors/tests/PracticeTests.java        |  31 +++++
 .../server/steps/ArchiveRecursive.java        | 124 ++++++++++++++++--
 .../steps/MetadataSyncRecursiveStep.java      |  68 ++++------
 .../server/steps/shared/EscortFiles.java      |   2 +-
 .../jobengine/server/steps/ArchiveItem.java   |  57 ++++----
 .../mediacube/metadata/planair/PlanAirAD.java |   9 +-
 .../metadata/planair/PlanAirMaterial.java     |   1 +
 .../metadata/planair/PlanAirPromo.java        |  15 ++-
 8 files changed, 214 insertions(+), 93 deletions(-)
 create mode 100644 server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/PracticeTests.java

diff --git a/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/PracticeTests.java b/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/PracticeTests.java
new file mode 100644
index 00000000..6d0daa2d
--- /dev/null
+++ b/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/PracticeTests.java
@@ -0,0 +1,31 @@
+package hu.user.mediacube.executors.tests;
+
+import java.util.Arrays;
+
+import org.junit.Test;
+
+public class PracticeTests {
+
+	public static int[] _01_Two_Sum(int[] nums, int target) {
+		for (int j = 0; j < nums.length; j++) {
+			for (int i = j + 1; i < nums.length; i++) {
+				if (nums[i] + nums[j] == target)
+					return new int[] { j, i };
+				// System.out.println("compare " + j + " " + i);
+			}
+		}
+		return null;
+	}
+
+	@Test
+	public void test() throws Exception {
+
+		int[] nums = { 2, 7, 11, 15 };
+		int target = 9;
+		int[] result = _01_Two_Sum(nums, target);
+
+		System.out.println(Arrays.toString(result));
+
+	}
+
+}
diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/ArchiveRecursive.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/ArchiveRecursive.java
index 1f320e48..f270fc77 100644
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/ArchiveRecursive.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/ArchiveRecursive.java
@@ -9,21 +9,21 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.Arrays;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
+import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.message.Message;
-import org.apache.logging.log4j.message.ParameterizedMessage;
 
 import com.ibm.nosql.json.api.BasicDBObject;
 
 import user.commons.JobStatus;
 import user.commons.ListUtils;
-import user.commons.log4j2.marker.MediaCubeMarker;
 import user.commons.mediatool.MediaInfo;
 import user.jobengine.server.IJobEngine;
 import user.jobengine.server.IJobRuntime;
@@ -55,6 +55,7 @@ public class ArchiveRecursive extends JobStep implements FileVisitor<Path> {
 	private int submitted;
 	private int killDateDays;
 	private boolean disableProxy;
+	private Set<String> includeList;
 
 	private boolean canReadMediaInfo(Path mediaFilePath) {
 		boolean result = false;
@@ -141,6 +142,9 @@ public class ArchiveRecursive extends JobStep implements FileVisitor<Path> {
 		this.disableProxy = disableProxy;
 		logger.info(getSessionMarker(), "Starting in {}", sourcePath);
 		try {
+			String location = "/opt/test-mediacube/file_list_original.txt";
+			includeList = loadIncludeList(location);
+
 			if (getJobRuntime().forkPrepare()) {
 				Files.walkFileTree(Paths.get(sourcePath), this);
 			}
@@ -197,6 +201,25 @@ public class ArchiveRecursive extends JobStep implements FileVisitor<Path> {
 			result.setMediaDescription(json.getString(MEDIA_DESCRIPTION));
 			result.setMediaType(json.getString(MEDIA_TYPE));
 		}
+
+		if (result == null) {
+			logger.info(getSessionMarker(), "Metadata not available for {}", mediaHouseId);
+
+			if (mediaHouseId.charAt(mediaHouseId.length() - 2) == '-') {
+				mediaHouseId = mediaHouseId.substring(0, mediaHouseId.length() - 2);
+				logger.info(getSessionMarker(), "Checking metadata for {}", mediaHouseId);
+				ArchiveItem metadata = getPlanAirMetadata(mediaHouseId);
+				// elenorizni, hogy ez tenyleg az e
+
+				if (metadata == null)
+					logger.info(getSessionMarker(), "Metadata not available for {}", mediaHouseId);
+				else
+					logger.info(getSessionMarker(), "Metadata is available for {}: {}", mediaHouseId,
+							metadata.getMediaTitle());
+			}
+
+		}
+
 		return result;
 	}
 
@@ -215,6 +238,21 @@ public class ArchiveRecursive extends JobStep implements FileVisitor<Path> {
 		return FileVisitResult.CONTINUE;
 	}
 
+	private boolean removeFile(Path filePath) {
+		boolean result = false;
+		try {
+			File file = filePath.toFile();
+			if (file.exists()) {
+				logger.info(getSessionMarker(), "Törlés {}", filePath);
+				result = file.delete();
+			}
+		} catch (Exception e) {
+			logger.error(getSessionMarker(), "A {} fájl nem törölhető. A rendszer hibaüzenete: {}", filePath,
+					e.getMessage());
+		}
+		return result;
+	}
+
 	@Override
 	public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes paramBasicFileAttributes)
 			throws IOException {
@@ -230,6 +268,13 @@ public class ArchiveRecursive extends JobStep implements FileVisitor<Path> {
 	}
 
 	private boolean processPathItem(Path mediaPath) throws Exception {
+
+		boolean includeContains = includeList.contains(mediaPath.toString());
+		if (!includeContains) {
+			logger.info(getSessionMarker(), "Not on whitelist {}, skipping", mediaPath);
+			return false;
+		}
+
 		if (limit != 0 && submitted == limit) {
 			logger.info(getSessionMarker(), "Limit reached {}, canceling", limit);
 			return false;
@@ -243,19 +288,28 @@ public class ArchiveRecursive extends JobStep implements FileVisitor<Path> {
 
 		File mediaFile = mediaPath.toFile();
 		if (mediaFile.isDirectory()) {
-			// logger.info(getSessionMarker(), "Skipping directory {}", mediaPath);
-			return false;
-		}
-
-		if (EscortFiles.isMediaCatched(mediaPath)) {
-			// logger.info(getSessionMarker(), "Skipping already catched {}", mediaPath);
 			return false;
 		}
 
 		Path nomdFile = Paths.get(mediaPath.toString() + ".nomd");
 
 		if (nomdFile.toFile().exists()) {
-			// logger.info(getSessionMarker(), "Skipping nomd file exists {}", nomdFile);
+			// toroljuk es ujbol letrehozzuk ha kell
+			if (!removeFile(nomdFile)) {
+				logger.info(getSessionMarker(), "Can't delete nomd file for {}, skipping", nomdFile);
+				return false;
+			}
+			if (EscortFiles.isMediaCatched(mediaPath)) {
+				Path catchedFile = EscortFiles.createMediaCatchFilePath(mediaPath);
+				if (!removeFile(catchedFile)) {
+					logger.info(getSessionMarker(), "Can't delete catched file for {}, skipping", nomdFile);
+					return false;
+				}
+			}
+		}
+
+		if (EscortFiles.isMediaCatched(mediaPath)) {
+			// logger.info(getSessionMarker(), "Skipping already catched {}", mediaPath);
 			return false;
 		}
 
@@ -272,9 +326,9 @@ public class ArchiveRecursive extends JobStep implements FileVisitor<Path> {
 		ArchiveItem archiveItem = createArchiveItem(mediaPath);
 
 		if (archiveItem == null) {
-			Message msg = new ParameterizedMessage("Nincs metaadat!");
-			logger.info(new MediaCubeMarker("vasary@elgekko.net,muszak@mediavivantis.hu",
-					"Értesítés problémás " + mediaPath.getFileName().toString() + " archiválásról"), msg);
+//			Message msg = new ParameterizedMessage("Nincs metaadat!");
+//			logger.info(new MediaCubeMarker("vasary@elgekko.net,muszak@mediavivantis.hu",
+//					"Értesítés problémás " + mediaPath.getFileName().toString() + " archiválásról"), msg);
 			Files.createFile(nomdFile);
 			return false;
 		}
@@ -298,6 +352,7 @@ public class ArchiveRecursive extends JobStep implements FileVisitor<Path> {
 			logger.error(getSessionMarker(),
 					"A(z) '{}' állomány archiválási kísérlete sikertelen. A rendszer üzenete: {}", mediaPath,
 					e.getMessage());
+			return false;
 		}
 
 		return true;
@@ -319,4 +374,47 @@ public class ArchiveRecursive extends JobStep implements FileVisitor<Path> {
 		logger.info("Error archive {}", filePath);
 		return FileVisitResult.CONTINUE;
 	}
+
+	private Set<String> loadIncludeList(String location) throws IOException {
+		Set<String> result = new LinkedHashSet<>();
+
+		Path path = Paths.get(location);
+		List<String> lines = FileUtils.readLines(path.toFile());
+
+		String lastDir = null;
+		for (String line : lines) {
+			line = line.trim();
+			if (line.startsWith("Directory of")) {
+				lastDir = line;
+				lastDir = lastDir.replace("Directory of", "");
+				lastDir = lastDir.replace("X:", "");
+				lastDir = lastDir.replace("\\", "/");
+				lastDir = lastDir.trim();
+				// if (!lastDir.endsWith(".STATUS"))
+				// System.out.println(">> " + lastDir);
+			}
+
+			if (lastDir != null && lastDir.endsWith(".STATUS"))
+				continue;
+
+			if (line.startsWith("2") && line.length() > 39) {
+				String file = line.substring(39).trim();
+
+				if (file.equals(".") || file.equals(".."))
+					continue;
+
+				String len = line.substring(21, 39).trim();
+				if (len.length() != 0) {
+					String fullpath = "/mnt/POLC/FINISHED_SHOWS" + lastDir + "/" + file;
+					// System.out.println("/mnt/POLC/FINISHED_SHOWS" + lastDir + "/" + file + " : "
+					// + len);
+					result.add(fullpath);
+				}
+			}
+
+		}
+
+		return result;
+	}
+
 }
diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/MetadataSyncRecursiveStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/MetadataSyncRecursiveStep.java
index c133bcf5..43875901 100644
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/MetadataSyncRecursiveStep.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/MetadataSyncRecursiveStep.java
@@ -12,7 +12,6 @@ import java.util.Arrays;
 import java.util.List;
 
 import org.apache.commons.io.FilenameUtils;
-import org.apache.ibatis.jdbc.SQL;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -38,13 +37,6 @@ import user.mediacube.metadata.interfaces.PlanAirMetadataListOptions;
 public class MetadataSyncRecursiveStep extends JobStep implements FileVisitor<Path> {
 	private static final Logger logger = LogManager.getLogger();
 
-	private static final String ITEM_TITLE = "itemTitle";
-	private static final String ITEM_HOUSEID = "itemHouseId";
-	private static final String MEDIA_HOUSEID = "mediaHouseId";
-	private static final String MEDIA_TITLE = "mediaTitle";
-	private static final String MEDIA_DESCRIPTION = "mediaDescription";
-	private static final String MEDIA_TYPE = "mediaType";
-
 	private List<String> skipPathNames = Arrays.asList("!ARCHIVALAS_ALATT", EscortFiles.STATUSFOLDER,
 			EscortFiles.CONFLICTFOLDER);
 
@@ -151,13 +143,8 @@ public class MetadataSyncRecursiveStep extends JobStep implements FileVisitor<Pa
 			}
 		}
 		if (json != null) {
-			result = new ArchiveItem();
-			result.setItemHouseId(json.getString(ITEM_HOUSEID));
-			result.setItemTitle(json.getString(ITEM_TITLE));
-			result.setMediaHouseId(json.getString(MEDIA_HOUSEID));
-			result.setMediaTitle(json.getString(MEDIA_TITLE));
-			result.setMediaDescription(json.getString(MEDIA_DESCRIPTION));
-			result.setMediaType(json.getString(MEDIA_TYPE));
+			logger.info(getSessionMarker(), json.toString());
+			result = ArchiveItem.fromJSONObject(json);
 		}
 
 		if (result == null) {
@@ -169,9 +156,13 @@ public class MetadataSyncRecursiveStep extends JobStep implements FileVisitor<Pa
 				ArchiveItem metadata = getPlanAirMetadata(mediaHouseId);
 				if (metadata == null)
 					logger.info(getSessionMarker(), "Metadata not available for {}", mediaHouseId);
-				else
+				else {
 					logger.info(getSessionMarker(), "Metadata is available for {}: {}", mediaHouseId,
 							metadata.getMediaTitle());
+
+					if (mediaHouseId.equals(metadata.getForeignMediaId()))
+						result = metadata;
+				}
 			}
 
 		}
@@ -221,7 +212,6 @@ public class MetadataSyncRecursiveStep extends JobStep implements FileVisitor<Pa
 		long size = mediaFSFile.length();
 		boolean mcArchived = mediaFile != null;
 		boolean metadataEquals = false;
-		boolean tsmArchived = false;
 		boolean sizeEquals = false;
 		long tsmSize = 0;
 
@@ -234,10 +224,12 @@ public class MetadataSyncRecursiveStep extends JobStep implements FileVisitor<Pa
 			// tsm
 			String tsmFileName = mediaFile.getRelativePath();
 			RemoteFile tsmFile = getTSMFile(tsmFileName);
-			tsmArchived = tsmFile != null;
-			if (tsmArchived) {
+			if (tsmFile != null) {
 				tsmSize = tsmFile.getSize();
 				sizeEquals = tsmSize == size;
+				logger.info(getSessionMarker(),
+						"Sync status: | metadataEquals {} | sizeEquals {} | archiveItem {} for {}", metadataEquals,
+						sizeEquals, archiveItem != null, mediaPath);
 
 				if (sizeEquals && archiveItem != null && !metadataEquals) {
 					syncMetadata(mediaPath, item, media, archiveItem, mediaFile);
@@ -250,32 +242,20 @@ public class MetadataSyncRecursiveStep extends JobStep implements FileVisitor<Pa
 		return true;
 	}
 
-	public String createUpdateItemQuery(long itemId, ArchiveItem archiveItem) {
-		SQL sql = new SQL();
-		sql.UPDATE("ITEM");
-		sql.SET(String.format("HOUSEID='%s'", archiveItem.getItemHouseId()));
-		sql.SET(String.format("TITLE='%s'", archiveItem.getItemTitle()));
-		sql.WHERE(String.format("ID = %d", itemId));
-		return sql.toString();
-	}
-
-	public String createUpdateMediaQuery(long mediaId, ArchiveItem archiveItem) {
-		SQL sql = new SQL();
-		sql.UPDATE("MEDIA");
-		sql.SET(String.format("HOUSEID='%s'", archiveItem.getMediaHouseId()));
-		sql.SET(String.format("TITLE='%s'", archiveItem.getMediaTitle()));
-		sql.SET(String.format("DESCRIPTION='%s'", archiveItem.getMediaDescription()));
-		sql.WHERE(String.format("ID = %d", mediaId));
-		return sql.toString();
-	}
-
 	private void syncMetadata(Path mediaPath, Item item, Media media, ArchiveItem archiveItem, MediaFile mediaFile) {
-		String sql = createUpdateItemQuery(item.getId(), archiveItem);
-		getManager().executeUpdate(sql, null, null);
-		// logger.info(getSessionMarker(), sql);
-		sql = createUpdateMediaQuery(media.getId(), archiveItem);
-		// logger.info(getSessionMarker(), sql);
-		getManager().executeUpdate(sql, null, null);
+
+		item.setId(0);
+		item.setHouseId(archiveItem.getItemHouseId());
+		item.setTitle(archiveItem.getItemTitle());
+		getManager().merge(item);
+		logger.info(getSessionMarker(), "Created new item {}", item.getId());
+
+		media.setItemId(item.getId());
+		media.setHouseId(archiveItem.getMediaHouseId());
+		media.setTitle(archiveItem.getMediaTitle());
+		media.setDescription(archiveItem.getMediaDescription());
+		getManager().merge(media);
+		logger.info(getSessionMarker(), "Updated media {}", media.getId());
 	}
 
 	@Override
diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/EscortFiles.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/EscortFiles.java
index 52c454e0..3068a030 100644
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/EscortFiles.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/EscortFiles.java
@@ -101,7 +101,7 @@ public class EscortFiles {
 		Files.createFile(catchedFile);
 	}
 
-	private static Path createMediaCatchFilePath(Path mediaFile) {
+	public static Path createMediaCatchFilePath(Path mediaFile) {
 		return Paths.get(mediaFile.getParent().toString(), STATUSFOLDER, mediaFile.getFileName() + DOT_CATCHED);
 	}
 
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/server/steps/ArchiveItem.java b/server/user.jobengine.osgi.server/src/user/jobengine/server/steps/ArchiveItem.java
index 6ac71d1b..a34ca069 100644
--- a/server/user.jobengine.osgi.server/src/user/jobengine/server/steps/ArchiveItem.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/server/steps/ArchiveItem.java
@@ -1,11 +1,14 @@
 package user.jobengine.server.steps;
 
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.Serializable;
 import java.nio.file.Files;
 import java.nio.file.Path;
 
+import org.apache.commons.lang.NullArgumentException;
+
 import com.ibm.nosql.json.JSONUtil;
 import com.ibm.nosql.json.api.BasicDBList;
 import com.ibm.nosql.json.api.BasicDBObject;
@@ -23,44 +26,41 @@ public class ArchiveItem implements Serializable {
 	public static final String MEDIA_TYPE = "mediaType";
 	private static final String DURATION = "duration";
 	private static final String EXISTING_MEDIAID = "existingMediaId";
+	private static final String FOREIGN_MEDIAID = "foreignMediaId";
 	private static final String TAGS = "tags";
 
 	public static ArchiveItem fromFile(Path jsonFilePath) throws IOException {
-		ArchiveItem result = null;
 		byte[] readAllBytes = null;
+
+		if (!jsonFilePath.toFile().exists())
+			throw new FileNotFoundException("JSON file not exists: " + jsonFilePath);
+
 		readAllBytes = Files.readAllBytes(jsonFilePath);
 		BasicDBObject dbObject = (BasicDBObject) JSONUtil.jsonToDbObject(new String(readAllBytes));
+
+		return fromJSONObject(dbObject);
+	}
+
+	public static ArchiveItem fromJSONObject(BasicDBObject dbObject) throws IOException {
+		ArchiveItem result = null;
 		if (dbObject == null)
-			throw new NullPointerException("Can not parse JSON file: " + jsonFilePath);
+			throw new NullArgumentException("JSON object is empty!");
+
 		result = new ArchiveItem();
-		result.setItemHouseId(getMetadata(dbObject, ITEM_HOUSEID));
-		result.setItemTitle(getMetadata(dbObject, ITEM_TITLE));
-		result.setItemDescription(getMetadata(dbObject, ITEM_DESCRIPTION));
-		result.setMediaHouseId(getMetadata(dbObject, MEDIA_HOUSEID));
-		result.setMediaTitle(getMetadata(dbObject, MEDIA_TITLE));
-		result.setMediaDescription(getMetadata(dbObject, MEDIA_DESCRIPTION));
-		result.setMediaType(getMetadata(dbObject, MEDIA_TYPE));
+		result.setItemHouseId(NoSQLUtils.asString(dbObject, ITEM_HOUSEID));
+		result.setItemTitle(NoSQLUtils.asString(dbObject, ITEM_TITLE));
+		result.setItemDescription(NoSQLUtils.asString(dbObject, ITEM_DESCRIPTION));
+		result.setMediaHouseId(NoSQLUtils.asString(dbObject, MEDIA_HOUSEID));
+		result.setMediaTitle(NoSQLUtils.asString(dbObject, MEDIA_TITLE));
+		result.setMediaDescription(NoSQLUtils.asString(dbObject, MEDIA_DESCRIPTION));
+		result.setMediaType(NoSQLUtils.asString(dbObject, MEDIA_TYPE));
 		result.setDuration(NoSQLUtils.asLong(dbObject, DURATION));
 		result.setExistingMediaId(NoSQLUtils.asLong(dbObject, EXISTING_MEDIAID));
-		result.setTags(getMetadatas(dbObject, TAGS));
+		result.setTags(NoSQLUtils.asDBList(dbObject, TAGS));
 
 		return result;
 	}
 
-	private static String getMetadata(BasicDBObject dbObject, String fieldName) {
-		String result = null;
-		if (dbObject.containsKey(fieldName))
-			result = dbObject.getString(fieldName);
-		return result;
-	}
-
-	private static BasicDBList getMetadatas(BasicDBObject dbObject, String fieldName) {
-		BasicDBList result = null;
-		if (dbObject.containsKey(fieldName))
-			result = (BasicDBList) dbObject.get(fieldName);
-		return result;
-	}
-
 	private String itemTitle;
 	private String itemHouseId;
 	private String itemDescription;
@@ -72,6 +72,7 @@ public class ArchiveItem implements Serializable {
 	private String mediaType;
 	private long duration;
 	private long existingMediaId;
+	private String foreignMediaId;
 	private boolean disableProxy;
 
 	private BasicDBList tags;
@@ -190,4 +191,12 @@ public class ArchiveItem implements Serializable {
 		this.disableProxy = disableProxy;
 	}
 
+	public String getForeignMediaId() {
+		return foreignMediaId;
+	}
+
+	public void setForeignMediaId(String foreignMediaId) {
+		this.foreignMediaId = foreignMediaId;
+	}
+
 }
diff --git a/server/user.mediacube.metadata/src/user/mediacube/metadata/planair/PlanAirAD.java b/server/user.mediacube.metadata/src/user/mediacube/metadata/planair/PlanAirAD.java
index d9d60e41..15c971eb 100644
--- a/server/user.mediacube.metadata/src/user/mediacube/metadata/planair/PlanAirAD.java
+++ b/server/user.mediacube.metadata/src/user/mediacube/metadata/planair/PlanAirAD.java
@@ -5,14 +5,15 @@ import com.ibm.nosql.json.api.BasicDBObject;
 import user.mediacube.metadata.interfaces.IMetadata;
 
 public class PlanAirAD implements IMetadata {
-	private String mediaID; //t_MediaID
-	private String title; //v_Title
-	private int spotID;//t_SpotID
-	private String okForAirs; //v_OkForAirs
+	private String mediaID; // t_MediaID
+	private String title; // v_Title
+	private int spotID;// t_SpotID
+	private String okForAirs; // v_OkForAirs
 
 	@Override
 	public BasicDBObject asJSON() {
 		BasicDBObject result = new BasicDBObject();
+		result.put("mediaId", mediaID);
 		result.put("itemHouseId", mediaID);
 		result.put("itemTitle", title);
 		result.put("mediaHouseId", mediaID);
diff --git a/server/user.mediacube.metadata/src/user/mediacube/metadata/planair/PlanAirMaterial.java b/server/user.mediacube.metadata/src/user/mediacube/metadata/planair/PlanAirMaterial.java
index 58cee01b..8c7e2bcf 100644
--- a/server/user.mediacube.metadata/src/user/mediacube/metadata/planair/PlanAirMaterial.java
+++ b/server/user.mediacube.metadata/src/user/mediacube/metadata/planair/PlanAirMaterial.java
@@ -24,6 +24,7 @@ public class PlanAirMaterial implements IMetadata {
 	@Override
 	public BasicDBObject asJSON() {
 		BasicDBObject result = new BasicDBObject();
+		result.put("mediaId", mediaID);
 		result.put("itemHouseId", programmeID);
 		result.put("itemTitle", progTitle);
 		result.put("mediaHouseId", episodeID);
diff --git a/server/user.mediacube.metadata/src/user/mediacube/metadata/planair/PlanAirPromo.java b/server/user.mediacube.metadata/src/user/mediacube/metadata/planair/PlanAirPromo.java
index 6800d5a9..08ddb32d 100644
--- a/server/user.mediacube.metadata/src/user/mediacube/metadata/planair/PlanAirPromo.java
+++ b/server/user.mediacube.metadata/src/user/mediacube/metadata/planair/PlanAirPromo.java
@@ -7,17 +7,18 @@ import com.ibm.nosql.json.api.BasicDBObject;
 import user.mediacube.metadata.interfaces.IMetadata;
 
 public class PlanAirPromo implements IMetadata {
-	private String mediaID; //t_MediaID
-	private String title; //v_Title
-	private String progTitle;//v_ProgTitle
-	private short episode;//v_Episode
-	private Date psStart;//t_PSStart
-	private int spotID;//t_SpotID
-	private String okForAirs; //v_OkForAirs
+	private String mediaID; // t_MediaID
+	private String title; // v_Title
+	private String progTitle;// v_ProgTitle
+	private short episode;// v_Episode
+	private Date psStart;// t_PSStart
+	private int spotID;// t_SpotID
+	private String okForAirs; // v_OkForAirs
 
 	@Override
 	public BasicDBObject asJSON() {
 		BasicDBObject result = new BasicDBObject();
+		result.put("mediaId", mediaID);
 		result.put("itemHouseId", mediaID);
 		result.put("itemTitle", title);
 		result.put("mediaHouseId", mediaID);
-- 
2.54.0