fix: use explicit cardId in RegisterRecurringPayment instead of first active card (#24)

When a user with multiple cards subscribes, the system was always picking
the first active card instead of the one selected during checkout. Added
cardId parameter to the command, proto event, and command handler with
backward-compatible fallback to first active card when not specified.Closes Issue #24

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: fupelaqu

build.sbt

@@ -18,7 +18,7 @@ ThisBuild / organization := "app.softnetwork"
 
 name := "payment"
 
-ThisBuild / version := "0.9.6"
+ThisBuild / version := "0.9.7"
 
 ThisBuild / scalaVersion := scala212
 

common/src/main/protobuf/message/payment/payment.proto

@@ -290,6 +290,7 @@ message RegisterRecurringPaymentCommandEvent {
     optional int32 nextDebitedAmount = 10;
     optional int32 nextFeesAmount = 11;
     optional string clientId = 12;
+    optional string cardId = 13;
 }
 
 message RecurringPaymentRegisteredEvent {

common/src/main/scala/app/softnetwork/payment/message/PaymentMessages.scala

@@ -503,6 +503,9 @@ object PaymentMessages {
     *   - statement descriptor
     * @param externalReference
     *   - optional external reference
+    * @param cardId
+    *   - optional card id to use for the recurring payment (if not provided, the first active card
+    *     will be used)
     * @param clientId
     *   - optional client id
     */
@@ -521,6 +524,7 @@ object PaymentMessages {
     statementDescriptor: Option[String] = None,
     externalReference: Option[String] = None,
     metadata: Map[String, String] = Map.empty,
+    cardId: Option[String] = None,
     clientId: Option[String] = None
   ) extends PaymentCommandWithKey
       with RecurringPaymentCommand {

core/src/main/scala/app/softnetwork/payment/persistence/query/PaymentCommandProcessorStream.scala

@@ -181,18 +181,19 @@ trait PaymentCommandProcessorStream extends EventProcessorStream[PaymentEventWit
           case evt: RegisterRecurringPaymentCommandEvent =>
             import evt._
             val command = RegisterRecurringPayment(
-              debitedAccount,
-              firstDebitedAmount,
-              firstFeesAmount,
-              currency,
-              `type`,
-              startDate,
-              endDate,
-              frequency,
-              fixedNextAmount,
-              nextDebitedAmount,
-              nextFeesAmount,
-              clientId
+              debitedAccount = debitedAccount,
+              firstDebitedAmount = firstDebitedAmount,
+              firstFeesAmount = firstFeesAmount,
+              currency = currency,
+              `type` = `type`,
+              startDate = startDate,
+              endDate = endDate,
+              frequency = frequency,
+              fixedNextAmount = fixedNextAmount,
+              nextDebitedAmount = nextDebitedAmount,
+              nextFeesAmount = nextFeesAmount,
+              cardId = cardId,
+              clientId = clientId
             )
             !?(command) map {
               case _: RecurringPaymentRegistered =>

core/src/main/scala/app/softnetwork/payment/persistence/typed/RecurringPaymentCommandHandler.scala

@@ -101,10 +101,13 @@ trait RecurringPaymentCommandHandler
                   case Some(userId) =>
                     paymentAccount.walletId match {
                       case Some(walletId) =>
-                        paymentAccount.cards
-                          .filterNot(_.expired)
-                          .find(_.getActive)
-                          .map(_.id) match {
+                        cmd.cardId
+                          .orElse(
+                            paymentAccount.cards
+                              .filterNot(_.expired)
+                              .find(_.getActive)
+                              .map(_.id)
+                          ) match {
                           case Some(cardId) =>
                             val createdDate = now()
                             var recurringPayment =

testkit/src/test/scala/app/softnetwork/payment/service/StripePaymentServiceSpec.scala

@@ -1042,7 +1042,8 @@ trait StripePaymentServiceSpec[SD <: SessionData with SessionDataDecorator[SD]]
             endDate = Some(LocalDate.now().plusMonths(1)),
             fixedNextAmount = Some(true),
             nextDebitedAmount = Some(4990),
-            nextFeesAmount = Some(0)
+            nextFeesAmount = Some(0),
+            cardId = Some(cardId)
           )
         )
       ) ~> routes ~> check {