DC-2235: bugfix for ClassCastException

src/main/scala/uk/gov/hmrc/workitem/WorkItemRepository.scala

@@ -20,7 +20,7 @@ import com.typesafe.config.Config
 import org.joda.time.{DateTime, Duration}
 import play.api.libs.json._
 import reactivemongo.api.indexes.{Index, IndexType}
-import reactivemongo.api.{DB, ReadPreference}
+import reactivemongo.api.{DB, ReadPreference, WriteConcern}
 import reactivemongo.bson.BSONObjectID
 import reactivemongo.play.json.ImplicitBSONHandlers.JsObjectDocumentWriter
 import uk.gov.hmrc.metrix.domain.MetricSource
@@ -133,11 +133,18 @@ abstract class WorkItemRepository[T, ID](collectionName: String,
   private def findNextItemId(failedBefore: DateTime, availableBefore: DateTime)(implicit ec: ExecutionContext) : Future[Option[IdList]] = {
 
     def findNextItemIdByQuery(query: JsObject)(implicit ec: ExecutionContext): Future[Option[IdList]] =
-      findAndUpdate(
-        query = query,
+      collection.findAndUpdate(
+        selector = query,
         update = setStatusOperation(InProgress, None),
         fetchNewObject = true,
-        fields = Some(Json.obj(workItemFields.id -> 1))
+        upsert = false,
+        sort = None,
+        fields = Some(Json.obj(workItemFields.id -> 1)),
+        bypassDocumentValidation = false,
+        writeConcern = WriteConcern.Default,
+        maxTime = None,
+        collation = None,
+        arrayFilters = Nil
       ).map(
         _.value.map(Json.toJson(_).as[IdList])
       )
@@ -167,27 +174,35 @@ abstract class WorkItemRepository[T, ID](collectionName: String,
   }
 
   def markAs(id: ID, status: ProcessingStatus, availableAt: Option[DateTime] = None)(implicit ec: ExecutionContext): Future[Boolean] =
-    collection.update(
-      selector = Json.obj(workItemFields.id -> id),
-      update = setStatusOperation(status, availableAt)
+    collection.update(ordered = false).one(
+      q = Json.obj(workItemFields.id -> id),
+      u = setStatusOperation(status, availableAt)
     ).map(_.n > 0)
 
   def complete(id: ID, newStatus: ProcessingStatus with ResultStatus)(implicit ec: ExecutionContext): Future[Boolean] = {
-    collection.update(
-      selector = Json.obj(workItemFields.id -> id, workItemFields.status -> InProgress),
-      update = setStatusOperation(newStatus, None)
+    collection.update(ordered = false).one(
+      q = Json.obj(workItemFields.id -> id, workItemFields.status -> InProgress),
+      u = setStatusOperation(newStatus, None)
     ).map(_.nModified > 0)
   }
 
   def cancel(id: ID)(implicit ec: ExecutionContext): Future[StatusUpdateResult] = {
     import uk.gov.hmrc.workitem.StatusUpdateResult._
-    findAndUpdate(
-      query = Json.obj(
+    collection.findAndUpdate(
+      selector = Json.obj(
         workItemFields.id -> id,
         workItemFields.status -> Json.obj("$in" -> List(ToDo, Failed, PermanentlyFailed, Ignored, Duplicate, Deferred)) // TODO we should be able to express the valid to/from states in traits of ProcessingStatus
       ),
       update = setStatusOperation(Cancelled, None),
-      fetchNewObject = false
+      fetchNewObject = false,
+      upsert = false,
+      sort = None,
+      fields = None,
+      bypassDocumentValidation = false,
+      writeConcern = WriteConcern.Default,
+      maxTime = None,
+      collation = None,
+      arrayFilters = Nil
     ).flatMap { res =>
       res.value match {
         case Some(item) => Future.successful(Updated(

src/test/scala/uk/gov/hmrc/workitem/WithWorkItemRepository.scala

@@ -21,7 +21,7 @@ import org.joda.time.chrono.ISOChronology
 import org.joda.time.{DateTime, Duration, LocalDate}
 import org.scalatest.concurrent.{IntegrationPatience, ScalaFutures}
 import org.scalatest.{BeforeAndAfterEach, Suite}
-import play.api.libs.json.Json
+import play.api.libs.json.{Format, Json, OFormat, Reads, Writes}
 import reactivemongo.bson.BSONObjectID
 import uk.gov.hmrc.mongo.MongoSpecSupport
 import uk.gov.hmrc.mongo.json.ReactiveMongoFormats
@@ -138,8 +138,8 @@ case class ExampleItemWithModule(_id: BSONObjectID, updatedAt: DateTime, value:
 
 object ExampleItemWithModule {
 
-  implicit val dateReads = ReactiveMongoFormats.dateTimeRead
-  implicit val dateWrites = ReactiveMongoFormats.dateTimeWrite
-  implicit val objectIdFormats = ReactiveMongoFormats.objectIdFormats
-  implicit val formats = Json.format[ExampleItemWithModule]
+  implicit val dateReads: Reads[DateTime] = ReactiveMongoFormats.dateTimeRead
+  implicit val dateWrites: Writes[DateTime] = ReactiveMongoFormats.dateTimeWrite
+  implicit val objectIdFormats: Format[BSONObjectID] = ReactiveMongoFormats.objectIdFormats
+  implicit val formats: OFormat[ExampleItemWithModule] = Json.format[ExampleItemWithModule]
 }

src/test/scala/uk/gov/hmrc/workitem/WorkItemModuleRepositorySpec.scala

@@ -25,6 +25,7 @@ import reactivemongo.play.json.ImplicitBSONHandlers._
 import uk.gov.hmrc.mongo.json.ReactiveMongoFormats
 
 import scala.concurrent.ExecutionContext.Implicits.global
+import scala.language.reflectiveCalls
 
 class WorkItemModuleRepositorySpec extends WordSpec
                                       with Matchers
@@ -49,7 +50,7 @@ class WorkItemModuleRepositorySpec extends WordSpec
         "$set" -> Json.obj("_id" -> _id, "updatedAt" -> documentCreationTime, "value" -> "test")
       ).deepMerge(WorkItemModuleRepository.upsertModuleQuery("testModule", workItemModuleCreationTime))
 
-      repo.collection.update[JsObject, JsObject](Json.obj("_id" -> _id), document, upsert = true).
+      repo.collection.update(ordered = false).one(Json.obj("_id" -> _id), document, upsert = true).
         futureValue.n shouldBe 1
 
       repo.pullOutstanding(documentCreationTime.plusHours(2), documentCreationTime.plusHours(2)).
@@ -91,13 +92,13 @@ class WorkItemModuleRepositorySpec extends WordSpec
         "$set" -> Json.obj("_id" -> _id, "updatedAt" -> documentCreationTime, "value" -> "test")
       ).deepMerge(WorkItemModuleRepository.upsertModuleQuery("testModule", workItemModuleCreationTime))
 
-      repo.collection.update[JsObject, JsObject](Json.obj("_id" -> _id), document, upsert = true).
+      repo.collection.update(ordered = false).one(Json.obj("_id" -> _id), document, upsert = true).
         futureValue.n shouldBe 1
 
       repo.markAs(_id, Succeeded).futureValue shouldBe true
 
       val Some(workItem: WorkItem[ExampleItemWithModule]) =
-        repo.collection.find(Json.obj("_id" -> _id)).one[WorkItem[ExampleItemWithModule]].futureValue
+        repo.collection.find[JsObject,ExampleItemWithModule](selector = Json.obj("_id" -> _id), projection = None).one[WorkItem[ExampleItemWithModule]].futureValue
       workItem.id shouldBe _id
       workItem.status shouldBe Succeeded
     }