Merge pull request #198 from guardian/refactor-contacts-to-common

Refactor specific items to anghammarad-common project so we can use them to test anghammarad-config changes.

anghammarad/src/main/scala/com/gu/anghammarad/AnghammaradService.scala

@@ -1,5 +1,6 @@
 package com.gu.anghammarad
 
+import com.gu.anghammarad.common.Contacts
 import com.gu.anghammarad.models.{Configuration, Contact, Message, Notification}
 import com.gu.anghammarad.messages.{Messages, SendMessages}
 

anghammarad/src/main/scala/com/gu/anghammarad/Config.scala

@@ -5,7 +5,7 @@ import com.amazonaws.auth.profile.ProfileCredentialsProvider
 import com.amazonaws.regions.Regions
 import com.amazonaws.services.s3.AmazonS3Client
 import com.amazonaws.services.s3.model.{GetObjectRequest, S3ObjectInputStream}
-import com.gu.anghammarad.AnghammaradException.Fail
+import com.gu.anghammarad.common.AnghammaradException.Fail
 
 import scala.io.Source
 import scala.util.{Success, Try}

anghammarad/src/main/scala/com/gu/anghammarad/messages/HangoutsService.scala

@@ -1,6 +1,6 @@
 package com.gu.anghammarad.messages
 
-import com.gu.anghammarad.AnghammaradException.Fail
+import com.gu.anghammarad.common.AnghammaradException.Fail
 import com.gu.anghammarad.models.HangoutMessage
 import sttp.client3.{HttpURLConnectionBackend, Response, UriContext, basicRequest}
 

anghammarad/src/main/scala/com/gu/anghammarad/messages/SendMessages.scala

@@ -1,7 +1,7 @@
 package com.gu.anghammarad.messages
 
-import com.gu.anghammarad.AnghammaradException.Fail
 import com.gu.anghammarad.Enrichments._
+import com.gu.anghammarad.common.AnghammaradException.Fail
 import com.gu.anghammarad.models._
 
 import scala.util.Try

anghammarad/src/main/scala/com/gu/anghammarad/serialization/Serialization.scala

@@ -2,7 +2,7 @@ package com.gu.anghammarad.serialization
 
 import cats.syntax.either._
 import com.amazonaws.services.lambda.runtime.events.SNSEvent
-import com.gu.anghammarad.AnghammaradException.Fail
+import com.gu.anghammarad.common.AnghammaradException.Fail
 import com.gu.anghammarad.Enrichments._
 import com.gu.anghammarad.models._
 import io.circe._

anghammarad/src/test/scala/com/gu/anghammarad/ContactsTest.scala → anghammarad/src/test/scala/com/gu/anghammarad/common/ContactsTest.scala

@@ -1,14 +1,13 @@
-package com.gu.anghammarad
+package com.gu.anghammarad.common
 
-import com.gu.anghammarad.Contacts._
+import com.gu.anghammarad.common.Contacts._
 import com.gu.anghammarad.models._
 import com.gu.anghammarad.serialization.Serialization
 import com.gu.anghammarad.testutils.TryValues
 import org.scalatest.freespec.AnyFreeSpec
 import org.scalatest.matchers.should.Matchers
 
 import scala.io.Source
-import scala.util.Try
 
 
 class ContactsTest extends AnyFreeSpec with Matchers with TryValues {

build.sbt

@@ -57,6 +57,9 @@ lazy val root = project
 lazy val common = project
   .settings(
     name := "anghammarad-common",
+    libraryDependencies ++= Seq(
+      "org.scalatest" %% "scalatest" % scalaTestVersion % Test
+    )
   )
 
 lazy val client = project

anghammarad/src/main/scala/com/gu/anghammarad/AnghammaradException.scala → common/src/main/scala/com/gu/anghammarad/common/AnghammaradException.scala

@@ -1,4 +1,4 @@
-package com.gu.anghammarad
+package com.gu.anghammarad.common
 
 import scala.util.{Failure, Try}
 

anghammarad/src/main/scala/com/gu/anghammarad/Contacts.scala → common/src/main/scala/com/gu/anghammarad/common/Contacts.scala

@@ -1,8 +1,8 @@
-package com.gu.anghammarad
+package com.gu.anghammarad.common
 
-import com.gu.anghammarad.AnghammaradException.Fail
-import com.gu.anghammarad.models.{Channel, Contact, Email, EmailAddress, HangoutsChat, HangoutsRoom, Mapping, Message, _}
-import com.gu.anghammarad.Targets._
+import com.gu.anghammarad.common.AnghammaradException.Fail
+import com.gu.anghammarad.common.Targets.{appMatches, awsAccountMatches, githubTeamSlugMatches, includesApp, includesAwsAccount, includesGithubTeamSlug, includesStack, sortMappingsByTargets, stackMatches}
+import com.gu.anghammarad.models._
 
 import scala.util.{Success, Try}
 

anghammarad/src/main/scala/com/gu/anghammarad/Targets.scala → common/src/main/scala/com/gu/anghammarad/common/Targets.scala

@@ -1,4 +1,4 @@
-package com.gu.anghammarad
+package com.gu.anghammarad.common
 
 import com.gu.anghammarad.models._
 

anghammarad/src/test/scala/com/gu/anghammarad/TargetsTest.scala → common/src/test/scala/com/gu/anghammarad/common/TargetsTest.scala

@@ -1,12 +1,12 @@
-package com.gu.anghammarad
+package com.gu.anghammarad.common
 
 import com.gu.anghammarad.models._
 import org.scalatest.freespec.AnyFreeSpec
 import org.scalatest.matchers.should.Matchers
 
 
 class TargetsTest extends AnyFreeSpec with Matchers {
-  import com.gu.anghammarad.Targets._
+  import com.gu.anghammarad.common.Targets._
 
   "includesAwsAccount" - {
     "returns false if AwsAccount is enquired about and not present" in {

dev/src/main/scala/com/gu/anghammarad/Main.scala

@@ -1,6 +1,6 @@
 package com.gu.anghammarad
 
-import com.gu.anghammarad.AnghammaradException.Fail
+import com.gu.anghammarad.common.AnghammaradException.Fail
 import com.gu.anghammarad.ArgParser.argParser
 import com.gu.anghammarad.models.{EmailAddress, HangoutsRoom, Notification}
 import com.gu.anghammarad.serialization.Serialization