PDSUI-2018 Change user type from LongId to StringId

3 files changed, 8 insertions, 13 deletions

diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/PatientCriterionService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/PatientCriterionService.scala
index 5c9aa19..c2f7b50 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/services/PatientCriterionService.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/services/PatientCriterionService.scala
@@ -73,7 +73,7 @@ object PatientCriterionService {
     case class CommonError(userMessage: String) extends GetByIdReply with DomainError
 
     implicit def toPhiString(reply: GetByIdReply): PhiString = reply match {
-      case x: DomainError => phi"GetByIdReply.Error($x)"
+      case x: DomainError              => phi"GetByIdReply.Error($x)"
       case Entity(x, labelId, armList) => phi"GetByIdReply.Entity(entity=$x, labelId=$labelId, armList=$armList)"
     }
   }
diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/TrialHistoryService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/TrialHistoryService.scala
index 17111a9..9ad9fc1 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/services/TrialHistoryService.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/services/TrialHistoryService.scala
@@ -22,15 +22,11 @@ object TrialHistoryService {
 
   sealed trait GetListReply
   object GetListReply {
-    case class EntityList(xs: Seq[TrialHistory],
-                          totalFound: Int,
-                          lastUpdate: Option[LocalDateTime])
+    case class EntityList(xs: Seq[TrialHistory], totalFound: Int, lastUpdate: Option[LocalDateTime])
         extends GetListReply
 
     case object AuthorizationError
-        extends GetListReply
-        with DomainError.AuthorizationError
-        with DefaultAccessDeniedError
+        extends GetListReply with DomainError.AuthorizationError with DefaultAccessDeniedError
   }
 
 }
@@ -43,7 +39,6 @@ trait TrialHistoryService {
                        filter: SearchFilterExpr = SearchFilterExpr.Empty,
                        sorting: Option[Sorting] = None,
                        pagination: Option[Pagination] = None)(
-      implicit requestContext: AuthenticatedRequestContext)
-    : Future[GetListReply]
+          implicit requestContext: AuthenticatedRequestContext): Future[GetListReply]
 
 }
diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/UserService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/UserService.scala
index a1d4800..b54b6a9 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/services/UserService.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/services/UserService.scala
@@ -2,7 +2,7 @@ package xyz.driver.pdsuidomain.services
 
 import xyz.driver.pdsuicommon.auth.{AnonymousRequestContext, AuthenticatedRequestContext}
 import xyz.driver.pdsuicommon.db.{Pagination, SearchFilterExpr, Sorting}
-import xyz.driver.pdsuicommon.domain.{Email, LongId, User}
+import xyz.driver.pdsuicommon.domain._
 import xyz.driver.pdsuicommon.error.DomainError
 
 import scala.concurrent.Future
@@ -103,10 +103,10 @@ trait UserService {
   /**
     * Utility method for getting request executor.
     */
-  def activateExecutor(executorId: LongId[User])(
+  def activateExecutor(executorId: StringId[User])(
           implicit requestContext: AnonymousRequestContext): Future[ActivateExecutorReply]
 
-  def getById(userId: LongId[User])(implicit requestContext: AuthenticatedRequestContext): Future[GetByIdReply]
+  def getById(userId: StringId[User])(implicit requestContext: AuthenticatedRequestContext): Future[GetByIdReply]
 
   def getByEmail(email: Email)(implicit requestContext: AnonymousRequestContext): Future[GetByEmailReply]
 
@@ -123,5 +123,5 @@ trait UserService {
   def update(origUser: User, draftUser: User)(
           implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply]
 
-  def delete(userId: LongId[User])(implicit requestContext: AuthenticatedRequestContext): Future[DeleteReply]
+  def delete(userId: StringId[User])(implicit requestContext: AuthenticatedRequestContext): Future[DeleteReply]
 }