Resolve merge conflicts

Author: jmarin

README.md

@@ -148,6 +148,11 @@ Alternatively, these dependencies (`Cassandra`, `Zookeeper` and `PostgreSQL`) ca
 
 `docker-compose -f docker-dev.yml up`
 
+* If you want to use the sample files in this repo for testing the app, run the edits in demo mode. Otherwise, edit S025 will trigger for all files.
+
+```shell
+export EDITS_DEMO_MODE=true
+```
 
 * Start `sbt`
 

api/src/main/resources/application.conf

@@ -62,7 +62,7 @@ hmda {
     timeout = 10
     timeout = ${?HMDA_HTTP_TIMEOUT}
   }
-  isDemo = true
+  isDemo = false
   isDemo = ${?HMDA_IS_DEMO}
   zookeeperHost = "192.168.99.100"
   zookeeperHost = ${?ZOOKEEPER_HOST}

build.sbt

@@ -52,7 +52,8 @@ lazy val hmda = (project in file("."))
     query,
     platformTest,
     validation,
-    census)
+    census,
+    publication)
 
 lazy val model = (crossProject in file("model"))
   .settings(hmdaBuildSettings: _*)

docker-compose.yml

@@ -20,6 +20,7 @@ services:
       CASSANDRA_CLUSTER_HOSTS: cassandra
       CASSANDRA_CLUSTER_PORT: 9042
       HMDA_IS_DEMO: 'true'
+      EDITS_DEMO_MODE: 'true'
       # lb settings
       EXCLUDE_PORTS: '8080, 8081' # 8080 proxied through auth_proxy; 8081 (Admin API) doesn't need proxy
       VIRTUAL_HOST: 'https://*:4443/public/*'

persistence-model/src/main/resources/application.conf

@@ -101,6 +101,6 @@ cassandra-query-journal {
 hmda {
   actor-lookup-timeout = 5
   persistent-actor-timeout = 3600
-  isDemo = true
+  isDemo = false
   isDemo = ${?HMDA_IS_DEMO}
 }

publication/src/main/scala/hmda/publication/reports/disclosure/D51.scala

@@ -6,7 +6,6 @@ import akka.NotUsed
 import akka.stream.scaladsl.Source
 import hmda.model.publication.reports.ApplicantIncomeEnum._
 import hmda.publication.reports._
-import hmda.model.publication.reports.ReportTypeEnum.Disclosure
 import hmda.model.publication.reports._
 import hmda.publication.reports.util.DateUtil._
 import hmda.publication.reports.util.DispositionType._

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

@@ -20,14 +20,14 @@ object Q061 extends AggregateEditCheck[LoanApplicationRegisterSource, LoanApplic
 
   override def apply[as: AS, mat: MAT, ec: EC](lars: LoanApplicationRegisterSource): Future[Result] = {
 
-    val firstLienHoepaLoans =
-      count(lars.filter(lar => lar.hoepaStatus == 1 && lar.actionTakenType == 1 && lar.lienStatus == 1 && lar.rateSpread != "NA")
-        .filter(lar => lar.rateSpread.toInt >= 5))
+    val firstLienPropertyLoans =
+      count(lars.filter(lar => lar.loan.propertyType == 1 && lar.actionTakenType == 1 && lar.lienStatus == 1 && lar.rateSpread != "NA")
+        .filter(lar => lar.rateSpread.toDouble > 5.0))
 
     val total = count(lars.filter(lar => lar.actionTakenType == 1))
 
     for {
-      f <- firstLienHoepaLoans
+      f <- firstLienPropertyLoans
       t <- total
     } yield {
       f.toDouble is lessThanOrEqual(t * multiplier)

validation/src/test/scala/hmda/validation/rules/lar/macro/Q061Spec.scala

@@ -10,10 +10,11 @@ class Q061Spec extends LessThanOrEqualToPropertyMacroSpec {
 
   override def irrelevantLar(lar: LoanApplicationRegister) = lar.copy(rateSpread = "NA").copy(actionTakenType = 1)
   override def relevantLar(lar: LoanApplicationRegister) = {
-    lar.copy(actionTakenType = 1).copy(hoepaStatus = 1).copy(rateSpread = "5").copy(lienStatus = 1).copy(actionTakenType = 1)
+    val newLoan = lar.loan.copy(propertyType = 1)
+    lar.copy(actionTakenType = 1).copy(loan = newLoan).copy(rateSpread = "5.01").copy(lienStatus = 1).copy(actionTakenType = 1)
   }
 
-  lessThanOrEqualToPropertyTests("first lien hoepa loans", multiplier, relevantLar, irrelevantLar)
+  lessThanOrEqualToPropertyTests("first lien property type loans", multiplier, relevantLar, irrelevantLar)
 
   override def check: AggregateEditCheck[LoanApplicationRegisterSource, LoanApplicationRegister] = Q061
 }