Skip to content

fix(api): fix polling duration wrongfully marshalled #1767

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

Merged
paul-nicolas merged 1 commit into from
May 15, 2025
Merged

fix(api): fix polling duration wrongfully marshalled #1767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 0 additions & 19 deletions components/payments/cmd/connectors/internal/api/connector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import (
"github.com/formancehq/payments/internal/otel"
"github.com/formancehq/stack/libs/go-libs/api"
"github.com/formancehq/stack/libs/go-libs/bun/bunpaginate"
"github.com/formancehq/stack/libs/go-libs/logging"
"github.com/formancehq/stack/libs/go-libs/pointer"
"github.com/google/uuid"
"github.com/gorilla/mux"
Expand Down Expand Up @@ -132,24 +131,6 @@ func readConfig[Config models.ConnectorConfigObject](
caser := cases.Title(language.English)
m["provider"] = caser.String(connectorID.Provider.String())

// rewrite pollingDuration struct as a string to match API spec
pollingPeriod, ok := m["pollingPeriod"].(map[string]interface{})
if ok {
duration, found := pollingPeriod["duration"]
if found {
var ns int64
switch v := duration.(type) {
case int64:
ns = v
case float64:
ns = int64(v)
default:
logging.FromContext(ctx).Debugf("pollingPeriod.Duration was of an unexpected type: %T", v)
}
m["pollingPeriod"] = time.Duration(ns).String()
}
}

result, err := json.Marshal(m)
if err != nil {
otel.RecordError(span, err)
Expand Down
2 changes: 1 addition & 1 deletion components/payments/cmd/connectors/internal/connectors/duration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ type Duration struct {
time.Duration `json:"duration"`
}

func (d *Duration) MarshalJSON() ([]byte, error) {
func (d Duration) MarshalJSON() ([]byte, error) {
return json.Marshal(d.Duration.String())
}

Expand Down