Further corrections to logic

Also, comment out specs for categorizations that require clarification

Author: schbetsy

publication/src/main/scala/hmda/publication/reports/util/RaceUtil.scala

@@ -49,7 +49,7 @@ object RaceUtil {
 
       case Joint =>
         larSource.filter { lar =>
-          (applicantTwoOrMoreMinorities(lar) || coApplicantTwoOrMoreMinorities(lar)) &&
+          (applicantOneOrMoreMinorities(lar) || coApplicantOneOrMoreMinorities(lar)) &&
             (lar.race1 == 5 || coApplicantWhite(lar))
         }
 
@@ -99,12 +99,19 @@ object RaceUtil {
         (lar.race5 != "" && lar.race5 != "5"))
   }
 
-  private def coApplicantTwoOrMoreMinorities(lar: LoanApplicationRegisterQuery): Boolean = {
-    lar.coRace1 != 5 &&
-      ((lar.coRace2 != "" && lar.coRace2 != "5") ||
-        (lar.coRace3 != "" && lar.coRace3 != "5") ||
-        (lar.coRace4 != "" && lar.coRace4 != "5") ||
-        (lar.coRace5 != "" && lar.coRace5 != "5"))
+  private def applicantOneOrMoreMinorities(lar: LoanApplicationRegisterQuery): Boolean = {
+    (lar.race1 == 1 || lar.race1 == 2 || lar.race1 == 3 || lar.race1 == 4) ||
+      (lar.race2 != "" && lar.race2 != "5") ||
+      (lar.race3 != "" && lar.race3 != "5") ||
+      (lar.race4 != "" && lar.race4 != "5") ||
+      (lar.race5 != "" && lar.race5 != "5")
+  }
+  private def coApplicantOneOrMoreMinorities(lar: LoanApplicationRegisterQuery): Boolean = {
+    (lar.coRace1 == 1 || lar.coRace1 == 2 || lar.coRace1 == 3 || lar.coRace1 == 4) ||
+      (lar.coRace2 != "" && lar.coRace2 != "5") ||
+      (lar.coRace3 != "" && lar.coRace3 != "5") ||
+      (lar.coRace4 != "" && lar.coRace4 != "5") ||
+      (lar.coRace5 != "" && lar.coRace5 != "5")
   }
 
   def raceBorrowerCharacteristic[as: AS, mat: MAT, ec: EC](larSource: Source[LoanApplicationRegisterQuery, NotUsed], dispositions: List[DispositionType]): Future[RaceBorrowerCharacteristic] = {

publication/src/test/scala/hmda/publication/reports/RaceUtilSpec.scala

@@ -127,10 +127,10 @@ class RaceUtilSpec extends AsyncWordSpec with MustMatchers with LarGenerators wi
 
   "'White' race filter" must {
     "include applications that meet 'White' criteria" in {
-      def nonWhiteCoApp = Gen.oneOf(5, 6, 7, 8).sample.get
+      def nonMinorityCoApp = Gen.oneOf(5, 6, 7, 8).sample.get
       val lars = larCollectionWithApplicant { app =>
         val whiteApp = app.copy(race1 = 5, race2 = "", race3 = "", race4 = "", race5 = "")
-        whiteApp.copy(coRace1 = nonWhiteCoApp, coRace2 = "", coRace3 = "", coRace4 = "", coRace5 = "")
+        whiteApp.copy(coRace1 = nonMinorityCoApp, coRace2 = "", coRace3 = "", coRace4 = "", coRace5 = "")
       }
       val whiteLars = filterRace(source(lars), White)
       count(whiteLars).map(_ mustBe 100)
@@ -173,7 +173,7 @@ class RaceUtilSpec extends AsyncWordSpec with MustMatchers with LarGenerators wi
       count(multiMinorityLars).map(_ mustBe 100)
     }
     /*"exclude lars where applicant does not meet criteria" in {
-      // Ask about this --- can any of the races be 5?
+      // TODO: Confirm with BAs--can any of the races be 5?
       val excludedLars = larCollectionWithApplicant(_.copy(race1 = 2, race2 = "5"))
       val otherLars = filterRace(source(excludedLars), TwoOrMoreMinority)
       count(otherLars).map(_ mustBe 0)
@@ -187,23 +187,43 @@ class RaceUtilSpec extends AsyncWordSpec with MustMatchers with LarGenerators wi
 
   /*
   "'Joint' race filter" must {
-    "include applications that meet 'Joint' criteria" in {
-      val lars = larCollection { lar =>
+    // TODO: Confirm with BAs--how to define "minority" here?
+    def minority = Gen.oneOf(1, 2, 3, 4).sample.get
+
+    "include applications with white applicant and minority coApplicant" in {
+      val lars = larCollectionWithApplicant { app =>
+        app.copy(race1 = 5, race2 = "", race3 = "", race4 = "", race5 = "", coRace1 = minority)
+      }
+      val jointLars = filterRace(source(lars), Joint)
+      count(jointLars).map(_ mustBe 100)
+    }
+    "include applications with minority applicant and white coApplicant" in {
+      val lars = larCollectionWithApplicant { app =>
+        app.copy(race1 = minority, coRace1 = 5, coRace2 = "", coRace3 = "", coRace4 = "", coRace5 = "")
       }
       val jointLars = filterRace(source(lars), Joint)
       count(jointLars).map(_ mustBe 100)
     }
-    "exclude applications that do not meet 'Joint' criteria" in {
-      val larsExcludedByApplicant = larCollection { lar =>
-        val applicant = lar.applicant.copy(ethnicity = 2, coEthnicity = 3)
-        lar.copy(applicant = applicant)
+    "exclude lars with two white applicants" in {
+      val excludedLars = larCollectionWithApplicant(_.copy(race1 = 5, coRace1 = 5))
+      val nonJointLars = filterRace(source(excludedLars), Joint)
+      count(nonJointLars).map(_ mustBe 0)
+    }
+    "exclude lars with two minority applicants" in {
+      val excludedLars = larCollectionWithApplicant { app =>
+        app.copy(race1 = minority, coRace1 = minority)
       }
-      val larsExcludedByCoApplicant = larCollection { lar =>
-        val applicant = lar.applicant.copy(ethnicity = 1, coEthnicity = 2)
-        lar.copy(applicant = applicant)
+      val nonJointLars = filterRace(source(excludedLars), Joint)
+      count(nonJointLars).map(_ mustBe 0)
+
+    }
+    "exclude lars with only one applicant" in {
+      val excludedLars = larCollectionWithApplicant { app =>
+        app.copy(race1 = minority, coRace1 = 8)
       }
-      val nonJointLars = filterRace(source(lars), Joint)
+      val nonJointLars = filterRace(source(excludedLars), Joint)
       count(nonJointLars).map(_ mustBe 0)
+
     }
   }
   */