Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 5 additions & 3 deletions .github/workflows/unit_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,15 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
go: [ '1.22', '1.23', '1.24' ]
go: [ '1.24', '1.25' ]
name: Go ${{ matrix.go }} test
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- name: Setup go
uses: actions/setup-go@v4
uses: actions/setup-go@v6
with:
go-version: ${{ matrix.go }}

- name: test
run: go test -v -race ./...
2 changes: 1 addition & 1 deletion appstore/api/model.go
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ const (
// ConsumptionRequestBody https://developer.apple.com/documentation/appstoreserverapi/consumptionrequest
type ConsumptionRequest struct {
CustomerConsented bool `json:"customerConsented"`
ConsumptionPercentage int32 `json:"consumptionPercentage"`
ConsumptionPercentage *int32 `json:"consumptionPercentage,omitempty"`
DeliveryStatus DeliveryStatus `json:"deliveryStatus"`
RefundPreference RefundPreference `json:"refundPreference"`
SampleContentProvided bool `json:"sampleContentProvided"`
Expand Down
77 changes: 77 additions & 0 deletions appstore/api/model_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
package api

import (
"encoding/json"
"testing"

"github.com/stretchr/testify/assert"
)

func TestConsumptionRequest_JSONSerialization(t *testing.T) {
t.Run("should omit ConsumptionPercentage when nil", func(t *testing.T) {
t.Parallel()
req := ConsumptionRequest{
CustomerConsented: true,
ConsumptionPercentage: nil,
DeliveryStatus: DELIVERED,
RefundPreference: DECLINE,
SampleContentProvided: false,
}

data, err := json.Marshal(req)
assert.NoError(t, err)

var result map[string]interface{}
err = json.Unmarshal(data, &result)
assert.NoError(t, err)

_, exists := result["consumptionPercentage"]
assert.False(t, exists, "consumptionPercentage should be omitted")
})

t.Run("should include ConsumptionPercentage when set to 0", func(t *testing.T) {
t.Parallel()
zero := int32(0)
req := ConsumptionRequest{
CustomerConsented: true,
ConsumptionPercentage: &zero,
DeliveryStatus: DELIVERED,
RefundPreference: GRANT_FULL,
SampleContentProvided: true,
}

data, err := json.Marshal(req)
assert.NoError(t, err)

var result map[string]interface{}
err = json.Unmarshal(data, &result)
assert.NoError(t, err)

val, exists := result["consumptionPercentage"]
assert.True(t, exists)
assert.Equal(t, float64(0), val)
})

t.Run("should include ConsumptionPercentage when set to non-zero value", func(t *testing.T) {
t.Parallel()
fifty := int32(50)
req := ConsumptionRequest{
CustomerConsented: true,
ConsumptionPercentage: &fifty,
DeliveryStatus: DELIVERED,
RefundPreference: GRANT_PRORATED,
SampleContentProvided: true,
}

data, err := json.Marshal(req)
assert.NoError(t, err)

var result map[string]interface{}
err = json.Unmarshal(data, &result)
assert.NoError(t, err)

val, exists := result["consumptionPercentage"]
assert.True(t, exists)
assert.Equal(t, float64(50), val)
})
}
61 changes: 53 additions & 8 deletions appstore/mocks/store.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.