Remove FileNameAdded from HmdaRawFile

schbetsy · schbetsy · commit 19cf052ffb82 · 2017-09-11T10:59:23.000-04:00
Now file name is handled by SubmissionPersistence
diff --git a/persistence-model/src/main/protobuf/FileUpload.proto b/persistence-model/src/main/protobuf/FileUpload.proto
@@ -7,8 +7,3 @@ message LineAddedMessage {
     int64 timestamp = 1;
     string data = 2;
 }
-
-message FileNameAddedMessage {
-    string fileName = 1;
-}
-
diff --git a/persistence-model/src/main/resources/application-dev.conf b/persistence-model/src/main/resources/application-dev.conf
@@ -23,10 +23,10 @@ akka {
       "hmda.persistence.messages.events.institutions.FilingEvents$FilingStatusUpdated" = filing
       "hmda.persistence.messages.events.institutions.SubmissionEvents$SubmissionCreated" = submission
       "hmda.persistence.messages.events.institutions.SubmissionEvents$SubmissionStatusUpdated" = submission
+      "hmda.persistence.messages.events.institutions.SubmissionEvents$SubmissionFileNameAdded" = submission
       "hmda.persistence.messages.events.processing.CommonHmdaValidatorEvents$LarValidated" = hmdaValidator
       "hmda.persistence.messages.events.processing.CommonHmdaValidatorEvents$TsValidated" = hmdaValidator
       "hmda.persistence.messages.events.processing.FileUploadEvents$LineAdded" = upload
-      "hmda.persistence.messages.events.processing.FileUploadEvents$FileNameAdded" = upload
       "hmda.persistence.messages.events.processing.HmdaFileParserEvents$TsParsed" = parser
       "hmda.persistence.messages.events.processing.HmdaFileParserEvents$TsParsedErrors" = parser
       "hmda.persistence.messages.events.processing.HmdaFileParserEvents$LarParsed" = parser
diff --git a/persistence-model/src/main/resources/application.conf b/persistence-model/src/main/resources/application.conf
@@ -22,10 +22,10 @@ akka {
       "hmda.persistence.messages.events.institutions.FilingEvents$FilingStatusUpdated" = filing
       "hmda.persistence.messages.events.institutions.SubmissionEvents$SubmissionCreated" = submission
       "hmda.persistence.messages.events.institutions.SubmissionEvents$SubmissionStatusUpdated" = submission
+      "hmda.persistence.messages.events.institutions.SubmissionEvents$SubmissionFileNameAdded" = submission
       "hmda.persistence.messages.events.processing.CommonHmdaValidatorEvents$LarValidated" = hmdaValidator
       "hmda.persistence.messages.events.processing.CommonHmdaValidatorEvents$TsValidated" = hmdaValidator
       "hmda.persistence.messages.events.processing.FileUploadEvents$LineAdded" = upload
-      "hmda.persistence.messages.events.processing.FileUploadEvents$FileNameAdded" = upload
       "hmda.persistence.messages.events.processing.HmdaFileParserEvents$TsParsed" = parser
       "hmda.persistence.messages.events.processing.HmdaFileParserEvents$TsParsedErrors" = parser
       "hmda.persistence.messages.events.processing.HmdaFileParserEvents$LarParsed" = parser
diff --git a/persistence-model/src/main/scala/hmda/persistence/messages/events/processing/FileUploadEvents.scala b/persistence-model/src/main/scala/hmda/persistence/messages/events/processing/FileUploadEvents.scala
@@ -4,5 +4,4 @@ import hmda.persistence.messages.CommonMessages.Event
 
 object FileUploadEvents {
   case class LineAdded(timestamp: Long, data: String) extends Event
-  case class FileNameAdded(fileName: String) extends Event
 }
diff --git a/persistence-model/src/main/scala/hmda/persistence/serialization/upload/UploadProtobufConverter.scala b/persistence-model/src/main/scala/hmda/persistence/serialization/upload/UploadProtobufConverter.scala
@@ -1,7 +1,7 @@
 package hmda.persistence.serialization.upload
 
-import hmda.persistence.messages.events.processing.FileUploadEvents.{ FileNameAdded, LineAdded }
-import hmda.persistence.model.serialization.FileUpload.{ FileNameAddedMessage, LineAddedMessage }
+import hmda.persistence.messages.events.processing.FileUploadEvents.LineAdded
+import hmda.persistence.model.serialization.FileUpload.LineAddedMessage
 
 object UploadProtobufConverter {
 
@@ -19,16 +19,4 @@ object UploadProtobufConverter {
     )
   }
 
-  def fileNameAddedToProtobuf(obj: FileNameAdded): FileNameAddedMessage = {
-    FileNameAddedMessage(
-      fileName = obj.fileName
-    )
-  }
-
-  def fileNameAddedFromProtobuf(msg: FileNameAddedMessage): FileNameAdded = {
-    FileNameAdded(
-      fileName = msg.fileName
-    )
-  }
-
 }
diff --git a/persistence-model/src/main/scala/hmda/persistence/serialization/upload/UploadProtobufSerializer.scala b/persistence-model/src/main/scala/hmda/persistence/serialization/upload/UploadProtobufSerializer.scala
@@ -1,8 +1,8 @@
 package hmda.persistence.serialization.upload
 
 import akka.serialization.SerializerWithStringManifest
-import hmda.persistence.messages.events.processing.FileUploadEvents.{ FileNameAdded, LineAdded }
-import hmda.persistence.model.serialization.FileUpload.{ FileNameAddedMessage, LineAddedMessage }
+import hmda.persistence.messages.events.processing.FileUploadEvents.LineAdded
+import hmda.persistence.model.serialization.FileUpload.LineAddedMessage
 import hmda.persistence.serialization.upload.UploadProtobufConverter._
 
 class UploadProtobufSerializer extends SerializerWithStringManifest {
@@ -11,19 +11,15 @@ class UploadProtobufSerializer extends SerializerWithStringManifest {
   override def manifest(o: AnyRef): String = o.getClass.getName
 
   final val LineAddedManifest = classOf[LineAdded].getName
-  final val FileNameAddedManifest = classOf[FileNameAdded].getName
 
   override def toBinary(o: AnyRef): Array[Byte] = o match {
     case evt: LineAdded => lineAddedToProtobuf(evt).toByteArray
-    case evt: FileNameAdded => fileNameAddedToProtobuf(evt).toByteArray
     case msg: Any => throw new RuntimeException(s"Cannot serialize this message: ${msg.toString}")
   }
 
   override def fromBinary(bytes: Array[Byte], manifest: String): AnyRef = manifest match {
     case LineAddedManifest =>
       lineAddedFromProtobuf(LineAddedMessage.parseFrom(bytes))
-    case FileNameAddedManifest =>
-      fileNameAddedFromProtobuf(FileNameAddedMessage.parseFrom(bytes))
     case msg: Any => throw new RuntimeException(s"Cannot deserialize this message: ${msg.toString}")
   }
 }
diff --git a/persistence-model/src/test/scala/hmda/persistence/serialization/upload/UploadProtobufConverterSpec.scala b/persistence-model/src/test/scala/hmda/persistence/serialization/upload/UploadProtobufConverterSpec.scala
@@ -1,7 +1,7 @@
 package hmda.persistence.serialization.upload
 
-import hmda.persistence.messages.events.processing.FileUploadEvents.{ FileNameAdded, LineAdded }
-import hmda.persistence.model.serialization.FileUpload.{ FileNameAddedMessage, LineAddedMessage }
+import hmda.persistence.messages.events.processing.FileUploadEvents.LineAdded
+import hmda.persistence.model.serialization.FileUpload.LineAddedMessage
 import org.scalacheck.Gen
 import org.scalatest.{ MustMatchers, PropSpec }
 import org.scalatest.prop.PropertyChecks
@@ -17,11 +17,4 @@ class UploadProtobufConverterSpec extends PropSpec with PropertyChecks with Must
     }
   }
 
-  property("Filename Added must serialize to protobuf and back") {
-    forAll(Gen.alphaStr) { fileName =>
-      val fileNameAdded = FileNameAdded(fileName)
-      val protobuf = fileNameAddedToProtobuf(fileNameAdded).toByteArray
-      fileNameAddedFromProtobuf(FileNameAddedMessage.parseFrom(protobuf)) mustBe fileNameAdded
-    }
-  }
 }
diff --git a/persistence-model/src/test/scala/hmda/persistence/serialization/upload/UploadProtobufSerializerSpec.scala b/persistence-model/src/test/scala/hmda/persistence/serialization/upload/UploadProtobufSerializerSpec.scala
@@ -1,6 +1,6 @@
 package hmda.persistence.serialization.upload
 
-import hmda.persistence.messages.events.processing.FileUploadEvents.{ FileNameAdded, LineAdded }
+import hmda.persistence.messages.events.processing.FileUploadEvents.LineAdded
 import org.scalacheck.Gen
 import org.scalatest.{ MustMatchers, PropSpec }
 import org.scalatest.prop.PropertyChecks
@@ -16,11 +16,4 @@ class UploadProtobufSerializerSpec extends PropSpec with PropertyChecks with Mus
     }
   }
 
-  property("File Name Added messages must be serialized to binary and back") {
-    forAll(Gen.alphaStr) { fileName =>
-      val msg = FileNameAdded(fileName)
-      val bytes = serializer.toBinary(msg)
-      serializer.fromBinary(bytes, serializer.FileNameAddedManifest) mustBe msg
-    }
-  }
 }
diff --git a/persistence/src/main/scala/hmda/persistence/processing/HmdaRawFile.scala b/persistence/src/main/scala/hmda/persistence/processing/HmdaRawFile.scala
@@ -19,12 +19,10 @@ object HmdaRawFile {
 
   case class AddLine(timestamp: Long, data: String) extends Command
 
-  case class HmdaRawFileState(size: Int = 0, fileName: String = "") {
+  case class HmdaRawFileState(size: Int = 0) {
     def updated(event: Event): HmdaRawFileState = event match {
       case LineAdded(_, _) =>
-        HmdaRawFileState(size + 1, fileName)
-      case FileNameAdded(n) =>
-        HmdaRawFileState(size, n)
+        HmdaRawFileState(size + 1)
     }
   }
 
diff --git a/persistence/src/test/scala/hmda/persistence/processing/HmdaRawFileSpec.scala b/persistence/src/test/scala/hmda/persistence/processing/HmdaRawFileSpec.scala
@@ -31,15 +31,15 @@ class HmdaRawFileSpec extends ActorSpec {
         probe.expectMsg(Persisted)
       }
       probe.send(hmdaFileUpload, GetState)
-      probe.expectMsg(HmdaRawFileState(4, ""))
+      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, ""))
+      probe.expectMsg(HmdaRawFileState(4))
       probe.send(secondHmdaFileUpload, Shutdown)
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,3 @@ message LineAddedMessage {`
`7`	`7`	`int64 timestamp = 1;`
`8`	`8`	`string data = 2;`
`9`	`9`	`}`
`10`		`-`
`11`		`-message FileNameAddedMessage {`
`12`		`- string fileName = 1;`
`13`		`-}`
`14`		`-`
Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,4 @@ import hmda.persistence.messages.CommonMessages.Event`
`4`	`4`
`5`	`5`	`object FileUploadEvents {`
`6`	`6`	`case class LineAdded(timestamp: Long, data: String) extends Event`
`7`		`- case class FileNameAdded(fileName: String) extends Event`
`8`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package hmda.persistence.serialization.upload`
`2`	`2`
`3`		`-import hmda.persistence.messages.events.processing.FileUploadEvents.{ FileNameAdded, LineAdded }`
`4`		`-import hmda.persistence.model.serialization.FileUpload.{ FileNameAddedMessage, LineAddedMessage }`
	`3`	`+import hmda.persistence.messages.events.processing.FileUploadEvents.LineAdded`
	`4`	`+import hmda.persistence.model.serialization.FileUpload.LineAddedMessage`
`5`	`5`	`import org.scalacheck.Gen`
`6`	`6`	`import org.scalatest.{ MustMatchers, PropSpec }`
`7`	`7`	`import org.scalatest.prop.PropertyChecks`
`@@ -17,11 +17,4 @@ class UploadProtobufConverterSpec extends PropSpec with PropertyChecks with Must`
`17`	`17`	`}`
`18`	`18`	`}`
`19`	`19`
`20`		`- property("Filename Added must serialize to protobuf and back") {`
`21`		`- forAll(Gen.alphaStr) { fileName =>`
`22`		`- val fileNameAdded = FileNameAdded(fileName)`
`23`		`- val protobuf = fileNameAddedToProtobuf(fileNameAdded).toByteArray`
`24`		`- fileNameAddedFromProtobuf(FileNameAddedMessage.parseFrom(protobuf)) mustBe fileNameAdded`
`25`		`- }`
`26`		`- }`
`27`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`package hmda.persistence.serialization.upload`
`2`	`2`
`3`		`-import hmda.persistence.messages.events.processing.FileUploadEvents.{ FileNameAdded, LineAdded }`
	`3`	`+import hmda.persistence.messages.events.processing.FileUploadEvents.LineAdded`
`4`	`4`	`import org.scalacheck.Gen`
`5`	`5`	`import org.scalatest.{ MustMatchers, PropSpec }`
`6`	`6`	`import org.scalatest.prop.PropertyChecks`
`@@ -16,11 +16,4 @@ class UploadProtobufSerializerSpec extends PropSpec with PropertyChecks with Mus`
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`
`19`		`- property("File Name Added messages must be serialized to binary and back") {`
`20`		`- forAll(Gen.alphaStr) { fileName =>`
`21`		`- val msg = FileNameAdded(fileName)`
`22`		`- val bytes = serializer.toBinary(msg)`
`23`		`- serializer.fromBinary(bytes, serializer.FileNameAddedManifest) mustBe msg`
`24`		`- }`
`25`		`- }`
`26`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,12 +19,10 @@ object HmdaRawFile {`
`19`	`19`
`20`	`20`	`case class AddLine(timestamp: Long, data: String) extends Command`
`21`	`21`
`22`		`- case class HmdaRawFileState(size: Int = 0, fileName: String = "") {`
	`22`	`+ case class HmdaRawFileState(size: Int = 0) {`
`23`	`23`	`def updated(event: Event): HmdaRawFileState = event match {`
`24`	`24`	`case LineAdded(_, _) =>`
`25`		`- HmdaRawFileState(size + 1, fileName)`
`26`		`- case FileNameAdded(n) =>`
`27`		`- HmdaRawFileState(size, n)`
	`25`	`+ HmdaRawFileState(size + 1)`
`28`	`26`	`}`
`29`	`27`	`}`
`30`	`28`
Original file line number	Diff line number	Diff line change
`@@ -31,15 +31,15 @@ class HmdaRawFileSpec extends ActorSpec {`
`31`	`31`	`probe.expectMsg(Persisted)`
`32`	`32`	`}`
`33`	`33`	`probe.send(hmdaFileUpload, GetState)`
`34`		`- probe.expectMsg(HmdaRawFileState(4, ""))`
	`34`	`+ probe.expectMsg(HmdaRawFileState(4))`
`35`	`35`	`}`
`36`	`36`	`"recover with event" in {`
`37`	`37`	`probe.send(hmdaFileUpload, Shutdown)`
`38`	`38`
`39`	`39`	`val secondHmdaFileUpload = createHmdaRawFile(system, submissionId)`
`40`	`40`
`41`	`41`	`probe.send(secondHmdaFileUpload, GetState)`
`42`		`- probe.expectMsg(HmdaRawFileState(4, ""))`
	`42`	`+ probe.expectMsg(HmdaRawFileState(4))`
`43`	`43`	`probe.send(secondHmdaFileUpload, Shutdown)`
`44`	`44`	`}`
`45`	`45`	`}`