ignore the case of email addresses when checking for discrepancies

guardian · Sep 18, 2018 · de9a2b1 · de9a2b1
1 parent 66d19e0
commit de9a2b1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/handlers/sf-contact-merge/src/main/scala/com/gu/sf_contact_merge/validate/AssertSame.scala b/handlers/sf-contact-merge/src/main/scala/com/gu/sf_contact_merge/validate/AssertSame.scala
@@ -16,7 +16,10 @@ object AssertSame {
     _.value.toLowerCase // some seem to be entered entirely lower case, but this isn't a significant difference, so ignore
   )
 
-  val emailAddress: AssertSame[Option[EmailAddress]] = AssertSame[Option[EmailAddress]]("emails")
+  val emailAddress: AssertSame[Option[EmailAddress]] = AssertSame[Option[EmailAddress]](
+    "emails",
+    _.map(_.value.toLowerCase) // although emails are technically case sensitive on the first part, it's usually just a typing in difference
+  )
 
 }
 

diff --git a/handlers/sf-contact-merge/src/test/scala/manualTest/RunBatch.scala b/handlers/sf-contact-merge/src/test/scala/manualTest/RunBatch.scala
@@ -34,12 +34,12 @@ object RunBatch {
 
     val result = for {
       args <- GetArgs(rawArgs)
-      postString = HttpOp(Http.response).setupRequest(post(args.apiKey))
+      postString = HttpOp(Http.response).setupRequest(post(args.apiKey)).flatMap(RestRequestMaker.toClientFailableOp)
       jsons <- ReadFile(args.fileName)
       postJsonString = postString.setupRequest[JsonString](jsonString => BodyAsString(jsonString.value))
       requestWithResultAsTry = (jsonString: JsonString) =>
         postJsonString.runRequest(jsonString) match {
-          case ClientSuccess(unit) => \/-(())
+          case ClientSuccess(_) => \/-(())
           case f: ClientFailure => -\/(s"failed to call sf contact merge: $f")
         }
       err <- jsons.traverseU(requestWithResultAsTry)