Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Multiple fixes around NumericString type #256

Merged
merged 3 commits into from
Dec 11, 2023
Merged

Multiple fixes around NumericString type #256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5076c87
Rename numericString to NumericString to make it publicly available
jbgosselin Dec 8, 2023
ac857ab
Make InApp.OriginalTransactionID a NumericString
jbgosselin Dec 8, 2023
bee0f17
Fix marshalling for OriginalTransactionID with omitempty
jbgosselin Dec 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions appstore/model.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ package appstore

import "encoding/json"

type numericString string
type NumericString string

func (n *numericString) UnmarshalJSON(b []byte) error {
func (n *NumericString) UnmarshalJSON(b []byte) error {
var number json.Number
if err := json.Unmarshal(b, &number); err != nil {
return err
}
*n = numericString(number.String())
*n = NumericString(number.String())
return nil
}

Expand Down Expand Up @@ -102,15 +102,15 @@ type (

// The InApp type has the receipt attributes
InApp struct {
Quantity string `json:"quantity"`
ProductID string `json:"product_id"`
TransactionID string `json:"transaction_id"`
OriginalTransactionID string `json:"original_transaction_id"` // this field is string
WebOrderLineItemID string `json:"web_order_line_item_id,omitempty"`
PromotionalOfferID string `json:"promotional_offer_id"`
SubscriptionGroupIdentifier string `json:"subscription_group_identifier"`
OfferCodeRefName string `json:"offer_code_ref_name,omitempty"`
AppAccountToken string `json:"app_account_token,omitempty"`
Quantity string `json:"quantity"`
ProductID string `json:"product_id"`
TransactionID string `json:"transaction_id"`
OriginalTransactionID NumericString `json:"original_transaction_id,omitempty"`
WebOrderLineItemID string `json:"web_order_line_item_id,omitempty"`
PromotionalOfferID string `json:"promotional_offer_id"`
SubscriptionGroupIdentifier string `json:"subscription_group_identifier"`
OfferCodeRefName string `json:"offer_code_ref_name,omitempty"`
AppAccountToken string `json:"app_account_token,omitempty"`

IsTrialPeriod string `json:"is_trial_period"`
IsInIntroOfferPeriod string `json:"is_in_intro_offer_period,omitempty"`
Expand All @@ -131,11 +131,11 @@ type (
Receipt struct {
ReceiptType string `json:"receipt_type"`
AdamID int64 `json:"adam_id"`
AppItemID numericString `json:"app_item_id"`
AppItemID NumericString `json:"app_item_id"`
BundleID string `json:"bundle_id"`
ApplicationVersion string `json:"application_version"`
DownloadID int64 `json:"download_id"`
VersionExternalIdentifier numericString `json:"version_external_identifier"`
VersionExternalIdentifier NumericString `json:"version_external_identifier"`
OriginalApplicationVersion string `json:"original_application_version"`
InApp []InApp `json:"in_app"`
ReceiptCreationDate
Expand Down Expand Up @@ -201,7 +201,7 @@ type (

// ReceiptForIOS6 is struct
ReceiptForIOS6 struct {
AppItemID numericString `json:"app_item_id"`
AppItemID NumericString `json:"app_item_id"`
BID string `json:"bid"`
BVRS string `json:"bvrs"`
CancellationDate
Expand All @@ -211,13 +211,13 @@ type (
ItemID string `json:"item_id"`
ProductID string `json:"product_id"`
PurchaseDate
OriginalTransactionID numericString `json:"original_transaction_id"`
OriginalTransactionID NumericString `json:"original_transaction_id,omitempty"`
OriginalPurchaseDate
Quantity string `json:"quantity"`
TransactionID string `json:"transaction_id"`
UniqueIdentifier string `json:"unique_identifier"`
UniqueVendorIdentifier string `json:"unique_vendor_identifier"`
VersionExternalIdentifier numericString `json:"version_external_identifier,omitempty"`
VersionExternalIdentifier NumericString `json:"version_external_identifier,omitempty"`
WebOrderLineItemID string `json:"web_order_line_item_id"`
}
)
2 changes: 1 addition & 1 deletion appstore/model_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

func TestNumericString_UnmarshalJSON(t *testing.T) {
type foo struct {
ID numericString
ID NumericString
}

tests := []struct {
Expand Down
6 changes: 3 additions & 3 deletions appstore/notification.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ type NotificationReceipt struct {
BID string `json:"bid"`
BVRS string `json:"bvrs"`
TransactionID string `json:"transaction_id"`
OriginalTransactionID numericString `json:"original_transaction_id"`
OriginalTransactionID NumericString `json:"original_transaction_id,omitempty"`
IsTrialPeriod string `json:"is_trial_period"`
IsInIntroOfferPeriod string `json:"is_in_intro_offer_period"`

Expand Down Expand Up @@ -94,7 +94,7 @@ type SubscriptionNotification struct {

// Not show in raw notify body
Password string `json:"password"`
OriginalTransactionID numericString `json:"original_transaction_id"`
OriginalTransactionID NumericString `json:"original_transaction_id,omitempty"`
AutoRenewAdamID string `json:"auto_renew_adam_id"`

// The primary key for identifying a subscription purchase.
Expand All @@ -103,7 +103,7 @@ type SubscriptionNotification struct {

// This is the same as the Subscription Expiration Intent in the receipt.
// Posted only if notification_type is RENEWAL or INTERACTIVE_RENEWAL.
ExpirationIntent numericString `json:"expiration_intent"`
ExpirationIntent NumericString `json:"expiration_intent"`

// Auto renew info
AutoRenewStatus string `json:"auto_renew_status"` // false or true
Expand Down