From 02568765f09480e0c6ce3273b99bc80426bfaa6c Mon Sep 17 00:00:00 2001 From: Marjan Kalanaki Date: Tue, 21 Jun 2022 14:27:41 +0100 Subject: [PATCH] remove the testing logging --- .../app/controllers/LiveBlogController.scala | 4 +- article/app/model/LiveBlogHelpers.scala | 56 ------------------- 2 files changed, 2 insertions(+), 58 deletions(-) diff --git a/article/app/controllers/LiveBlogController.scala b/article/app/controllers/LiveBlogController.scala index 79bbfce804fd..6be87fe744e2 100644 --- a/article/app/controllers/LiveBlogController.scala +++ b/article/app/controllers/LiveBlogController.scala @@ -63,7 +63,7 @@ class LiveBlogController( ): Action[AnyContent] = { Action.async { implicit request => val filter = shouldFilter(filterKeyEvents) - val topMentions = getTopMentionsByTopics(path, topics, filter) + val topMentions = getTopMentionsByTopicsAndPath(path, topics, filter) page.map(ParseBlockId.fromPageParam) match { case Some(ParsedBlockId(id)) => @@ -351,7 +351,7 @@ class LiveBlogController( filterKeyEvents.getOrElse(false) } - def getTopMentionsByTopics(blogId: String, topics: Option[String], filterKeyEvent: Boolean) = { + def getTopMentionsByTopicsAndPath(blogId: String, topics: Option[String], filterKeyEvent: Boolean) = { if (filterKeyEvent) None else { val topMentionsResult = for { diff --git a/article/app/model/LiveBlogHelpers.scala b/article/app/model/LiveBlogHelpers.scala index 6be77628dbdc..07ada2c58138 100644 --- a/article/app/model/LiveBlogHelpers.scala +++ b/article/app/model/LiveBlogHelpers.scala @@ -59,59 +59,6 @@ object LiveBlogHelpers extends GuLogging { } - def printCurrentPage(page: Option[LiveBlogCurrentPage]) = { - val stringBuilder = StringBuilder.newBuilder - if (page.isDefined) { - stringBuilder.append("current pages: \n") - - page.get.currentPage.blocks.foreach(block => stringBuilder.append(s"block: ${block.id} \n")) - - if (page.get.pagination.isDefined) { - - val older = page.get.pagination.get.older - val oldest = page.get.pagination.get.oldest - val newer = page.get.pagination.get.newer - val newest = page.get.pagination.get.newest - - if (older.isDefined) { - stringBuilder.append(s"older pages: length: ${older.get.blocks.length} \n") - older.get match { - case BlockPage(_, blockId, _, _) => stringBuilder.append(s"block id: ${blockId} \n") - case _ => older.get.blocks.foreach(block => stringBuilder.append(s"block: ${block.id} \n")) - } - - } else stringBuilder.append("older pages: None \n") - - if (oldest.isDefined) { - stringBuilder.append(s"oldest pages: length: ${oldest.get.blocks.length} \n") - oldest.get match { - case BlockPage(_, blockId, _, _) => stringBuilder.append(s"block id: ${blockId} \n") - case _ => oldest.get.blocks.foreach(block => stringBuilder.append(s"block: ${block.id} \n")) - } - } else stringBuilder.append("oldest pages: None \n") - - if (newer.isDefined) { - stringBuilder.append(s"newer pages: length: ${newer.get.blocks.length} \n") - - newer.get match { - case BlockPage(_, blockId, _, _) => stringBuilder.append(s"block id: ${blockId} \n") - case _ => newer.get.blocks.foreach(block => stringBuilder.append(s"block: ${block.id} \n")) - } - } else stringBuilder.append("newer pages: None \n") - - if (newest.isDefined) { - stringBuilder.append(s"newest pages: length: ${newest.get.blocks.length} \n") - newest.get match { - case BlockPage(_, blockId, _, _) => stringBuilder.append(s"block id: ${blockId} \n") - case _ => newest.get.blocks.foreach(block => stringBuilder.append(s"block: ${block.id} \n")) - } - } else stringBuilder.append("newest pages: None \n") - } else stringBuilder.append("pagination pages: None \n") - } - - log.info(stringBuilder.toString()) - } - def createLiveBlogModel( liveBlog: Article, response: ItemResponse, @@ -133,9 +80,6 @@ object LiveBlogHelpers extends GuLogging { ) } getOrElse None - if (topMentionResult.isDefined) log.info(s"topMentionResult count: ${topMentionResult.get.count}") - printCurrentPage(liveBlogPageModel) - liveBlogPageModel .map { pageModel => val isTransient = range match {