fix: Handle empty string as None

Author: tikhop

src/primitives/consumption_request.rs

@@ -1,3 +1,4 @@
+use crate::primitives::de_ext::deserialize_optional_uuid;
 use crate::primitives::account_tenure::AccountTenure;
 use crate::primitives::consumption_status::ConsumptionStatus;
 use crate::primitives::delivery_status::DeliveryStatus;
@@ -44,7 +45,10 @@ pub struct ConsumptionRequest {
     /// The UUID that an app optionally generates to map a customer's in-app purchase with its resulting App Store transaction.
     ///
     /// [appAccountToken](https://developer.apple.com/documentation/appstoreserverapi/appaccounttoken)
-    #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(
+        skip_serializing_if = "Option::is_none",
+        deserialize_with = "deserialize_optional_uuid"
+    )]
     pub app_account_token: Option<Uuid>,
 
     /// The age of the customer’s account.

src/primitives/de_ext.rs

@@ -0,0 +1,62 @@
+use serde::{Deserialize, Deserializer};
+use uuid::Uuid;
+
+/// Custom deserializer for optional UUID that treats empty strings as None.
+pub fn deserialize_optional_uuid<'de, D>(deserializer: D) -> Result<Option<Uuid>, D::Error>
+where
+    D: Deserializer<'de>,
+{
+    let s: Option<String> = Option::deserialize(deserializer)?;
+    match s {
+        None => Ok(None),
+        Some(ref s) if s.is_empty() => Ok(None),
+        Some(s) => s.parse::<Uuid>().map(Some).map_err(serde::de::Error::custom),
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use serde::Deserialize;
+    use serde_json::json;
+
+    #[derive(Debug, Deserialize, PartialEq)]
+    struct TestStruct {
+        #[serde(deserialize_with = "deserialize_optional_uuid")]
+        id: Option<Uuid>,
+    }
+
+    #[test]
+    fn test_deserialize_null_uuid() {
+        let json = json!({"id": null});
+        let result: TestStruct = serde_json::from_value(json).unwrap();
+        assert_eq!(result.id, None);
+    }
+
+    #[test]
+    fn test_deserialize_empty_string_uuid() {
+        let json = json!({"id": ""});
+        let result: TestStruct = serde_json::from_value(json).unwrap();
+        assert_eq!(result.id, None);
+    }
+
+    #[test]
+    fn test_deserialize_valid_uuid() {
+        let uuid_str = "550e8400-e29b-41d4-a716-446655440000";
+        let json = json!({"id": uuid_str});
+        let result: TestStruct = serde_json::from_value(json).unwrap();
+        assert_eq!(result.id, Some(Uuid::parse_str(uuid_str).unwrap()));
+    }
+
+    #[test]
+    fn test_deserialize_invalid_uuid() {
+        let json = json!({"id": "not-a-valid-uuid"});
+        let result: Result<TestStruct, _> = serde_json::from_value(json);
+        assert!(result.is_err());
+
+        // Verify the error message contains something about UUID parsing
+        let err = result.unwrap_err();
+        let err_msg = err.to_string().to_lowercase();
+        assert!(err_msg.contains("uuid") || err_msg.contains("invalid"));
+    }
+}

src/primitives/jws_renewal_info_decoded_payload.rs

@@ -16,92 +16,79 @@ use crate::primitives::advanced_commerce_renewal_info::AdvancedCommerceRenewalIn
 /// [JWSRenewalInfoDecodedPayload](https://developer.apple.com/documentation/appstoreserverapi/jwsrenewalinfodecodedpayload)
 #[serde_with::serde_as]
 #[derive(Debug, Clone, Deserialize, Serialize, Hash)]
+#[serde(rename_all = "camelCase")]
 pub struct JWSRenewalInfoDecodedPayload {
     /// The reason the subscription expired.
     ///
     /// [expirationIntent](https://developer.apple.com/documentation/appstoreserverapi/expirationintent)
-    #[serde(rename = "expirationIntent")]
     pub expiration_intent: Option<ExpirationIntent>,
 
     /// The original transaction identifier of a purchase.
     ///
     /// [originalTransactionId](https://developer.apple.com/documentation/appstoreserverapi/originaltransactionid)
-    #[serde(rename = "originalTransactionId")]
     pub original_transaction_id: Option<String>,
 
     /// The product identifier of the product that will renew at the next billing period.
     ///
     /// [autoRenewProductId](https://developer.apple.com/documentation/appstoreserverapi/autorenewproductid)
-    #[serde(rename = "autoRenewProductId")]
     pub auto_renew_product_id: Option<String>,
 
     /// The unique identifier for the product, that you create in App Store Connect.
     ///
     /// [productId](https://developer.apple.com/documentation/appstoreserverapi/productid)
-    #[serde(rename = "productId")]
     pub product_id: Option<String>,
 
     /// The renewal status of the auto-renewable subscription.
     ///
     /// [autoRenewStatus](https://developer.apple.com/documentation/appstoreserverapi/autorenewstatus)
-    #[serde(rename = "autoRenewStatus")]
     pub auto_renew_status: Option<AutoRenewStatus>,
 
     /// A Boolean value that indicates whether the App Store is attempting to automatically renew an expired subscription.
     ///
     /// [isInBillingRetryPeriod](https://developer.apple.com/documentation/appstoreserverapi/isinbillingretryperiod)
-    #[serde(rename = "isInBillingRetryPeriod")]
     pub is_in_billing_retry_period: Option<bool>,
 
     /// The status that indicates whether the auto-renewable subscription is subject to a price increase.
     ///
     /// [priceIncreaseStatus](https://developer.apple.com/documentation/appstoreserverapi/priceincreasestatus)
-    #[serde(rename = "priceIncreaseStatus")]
     pub price_increase_status: Option<PriceIncreaseStatus>,
 
     /// The time when the billing grace period for subscription renewals expires.
     ///
     /// [gracePeriodExpiresDate](https://developer.apple.com/documentation/appstoreserverapi/graceperiodexpiresdate)
-    #[serde(rename = "gracePeriodExpiresDate")]
     #[serde_as(as = "Option<TimestampMilliSeconds<String, Flexible>>")]
     pub grace_period_expires_date: Option<DateTime<Utc>>,
 
     /// The type of subscription offer.
     ///
     /// [offerType](https://developer.apple.com/documentation/appstoreserverapi/offertype)
-    #[serde(rename = "offerType")]
     pub offer_type: Option<OfferType>,
 
     /// The offer code or the promotional offer identifier.
     ///
     /// [offerIdentifier](https://developer.apple.com/documentation/appstoreserverapi/offeridentifier)
-    #[serde(rename = "offerIdentifier")]
     pub offer_identifier: Option<String>,
 
     /// The UNIX time, in milliseconds, that the App Store signed the JSON Web Signature data.
     ///
     /// [signedDate](https://developer.apple.com/documentation/appstoreserverapi/signeddate)
-    #[serde(rename = "signedDate")]
     #[serde_as(as = "Option<TimestampMilliSeconds<String, Flexible>>")]
     pub signed_date: Option<DateTime<Utc>>,
 
     /// The server environment, either sandbox or production.
     ///
     /// [environment](https://developer.apple.com/documentation/appstoreserverapi/environment)
-    #[serde(rename = "environment")]
     pub environment: Option<Environment>,
 
     /// The earliest start date of a subscription in a series of auto-renewable subscription purchases that ignores all lapses of paid service shorter than 60 days.
     ///
     /// [recentSubscriptionStartDate](https://developer.apple.com/documentation/appstoreserverapi/recentsubscriptionstartdate)
-    #[serde(rename = "recentSubscriptionStartDate")]
     #[serde_as(as = "Option<TimestampMilliSeconds<String, Flexible>>")]
     pub recent_subscription_start_date: Option<DateTime<Utc>>,
 
     /// The UNIX time, in milliseconds, when the most recent auto-renewable subscription purchase expires.
     ///
     /// [renewalDate](https://developer.apple.com/documentation/appstoreserverapi/renewaldate)
-    #[serde(rename = "renewalDate")]
     #[serde_as(as = "Option<TimestampMilliSeconds<String, Flexible>>")]
     pub renewal_date: Option<DateTime<Utc>>,
 
@@ -113,37 +100,32 @@ pub struct JWSRenewalInfoDecodedPayload {
     ///The renewal price, in milliunits, of the auto-renewable subscription that renews at the next billing period.
     ///
     ///[renewalPrice](https://developer.apple.com/documentation/appstoreserverapi/renewalprice)
-    #[serde(rename = "renewalPrice")]
     pub renewal_price: Option<i64>,
 
     ///The payment mode you configure for the offer.
     ///
     ///[offerDiscountType](https://developer.apple.com/documentation/appstoreserverapi/offerdiscounttype)
-    #[serde(rename = "offerDiscountType")]
     pub offer_discount_type: Option<OfferDiscountType>,
 
     ///An array of win-back offer identifiers that a customer is eligible to redeem, which sorts the identifiers to present the better offers first.
     ///
     ///[eligibleWinBackOfferIds](https://developer.apple.com/documentation/appstoreserverapi/eligiblewinbackofferids)
-    #[serde(rename = "eligibleWinBackOfferIds")]
     pub eligible_win_back_offer_ids: Option<Vec<String>>,
 
     /// The UUID that an app optionally generates to map a customer’s in-app purchase with its resulting App Store transaction.
     ///
     /// [appAccountToken](https://developer.apple.com/documentation/appstoreserverapi/appAccountToken)
-    #[serde(rename = "appAccountToken")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub app_account_token: Option<Uuid>,
 
     /// The unique identifier of the app download transaction.
     ///
     /// [appTransactionId](https://developer.apple.com/documentation/appstoreserverapi/appTransactionId)
-    #[serde(rename = "appTransactionId")]
     pub app_transaction_id: Option<String>,
 
     /// The duration of the offer.
     ///
     /// [offerPeriod](https://developer.apple.com/documentation/appstoreserverapi/offerPeriod)
-    #[serde(rename = "offerPeriod")]
     pub offer_period: Option<String>,
 
     /// Renewal information that is present only for Advanced Commerce SKUs.

src/primitives/jws_transaction_decoded_payload.rs

@@ -16,124 +16,107 @@ use crate::primitives::advanced_commerce_transaction_info::AdvancedCommerceTrans
 /// [JWSTransactionDecodedPayload](https://developer.apple.com/documentation/appstoreserverapi/jwstransactiondecodedpayload)
 #[serde_with::serde_as]
 #[derive(Debug, Clone, serde::Deserialize, serde::Serialize, Hash)]
+#[serde(rename_all = "camelCase")]
 pub struct JWSTransactionDecodedPayload {
     /// The original transaction identifier of a purchase.
     ///
     /// [originalTransactionId](https://developer.apple.com/documentation/appstoreserverapi/originaltransactionid)
-    #[serde(rename = "originalTransactionId")]
     pub original_transaction_id: Option<String>,
 
     /// The unique identifier for a transaction such as an in-app purchase, restored in-app purchase, or subscription renewal.
     ///
     /// [transactionId](https://developer.apple.com/documentation/appstoreserverapi/transactionid)
-    #[serde(rename = "transactionId")]
     pub transaction_id: Option<String>,
 
     /// The unique identifier of subscription-purchase events across devices, including renewals.
     ///
     /// [webOrderLineItemId](https://developer.apple.com/documentation/appstoreserverapi/weborderlineitemid)
-    #[serde(rename = "webOrderLineItemId")]
     pub web_order_line_item_id: Option<String>,
 
     /// The bundle identifier of an app.
     ///
     /// [bundle_id](https://developer.apple.com/documentation/appstoreserverapi/bundleid)
-    #[serde(rename = "bundleId")]
     pub bundle_id: Option<String>,
 
     /// The unique identifier for the product, that you create in App Store Connect.
     ///
     /// [productId](https://developer.apple.com/documentation/appstoreserverapi/productid)
-    #[serde(rename = "productId")]
     pub product_id: Option<String>,
 
     /// The identifier of the subscription group that the subscription belongs to.
     ///
     /// [subscriptionGroupIdentifier](https://developer.apple.com/documentation/appstoreserverapi/subscriptiongroupidentifier)
-    #[serde(rename = "subscriptionGroupIdentifier")]
     pub subscription_group_identifier: Option<String>,
 
     /// The time that the App Store charged the user’s account for an in-app purchase, a restored in-app purchase, a subscription, or a subscription renewal after a lapse.
     ///
     /// [purchaseDate](https://developer.apple.com/documentation/appstoreserverapi/purchasedate)
-    #[serde(rename = "purchaseDate")]
     #[serde_as(as = "Option<TimestampMilliSeconds<String, Flexible>>")]
     pub purchase_date: Option<DateTime<Utc>>,
 
     /// The purchase date of the transaction associated with the original transaction identifier.
     ///
     /// [originalPurchaseDate](https://developer.apple.com/documentation/appstoreserverapi/originalpurchasedate)
-    #[serde(rename = "originalPurchaseDate")]
     #[serde_as(as = "Option<TimestampMilliSeconds<String, Flexible>>")]
     pub original_purchase_date: Option<DateTime<Utc>>,
 
     /// The UNIX time, in milliseconds, an auto-renewable subscription expires or renews.
     ///
     /// [expiresDate](https://developer.apple.com/documentation/appstoreserverapi/expiresdate)
-    #[serde(rename = "expiresDate")]
     #[serde_as(as = "Option<TimestampMilliSeconds<String, Flexible>>")]
     pub expires_date: Option<DateTime<Utc>>,
 
     /// The number of consumable products purchased.
     ///
     /// [quantity](https://developer.apple.com/documentation/appstoreserverapi/quantity)
-    #[serde(rename = "quantity")]
     pub quantity: Option<i32>,
 
     /// The type of the in-app purchase.
     ///
     /// [type](https://developer.apple.com/documentation/appstoreserverapi/type)
-    #[serde(rename = "type")]
     pub r#type: Option<ProductType>,
 
     /// The UUID that an app optionally generates to map a customer’s in-app purchase with its resulting App Store transaction.
     ///
     /// [appAccountToken](https://developer.apple.com/documentation/appstoreserverapi/appaccounttoken)
-    #[serde(rename = "appAccountToken")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub app_account_token: Option<Uuid>,
 
     /// A string that describes whether the transaction was purchased by the user, or is available to them through Family Sharing.
     ///
     /// [inAppOwnershipType](https://developer.apple.com/documentation/appstoreserverapi/inappownershiptype)
-    #[serde(rename = "inAppOwnershipType")]
     pub in_app_ownership_type: Option<InAppOwnershipType>,
 
     /// The UNIX time, in milliseconds, that the App Store signed the JSON Web Signature data.
     ///
     /// [signedDate](https://developer.apple.com/documentation/appstoreserverapi/signeddate)
-    #[serde(rename = "signedDate")]
     #[serde_as(as = "Option<TimestampMilliSeconds<String, Flexible>>")]
     pub signed_date: Option<DateTime<Utc>>,
 
     /// The reason that the App Store refunded the transaction or revoked it from Family Sharing.
     ///
     /// [revocationReason](https://developer.apple.com/documentation/appstoreserverapi/revocationreason)
-    #[serde(rename = "revocationReason")]
     pub revocation_reason: Option<RevocationReason>,
 
     /// The UNIX time, in milliseconds, that Apple Support refunded a transaction.
     ///
     /// [revocationDate](https://developer.apple.com/documentation/appstoreserverapi/revocationdate)
-    #[serde(rename = "revocationDate")]
     #[serde_as(as = "Option<TimestampMilliSeconds<String, Flexible>>")]
     pub revocation_date: Option<DateTime<Utc>>,
 
     /// The Boolean value that indicates whether the user upgraded to another subscription.
     ///
     /// [isUpgraded](https://developer.apple.com/documentation/appstoreserverapi/isupgraded)
-    #[serde(rename = "isUpgraded")]
     pub is_upgraded: Option<bool>,
 
     /// A value that represents the promotional offer type.
     ///
     /// [offerType](https://developer.apple.com/documentation/appstoreserverapi/offertype)
-    #[serde(rename = "offerType")]
     pub offer_type: Option<OfferType>,
 
     /// The identifier that contains the offer code or the promotional offer identifier.
     ///
     /// [offerIdentifier](https://developer.apple.com/documentation/appstoreserverapi/offeridentifier)
-    #[serde(rename = "offerIdentifier")]
     pub offer_identifier: Option<String>,
 
     /// The server environment, either sandbox or production.
@@ -149,13 +132,11 @@ pub struct JWSTransactionDecodedPayload {
     /// An Apple-defined value that uniquely identifies the App Store storefront associated with the purchase.
     ///
     /// [storefrontId](https://developer.apple.com/documentation/appstoreserverapi/storefrontid)
-    #[serde(rename = "storefrontId")]
     pub storefront_id: Option<String>,
 
     /// The reason for the purchase transaction, which indicates whether it’s a customer’s purchase or a renewal for an auto-renewable subscription that the system initiates.
     ///
     /// [transactionReason](https://developer.apple.com/documentation/appstoreserverapi/transactionreason)
-    #[serde(rename = "transactionReason")]
     pub transaction_reason: Option<TransactionReason>,
 
     /// The three-letter ISO 4217 currency code for the price of the product.
@@ -171,24 +152,20 @@ pub struct JWSTransactionDecodedPayload {
     /// The payment mode you configure for the offer.
     ///
     /// [offerDiscountType](https://developer.apple.com/documentation/appstoreserverapi/offerdiscounttype)
-    #[serde(rename = "offerDiscountType")]
     pub offer_discount_type: Option<OfferDiscountType>,
 
     /// The unique identifier of the app download transaction.
     ///
     /// [appTransactionId](https://developer.apple.com/documentation/appstoreserverapi/appTransactionId)
-    #[serde(rename = "appTransactionId")]
     pub app_transaction_id: Option<String>,
 
     /// The duration of the offer.
     ///
     /// [offerPeriod](https://developer.apple.com/documentation/appstoreserverapi/offerPeriod)
-    #[serde(rename = "offerPeriod")]
     pub offer_period: Option<String>,
 
     /// Transaction information that is present only for Advanced Commerce SKUs.
     ///
     /// [advancedCommerceTransactionInfo](https://developer.apple.com/documentation/appstoreserverapi/advancedcommercetransactioninfo)
-    #[serde(rename = "advancedCommerceInfo")]
     pub advanced_commerce_info: Option<AdvancedCommerceTransactionInfo>,
 }

src/primitives/mod.rs

@@ -63,3 +63,4 @@ pub mod advanced_commerce_transaction_info;
 pub mod advanced_commerce_renewal_info;
 pub mod advanced_commerce_renewal_item;
 pub mod retention_messaging;
+mod de_ext;