Fix generation of organisation from batch only When only batch processing of the Git repository is requested, perform correctly the post-processing of data, including the organisations Bug: Issue 9036 Change-Id: I7e6a183cfa94d0526f40b23ce1c460139838de45
diff --git a/src/main/scala/com/gerritforge/analytics/job/Main.scala b/src/main/scala/com/gerritforge/analytics/job/Main.scala index e6f322d..b1ba47d 100644 --- a/src/main/scala/com/gerritforge/analytics/job/Main.scala +++ b/src/main/scala/com/gerritforge/analytics/job/Main.scala
@@ -167,7 +167,7 @@ val statsFromEvents = getContributorStatsFromGerritEvents(repositoryAlteringEvents, statsFromAnalyticsPlugin.commitSet.rdd, aggregationStrategy) - if (statsFromEvents.head(1).isEmpty) { + val mergedEvents = if (statsFromEvents.head(1).isEmpty) { statsFromAnalyticsPlugin } else { require(statsFromAnalyticsPlugin.schema == statsFromEvents.schema, @@ -177,7 +177,9 @@ """.stripMargin) (statsFromAnalyticsPlugin union statsFromEvents) - }.dashboardStats(aliasesDF) + } + + mergedEvents.dashboardStats(aliasesDF) } def loadEvents(implicit config: GerritEndpointConfig, spark: SparkSession): RDD[Either[NotParsableJsonEvent, GerritJsonEvent]] = { // toDF