Move AddFileName command to SubmissionManager

and remove it from HmdaRawFile

Author: schbetsy

api/src/main/scala/hmda/api/http/institutions/UploadPaths.scala

@@ -22,9 +22,10 @@ import hmda.model.fi.{ Created, Failed, Submission, SubmissionId, Uploaded }
 import hmda.persistence.HmdaSupervisor.{ FindHmdaFiling, FindProcessingActor, FindSubmissions }
 import hmda.persistence.institutions.SubmissionPersistence
 import hmda.persistence.institutions.SubmissionPersistence.GetSubmissionById
-import hmda.persistence.processing.HmdaRawFile.{ AddFileName, AddLine }
+import hmda.persistence.processing.HmdaRawFile.AddLine
 import hmda.persistence.processing.ProcessingMessages.{ CompleteUpload, Persisted, StartUpload }
 import hmda.persistence.processing.SubmissionManager
+import hmda.persistence.processing.SubmissionManager.AddFileName
 import hmda.query.HmdaQuerySupervisor.FindHmdaFilingView
 import hmda.query.projections.filing.HmdaFilingDBProjection.{ CreateSchema, DeleteLars }
 

api/src/test/scala/hmda/api/http/institutions/submissions/SubmissionSummaryPathsSpec.scala

@@ -10,9 +10,9 @@ import hmda.model.fi.SubmissionId
 import hmda.parser.fi.ts.TsCsvParser
 import hmda.persistence.HmdaSupervisor.FindProcessingActor
 import hmda.persistence.processing.{ HmdaFileValidator, SubmissionManager }
-import hmda.persistence.processing.HmdaRawFile.AddFileName
 import hmda.api.model.ErrorResponse
 import hmda.parser.fi.lar.LarCsvParser
+import hmda.persistence.processing.SubmissionManager.AddFileName
 import org.scalatest.BeforeAndAfterAll
 
 import scala.concurrent.Await

persistence/src/main/scala/hmda/persistence/processing/HmdaFileValidator.scala

@@ -30,7 +30,7 @@ import hmda.persistence.messages.events.processing.HmdaFileValidatorEvents._
 import hmda.persistence.model.HmdaSupervisorActor.FindActorByName
 import hmda.persistence.processing.SubmissionManager.GetActorRef
 import hmda.validation.SubmissionLarStats
-import hmda.validation.SubmissionLarStats.{ PersistIrs, PersistStatsForMacroEdits }
+import hmda.validation.SubmissionLarStats.PersistStatsForMacroEdits
 import hmda.validation.ValidationStats.AddSubmissionTaxId
 
 import scala.util.Try

persistence/src/main/scala/hmda/persistence/processing/HmdaRawFile.scala

@@ -18,7 +18,6 @@ object HmdaRawFile {
   }
 
   case class AddLine(timestamp: Long, data: String) extends Command
-  case class AddFileName(fileName: String) extends Command
 
   case class HmdaRawFileState(size: Int = 0, fileName: String = "") {
     def updated(event: Event): HmdaRawFileState = event match {
@@ -45,12 +44,6 @@ class HmdaRawFile(submissionId: SubmissionId) extends HmdaPersistentActor {
 
   override def receiveCommand: Receive = {
 
-    case cmd: AddFileName =>
-      persist(FileNameAdded(cmd.fileName)) { e =>
-        log.debug(s"Persisted: ${cmd.fileName}")
-        updateState(FileNameAdded(cmd.fileName))
-      }
-
     case cmd: AddLine =>
       persist(LineAdded(cmd.timestamp, cmd.data)) { e =>
         log.debug(s"Persisted: ${e.data}")

persistence/src/main/scala/hmda/persistence/processing/SubmissionManager.scala

@@ -8,17 +8,17 @@ import akka.util.Timeout
 import com.typesafe.config.ConfigFactory
 import hmda.model.fi.{ Signed => _, _ }
 import hmda.persistence.institutions.{ FilingPersistence, SubmissionPersistence }
-import hmda.persistence.institutions.FilingPersistence.{ GetFilingByPeriod, UpdateFilingStatus }
+import hmda.persistence.institutions.FilingPersistence.UpdateFilingStatus
 import hmda.persistence.HmdaSupervisor.{ FindFilings, FindHmdaFiling, FindSubmissions }
 import hmda.persistence.institutions.SubmissionPersistence.AddSubmissionFileName
 import hmda.persistence.messages.CommonMessages.{ Command, GetState, Shutdown }
 import hmda.persistence.model.HmdaActor
 import hmda.persistence.processing.HmdaFileParser.ReadHmdaRawFile
 import hmda.persistence.processing.HmdaFileValidator.ValidationStarted
-import hmda.persistence.processing.HmdaRawFile.{ AddFileName, AddLine }
+import hmda.persistence.processing.HmdaRawFile.AddLine
 import hmda.persistence.processing.ProcessingMessages._
 import hmda.persistence.processing.SubmissionFSM.{ Create, SubmissionData }
-import hmda.persistence.processing.SubmissionManager.GetActorRef
+import hmda.persistence.processing.SubmissionManager.{ AddFileName, GetActorRef }
 import hmda.validation.SubmissionLarStats
 
 import scala.concurrent.Future
@@ -29,6 +29,7 @@ object SubmissionManager {
   val name = "SubmissionManager"
 
   case class GetActorRef(name: String) extends Command
+  case class AddFileName(fileName: String) extends Command
 
   def props(validationStats: ActorRef, submissionId: SubmissionId): Props = Props(new SubmissionManager(validationStats, submissionId))
 

persistence/src/test/scala/hmda/persistence/processing/HmdaRawFileSpec.scala

@@ -24,30 +24,22 @@ class HmdaRawFileSpec extends ActorSpec {
   val lines = fiCSV.split("\n")
   val timestamp = Instant.now.toEpochMilli
 
-  val fileName = "lars.dat"
-
   "A HMDA File" must {
-    "persist file name" in {
-
-      probe.send(hmdaFileUpload, AddFileName(fileName))
-      probe.send(hmdaFileUpload, GetState)
-      probe.expectMsg(HmdaRawFileState(0, fileName))
-    }
     "persist raw data" in {
       for (line <- lines) {
         probe.send(hmdaFileUpload, AddLine(timestamp, line.toString))
         probe.expectMsg(Persisted)
       }
       probe.send(hmdaFileUpload, GetState)
-      probe.expectMsg(HmdaRawFileState(4, fileName))
+      probe.expectMsg(HmdaRawFileState(4, ""))
     }
     "recover with event" in {
       probe.send(hmdaFileUpload, Shutdown)
 
       val secondHmdaFileUpload = createHmdaRawFile(system, submissionId)
 
       probe.send(secondHmdaFileUpload, GetState)
-      probe.expectMsg(HmdaRawFileState(4, "lars.dat"))
+      probe.expectMsg(HmdaRawFileState(4, ""))
       probe.send(secondHmdaFileUpload, Shutdown)
     }
   }

persistence/src/test/scala/hmda/persistence/processing/SubmissionManagerSpec.scala

@@ -17,7 +17,8 @@ import hmda.persistence.model.ActorSpec
 import hmda.persistence.processing.ProcessingMessages.{ CompleteUpload, Persisted, StartUpload }
 import hmda.persistence.institutions.FilingPersistence._
 import hmda.persistence.institutions.SubmissionPersistence.{ CreateSubmission, GetSubmissionById }
-import hmda.persistence.processing.HmdaRawFile.{ AddFileName, AddLine }
+import hmda.persistence.processing.HmdaRawFile.AddLine
+import hmda.persistence.processing.SubmissionManager.AddFileName
 import hmda.validation.ValidationStats
 
 import scala.concurrent.Await