Bug fix: Only persist one filing per period per institution

Update FilingPersistence spec to use more realistic test data

Author: schbetsy

persistence/src/main/scala/hmda/persistence/institutions/FilingPersistence.scala

@@ -1,7 +1,7 @@
 package hmda.persistence.institutions
 
 import akka.actor.{ ActorRef, ActorSystem, Props }
-import hmda.model.fi.{ Completed, Filing, InProgress, NotStarted }
+import hmda.model.fi._
 import hmda.persistence.messages.CommonMessages._
 import hmda.persistence.institutions.FilingPersistence._
 import hmda.persistence.model.HmdaPersistentActor
@@ -48,15 +48,15 @@ class FilingPersistence(institutionId: String) extends HmdaPersistentActor {
 
   override def receiveCommand: Receive = super.receiveCommand orElse {
     case CreateFiling(f) =>
-      if (!state.filings.contains(f)) {
+      if (!state.filings.map(_.period).contains(f.period)) {
         persist(FilingCreated(f)) { e =>
           log.debug(s"Persisted: $f")
           updateState(e)
           sender() ! Some(f)
         }
       } else {
         sender() ! None
-        log.warning(s"Filing already exists. Could not create $f")
+        log.warning(s"Could not create Filing. Filing period ${f.period} already exists for institution $institutionId.")
       }
 
     case UpdateFilingStatus(modified) =>

persistence/src/test/scala/hmda/persistence/institutions/FilingPersistenceSpec.scala

@@ -11,11 +11,14 @@ class FilingPersistenceSpec extends ActorSpec {
 
   val filingsActor = createFilings("12345", system)
 
+  val sample1 = Filing("2016", "12345", Completed, filingRequired = true, 1483287071000L, 1514736671000L)
+  val sample2 = Filing("2017", "12345", NotStarted, filingRequired = true, 0L, 0L)
+
   val probe = TestProbe()
 
-  "Filings" must {
-    "be created and read back" in {
-      val filings = DemoData.testFilings
+  "CreateFiling" must {
+    "create a filing" in {
+      val filings = Seq(sample1, sample2)
       for (filing <- filings) {
         probe.send(filingsActor, CreateFiling(filing))
         probe.expectMsg(Some(filing))
@@ -32,12 +35,12 @@ class FilingPersistenceSpec extends ActorSpec {
       probe.expectMsg(modified)
     }
 
-    "return None when persisting a filing that already exists" in {
-      val f1 = Filing("2016", "12345", Completed, true, 1483287071000L, 1514736671000L)
+    "return None when persisting a filing period that already exists" in {
+      val f1 = Filing("2018", "12345", Completed, true, 1483287071000L, 1514736671000L)
       probe.send(filingsActor, CreateFiling(f1))
       probe.expectMsg(Some(f1))
 
-      val f2 = Filing("2016", "12345", Completed, true, 1483287071000L, 1514736671000L)
+      val f2 = Filing("2016", "12345", InProgress, true, 1483287071000L, 0L)
       probe.send(filingsActor, CreateFiling(f2))
       probe.expectMsg(None)
     }