WIP update dynamo tests

Author: vlbee

liveactivities/src/test/scala/com/gu/liveactivities/DynamodbSpecification.scala

@@ -24,7 +24,7 @@ trait DynamodbSpecification extends Specification with BeforeAfterAll {
 
   def createTableRequest: CreateTableRequest
 
-  val TestEndpoint = "http://localhost:8002"
+  val TestEndpoint = "http://localhost:8000"
 
   override def beforeAll(): Unit = {
     awsClient.createTable(createTableRequest)
@@ -39,9 +39,8 @@ trait DynamodbSpecification extends Specification with BeforeAfterAll {
       override def refresh(): Unit = {}
 
       override def getCredentials: AWSCredentials = new AWSCredentials {
-        override def getAWSAccessKeyId: String = ""
-
-        override def getAWSSecretKey: String = ""
+        override def getAWSAccessKeyId: String = "testid"
+        override def getAWSSecretKey: String = "testkey"
       }
     })
 

liveactivities/src/test/scala/com/gu/liveactivities/LiveActivityChannelRepositorySpec.scala

@@ -1,16 +1,16 @@
 package com.gu.liveactivities
 
-
 import com.amazonaws.services.dynamodbv2.model._
 import org.specs2.concurrent.ExecutionEnv
 import org.specs2.mock.Mockito
 import tracking.Repository.RepositoryResult
-
+import tracking.RepositoryError
 import scala.concurrent.Future
 import scala.jdk.CollectionConverters._
 
-
-class LiveActivityChannelRepositoryTest (implicit ev: ExecutionEnv) extends DynamodbSpecification with Mockito {
+class LiveActivityChannelRepositoryTest(implicit ev: ExecutionEnv)
+    extends DynamodbSpecification
+    with Mockito {
 
   override val TableName = "test-table"
 
@@ -20,23 +20,38 @@ class LiveActivityChannelRepositoryTest (implicit ev: ExecutionEnv) extends Dyna
       1 must beEqualTo(1)
     }
 
-    "save a new channel mapping for an id if it does not exist" in new RepositoryScope with ExampleData {
+    "save a new channel mapping for an id if it does not exist" in new RepositoryScope
+      with ExampleData {
       repository.saveMapping(footballMapping).flatMap { _ =>
         repository.getMappingByActivityId(footballMapping.liveActivityId)
-      } must beEqualTo(Right(Some(footballMapping))).await
+      } must beEqualTo(Right(footballMapping)).await
     }
 
-    "Error if trying to save a new channel mapping for an id that already exists" in new RepositoryScope with ExampleData {
+    "Error if trying to save a new channel mapping for an id that already exists" in new RepositoryScope
+      with ExampleData {
       repository.saveMapping(footballMapping).flatMap { _ =>
-        repository.getMappingByActivityId(footballMapping.liveActivityId)
-      } must beEqualTo(Right(Some(footballMapping))).await
+        repository.saveMapping(footballMapping)
+      } must beLike[RepositoryResult[Unit]] {
+        case Left(RepositoryError(msg))
+            if msg.contains("ConditionalCheckFailed") =>
+          ok
+      }.await
+    }
+
+    "delete a channel mapping for an activity id if it exists" in new RepositoryScope
+      with ExampleData {
+
+      repository.saveMapping(footballMapping).flatMap { _ =>
+        repository.deleteMappingByActivityId(footballMapping.liveActivityId)
+      } must beEqualTo(Right(())).await
     }
 
-//    "delete a channel mapping for an activity id if it exists" in new RepositoryScope with ExampleData {
-//    }
-//
-//    "get a channel mapping for an activity id if it exists" in new RepositoryScope with ExampleData {
-//    }
+    "get a channel mapping for an activity id if it exists" in new RepositoryScope
+      with ExampleData {
+      repository.saveMapping(footballMapping).flatMap { _ =>
+        repository.getMappingByActivityId(footballMapping.liveActivityId)
+      } must beEqualTo(Right(footballMapping)).await
+    }
   }
 
   trait RepositoryScope extends AsyncDynamoScope {
@@ -60,11 +75,16 @@ class LiveActivityChannelRepositoryTest (implicit ev: ExecutionEnv) extends Dyna
   override def createTableRequest: CreateTableRequest = {
     val IdField = "liveActivityId"
 
-    new CreateTableRequest(TableName, List(new KeySchemaElement(IdField, KeyType.HASH)).asJava)
-      .withAttributeDefinitions(List(
-        new AttributeDefinition(IdField, ScalarAttributeType.S)
-      ).asJava)
+    new CreateTableRequest(
+      TableName,
+      List(new KeySchemaElement(IdField, KeyType.HASH)).asJava
+    )
+      .withAttributeDefinitions(
+        List(
+          new AttributeDefinition(IdField, ScalarAttributeType.S)
+        ).asJava
+      )
       .withProvisionedThroughput(new ProvisionedThroughput(5L, 5L))
   }
 
-}
+}

project/LocalDynamoDBLiveActivities.scala

@@ -7,8 +7,7 @@ object LocalDynamoDBLiveActivities {
   val settings: Seq[Setting[_]] = DynamoDBLocalKeys.baseDynamoDBSettings ++ Seq(
     dynamoDBLocalDownloadDir := file("dynamodb-local-live-activities"),
     dynamoDBLocalInMemory := true,
-    dynamoDBLocalVersion := "latest",
-//    dynamoDBLocalSharedDB := true, // Add this line
+    dynamoDBLocalVersion := "2018-04-11",
     dynamoDBLocalPort := 8002
   )
 }