Member existence related message renaming

ggraffieti · Sep 18, 2017 · 7fc1178 · 7fc1178
1 parent 7ec95ed
commit 7fc1178
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/src/main/scala/org/gammf/collabora/database/actors/master/DBMasterMember.scala b/src/main/scala/org/gammf/collabora/database/actors/master/DBMasterMember.scala
@@ -30,8 +30,8 @@ class DBMasterMember(override val yellowPages: ActorRef,
         case UpdateMessageType.CREATION =>
           getActorOrElse(Topic() :+ Database :+ Member, ExistenceChecking, message).
             foreach(checkMemberWorker =>
-          (checkMemberWorker ? IsMemberExistsMessage(message.member.get.user)).mapTo[QueryOkMessage].map(query => query.queryGoneWell match {
-            case member: IsMemberExistsResponseMessage =>
+          (checkMemberWorker ? CheckMemberExistenceRequestMessage(message.member.get.user)).mapTo[QueryOkMessage].map(query => query.queryGoneWell match {
+            case member: CheckMemberExistenceResponseMessage =>
               if (member.isRegistered)
                 getActorOrElse(Topic() :+ Database :+ Member, DefaultWorker, message).foreach(_ ! InsertMemberMessage(message.member.get, message.collaborationId.get, message.user))
               else

diff --git a/.../scala/org/gammf/collabora/database/actors/worker/DBWorkerCheckMemberExistenceActor.scala b/.../scala/org/gammf/collabora/database/actors/worker/DBWorkerCheckMemberExistenceActor.scala
@@ -18,10 +18,10 @@ class DBWorkerCheckMemberExistenceActor(override val yellowPages: ActorRef,
 
   override def receive: Receive = super.receive orElse ({
 
-    case message: IsMemberExistsMessage =>
+    case message: CheckMemberExistenceRequestMessage =>
       find(
         selector = BSONDocument(USER_ID -> message.username),
-        okStrategy = bsonDocumet => QueryOkMessage(IsMemberExistsResponseMessage(message.username, bsonDocumet.isDefined)),
+        okStrategy = bsonDocumet => QueryOkMessage(CheckMemberExistenceResponseMessage(message.username, bsonDocumet.isDefined)),
         failStrategy = defaultDBWorkerFailStrategy(message.username)
       ) pipeTo sender
   }: Receive)

diff --git a/src/main/scala/org/gammf/collabora/database/messages/QueryMessage.scala b/src/main/scala/org/gammf/collabora/database/messages/QueryMessage.scala
@@ -95,15 +95,16 @@ case class AllCollaborationsMessage(collaborationList: List[Collaboration]) exte
   * to check the existence of a member in the application.
   * @param username the username of the member.
   */
-case class IsMemberExistsMessage(username: String) extends QueryMessage
+case class CheckMemberExistenceRequestMessage(username: String) extends QueryMessage
 
 /**
-  * A message that represents a response to a [[IsMemberExistsMessage]], containing a boolean value that indicates
+  * A message that represents a response to a [[CheckMemberExistenceRequestMessage]], containing a boolean value that indicates
   * if the member is registered in the system or no.
+ *
   * @param username the username of the member.
   * @param isRegistered true if the member is Registered, false otherwise.
   */
-case class IsMemberExistsResponseMessage(username: String, isRegistered: Boolean) extends QueryMessage
+case class CheckMemberExistenceResponseMessage(username: String, isRegistered: Boolean) extends QueryMessage
 
 /**
   * A message sent to the [[org.gammf.collabora.database.actors.worker.DBWorkerChangeModuleStateActor]], in

diff --git a/...est/scala/org/gammf/collabora/database/actors/DBWorkerCheckMemberExistenceActorTest.scala b/...est/scala/org/gammf/collabora/database/actors/DBWorkerCheckMemberExistenceActorTest.scala
@@ -5,7 +5,7 @@ import akka.testkit.{ImplicitSender, TestKit}
 import akka.util.Timeout
 import akka.pattern.ask
 import org.gammf.collabora.TestMessageUtil
-import org.gammf.collabora.database.messages.{IsMemberExistsMessage, IsMemberExistsResponseMessage, QueryOkMessage}
+import org.gammf.collabora.database.messages.{CheckMemberExistenceRequestMessage, CheckMemberExistenceResponseMessage, QueryOkMessage}
 import org.gammf.collabora.yellowpages.ActorContainer
 import org.gammf.collabora.yellowpages.ActorService._
 import org.gammf.collabora.yellowpages.messages.{ActorRequestMessage, ActorResponseMessage, ActorResponseOKMessage}
@@ -42,9 +42,9 @@ class DBWorkerCheckMemberExistenceActorTest extends TestKit (ActorSystem("Collab
       Await.result(rootYellowPages ? ActorRequestMessage(Topic() :+ Database :+ Member, ExistenceChecking), askTimeout.duration)
         .asInstanceOf[ActorResponseMessage] match {
         case response: ActorResponseOKMessage =>
-          response.actor ! IsMemberExistsMessage("maffone")
+          response.actor ! CheckMemberExistenceRequestMessage("maffone")
           expectMsgPF() {
-            case QueryOkMessage(IsMemberExistsResponseMessage(username, existence)) => assert(existence && username == "maffone")
+            case QueryOkMessage(CheckMemberExistenceResponseMessage(username, existence)) => assert(existence && username == "maffone")
           }
         case _ => fail
       }
@@ -53,9 +53,9 @@ class DBWorkerCheckMemberExistenceActorTest extends TestKit (ActorSystem("Collab
       Await.result(rootYellowPages ? ActorRequestMessage(Topic() :+ Database :+ Member, ExistenceChecking), askTimeout.duration)
         .asInstanceOf[ActorResponseMessage] match {
         case response: ActorResponseOKMessage =>
-          response.actor ! IsMemberExistsMessage("usernameNotPresent")
+          response.actor ! CheckMemberExistenceRequestMessage("usernameNotPresent")
           expectMsgPF() {
-            case QueryOkMessage(IsMemberExistsResponseMessage(username, existence)) => assert(!existence && username == "usernameNotPresent")
+            case QueryOkMessage(CheckMemberExistenceResponseMessage(username, existence)) => assert(!existence && username == "usernameNotPresent")
           }
         case _ => fail
       }