Fix validation tests

Author: jmarin

validation/src/main/resources/application.conf

@@ -29,6 +29,7 @@ hmda {
   persistent-actor-timeout = 60
   edits.demoMode = false
   edits.demoMode = ${?EDITS_DEMO_MODE}
+  isClustered = true
 }
 
 hmda.validation.quality {

validation/src/main/scala/hmda/validation/rules/StatsLookup.scala

@@ -1,22 +1,32 @@
 package hmda.validation.rules
 
+import akka.actor.ActorRef
 import akka.cluster.singleton.{ ClusterSingletonProxy, ClusterSingletonProxySettings }
 import akka.util.Timeout
 import com.typesafe.config.ConfigFactory
-import hmda.validation.AS
+import hmda.validation.{ AS, EC }
 
+import scala.concurrent.Future
 import scala.concurrent.duration._
 
 trait StatsLookup {
   val configuration = ConfigFactory.load()
   val duration = configuration.getInt("hmda.actor.timeout")
+  val isClustered = configuration.getBoolean("hmda.isClustered")
   implicit val timeout = Timeout(duration.seconds)
 
-  def validationStats(implicit system: AS[_]) = system.actorOf(
-    ClusterSingletonProxy.props(
-      singletonManagerPath = "/user/validation-stats",
-      settings = ClusterSingletonProxySettings(system).withRole("persistence")
-    )
-  )
+  def validationStats(implicit system: AS[_], ec: EC[_]): Future[ActorRef] =
+    if (isClustered) {
+      Future(
+        system.actorOf(
+          ClusterSingletonProxy.props(
+            singletonManagerPath = "/user/validation-stats",
+            settings = ClusterSingletonProxySettings(system).withRole("persistence")
+          )
+        )
+      )
+    } else {
+      system.actorSelection("/user/validation-stats").resolveOne()
+    }
 
 }

validation/src/main/scala/hmda/validation/rules/lar/macro/Q011.scala

@@ -30,7 +30,10 @@ class Q011 private (institution: Institution, year: Int) extends AggregateEditCh
     val lastYear = year - 1
     val currentLarCount: Future[Int] = count(lars)
 
-    val lastYearCount = (validationStats ? FindTotalValidatedLars(institution.id, lastYear.toString)).mapTo[Int]
+    val lastYearCount = for {
+      actorRef <- validationStats
+      count <- (actorRef ? FindTotalValidatedLars(institution.id, lastYear.toString)).mapTo[Int]
+    } yield count
 
     for {
       c <- currentLarCount

validation/src/main/scala/hmda/validation/rules/lar/macro/Q070.scala

@@ -44,7 +44,10 @@ class Q070 private (institution: Institution, year: Int) extends AggregateEditCh
     val numRelevant = count(relevantLars)
     val numRelevantSold = count(relevantLars.filter(Q070.sold))
 
-    val lastYearLars = (validationStats ? FindQ070(institution.id, (year - 1).toString)).mapTo[(Int, Int)]
+    val lastYearLars = for {
+      actorRef <- validationStats
+      lars <- (actorRef ? FindQ070(institution.id, (year - 1).toString)).mapTo[(Int, Int)]
+    } yield lars
 
     for {
       r <- numRelevant

validation/src/main/scala/hmda/validation/rules/lar/macro/Q071.scala

@@ -44,7 +44,10 @@ class Q071 private (institution: Institution, year: Int) extends AggregateEditCh
     val numRelevant = count(relevantLars)
     val numRelevantSold = count(relevantLars.filter(Q071.sold))
 
-    val lastYearLars = (validationStats ? FindQ071(institution.id, (year - 1).toString)).mapTo[(Int, Int)]
+    val lastYearLars = for {
+      actorRef <- validationStats
+      lars <- (actorRef ? FindQ071(institution.id, (year - 1).toString)).mapTo[(Int, Int)]
+    } yield lars
 
     for {
       r <- numRelevant

validation/src/main/scala/hmda/validation/rules/lar/macro/Q072.scala

@@ -44,7 +44,10 @@ class Q072 private (institution: Institution, year: Int) extends AggregateEditCh
     val numRelevant = count(relevantLars)
     val numRelevantSold = count(relevantLars.filter(Q072.sold))
 
-    val lastYearLars = (validationStats ? FindQ072(institution.id, (year - 1).toString)).mapTo[(Int, Int)]
+    val lastYearLars = for {
+      actorRef <- validationStats
+      lars <- (actorRef ? FindQ072(institution.id, (year - 1).toString)).mapTo[(Int, Int)]
+    } yield lars
 
     for {
       r <- numRelevant

validation/src/main/scala/hmda/validation/rules/lar/macro/Q075.scala

@@ -42,7 +42,10 @@ class Q075 private (institution: Institution, year: Int) extends AggregateEditCh
     val numRelevant = count(relevantLars)
     val numRelevantSold = count(relevantLars.filter(Q075.sold))
 
-    val lastYearStats = (validationStats ? FindQ075(institution.id, (year - 1).toString)).mapTo[Double]
+    val lastYearStats = for {
+      actorRef <- validationStats
+      stats <- (actorRef ? FindQ075(institution.id, (year - 1).toString)).mapTo[Double]
+    } yield stats
 
     for {
       r <- numRelevant

validation/src/main/scala/hmda/validation/rules/lar/macro/Q076.scala

@@ -41,7 +41,10 @@ class Q076 private (institution: Institution, year: Int) extends AggregateEditCh
     val numRelevant = count(relevantLars)
     val numRelevantSold = count(relevantLars.filter(Q076.sold))
 
-    val lastYearStats = (validationStats ? FindQ076(institution.id, (year - 1).toString)).mapTo[Double]
+    val lastYearStats = for {
+      actorRef <- validationStats
+      stats <- (actorRef ? FindQ076(institution.id, (year - 1).toString)).mapTo[Double]
+    } yield stats
 
     for {
       r <- numRelevant

validation/src/main/scala/hmda/validation/rules/ts/quality/Q012.scala

@@ -23,7 +23,11 @@ class Q012 private (institution: Institution, year: Int) extends AggregateEditCh
   override def name: String = "Q012"
 
   override def apply[as: AS, mat: MAT, ec: EC](input: TransmittalSheet): Future[Result] = {
-    val fLastYearTaxId = (validationStats ? FindTaxId(institution.id, (year - 1).toString)).mapTo[String]
+
+    val fLastYearTaxId = for {
+      actorRef <- validationStats
+      lastYearId <- (actorRef ? FindTaxId(institution.id, (year - 1).toString)).mapTo[String]
+    } yield lastYearId
 
     for {
       l <- fLastYearTaxId
@@ -34,3 +38,4 @@ class Q012 private (institution: Institution, year: Int) extends AggregateEditCh
     }
   }
 }
+

validation/src/main/scala/hmda/validation/rules/ts/quality/Q130.scala

@@ -24,7 +24,10 @@ class Q130 private (institution: Institution, year: Int) extends AggregateEditCh
 
   override def apply[as: AS, mat: MAT, ec: EC](input: TransmittalSheet): Future[Result] = {
 
-    val fSubmittedLars = (validationStats ? FindTotalSubmittedLars(institution.id, year.toString)).mapTo[Int]
+    val fSubmittedLars = for {
+      actorRef <- validationStats
+      totalLars <- (actorRef ? FindTotalSubmittedLars(institution.id, year.toString)).mapTo[Int]
+    } yield totalLars
 
     for {
       submitted <- fSubmittedLars