to fix bank account update

SOFTNETWORK-APP · Aug 8, 2024 · 5c77754 · 5c77754
1 parent 9780dc2
commit 5c77754
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 26 deletions.
diff --git a/core/src/main/scala/app/softnetwork/payment/persistence/typed/PaymentBehavior.scala b/core/src/main/scala/app/softnetwork/payment/persistence/typed/PaymentBehavior.scala
@@ -1031,32 +1031,14 @@ trait PaymentBehavior
               val shouldUpdateIban =
                 !paymentAccount.bankAccount.exists(_.checkIfSameIban(bankAccount.iban))
 
-              val iban = {
-                if (!shouldUpdateIban) {
-                  paymentAccount.bankAccount match {
-                    case Some(previous) => previous.iban
-                    case _              => bankAccount.iban
-                  }
-                } else {
-                  bankAccount.iban
-                }
-              }
+              val iban = bankAccount.iban
 
               val shouldUpdateBic =
                 shouldUpdateIban || !paymentAccount.bankAccount.exists(
                   _.checkIfSameBic(bankAccount.bic)
                 )
 
-              val bic = {
-                if (!shouldUpdateBic) {
-                  paymentAccount.bankAccount match {
-                    case Some(previous) => previous.bic
-                    case _              => bankAccount.bic
-                  }
-                } else {
-                  bankAccount.bic
-                }
-              }
+              val bic = bankAccount.bic
 
               var updatedPaymentAccount =
                 paymentAccount

diff --git a/testkit/src/main/scala/app/softnetwork/payment/scalatest/StripePaymentEndpointsTestKit.scala b/testkit/src/main/scala/app/softnetwork/payment/scalatest/StripePaymentEndpointsTestKit.scala
@@ -2,13 +2,27 @@ package app.softnetwork.payment.scalatest
 
 import akka.actor.typed.ActorSystem
 import app.softnetwork.payment.config.PaymentSettings
-import app.softnetwork.payment.handlers.{MockPaymentHandler, MockSoftPayAccountDao, SoftPayAccountDao}
+import app.softnetwork.payment.handlers.{
+  MockPaymentHandler,
+  MockSoftPayAccountDao,
+  SoftPayAccountDao
+}
 import app.softnetwork.payment.model.SoftPayAccount.Client.Provider.ProviderType
-import app.softnetwork.payment.service.{MockPaymentServiceEndpoints, PaymentServiceEndpoints, StripeHooksEndpoints}
+import app.softnetwork.payment.service.{
+  MockPaymentServiceEndpoints,
+  PaymentServiceEndpoints,
+  StripeHooksEndpoints
+}
 import app.softnetwork.persistence.schema.SchemaProvider
 import app.softnetwork.session.{CsrfCheck, CsrfCheckHeader}
 import app.softnetwork.session.model.{SessionData, SessionDataCompanion, SessionDataDecorator}
-import app.softnetwork.session.scalatest.{OneOffCookieSessionEndpointsTestKit, OneOffHeaderSessionEndpointsTestKit, RefreshableCookieSessionEndpointsTestKit, RefreshableHeaderSessionEndpointsTestKit, SessionTestKit}
+import app.softnetwork.session.scalatest.{
+  OneOffCookieSessionEndpointsTestKit,
+  OneOffHeaderSessionEndpointsTestKit,
+  RefreshableCookieSessionEndpointsTestKit,
+  RefreshableHeaderSessionEndpointsTestKit,
+  SessionTestKit
+}
 import app.softnetwork.session.service.{JwtClaimsSessionMaterials, SessionMaterials}
 import com.softwaremill.session.{RefreshTokenStorage, SessionConfig, SessionManager}
 import org.scalatest.wordspec.AnyWordSpecLike
@@ -46,7 +60,11 @@ trait StripePaymentEndpointsTestKit[SD <: SessionData with SessionDataDecorator[
           override def log: Logger = org.slf4j.LoggerFactory.getLogger(getClass)
 
           override implicit def system: ActorSystem[_] = sys
-        }.hooks(rootEndpoint.in(PaymentSettings.PaymentConfig.hooksRoute).in(ProviderType.STRIPE.name.toLowerCase))
+        }.hooks(
+          rootEndpoint
+            .in(PaymentSettings.PaymentConfig.hooksRoute)
+            .in(ProviderType.STRIPE.name.toLowerCase)
+        )
       )
     }
 

diff --git a/testkit/src/main/scala/app/softnetwork/payment/scalatest/StripePaymentRoutesTestKit.scala b/testkit/src/main/scala/app/softnetwork/payment/scalatest/StripePaymentRoutesTestKit.scala
@@ -3,12 +3,22 @@ package app.softnetwork.payment.scalatest
 import akka.actor.typed.ActorSystem
 import akka.http.scaladsl.server.Route
 import app.softnetwork.payment.config.PaymentSettings.PaymentConfig._
-import app.softnetwork.payment.handlers.{MockPaymentHandler, MockSoftPayAccountDao, SoftPayAccountDao}
+import app.softnetwork.payment.handlers.{
+  MockPaymentHandler,
+  MockSoftPayAccountDao,
+  SoftPayAccountDao
+}
 import app.softnetwork.payment.model.SoftPayAccount.Client.Provider.ProviderType
 import app.softnetwork.payment.service.{MockPaymentService, PaymentService, StripeHooksDirectives}
 import app.softnetwork.persistence.schema.SchemaProvider
 import app.softnetwork.session.model.{SessionData, SessionDataCompanion, SessionDataDecorator}
-import app.softnetwork.session.scalatest.{OneOffCookieSessionServiceTestKit, OneOffHeaderSessionServiceTestKit, RefreshableCookieSessionServiceTestKit, RefreshableHeaderSessionServiceTestKit, SessionTestKit}
+import app.softnetwork.session.scalatest.{
+  OneOffCookieSessionServiceTestKit,
+  OneOffHeaderSessionServiceTestKit,
+  RefreshableCookieSessionServiceTestKit,
+  RefreshableHeaderSessionServiceTestKit,
+  SessionTestKit
+}
 import app.softnetwork.session.service.{JwtClaimsSessionMaterials, SessionMaterials}
 import com.softwaremill.session.{RefreshTokenStorage, SessionConfig, SessionManager}
 import org.json4s.Formats