fix: read correlation id also for transactions without requested auth…

…orization (#89)
pagopa · Mar 11, 2024 · 28eb6de · 28eb6de
1 parent d9e7c4d
commit 28eb6de
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/src/main/kotlin/it/pagopa/ecommerce/helpdesk/utils/ResponseBuilderV2.kt b/src/main/kotlin/it/pagopa/ecommerce/helpdesk/utils/ResponseBuilderV2.kt
@@ -135,13 +135,10 @@ private fun getTransactionAuthRequestedData(
 private fun getTransactionActivatedData(
     baseTransaction: BaseTransaction
 ): TransactionActivatedData? =
-    when (baseTransaction) {
-        is BaseTransactionExpired ->
-            getTransactionActivatedData(baseTransaction.transactionAtPreviousState)
-        is BaseTransactionWithClosureError ->
-            getTransactionActivatedData(baseTransaction.transactionAtPreviousState)
-        is BaseTransactionWithRequestedAuthorization -> baseTransaction.transactionActivatedData
-        else -> null
+    if (baseTransaction is BaseTransactionWithPaymentToken) {
+        baseTransaction.transactionActivatedData
+    } else {
+        null
     }
 
 private fun getTransactionAuthCompletedData(

diff --git a/...agopa/ecommerce/helpdesk/dataproviders/mongo/EcommerceForTransactionV2DataProviderTest.kt b/...agopa/ecommerce/helpdesk/dataproviders/mongo/EcommerceForTransactionV2DataProviderTest.kt
@@ -32,7 +32,6 @@ import it.pagopa.generated.ecommerce.helpdesk.model.*
 import java.time.ZonedDateTime
 import java.util.*
 import java.util.stream.Stream
-import kotlin.collections.HashSet
 import org.junit.jupiter.api.AfterAll
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Assertions.assertEquals
@@ -234,6 +233,7 @@ class EcommerceForTransactionV2DataProviderTest {
                             .authorizationCode(null)
                             .paymentMethodName(null)
                             .brand(null)
+                            .correlationId(UUID.fromString(correlationId))
                     )
                     .paymentInfo(
                         PaymentInfoDto()
@@ -1147,6 +1147,7 @@ class EcommerceForTransactionV2DataProviderTest {
                             .authorizationCode(null)
                             .paymentMethodName(null)
                             .brand(null)
+                            .correlationId(UUID.fromString(correlationId))
                     )
                     .paymentInfo(
                         PaymentInfoDto()
@@ -1254,6 +1255,7 @@ class EcommerceForTransactionV2DataProviderTest {
                             .authorizationCode(null)
                             .paymentMethodName(null)
                             .brand(null)
+                            .correlationId(UUID.fromString(correlationId))
                     )
                     .paymentInfo(
                         PaymentInfoDto()