feat(EN-208): set a different polling interval per plugin where appropriate

docs/api/README.md

@@ -6879,7 +6879,7 @@ xor
   "baseUrl": "string",
   "name": "string",
   "pageSize": 25,
-  "pollingPeriod": "2m",
+  "pollingPeriod": "string",
   "provider": "Atlar",
   "secret": "string"
 }
@@ -6912,7 +6912,7 @@ xor
   "name": "string",
   "pageSize": 25,
   "password": "string",
-  "pollingPeriod": "2m",
+  "pollingPeriod": "string",
   "provider": "Bankingcircle",
   "userCertificate": "string",
   "userCertificateKey": "string",
@@ -6949,7 +6949,7 @@ xor
   "endpoint": "string",
   "name": "string",
   "pageSize": 25,
-  "pollingPeriod": "2m",
+  "pollingPeriod": "string",
   "provider": "Column"
 }
 
@@ -7043,7 +7043,7 @@ xor
   "endpoint": "string",
   "name": "string",
   "pageSize": 25,
-  "pollingPeriod": "2m",
+  "pollingPeriod": "string",
   "provider": "Generic"
 }
 
@@ -7073,7 +7073,7 @@ xor
   "endpoint": "string",
   "name": "string",
   "pageSize": 25,
-  "pollingPeriod": "2m",
+  "pollingPeriod": "string",
   "provider": "Increase",
   "webhookSharedSecret": "string"
 }
@@ -7106,7 +7106,7 @@ xor
   "endpoint": "string",
   "name": "string",
   "pageSize": 25,
-  "pollingPeriod": "2m",
+  "pollingPeriod": "string",
   "provider": "Mangopay"
 }
 
@@ -7138,7 +7138,7 @@ xor
   "endpoint": "string",
   "name": "string",
   "pageSize": 25,
-  "pollingPeriod": "2m",
+  "pollingPeriod": "string",
   "provider": "Modulr"
 }
 
@@ -7170,7 +7170,7 @@ xor
   "endpoint": "string",
   "name": "string",
   "pageSize": 25,
-  "pollingPeriod": "2m",
+  "pollingPeriod": "string",
   "provider": "Moneycorp"
 }
 
@@ -7272,7 +7272,7 @@ xor
   "endpoint": "string",
   "name": "string",
   "pageSize": 25,
-  "pollingPeriod": "2m",
+  "pollingPeriod": "string",
   "provider": "Qonto",
   "stagingToken": "string"
 }
@@ -7304,7 +7304,7 @@ xor
   "apiKey": "string",
   "name": "string",
   "pageSize": 25,
-  "pollingPeriod": "2m",
+  "pollingPeriod": "string",
   "provider": "Stripe"
 }
 
@@ -7364,7 +7364,7 @@ xor
   "apiKey": "string",
   "name": "string",
   "pageSize": 25,
-  "pollingPeriod": "2m",
+  "pollingPeriod": "string",
   "provider": "Wise",
   "webhookPublicKey": "string"
 }

internal/connectors/config.go

@@ -31,9 +31,13 @@ func combineConfigs(baseConfig models.Config, pluginConfig models.PluginInternal
 		pluginMap = make(map[string]interface{}, len(baseMap))
 	}
 
-	// Merge maps (fields from baseConfig take precedence)
+	//Merge maps giving precedence to pluginConfig values
 	for key, value := range baseMap {
-		pluginMap[key] = value
+		_, exists := pluginMap[key]
+		if !exists {
+			pluginMap[key] = value
+			continue
+		}
 	}
 
 	return json.Marshal(pluginMap)

internal/connectors/config_test.go

@@ -0,0 +1,43 @@
+package connectors
+
+import (
+	"encoding/json"
+	"testing"
+	"time"
+
+	"github.com/formancehq/payments/internal/models"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestCombineConfigs_PluginPrecedence(t *testing.T) {
+	t.Parallel()
+
+	base := models.Config{
+		Name:          "conn-name",
+		PollingPeriod: 10 * time.Minute, // lower than plugin
+		PageSize:      50,
+	}
+
+	pluginCfg := map[string]any{
+		"apiKey":        "sk_test",
+		"pollingPeriod": "20m0s", // plugin-normalized value should win
+	}
+
+	b, err := combineConfigs(base, pluginCfg)
+	require.NoError(t, err)
+
+	var out map[string]any
+	require.NoError(t, json.Unmarshal(b, &out))
+
+	// Plugin value should take precedence
+	assert.Equal(t, "20m0s", out["pollingPeriod"])
+
+	// Base-only fields should be present
+	assert.Equal(t, "conn-name", out["name"])
+	// pageSize from base since plugin didn't set it
+	assert.Equal(t, float64(50), out["pageSize"]) // numbers become float64 via json
+
+	// Plugin specific field preserved
+	assert.Equal(t, "sk_test", out["apiKey"])
+}

internal/connectors/engine/engine_test.go

@@ -134,7 +134,7 @@ var _ = Describe("Engine Tests", func() {
 			config json.RawMessage
 		)
 		BeforeEach(func() {
-			config = json.RawMessage(`{"name":"somename","pollingPeriod":"30s"}`)
+			config = json.RawMessage(`{"name":"somename","pollingPeriod":"30m"}`)
 		})
 
 		It("should return validation error when config is not a valid json", func(ctx SpecContext) {
@@ -399,7 +399,7 @@ var _ = Describe("Engine Tests", func() {
 			connectorID models.ConnectorID
 		)
 		BeforeEach(func() {
-			config = json.RawMessage(`{"name":"somename","pollingPeriod":"30s"}`)
+			config = json.RawMessage(`{"name":"somename","pollingPeriod":"30m"}`)
 			connectorID = models.ConnectorID{Provider: "dummypay", Reference: uuid.New()}
 		})
 
@@ -464,7 +464,7 @@ var _ = Describe("Engine Tests", func() {
 
 		It("should store the updated config", func(ctx SpecContext) {
 			newName := "new-name"
-			inputJson := json.RawMessage(fmt.Sprintf(`{"name":"%s","pollingPeriod":"2m","pageSize":25}`, newName))
+			inputJson := json.RawMessage(fmt.Sprintf(`{"name":"%s","pollingPeriod":"20m","pageSize":25}`, newName))
 			connector := &models.Connector{
 				ConnectorBase: models.ConnectorBase{
 					ID:        connectorID,

internal/connectors/plugins/public/atlar/config.go

@@ -3,22 +3,45 @@ package atlar
 import (
 	"encoding/json"
 
+	"github.com/formancehq/payments/internal/connectors/plugins/sharedconfig"
 	"github.com/formancehq/payments/internal/models"
 	"github.com/go-playground/validator/v10"
 	"github.com/pkg/errors"
 )
 
 type Config struct {
-	BaseURL   string `json:"baseUrl" validate:"required"`
-	AccessKey string `json:"accessKey" validate:"required"`
-	Secret    string `json:"secret" validate:"required"`
+	BaseURL       string                     `json:"baseUrl" validate:"required"`
+	AccessKey     string                     `json:"accessKey" validate:"required"`
+	Secret        string                     `json:"secret" validate:"required"`
+	PollingPeriod sharedconfig.PollingPeriod `json:"pollingPeriod"`
 }
 
 func unmarshalAndValidateConfig(payload []byte) (Config, error) {
-	var config Config
-	if err := json.Unmarshal(payload, &config); err != nil {
+	var raw struct {
+		BaseURL       string `json:"baseUrl"`
+		AccessKey     string `json:"accessKey"`
+		Secret        string `json:"secret"`
+		PollingPeriod string `json:"pollingPeriod"`
+	}
+	if err := json.Unmarshal(payload, &raw); err != nil {
+		return Config{}, errors.Wrap(models.ErrInvalidConfig, err.Error())
+	}
+
+	pp, err := sharedconfig.NewPollingPeriod(
+		raw.PollingPeriod,
+		sharedconfig.DefaultPollingPeriod,
+		sharedconfig.MinimumPollingPeriod,
+	)
+	if err != nil {
 		return Config{}, errors.Wrap(models.ErrInvalidConfig, err.Error())
 	}
+
+	config := Config{
+		BaseURL:       raw.BaseURL,
+		AccessKey:     raw.AccessKey,
+		Secret:        raw.Secret,
+		PollingPeriod: pp,
+	}
 	validate := validator.New(validator.WithRequiredStructEnabled())
 	return config, validate.Struct(config)
 }

internal/connectors/plugins/public/atlar/config_test.go

@@ -0,0 +1,70 @@
+package atlar
+
+import (
+	"testing"
+
+	"github.com/formancehq/payments/internal/connectors/plugins/sharedconfig"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestUnmarshalAndValidateConfig(t *testing.T) {
+	 t.Parallel()
+
+	 defaultPollingPeriod, _ := sharedconfig.NewPollingPeriod("", sharedconfig.DefaultPollingPeriod, sharedconfig.MinimumPollingPeriod)
+	 longPollingPeriod, _ := sharedconfig.NewPollingPeriod("45m", sharedconfig.DefaultPollingPeriod, sharedconfig.MinimumPollingPeriod)
+
+	 tests := []struct {
+		 name        string
+		 payload     []byte
+		 expected    Config
+		 expectError bool
+	 }{
+		 {
+			 name:    "Valid Config",
+			 payload: []byte(`{"baseUrl":"https://api.atlar.com","accessKey":"ak_test","secret":"sk_test"}`),
+			 expected: Config{
+				 BaseURL:       "https://api.atlar.com",
+				 AccessKey:     "ak_test",
+				 Secret:        "sk_test",
+				 PollingPeriod: defaultPollingPeriod,
+			 },
+			 expectError: false,
+		 },
+		 {
+			 name:        "Missing Required Fields",
+			 payload:     []byte(`{"baseUrl":"https://api.atlar.com"}`),
+			 expected:    Config{},
+			 expectError: true,
+		 },
+		 {
+			 name:    "Non default polling period",
+			 payload: []byte(`{"baseUrl":"https://api.atlar.com","accessKey":"ak_test","secret":"sk_test","pollingPeriod":"45m"}`),
+			 expected: Config{
+				 BaseURL:       "https://api.atlar.com",
+				 AccessKey:     "ak_test",
+				 Secret:        "sk_test",
+				 PollingPeriod: longPollingPeriod,
+			 },
+			 expectError: false,
+		 },
+		 {
+			 name:        "Invalid polling period",
+			 payload:     []byte(`{"baseUrl":"https://api.atlar.com","accessKey":"ak_test","secret":"sk_test","pollingPeriod":"not-a-duration"}`),
+			 expected:    Config{},
+			 expectError: true,
+		 },
+	 }
+
+	 for _, tt := range tests {
+		 t.Run(tt.name, func(t *testing.T) {
+			 config, err := unmarshalAndValidateConfig(tt.payload)
+			 if tt.expectError {
+				 require.Error(t, err)
+			 } else {
+				 require.NoError(t, err)
+				 assert.Equal(t, tt.expected, config)
+			 }
+		 })
+	 }
+}

internal/connectors/plugins/public/bankingcircle/config.go

@@ -3,25 +3,54 @@ package bankingcircle
 import (
 	"encoding/json"
 
+	"github.com/formancehq/payments/internal/connectors/plugins/sharedconfig"
 	"github.com/formancehq/payments/internal/models"
 	"github.com/go-playground/validator/v10"
 	"github.com/pkg/errors"
 )
 
 type Config struct {
-	Username              string `json:"username" yaml:"username" validate:"required"`
-	Password              string `json:"password" yaml:"password" validate:"required"`
-	Endpoint              string `json:"endpoint" yaml:"endpoint" validate:"required"`
-	AuthorizationEndpoint string `json:"authorizationEndpoint" yaml:"authorizationEndpoint" validate:"required"`
-	UserCertificate       string `json:"userCertificate" yaml:"userCertificate" validate:"required"`
-	UserCertificateKey    string `json:"userCertificateKey" yaml:"userCertificateKey" validate:"required"`
+	Username              string                     `json:"username" yaml:"username" validate:"required"`
+	Password              string                     `json:"password" yaml:"password" validate:"required"`
+	Endpoint              string                     `json:"endpoint" yaml:"endpoint" validate:"required"`
+	AuthorizationEndpoint string                     `json:"authorizationEndpoint" yaml:"authorizationEndpoint" validate:"required"`
+	UserCertificate       string                     `json:"userCertificate" yaml:"userCertificate" validate:"required"`
+	UserCertificateKey    string                     `json:"userCertificateKey" yaml:"userCertificateKey" validate:"required"`
+	PollingPeriod         sharedconfig.PollingPeriod `json:"pollingPeriod"`
 }
 
 func unmarshalAndValidateConfig(payload []byte) (Config, error) {
-	var config Config
-	if err := json.Unmarshal(payload, &config); err != nil {
+	var raw struct {
+		Username              string `json:"username"`
+		Password              string `json:"password"`
+		Endpoint              string `json:"endpoint"`
+		AuthorizationEndpoint string `json:"authorizationEndpoint"`
+		UserCertificate       string `json:"userCertificate"`
+		UserCertificateKey    string `json:"userCertificateKey"`
+		PollingPeriod         string `json:"pollingPeriod"`
+	}
+	if err := json.Unmarshal(payload, &raw); err != nil {
+		return Config{}, errors.Wrap(models.ErrInvalidConfig, err.Error())
+	}
+
+	pp, err := sharedconfig.NewPollingPeriod(
+		raw.PollingPeriod,
+		sharedconfig.DefaultPollingPeriod,
+		sharedconfig.MinimumPollingPeriod,
+	)
+	if err != nil {
 		return Config{}, errors.Wrap(models.ErrInvalidConfig, err.Error())
 	}
+
+	config := Config{
+		Username:              raw.Username,
+		Password:              raw.Password,
+		Endpoint:              raw.Endpoint,
+		AuthorizationEndpoint: raw.AuthorizationEndpoint,
+		UserCertificate:       raw.UserCertificate,
+		UserCertificateKey:    raw.UserCertificateKey,
+		PollingPeriod:         pp,
+	}
 	validate := validator.New(validator.WithRequiredStructEnabled())
 	return config, validate.Struct(config)
 }