task: Migrate the DbTx import in service and auth classes

Author: adamw

backend/src/main/scala/com/softwaremill/bootzooka/email/EmailService.scala

@@ -1,6 +1,6 @@
 package com.softwaremill.bootzooka.email
 
-import com.augustnagro.magnum.DbTx
+import ma.chinespirit.parlance.{DbTx, Postgres}
 import com.softwaremill.bootzooka.email.sender.EmailSender
 import com.softwaremill.bootzooka.infrastructure.DB
 import com.softwaremill.bootzooka.logging.Logging
@@ -21,7 +21,7 @@ class EmailService(
 ) extends EmailScheduler
     with Logging:
 
-  def schedule(data: EmailData)(using DbTx): Unit =
+  def schedule(data: EmailData)(using DbTx[Postgres]): Unit =
     logger.debug(s"Scheduling email to be sent to: ${data.recipient}")
     val id = idGenerator.nextId[Email]()
     emailModel.insert(Email(id, data))
@@ -57,4 +57,4 @@ class EmailService(
 end EmailService
 
 trait EmailScheduler:
-  def schedule(data: EmailData)(using DbTx): Unit
+  def schedule(data: EmailData)(using DbTx[Postgres]): Unit

backend/src/main/scala/com/softwaremill/bootzooka/passwordreset/PasswordResetService.scala

@@ -1,6 +1,6 @@
 package com.softwaremill.bootzooka.passwordreset
 
-import com.augustnagro.magnum.DbTx
+import ma.chinespirit.parlance.{DbTx, Postgres}
 import com.softwaremill.bootzooka.Fail
 import com.softwaremill.bootzooka.email.{EmailData, EmailScheduler, EmailSubjectContent, EmailTemplates}
 import com.softwaremill.bootzooka.infrastructure.DB
@@ -23,22 +23,22 @@ class PasswordResetService(
     clock: Clock,
     db: DB
 ) extends Logging:
-  def forgotPassword(loginOrEmail: String)(using DbTx): Unit =
+  def forgotPassword(loginOrEmail: String)(using DbTx[Postgres]): Unit =
     userModel.findByLoginOrEmail(loginOrEmail.toLowerCased) match
       case None       => logger.debug(s"Could not find user with $loginOrEmail login/email")
       case Some(user) =>
         val pcr = createCode(user)
         sendCode(user, pcr)
 
-  private def createCode(user: User)(using DbTx): PasswordResetCode =
+  private def createCode(user: User)(using DbTx[Postgres]): PasswordResetCode =
     logger.debug(s"Creating password reset code for user: ${user.id}")
     val id = idGenerator.nextId[PasswordResetCode]()
     val validUntil = clock.now().plusMillis(config.codeValid.toMillis)
     val passwordResetCode = PasswordResetCode(id, user.id, validUntil)
     passwordResetCodeModel.insert(passwordResetCode)
     passwordResetCode
 
-  private def sendCode(user: User, code: PasswordResetCode)(using DbTx): Unit =
+  private def sendCode(user: User, code: PasswordResetCode)(using DbTx[Postgres]): Unit =
     logger.debug(s"Scheduling e-mail with reset code for user: ${user.id}")
     emailScheduler.schedule(EmailData(user.emailLowerCase, prepareResetEmail(user, code)))
 

backend/src/main/scala/com/softwaremill/bootzooka/security/ApiKeyService.scala

@@ -1,6 +1,6 @@
 package com.softwaremill.bootzooka.security
 
-import com.augustnagro.magnum.DbTx
+import ma.chinespirit.parlance.{DbTx, Postgres}
 import com.softwaremill.bootzooka.logging.Logging
 import com.softwaremill.bootzooka.user.User
 import com.softwaremill.bootzooka.util.Strings.Id
@@ -10,7 +10,7 @@ import java.time.temporal.ChronoUnit
 import scala.concurrent.duration.Duration
 
 class ApiKeyService(apiKeyModel: ApiKeyModel, idGenerator: IdGenerator, clock: Clock) extends Logging:
-  def create(userId: Id[User], valid: Duration)(using DbTx): ApiKey =
+  def create(userId: Id[User], valid: Duration)(using DbTx[Postgres]): ApiKey =
     val id = idGenerator.nextId[ApiKey]()
     val now = clock.now()
     val validUntil = now.plus(valid.toMillis, ChronoUnit.MILLIS)
@@ -20,11 +20,11 @@ class ApiKeyService(apiKeyModel: ApiKeyModel, idGenerator: IdGenerator, clock: C
     apiKey
   end create
 
-  def invalidate(id: Id[ApiKey])(using DbTx): Unit =
+  def invalidate(id: Id[ApiKey])(using DbTx[Postgres]): Unit =
     logger.debug(s"Invalidating api key $id")
     apiKeyModel.delete(id)
 
-  def invalidateAllForUser(userId: Id[User])(using DbTx): Unit =
+  def invalidateAllForUser(userId: Id[User])(using DbTx[Postgres]): Unit =
     logger.debug(s"Invalidating all api keys for user $userId")
     apiKeyModel.deleteAllForUser(userId)
 end ApiKeyService

backend/src/main/scala/com/softwaremill/bootzooka/security/Auth.scala

@@ -1,6 +1,6 @@
 package com.softwaremill.bootzooka.security
 
-import com.augustnagro.magnum.DbTx
+import ma.chinespirit.parlance.{DbTx, Postgres}
 import com.softwaremill.bootzooka.*
 import com.softwaremill.bootzooka.infrastructure.DB
 import com.softwaremill.bootzooka.logging.Logging
@@ -44,8 +44,8 @@ end Auth
   */
 trait AuthTokenOps[T]:
   def tokenName: String
-  def findById: DbTx ?=> Id[T] => Option[T]
-  def delete: DbTx ?=> T => Unit
+  def findById: DbTx[Postgres] ?=> Id[T] => Option[T]
+  def delete: DbTx[Postgres] ?=> T => Unit
   def userId: T => Id[User]
   def validUntil: T => Instant
   def deleteWhenValid: Boolean

backend/src/main/scala/com/softwaremill/bootzooka/user/UserService.scala

@@ -1,6 +1,6 @@
 package com.softwaremill.bootzooka.user
 
-import com.augustnagro.magnum.DbTx
+import ma.chinespirit.parlance.{DbTx, Postgres}
 import com.softwaremill.bootzooka.*
 import com.softwaremill.bootzooka.email.{EmailData, EmailScheduler, EmailTemplates}
 import com.softwaremill.bootzooka.logging.Logging
@@ -26,7 +26,7 @@ class UserService(
   private val EmailAlreadyUsed = "E-mail already in use!"
   private val IncorrectLoginOrPassword = "Incorrect login/email or password"
 
-  def registerNewUser(login: String, email: String, password: String)(using DbTx): Either[Fail, ApiKey] =
+  def registerNewUser(login: String, email: String, password: String)(using DbTx[Postgres]): Either[Fail, ApiKey] =
     val loginClean = login.trim()
     val emailClean = email.trim()
 
@@ -56,17 +56,17 @@ class UserService(
       doRegister()
   end registerNewUser
 
-  def findById(id: Id[User])(using DbTx): Either[Fail, User] = userOrNotFound(userModel.findById(id))
+  def findById(id: Id[User])(using DbTx[Postgres]): Either[Fail, User] = userOrNotFound(userModel.findById(id))
 
-  def login(loginOrEmail: String, password: String, apiKeyValid: Option[Duration])(using DbTx): Either[Fail, ApiKey] = either:
+  def login(loginOrEmail: String, password: String, apiKeyValid: Option[Duration])(using DbTx[Postgres]): Either[Fail, ApiKey] = either:
     val loginOrEmailClean = loginOrEmail.trim()
     val user = userOrNotFound(userModel.findByLoginOrEmail(loginOrEmailClean.toLowerCased)).ok()
     verifyPassword(user, password, validationErrorMsg = IncorrectLoginOrPassword).ok()
     apiKeyService.create(user.id, apiKeyValid.getOrElse(config.defaultApiKeyValid))
 
-  def logout(id: Id[ApiKey])(using DbTx): Unit = apiKeyService.invalidate(id)
+  def logout(id: Id[ApiKey])(using DbTx[Postgres]): Unit = apiKeyService.invalidate(id)
 
-  def changeUser(userId: Id[User], newLogin: String, newEmail: String)(using DbTx): Either[Fail, Unit] =
+  def changeUser(userId: Id[User], newLogin: String, newEmail: String)(using DbTx[Postgres]): Either[Fail, Unit] =
     val newLoginClean = newLogin.trim()
     val newEmailClean = newEmail.trim()
     val newEmailtoLowerCased = newEmailClean.toLowerCased
@@ -111,7 +111,7 @@ class UserService(
       if anyUpdate then sendMail(findById(userId).ok())
   end changeUser
 
-  def changePassword(userId: Id[User], currentPassword: String, newPassword: String)(using DbTx): Either[Fail, ApiKey] =
+  def changePassword(userId: Id[User], currentPassword: String, newPassword: String)(using DbTx[Postgres]): Either[Fail, ApiKey] =
     def validateUserPassword(userId: Id[User], currentPassword: String): Either[Fail, User] =
       for
         user <- userOrNotFound(userModel.findById(userId))