Merge pull request #2 from paytrail/add-decimal-vat-support

Add decimal vat support

Author: kotivuori

README.md

@@ -35,7 +35,7 @@ For a deep dive into the SDK's APIs, consult our [Paytrail Android SDK Wiki](htt
 
    ```groovy
    dependencies {
-       implementation("com.github.paytrail:paytrail-android-sdk:v0.2.0-beta")
+       implementation("com.github.paytrail:paytrail-android-sdk:v0.3.0-beta")
    }
    ```
 

VERSION

@@ -1 +1 @@
-0.2.0-beta
+0.3.0-beta

api-client-retrofit2/src/main/kotlin/fi/paytrail/sdk/apiclient/infrastructure/BigDecimalAsNumberAdapter.kt

@@ -0,0 +1,46 @@
+package fi.paytrail.sdk.apiclient.infrastructure
+
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.SerializationException
+import kotlinx.serialization.descriptors.PrimitiveKind
+import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import kotlinx.serialization.json.JsonDecoder
+import kotlinx.serialization.json.JsonEncoder
+import kotlinx.serialization.json.JsonPrimitive
+import java.math.BigDecimal
+
+object BigDecimalAsNumberAdapter : KSerializer<BigDecimal> {
+    override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("BigDecimalAsNumber", PrimitiveKind.STRING)
+
+    override fun serialize(encoder: Encoder, value: BigDecimal) {
+        when (encoder) {
+            is JsonEncoder -> {
+                encoder.encodeJsonElement(JsonPrimitive(value))
+            }
+            else -> {
+                // Fallback for non-JSON encoders, encode as string
+                encoder.encodeString(value.toPlainString())
+            }
+        }
+    }
+
+    override fun deserialize(decoder: Decoder): BigDecimal {
+        return when (decoder) {
+            is JsonDecoder -> {
+                val jsonElement = decoder.decodeJsonElement()
+                if (jsonElement is JsonPrimitive && !jsonElement.isString) {
+                    return BigDecimal(jsonElement.content)
+                } else {
+                    throw SerializationException("Expected JSON number for BigDecimal")
+                }
+            }
+            else -> {
+                // Fallback for non-JSON decoders
+                BigDecimal(decoder.decodeString())
+            }
+        }
+    }
+}

api-client-retrofit2/src/main/kotlin/fi/paytrail/sdk/apiclient/models/Item.kt

@@ -15,16 +15,18 @@
 
 package fi.paytrail.sdk.apiclient.models
 
+import fi.paytrail.sdk.apiclient.infrastructure.BigDecimalAsNumberAdapter
 import kotlinx.serialization.Contextual
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+import java.math.BigDecimal
 
 /**
  *
  *
  * @param unitPrice Unit price of an item in currency minor unit, eg. EUR cents. VAT should be included in amount unless `usePricesWithoutVat` is set to true.
  * @param units Number of units
- * @param vatPercentage Item VAT percentage
+ * @param vatPercentage Item VAT percentage. Values between 0 and 100 are allowed with one decimal place.
  * @param productCode Merchant specific product code
  * @param deliveryDate Estimated delivery date
  * @param description Merchant specific product description
@@ -46,9 +48,10 @@ data class Item(
     @SerialName(value = "units")
     val units: kotlin.Long,
 
-    /* Item VAT percentage */
+    /* Item VAT percentage. Values between 0 and 100 are allowed with one decimal place. */
     @SerialName(value = "vatPercentage")
-    val vatPercentage: kotlin.Long,
+    @Serializable(with = BigDecimalAsNumberAdapter::class)
+    val vatPercentage: BigDecimal,
 
     /* Merchant specific product code */
     @SerialName(value = "productCode")

demo-app/src/main/java/fi/paytrail/demo/shoppingcart/ShoppingCartRepository.kt

@@ -27,15 +27,15 @@ val fakeCart = ShoppingCart(
             amount = 1,
             unitPrice = BigDecimal.valueOf(15),
             fakeImage = R.drawable.product_img2,
-            vatPercentage = 24,
+            vatPercentage = BigDecimal(25.5),
         ),
         ShoppingCartRow(
             name = "Paytrail Drinking Bottle",
             id = UUID.fromString("c739864b-0307-4cba-9101-60990c449da0"),
             amount = 2,
             unitPrice = BigDecimal.valueOf(20),
             fakeImage = R.drawable.product_img1,
-            vatPercentage = 24,
+            vatPercentage = BigDecimal(14),
         ),
     ).associateBy { it.id },
 )

demo-app/src/main/java/fi/paytrail/demo/shoppingcart/ShoppingCartRow.kt

@@ -9,7 +9,7 @@ data class ShoppingCartRow(
     val id: UUID,
     val amount: Long,
     val unitPrice: BigDecimal,
-    val vatPercentage: Long,
+    val vatPercentage: BigDecimal,
     val fakeImage: Int, // You can replace it with a string that contain url of the image
 ) {
     val totalPrice by lazy { amount * unitPrice }

demo-app/src/main/java/fi/paytrail/demo/shoppingcart/ShoppingCartScreen.kt

@@ -395,7 +395,7 @@ fun PreviewShoppingCartItem() {
             id = UUID.fromString("6427e0c2-382d-4f03-99e5-413fff4d0afb"),
             amount = 2,
             unitPrice = BigDecimal("2.99"),
-            vatPercentage = 24,
+            vatPercentage = BigDecimal(14),
             fakeImage = R.drawable.image_placeholder,
         ),
     )
@@ -411,7 +411,7 @@ fun PreviewShoppingCartItem_LongName() {
             id = UUID.fromString("6427e0c2-382d-4f03-99e5-413fff4d0afb"),
             amount = 2,
             unitPrice = BigDecimal("2345.67"),
-            vatPercentage = 24,
+            vatPercentage = BigDecimal(25.5),
             fakeImage = R.drawable.image_placeholder,
         ),
     )