From 79a42803de027faade8be348d5ebaa52237a91a6 Mon Sep 17 00:00:00 2001
From: "vasary.daniel" <TFS\vasary.daniel>
Date: Mon, 11 Apr 2022 20:27:24 +0000
Subject: [PATCH] git-tfs-id:
 [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C33148

---
 .../executors/tests/OctopusTests.java         | 31 ++++++++++++++++---
 .../server/steps/shared/OctopusDataMiner.java | 10 +++---
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/OctopusTests.java b/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/OctopusTests.java
index c94baa3b..ab01b3e2 100644
--- a/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/OctopusTests.java
+++ b/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/OctopusTests.java
@@ -21,14 +21,28 @@ public class OctopusTests {
 		String pwd = SystemConfiguration.getInstance().value("services.octopus.api.password");
 
 		sut = new OctopusDataMiner(address, user, pwd);
-		List<BasicDBObject> rundowns = NoSQLUtils.asList(sut.queryRundowns());
-		rundowns.forEach(r -> processRundown(r));
+
+		List<BasicDBObject> folders = NoSQLUtils.asList(sut.queryStoryFolders());
+		folders.forEach(f -> processFolders(f));
+
+//		List<BasicDBObject> rundowns = NoSQLUtils.asList(sut.queryRundowns());
+//		rundowns.forEach(r -> processRundown(r));
+	}
+
+	private void processFolders(BasicDBObject f) {
+		String folderId = f.getString(IOctopusAPI.ID);
+		String folderName = f.getString(IOctopusAPI.NAME);
+		System.out.println(folderId + " - " + folderName);
+
+		BasicDBObject folderStories = sut.queryStoryFolder(f, OctopusDataMiner.FIELDS_STORYFOLDER_STORYIDS);
+		List<BasicDBObject> stories = NoSQLUtils.asList(folderStories, IOctopusAPI.STORIES);
+		stories.forEach(s -> processStory(s.getLong(IOctopusAPI.ID)));
+
 	}
 
 	private void processRundown(BasicDBObject r) {
-		// NoSQLUtils.asString(r, null))
 		String rundownId = r.getString(IOctopusAPI.ID);
-		Object rundownName = r.get(IOctopusAPI.NAME);
+		String rundownName = r.getString(IOctopusAPI.NAME);
 		System.out.println(rundownId + " - " + rundownName);
 
 		List<BasicDBObject> slugs = NoSQLUtils.asList(sut.queryRundown(r, OctopusDataMiner.FIELDS_RUNDOWN_STORYIDS),
@@ -39,11 +53,20 @@ public class OctopusTests {
 
 	private void processSlug(BasicDBObject s) {
 		long storyId = s.getLong(IOctopusAPI.STORYID);
+		processStory(storyId);
+	}
+
+	private void processStory(long storyId) {
 		BasicDBObject story = sut.queryStory(storyId);
 		sut.normalizeStory(story);
 		String location = story.getString(IOctopusAPI.LOCATION);
 		if (location != null)
 			System.out.println(story.toPrettyString(""));
+
+		String desc = story.getString(IOctopusAPI.DESCRIPTIONS);
+		if (desc != null)
+			System.out.println(story.toPrettyString(""));
+
 	}
 
 }
diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/OctopusDataMiner.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/OctopusDataMiner.java
index 32f61ec8..6d2b3754 100644
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/OctopusDataMiner.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/OctopusDataMiner.java
@@ -51,7 +51,7 @@ public class OctopusDataMiner {
 	public static final String FIELDS_RUNDOWN_STORYIDS = "id,slugs,Slug.storyId,Slug.position";
 	public static final String SLUGS = "slugs";
 	private static final String FIELDS_STORYFOLDER = "id,name,modified";
-	private static final String FIELDS_STORYFOLDER_STORYIDS = "id,stories,Story.id";
+	public static final String FIELDS_STORYFOLDER_STORYIDS = "id,stories,Story.id";
 	private static final String RUNDOWN = "Rundown";
 	private static final String FIELDS = "fields";
 	private static final String EXIT = "Exit";
@@ -530,7 +530,7 @@ public class OctopusDataMiner {
 		return result;
 	}
 
-	private BasicDBObject queryStoryFolder(BasicDBObject storyFolder, String fields) {
+	public BasicDBObject queryStoryFolder(BasicDBObject storyFolder, String fields) {
 		logger.trace(ENTER);
 		BasicDBObject result = null;
 		long id = NoSQLUtils.asLong(storyFolder, IOctopusAPI.ID);
@@ -545,7 +545,7 @@ public class OctopusDataMiner {
 		return result;
 	}
 
-	private BasicDBList queryStoryFolders() {
+	public BasicDBList queryStoryFolders() {
 		logger.trace(ENTER);
 		BasicDBList result = null;
 		Response response = query(STORY_FOLDER, FIELDS_STORYFOLDER).get();
@@ -668,11 +668,9 @@ public class OctopusDataMiner {
 			story.put(IOctopusAPI.MOS_OBJECTS, modifiedMOS);
 
 		BasicDBObject customColumns = getCustomColumns(story);
-		logger.info(customColumns.toPrettyString(""));
+		// logger.info(customColumns.toPrettyString(""));
 		String parentStoryId = NoSQLUtils.asString(customColumns, IOctopusAPI.PARENT_STORY_ID);
 		if (parentStoryId == null) {
-			// logger.warn("Missing {} in story", IOctopusAPI.PARENT_STORY_ID,
-			// story.toPrettyString(null));
 			parentStoryId = story.getString(IOctopusAPI.ID);
 		}
 		story.append(IOctopusAPI.PARENT_STORY_ID, parentStoryId);
-- 
2.54.0