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.

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

PR 1424 and 1447 #100

Merged
merged 10 commits into from
Jan 19, 2024
Prev Previous commit
Next Next commit
Fix batch serialization
Signed-off-by: Peter Broadhurst <peter.broadhurst@kaleido.io>
peterbroadhurst committed Jan 19, 2024
commit 65f92416b465ab89cebae44754936bd0583ec711
9 changes: 8 additions & 1 deletion pkg/core/subscription.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright © 2023 Kaleido, Inc.
// Copyright © 2024 Kaleido, Inc.
//
// SPDX-License-Identifier: Apache-2.0
//
@@ -88,6 +88,7 @@ const (
)

// SubscriptionCoreOptions are the core options that apply across all transports
// REMEMBER TO ADD OPTIONS HERE TO MarshalJSON()
type SubscriptionCoreOptions struct {
FirstEvent *SubOptsFirstEvent `ffstruct:"SubscriptionCoreOptions" json:"firstEvent,omitempty"`
ReadAhead *uint16 `ffstruct:"SubscriptionCoreOptions" json:"readAhead,omitempty"`
@@ -167,6 +168,12 @@ func (so SubscriptionOptions) MarshalJSON() ([]byte, error) {
if so.TLSConfigName != "" {
so.additionalOptions["tlsConfigName"] = so.TLSConfigName
}
if so.Batch != nil {
so.additionalOptions["batch"] = so.Batch
}
if so.BatchTimeout != nil {
so.additionalOptions["batchTimeout"] = so.BatchTimeout
}

return json.Marshal(&so.additionalOptions)
}
22 changes: 18 additions & 4 deletions pkg/core/subscription_test.go
Original file line number Diff line number Diff line change
@@ -28,12 +28,15 @@ func TestSubscriptionOptionsDatabaseSerialization(t *testing.T) {
firstEvent := SubOptsFirstEventNewest
readAhead := uint16(50)
yes := true
oneSec := "1s"
sub1 := &Subscription{
Options: SubscriptionOptions{
SubscriptionCoreOptions: SubscriptionCoreOptions{
FirstEvent: &firstEvent,
ReadAhead: &readAhead,
WithData: &yes,
FirstEvent: &firstEvent,
ReadAhead: &readAhead,
WithData: &yes,
Batch: &yes,
BatchTimeout: &oneSec,
},
WebhookSubOptions: WebhookSubOptions{
TLSConfigName: "myconfig",
@@ -49,7 +52,18 @@ func TestSubscriptionOptionsDatabaseSerialization(t *testing.T) {
// Verify it serializes as bytes to the database
b1, err := sub1.Options.Value()
assert.NoError(t, err)
assert.Equal(t, `{"firstEvent":"newest","my-nested-opts":{"myopt1":12345,"myopt2":"test"},"readAhead":50,"tlsConfigName":"myconfig","withData":true}`, string(b1.([]byte)))
assert.JSONEq(t, `{
"firstEvent":"newest",
"my-nested-opts":{
"myopt1":12345,
"myopt2":"test"
},
"readAhead":50,
"tlsConfigName":"myconfig",
"withData":true,
"batch":true,
"batchTimeout":"1s"
}`, string(b1.([]byte)))

f1, err := sub1.Filter.Value()
assert.NoError(t, err)