From: Vásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Date: Wed, 4 Jul 2018 13:13:17 +0000 (+0000)
Subject: git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube... 
X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=b261c99ac4b1dc1df93a52357830fb7cbb3df286;p=mediacube.git

git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31146
---

diff --git a/server/-configuration/scheduledjobs.json b/server/-configuration/scheduledjobs.json
index 60a7180f..de2427f5 100644
--- a/server/-configuration/scheduledjobs.json
+++ b/server/-configuration/scheduledjobs.json
@@ -68,7 +68,7 @@
       "template": "sys-import-morpheus-missing-materials.xml",
       "cronexpression": "0 0 0/1 1/1 * ? *",
       "parameters": [ 
-      	{"name": "csvFilePath", "value": "/mnt/MORPHEUS", "type": "java.lang.String"},
+      	{"name": "csvFilePath", "value": "c:\\temp\\__", "type": "java.lang.String"},
       	{"name": "processedFolder", "value": "DONE", "type": "java.lang.String"},
       	{"name": "targetPath", "value": "/mnt/ISILON/ARCHIVE_RESTORE", "type": "java.lang.String"}
       ]
diff --git a/server/user.jobengine.osgi.commons/src/user/commons/nosql/NoSQLUtils.java b/server/user.jobengine.osgi.commons/src/user/commons/nosql/NoSQLUtils.java
index fad74d42..ac57183a 100644
--- a/server/user.jobengine.osgi.commons/src/user/commons/nosql/NoSQLUtils.java
+++ b/server/user.jobengine.osgi.commons/src/user/commons/nosql/NoSQLUtils.java
@@ -10,6 +10,7 @@ import org.apache.logging.log4j.Logger;
 import com.ibm.nosql.json.api.BasicDBList;
 import com.ibm.nosql.json.api.BasicDBObject;
 import com.ibm.nosql.json.api.DB;
+import com.ibm.nosql.json.api.DBCollection;
 import com.ibm.nosql.json.api.DBCursor;
 import com.ibm.nosql.json.api.DBObject;
 import com.ibm.nosql.json.api.NoSQLClient;
@@ -91,11 +92,17 @@ public class NoSQLUtils {
 
 	public static List<DBObject> asList(DBCursor cursor) {
 		List<DBObject> result = null;
-		if (cursor.hasNext())
-			result = cursor.toArray();
-		cursor.close();
-		if (result == null)
-			result = new ArrayList<>();
+		try {
+			cursor.lazyFetch();
+			while (cursor.hasNext()) {
+				DBObject obj = cursor.next();
+				if (result == null)
+					result = new ArrayList<>();
+				result.add(obj);
+			}
+		} finally {
+			cursor.close();
+		}
 		return result;
 	}
 
@@ -113,6 +120,10 @@ public class NoSQLUtils {
 		return result;
 	}
 
+	public static DBCollection collection(String name) {
+		return getNoSQLDB().getCollection(name);
+	}
+
 	public static DB getNoSQLDB() {
 		try {
 			//			if (noSQLClient == null)
@@ -122,5 +133,4 @@ public class NoSQLUtils {
 		}
 		return noSQLClient;
 	}
-
 }
diff --git a/server/user.jobengine.osgi.commons/src/user/commons/octopus/IOctopusAPI.java b/server/user.jobengine.osgi.commons/src/user/commons/octopus/IOctopusAPI.java
index 5013aa97..86360d46 100644
--- a/server/user.jobengine.osgi.commons/src/user/commons/octopus/IOctopusAPI.java
+++ b/server/user.jobengine.osgi.commons/src/user/commons/octopus/IOctopusAPI.java
@@ -48,6 +48,8 @@ public interface IOctopusAPI {
 	static final String STORYID = "storyId";
 	static final String FORMAT = "format";
 	static final String REPORTERS = "reporters";
+	static final String $DATE = "$date";
+	static final String $ELEMMATCH = "$elemMatch";
 
 	DBObject getRundown(Date scheduledDate);
 
diff --git a/server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusAPI.java b/server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusAPI.java
index df2e0300..4244dd5d 100644
--- a/server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusAPI.java
+++ b/server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusAPI.java
@@ -20,8 +20,6 @@ import user.commons.nosql.NoSQLUtils;
 
 public class OctopusAPI implements IOctopusAPI {
 	//private static final Logger logger = LogManager.getLogger();
-	private static final String $DATE = "$date";
-	private static final String $ELEMMATCH = "$elemMatch";
 	private DB db;
 
 	public OctopusAPI() throws SQLException {
diff --git a/server/user.jobengine.osgi.server/img/ic_delete_forever_black_18dp.png b/server/user.jobengine.osgi.server/img/ic_delete_forever_black_18dp.png
new file mode 100644
index 00000000..3a251b69
Binary files /dev/null and b/server/user.jobengine.osgi.server/img/ic_delete_forever_black_18dp.png differ
diff --git a/server/user.jobengine.osgi.server/pages/index.zul b/server/user.jobengine.osgi.server/pages/index.zul
index 697ac54c..fa02bd7a 100644
--- a/server/user.jobengine.osgi.server/pages/index.zul
+++ b/server/user.jobengine.osgi.server/pages/index.zul
@@ -69,7 +69,7 @@
 						<east border="0">
 							<hbox height="100%" width="100%" align="bottom" pack="center" style="background: #008AC8;">
 								<div style="margin-right: 10px">
-									<label style="color:#e3e3e3;font-size:12px;font-weight:bold" value="Bejelentkezve: ${sessionScope.userPrincipal.displayName}" /> 
+									<label style="color:#e3e3e3; font-size:12px; font-weight:bold; cursor: help;" value="Bejelentkezve: ${sessionScope.userPrincipal.displayName}" /> 
 									<attribute name="tooltip" if="${not empty sessionScope.userPrincipal.email}">
 										emailPopup, at_pointer
 									</attribute>												
diff --git a/server/user.jobengine.osgi.server/pages/missingmaterials.zul b/server/user.jobengine.osgi.server/pages/missingmaterials.zul
index 8d670675..1addebe6 100644
--- a/server/user.jobengine.osgi.server/pages/missingmaterials.zul
+++ b/server/user.jobengine.osgi.server/pages/missingmaterials.zul
@@ -2,6 +2,9 @@
 <?taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c" ?>
 <?init class="user.jobengine.zk.util.SubmitterAuthInitiator"?>
 <zk xmlns:w="http://www.zkoss.org/2005/zk/client" xmlns:ca="client/attribute">
+	<script>
+	window.history.pushState(null, "Hiányzó anyagok", "/actions/missingmaterials");                  
+	</script>
 	<custom-attributes org.zkoss.zul.listbox.rod="true" />
 	<custom-attributes org.zkoss.zul.listbox.initRodSize="50" />
 	<custom-attributes org.zkoss.zul.listbox.preloadSize="50" />
@@ -14,15 +17,22 @@
 		<div align="left" width="100%">
 			<space bar="false" />
 			<button label="Importálás" onClick="@command('executeImportJob')" autodisable="self" disabled="@load(jlm.importDisabled)" />
-			<button label="Visszaállítás" onClick="@command('executeRestoreJobs')" autodisable="self" disabled="false" />
+			<button label="Visszaállítás" onClick="@command('executeRestoreJobs')" autodisable="self" disabled="@load(jlm.selectedJobs eq null)" />
 		</div>
 
 		<div height="100%" width="100%" style="background: #e3e3e3" align="left">
 			<groupbox height="94%" closable="false">
-				<caption sclass="boldfont" label="Hiányzó adásanyagok" />
-				<listbox id="lbJobList" sizedByContent="false" model="@load(jlm.jobList)" multiple="true" pagingPosition="top" mold="paging" autopaging="true"
-					vflex="true" checkmark="true" style="border: none; background: #e3e3e3 !important;" oddRowSclass="listbox-odd-style"
-					sclass="listbox-normal-style" emptyMessage="Nincs hiányzó anyag." selectedItems="@bind(jlm.selectedJobs)">
+				<caption sclass="boldfont" label="Adásanyagok" />
+				<listbox id="lbJobList" sizedByContent="false" model="@load(jlm.jobList)" multiple="true" pagingPosition="top"
+					vflex="true" checkmark="true" style="border: none; background: #e3e3e3 !important;" oddRowSclass="listbox-odd-style" sclass="listbox-normal-style"
+					emptyMessage="Nincs hiányzó anyag." selectedItems="@bind(jlm.selectedJobs)">
+					<auxhead sclass="category-center">
+						<auxheader colspan="4">
+							<toolbar vflex="min" style="font-size:8px; float: right;">
+								<toolbarbutton label="Lista törlése" image="/img/ic_delete_forever_black_18dp.png" autodisable="self" onClick="@command('clearList')" />
+							</toolbar>
+						</auxheader>
+					</auxhead>
 					<listhead sizable="true">
 						<listheader label="Adásbakerülés" hflex="min" align="left" sort="auto" />
 						<listheader label="Adásanyag" hflex="min" align="left" sort="auto" />
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/IndexModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/IndexModel.java
index f33f6bd4..a9ff2543 100644
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/IndexModel.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/IndexModel.java
@@ -22,7 +22,7 @@ public class IndexModel extends BaseModel {
 		Selectors.wireComponents(view, this, false);
 		Selectors.wireEventListeners(view, this);
 
-		Map<String, Object> pathMap = ListUtils.asMap("jobs", "joblist");
+		Map<String, Object> pathMap = ListUtils.asMap("jobs", "joblist", "missingmaterials", "missingmaterials");
 		String parameter = Executions.getCurrent().getParameter("action");
 		String action = (String) pathMap.get(parameter);
 		if ("null".equals(parameter) || action == null) {
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MissingMaterialsModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MissingMaterialsModel.java
index e4346162..735b3dfe 100644
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MissingMaterialsModel.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MissingMaterialsModel.java
@@ -15,10 +15,10 @@ import org.zkoss.zul.ListModelList;
 import org.zkoss.zul.Messagebox;
 
 import com.ibm.nosql.json.api.BasicDBObject;
-import com.ibm.nosql.json.api.DB;
 import com.ibm.nosql.json.api.DBCollection;
 import com.ibm.nosql.json.api.DBCursor;
 
+import user.commons.ListUtils;
 import user.commons.morpheus.MorpheusStrings;
 import user.commons.nosql.NoSQLUtils;
 import user.jobengine.db.ItemManagerData.SignalType;
@@ -43,6 +43,12 @@ public class MissingMaterialsModel extends AsyncBaseModel implements IJobChanged
 	private DBCollection collection;
 	private ScheduledJob importJob;
 
+	@Command
+	public void clearList() {
+		resetLists();
+		collection.drop();
+	}
+
 	@Command
 	public void executeImportJob() {
 		try {
@@ -57,6 +63,8 @@ public class MissingMaterialsModel extends AsyncBaseModel implements IJobChanged
 
 	@Command
 	public void executeRestoreJobs() {
+		if (selectedJobs == null)
+			return;
 		if (importJob == null) {
 			Messagebox.show("Nem található a rendszerben a 'import-morpheus-missing-materials.xml' folyamatsablon.");
 			return;
@@ -121,12 +129,13 @@ public class MissingMaterialsModel extends AsyncBaseModel implements IJobChanged
 	@Init
 	public void init() {
 		try {
+			collection = NoSQLUtils.collection(MorpheusStrings.COLLECTION_NAME);
 			jobList.setMultiple(true);
-			SessionUtil.registerJobChangedListener(this);
 			this.jobEngine = JobEngine.getInstance();
 			if (jobEngine == null)
 				throw new Exception("Belső hiba! A JobEngine szolgáltatás elérhetetlen.");
 
+			SessionUtil.registerJobChangedListener(this);
 			importJob = jobEngine.getScheduledJob(IMPORT_TEMPLATE);
 
 			List<IJobRuntime> jobRuntimes = new ArrayList<>(jobEngine.getJobs().values());
@@ -141,15 +150,9 @@ public class MissingMaterialsModel extends AsyncBaseModel implements IJobChanged
 	}
 
 	private void initializeList() {
-		DB db = NoSQLUtils.getNoSQLDB();
-		collection = db.getCollection(MorpheusStrings.COLLECTION_NAME);
+		resetLists();
 		DBCursor cursor = collection.find().sort(new BasicDBObject(MorpheusStrings.TIMETOAIR, -1)).limit(1000);
-		if (selectedJobs != null)
-			selectedJobs.clear();
-		jobList.clear();
-		while (cursor.hasNext())
-			jobList.add((BasicDBObject) cursor.next());
-
+		jobList.addAll(ListUtils.cast(cursor.toArray()));
 	}
 
 	public boolean isImportDisabled() {
@@ -203,6 +206,12 @@ public class MissingMaterialsModel extends AsyncBaseModel implements IJobChanged
 		}
 	}
 
+	private void resetLists() {
+		if (selectedJobs != null)
+			selectedJobs.clear();
+		jobList.clear();
+	}
+
 	public void setImportDisabled(boolean importDisabled) {
 		this.importDisabled = importDisabled;
 		NotifyChange(IMPORT_DISABLED);
@@ -215,5 +224,4 @@ public class MissingMaterialsModel extends AsyncBaseModel implements IJobChanged
 	public void setSelectedJobs(Set<BasicDBObject> selectedJobs) {
 		this.selectedJobs = selectedJobs;
 	}
-
 }
diff --git a/server/user.jobengine.osgi.server/test/user/jobengine/server/IT/Support.java b/server/user.jobengine.osgi.server/test/user/jobengine/server/IT/Support.java
index 3a0d3b8b..f040151a 100644
--- a/server/user.jobengine.osgi.server/test/user/jobengine/server/IT/Support.java
+++ b/server/user.jobengine.osgi.server/test/user/jobengine/server/IT/Support.java
@@ -35,7 +35,9 @@ import com.ibm.nosql.json.JSONUtil;
 import com.ibm.nosql.json.api.BasicDBObject;
 import com.ibm.nosql.json.api.DB;
 import com.ibm.nosql.json.api.DBCollection;
+import com.ibm.nosql.json.api.DBCursor;
 import com.ibm.nosql.json.api.DBObject;
+import com.ibm.nosql.json.api.QueryBuilder;
 
 import sqlj.runtime.ref.DefaultContext;
 import user.commons.CalendarUtils;
@@ -269,6 +271,33 @@ public class Support {
 		return result[0];
 	}
 
+	private List<DBObject> getReferencedObjects(List<DBObject> stories, String referenceCollectionName, String referenceField) {
+		if (stories == null || stories.size() == 0)
+			return null;
+		List<Long> ids = null;
+		for (DBObject story : stories) {
+			if (story == null)
+				continue;
+			List<BasicDBObject> references = NoSQLUtils.asList((BasicDBObject) story, referenceField);
+			if (references == null)
+				continue;
+			for (BasicDBObject reference : references) {
+				if (reference == null || !reference.containsKey(IOctopusAPI.ID))
+					continue;
+				long id = reference.getLong(IOctopusAPI.ID);
+				if (ids == null)
+					ids = new ArrayList<>();
+				ids.add(id);
+			}
+		}
+		if (ids == null)
+			return null;
+		DBCollection rundownCollection = NoSQLUtils.collection(referenceCollectionName);
+		BasicDBObject query = (BasicDBObject) QueryBuilder.start().put(IOctopusAPI.ID).in(ids).get();
+		DBCursor cursor = rundownCollection.find(query);
+		return NoSQLUtils.asList(cursor);
+	}
+
 	private Item getRundownItem(BasicDBObject rundown) {
 
 		StringBuilder query = new StringBuilder();
@@ -302,6 +331,15 @@ public class Support {
 		return result;
 	}
 
+	public List<DBObject> getRundownsByPlaceHolderID(String id) {
+		DBCollection storyCollection = NoSQLUtils.collection(IOctopusAPI.STORY_COLLECTION);
+		BasicDBObject criteria = new BasicDBObject(IOctopusAPI.MOS_OBJECTS,
+				new BasicDBObject(IOctopusAPI.$ELEMMATCH, new BasicDBObject(IOctopusAPI.OBJ_ID, id)));
+		DBCursor find = storyCollection.find(criteria, new BasicDBObject(IOctopusAPI.REF_RUNDOWN, 1));
+		List<DBObject> rundowns = NoSQLUtils.asList(find);
+		return getReferencedObjects(rundowns, IOctopusAPI.RUNDOWN_COLLECTION, IOctopusAPI.REF_RUNDOWN);
+	}
+
 	private String getRundownTitle(BasicDBObject rundown) {
 		String name = NoSQLUtils.asString(NoSQLUtils.asDBObject(rundown, IOctopusAPI.RUNDOWN_TYPE), IOctopusAPI.NAME);
 		if (StringUtils.isBlank(name))
@@ -430,7 +468,6 @@ public class Support {
 
 	@Test
 	public void repairRundownChunks() throws Exception {
-		OctopusAPI octopusAPI = new OctopusAPI();
 		Path sourcePath = Paths.get("c:\\Temp\\__");
 		final Set<String> names = new LinkedHashSet<>();
 
@@ -456,7 +493,7 @@ public class Support {
 
 							Media media = (Media) existing.keySet().toArray()[0];
 							List<String> itemTitles = (List<String>) existing.values().toArray()[0];
-							List<BasicDBObject> rundowns = ListUtils.cast(octopusAPI.getRundownsByPlaceHolderID(splittedLine[1]));
+							List<BasicDBObject> rundowns = ListUtils.cast(getRundownsByPlaceHolderID(splittedLine[1]));
 							System.out.println(String.format("%s %d: ", splittedLine[1], media.getId()));
 
 							for (BasicDBObject rd : rundowns) {
@@ -501,46 +538,49 @@ public class Support {
 
 	@Test
 	public void repairRundownChunksNoLog() throws Exception {
-		OctopusAPI octopusAPI = new OctopusAPI();
+		NoSQLUtils.collection(IOctopusAPI.RUNDOWN_COLLECTION).ensureIndex(new BasicDBObject(IOctopusAPI.ID, 1));
+
 		List<String> archivedFiles = getRundownMedias("2018-03-03", "2018-06-07");
+		int i = 1;
 		for (String file : archivedFiles) {
 			//lenyeli a duplikalt hozzadast, lekezelni. addig nem futtathato!!!!!!!
 			Map<Media, List<String>> existing = getExistingItemHouseIDs(file);
 
 			Media media = (Media) existing.keySet().toArray()[0];
 			List<String> itemTitles = (List<String>) existing.values().toArray()[0];
-			List<BasicDBObject> rundowns = ListUtils.cast(octopusAPI.getRundownsByPlaceHolderID(file));
-			System.out.println(String.format("%s %d: ", file, media.getId()));
-
-			if (rundowns == null)
-				continue;
-			for (BasicDBObject rd : rundowns) {
-				String rundownTitle = getRundownTitle(rd);
-				if (itemTitles.contains(rundownTitle) || rundownTitle.contains("00:00"))
-					continue;
-
-				Item item = getRundownItem(rd);
-				if (item == null) {
-					item = manager.createItem("Generic", rundownTitle, null, NoSQLUtils.asString(rd, IOctopusAPI.ID));
-					item.add();
-					System.out.print(String.format("* %s,", rundownTitle));
-				} else {
-					System.out.print(String.format("%s (%d),", rundownTitle, item.getId()));
-				}
-
-				List<MediaFile> mediaFiles = media.getMediaFiles();
-				if (mediaFiles != null) {
-					for (MediaFile mf : mediaFiles) {
-						mf.setId(0);
-						mf.setMediaId(0);
-					}
-				}
-				media.setId(0);
-				media.setItemId(item.getId());
-				media.setPersister(manager);
-				media.add();
-
-			}
+			List<BasicDBObject> rundowns = ListUtils.cast(getRundownsByPlaceHolderID(file));
+			System.out.println(String.format("%d - %s %d: ", i, file, media.getId()));
+			i++;
+
+			//			if (rundowns == null)
+			//				continue;
+			//			for (BasicDBObject rd : rundowns) {
+			//				String rundownTitle = getRundownTitle(rd);
+			//				if (itemTitles.contains(rundownTitle) || rundownTitle.contains("00:00"))
+			//					continue;
+			//
+			//				Item item = getRundownItem(rd);
+			//				if (item == null) {
+			//					item = manager.createItem("Generic", rundownTitle, null, NoSQLUtils.asString(rd, IOctopusAPI.ID));
+			//					item.add();
+			//					System.out.print(String.format("* %s,", rundownTitle));
+			//				} else {
+			//					System.out.print(String.format("%s (%d),", rundownTitle, item.getId()));
+			//				}
+			//
+			//				List<MediaFile> mediaFiles = media.getMediaFiles();
+			//				if (mediaFiles != null) {
+			//					for (MediaFile mf : mediaFiles) {
+			//						mf.setId(0);
+			//						mf.setMediaId(0);
+			//					}
+			//				}
+			//				media.setId(0);
+			//				media.setItemId(item.getId());
+			//				media.setPersister(manager);
+			//				media.add();
+			//
+			//			}
 		}
 	}
 
diff --git a/server/user.jobengine.osgi.services/src/user/jobengine/osgi/ws/nexio/NexioWSServlet.java b/server/user.jobengine.osgi.services/src/user/jobengine/osgi/ws/nexio/NexioWSServlet.java
index b59e3a8f..df9286dc 100644
--- a/server/user.jobengine.osgi.services/src/user/jobengine/osgi/ws/nexio/NexioWSServlet.java
+++ b/server/user.jobengine.osgi.services/src/user/jobengine/osgi/ws/nexio/NexioWSServlet.java
@@ -79,10 +79,17 @@ public class NexioWSServlet extends WebSocketServlet implements INexioChangeList
 	private void processMessage(BasicDBObject message) {
 		List<Session> deadSessions = null;
 		for (Session session : sessions) {
+			boolean sessionOpened = false;
 			try {
-				NexioWSSocket.asyncSendResponse(session, message);
+				sessionOpened = session.isOpen();
+				if (sessionOpened)
+					NexioWSSocket.asyncSendResponse(session, message);
 			} catch (Exception e) {
 				logger.error(e);
+				sessionOpened = false;
+			}
+
+			if (!sessionOpened) {
 				if (deadSessions == null)
 					deadSessions = new ArrayList<>();
 				deadSessions.add(session);