Merge pull request #799 from NDLANO/reindex-grep-in-cron

Adds reindexing grep in cron job

Author: gunnarvelle

search-api/src/main/scala/no/ndla/searchapi/service/StandaloneIndexing.scala

@@ -95,6 +95,17 @@ class StandaloneIndexing(props: SearchApiProperties, componentRegistry: Componen
         implicit val ec: ExecutionContextExecutorService =
           ExecutionContext.fromExecutorService(Executors.newFixedThreadPool(SearchType.values.size))
 
+        def handleOnComplete(future: Future[Try[ReindexResult]], indexName: String): Future[Try[ReindexResult]] = {
+          future.onComplete {
+            case Success(Success(reindexResult: ReindexResult)) => logger.info(
+                s"Completed indexing of ${reindexResult.totalIndexed} $indexName in ${reindexResult.millisUsed} ms."
+              )
+            case Success(Failure(ex)) => logger.warn(ex.getMessage, ex)
+            case Failure(ex)          => logger.warn(s"Unable to create index '$indexName': " + ex.getMessage, ex)
+          }
+          future
+        }
+
         def reindexWithIndexService[C <: Content](indexService: IndexService[C], shouldUsePublishedTax: Boolean)(
             implicit d: Decoder[C]
         ): Future[Try[ReindexResult]] = {
@@ -109,26 +120,34 @@ class StandaloneIndexing(props: SearchApiProperties, componentRegistry: Componen
           val reindexFuture = Future {
             indexService.indexDocuments(indexingBundle)
           }
-
-          reindexFuture.onComplete {
-            case Success(Success(reindexResult: ReindexResult)) => logger.info(
-                s"Completed indexing of ${reindexResult.totalIndexed} ${indexService.searchIndex} in ${reindexResult.millisUsed} ms."
-              )
-            case Success(Failure(ex)) => logger.warn(ex.getMessage, ex)
-            case Failure(ex)          =>
-              logger.warn(s"Unable to create index '${indexService.searchIndex}': " + ex.getMessage, ex)
-          }
-
-          reindexFuture
+          handleOnComplete(reindexFuture, indexService.searchIndex)
         }
 
+        val indexingBundle = IndexingBundle(
+          grepBundle = Some(grepBundle),
+          taxonomyBundle = Some(taxonomyBundlePublished),
+          myndlaBundle = Some(myndlaBundle),
+        )
+
         Await.result(
           Future.sequence(
             Seq(
               reindexWithIndexService(componentRegistry.learningPathIndexService, shouldUsePublishedTax = true),
               reindexWithIndexService(componentRegistry.articleIndexService, shouldUsePublishedTax = true),
               reindexWithIndexService(componentRegistry.draftIndexService, shouldUsePublishedTax = false),
               reindexWithIndexService(componentRegistry.draftConceptIndexService, shouldUsePublishedTax = true),
+              handleOnComplete(
+                Future {
+                  componentRegistry.grepIndexService.indexDocuments(None, indexingBundle.grepBundle)
+                },
+                "greps",
+              ),
+              handleOnComplete(
+                Future {
+                  componentRegistry.nodeIndexService.indexDocuments(None, indexingBundle)
+                },
+                "nodes",
+              ),
             )
           ),
           Duration.Inf,