More precise logging

guardian · Feb 4, 2020 · fe89602 · fe89602
1 parent e4a7fde
commit fe89602
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/mobile-save-for-later/src/main/scala/com/gu/sfl/lib/SavedArticlesMerger.scala b/mobile-save-for-later/src/main/scala/com/gu/sfl/lib/SavedArticlesMerger.scala
@@ -38,15 +38,17 @@ class SavedArticlesMergerImpl(savedArticlesMergerConfig: SavedArticlesMergerConf
     savedArticlesPersistence.read(userId) match {
       case Success(Some(currentArticles)) if currentArticles.version == deduplicatedArticles.version =>
         if(currentArticles != deduplicatedArticles) {
+          logger.info(s"UserId: $userId. Received version ${deduplicatedArticles.version} which matched the database. DB count: ${currentArticles.articles.length}, client count: ${deduplicatedArticles.articles.length}")
           persistMergedArticles(userId, deduplicatedArticles)(savedArticlesPersistence.update)
         }
         else
           Right(deduplicatedArticles)
       case Success(Some(currentArticles)) =>
         val articlesToSave = currentArticles.copy(articles = MergeLogic.mergeListBy(currentArticles.articles, deduplicatedArticles.articles)(_.id))
-        logger.info(s"Received version ${deduplicatedArticles.version} from the client but had version ${currentArticles.version} in the database. DB count: ${currentArticles.articles.length}, client count: ${deduplicatedArticles.articles.length}, merged count: ${articlesToSave.articles.length}")
+        logger.info(s"UserId: $userId. Received version ${deduplicatedArticles.version} from the client but had version ${currentArticles.version} in the database. DB count: ${currentArticles.articles.length}, client count: ${deduplicatedArticles.articles.length}, merged count: ${articlesToSave.articles.length}")
         persistMergedArticles(userId, articlesToSave)(savedArticlesPersistence.update)
       case Success(None) =>
+        logger.info(s"UserId: $userId. Storing articles for the first time. Version: ${deduplicatedArticles.version}. Client count: ${deduplicatedArticles.articles.length}")
         persistMergedArticles(userId, deduplicatedArticles)(savedArticlesPersistence.write)
       case _ => Left(SavedArticleMergeError("Could not retrieve current articles"))
     }

diff --git a/mobile-save-for-later/src/main/scala/com/gu/sfl/savedarticles/UpdateSavedArticles.scala b/mobile-save-for-later/src/main/scala/com/gu/sfl/savedarticles/UpdateSavedArticles.scala
@@ -22,7 +22,7 @@ class UpdateSavedArticlesImpl(identityService: IdentityService, savedArticlesMer
       val eventualMaybeString = identityService.userFromRequest(identityHeaders)
       eventualMaybeString transformWith {
           case Success(Some(userId)) =>
-            logger.info(s"Attempting to save articles fo user: $userId")
+            logger.debug(s"Storing ${savedArticles.numberOfArticles} articles for user $userId")
             Future.successful(savedArticlesMerger.updateWithRetryAndMerge(userId, savedArticles))
           case Success(_) =>
             logger.debug(s"Could not retrieve a user id for token: ${identityHeaders.auth}")