Changed ids underlying type to String and made Ids and Names — value-classes

5 files changed, 31 insertions, 34 deletions

diff --git a/src/test/scala/xyz/driver/core/AuthTest.scala b/src/test/scala/xyz/driver/core/AuthTest.scala
index e5e991b..f4d4d2a 100644
--- a/src/test/scala/xyz/driver/core/AuthTest.scala
+++ b/src/test/scala/xyz/driver/core/AuthTest.scala
@@ -19,7 +19,7 @@ class AuthTest extends FlatSpec with Matchers with MockitoSugar with ScalatestRo
     override def authStatus(context: ServiceRequestContext): OptionT[Future, User] = OptionT.optionT[Future] {
       if (context.contextHeaders.keySet.contains(AuthService.AuthenticationTokenHeader)) {
         Future.successful(Some(new User {
-          override def id: Id[User]     = Id[User](1L)
+          override def id: Id[User]     = Id[User]("1")
           override def roles: Set[Role] = Set(PathologistRole)
         }: User))
       } else {
@@ -33,9 +33,8 @@ class AuthTest extends FlatSpec with Matchers with MockitoSugar with ScalatestRo
   "'authorize' directive" should "throw error is auth token is not in the request" in {
 
     Get("/naive/attempt") ~>
-      authorize(CanSignOutReport) {
-        case user =>
-          complete("Never going to be here")
+      authorize(CanSignOutReport) { user =>
+        complete("Never going to be here")
       } ~>
       check {
         // handled shouldBe false
@@ -50,9 +49,8 @@ class AuthTest extends FlatSpec with Matchers with MockitoSugar with ScalatestRo
     Post("/administration/attempt").addHeader(
       RawHeader(AuthService.AuthenticationTokenHeader, referenceAuthToken.value)
     ) ~>
-      authorize(CanAssignRoles) {
-        case user =>
-          complete("Never going to get here")
+      authorize(CanAssignRoles) { user =>
+        complete("Never going to get here")
       } ~>
       check {
         handled shouldBe false
@@ -70,9 +68,8 @@ class AuthTest extends FlatSpec with Matchers with MockitoSugar with ScalatestRo
     Get("/valid/attempt/?a=2&b=5").addHeader(
       RawHeader(AuthService.AuthenticationTokenHeader, referenceAuthToken.value)
     ) ~>
-      authorize(CanSignOutReport) {
-        case user =>
-          complete("Alright, user \"" + user.id + "\" is authorized")
+      authorize(CanSignOutReport) { user =>
+        complete("Alright, user \"" + user.id + "\" is authorized")
       } ~>
       check {
         handled shouldBe true
diff --git a/src/test/scala/xyz/driver/core/CoreTest.scala b/src/test/scala/xyz/driver/core/CoreTest.scala
index f9a1aab..3eb9eaa 100644
--- a/src/test/scala/xyz/driver/core/CoreTest.scala
+++ b/src/test/scala/xyz/driver/core/CoreTest.scala
@@ -31,12 +31,12 @@ class CoreTest extends FlatSpec with Matchers with MockitoSugar {
 
   "Id" should "have equality and ordering working correctly" in {
 
-    (Id[String](1234213L) === Id[String](1234213L)) should be(true)
-    (Id[String](1234213L) === Id[String](213414L)) should be(false)
-    (Id[String](213414L) === Id[String](1234213L)) should be(false)
+    (Id[String]("1234213") === Id[String]("1234213")) should be(true)
+    (Id[String]("1234213") === Id[String]("213414")) should be(false)
+    (Id[String]("213414") === Id[String]("1234213")) should be(false)
 
-    Seq(Id[String](4L), Id[String](3L), Id[String](2L), Id[String](1L)).sorted should contain
-    theSameElementsInOrderAs(Seq(Id[String](1L), Id[String](2L), Id[String](3L), Id[String](4L)))
+    Seq(Id[String]("4"), Id[String]("3"), Id[String]("2"), Id[String]("1")).sorted should contain
+    theSameElementsInOrderAs(Seq(Id[String]("1"), Id[String]("2"), Id[String]("3"), Id[String]("4")))
   }
 
   "Name" should "have equality and ordering working correctly" in {
diff --git a/src/test/scala/xyz/driver/core/FileTest.scala b/src/test/scala/xyz/driver/core/FileTest.scala
index aba79f7..57af1c2 100644
--- a/src/test/scala/xyz/driver/core/FileTest.scala
+++ b/src/test/scala/xyz/driver/core/FileTest.scala
@@ -51,7 +51,7 @@ class FileTest extends FlatSpec with Matchers with MockitoSugar {
     val s3ObjectMetadataMock = mock[ObjectMetadata]
     val amazonS3Mock         = mock[AmazonS3]
     when(amazonS3Mock.listObjectsV2(any[ListObjectsV2Request]())).thenReturn(s3ResultsMock)
-    when(amazonS3Mock.putObject(testBucket, testFilePath.toString, sourceTestFile)).thenReturn(s3PutMock)
+    when(amazonS3Mock.putObject(testBucket.value, testFilePath.toString, sourceTestFile)).thenReturn(s3PutMock)
     when(amazonS3Mock.getObject(any[GetObjectRequest](), any[File]())).thenReturn(s3ObjectMetadataMock)
 
     val s3Storage = new S3Storage(amazonS3Mock, testBucket, scala.concurrent.ExecutionContext.global)
diff --git a/src/test/scala/xyz/driver/core/GeneratorsTest.scala b/src/test/scala/xyz/driver/core/GeneratorsTest.scala
index 0432b2a..4ec73ec 100644
--- a/src/test/scala/xyz/driver/core/GeneratorsTest.scala
+++ b/src/test/scala/xyz/driver/core/GeneratorsTest.scala
@@ -11,25 +11,25 @@ class GeneratorsTest extends FlatSpec with Matchers with Assertions {
     val generatedId2 = nextId[String]()
     val generatedId3 = nextId[Long]()
 
-    generatedId1 should be >= 0L
-    generatedId2 should be >= 0L
-    generatedId3 should be >= 0L
+    generatedId1.length should be >= 0
+    generatedId2.length should be >= 0
+    generatedId3.length should be >= 0
     generatedId1 should not be generatedId2
     generatedId2 should !==(generatedId3)
   }
 
   it should "be able to generate com.drivergrp.core.Id identifiers with max value" in {
 
-    val generatedLimitedId1 = nextId[String](10000)
-    val generatedLimitedId2 = nextId[String](1000)
-    val generatedLimitedId3 = nextId[Long](2000)
+    val generatedLimitedId1 = nextId[String](5)
+    val generatedLimitedId2 = nextId[String](4)
+    val generatedLimitedId3 = nextId[Long](3)
 
-    generatedLimitedId1 should be >= 0L
-    generatedLimitedId1 should be < 10000L
-    generatedLimitedId2 should be >= 0L
-    generatedLimitedId2 should be < 1000L
-    generatedLimitedId3 should be >= 0L
-    generatedLimitedId3 should be < 2000L
+    generatedLimitedId1.length should be >= 0
+    generatedLimitedId1.length should be < 6
+    generatedLimitedId2.length should be >= 0
+    generatedLimitedId2.length should be < 5
+    generatedLimitedId3.length should be >= 0
+    generatedLimitedId3.length should be < 4
     generatedLimitedId1 should not be generatedLimitedId2
     generatedLimitedId2 should !==(generatedLimitedId3)
   }
@@ -37,11 +37,11 @@ class GeneratorsTest extends FlatSpec with Matchers with Assertions {
   it should "be able to generate com.drivergrp.core.Name names" in {
 
     nextName[String]() should not be nextName[String]()
-    nextName[String]().length should be >= 0
+    nextName[String]().value.length should be >= 0
 
     val fixedLengthName = nextName[String](10)
     fixedLengthName.length should be <= 10
-    assert(!fixedLengthName.exists(_.isControl))
+    assert(!fixedLengthName.value.exists(_.isControl))
   }
 
   it should "be able to generate proper UUIDs" in {
@@ -82,7 +82,7 @@ class GeneratorsTest extends FlatSpec with Matchers with Assertions {
 
     val generatedPair = nextPair(nextId[Int](), nextName[Int]())
 
-    generatedPair._1 should be > 0L
+    generatedPair._1.length should be > 0
     generatedPair._2.length should be > 0
 
     nextPair(nextId[Int](), nextName[Int]()) should not be
@@ -98,7 +98,7 @@ class GeneratorsTest extends FlatSpec with Matchers with Assertions {
 
     val generatedTriad = nextTriad(nextId[Int](), nextName[Int](), nextBigDecimal())
 
-    generatedTriad._1 should be > 0L
+    generatedTriad._1.length should be > 0
     generatedTriad._2.length should be > 0
     generatedTriad._3 should be >= BigDecimal(0.00)
 
diff --git a/src/test/scala/xyz/driver/core/JsonTest.scala b/src/test/scala/xyz/driver/core/JsonTest.scala
index bcdcd5d..c113c59 100644
--- a/src/test/scala/xyz/driver/core/JsonTest.scala
+++ b/src/test/scala/xyz/driver/core/JsonTest.scala
@@ -9,10 +9,10 @@ class JsonTest extends FlatSpec with Matchers {
 
   "Json format for Id" should "read and write correct JSON" in {
 
-    val referenceId = Id[String](1312L)
+    val referenceId = Id[String]("1312-34A")
 
     val writtenJson = json.idFormat.write(referenceId)
-    writtenJson.prettyPrint should be("1312")
+    writtenJson.prettyPrint should be("\"1312-34A\"")
 
     val parsedId = json.idFormat.read(writtenJson)
     parsedId should be(referenceId)