feat: datadis datasource can filter by cups now

Author: rubiojr

docs/datasources/datadis.md

@@ -18,21 +18,24 @@ interval = '24h0m0s'  # Fetch once per day (default: 24h)
 [datasources.datadis.config]
 username = 'your-datadis-username'  # Required
 password = 'your-datadis-password'  # Required
+cups = ''  # Optional: Comma-separated list of CUPS to filter
 ```
 
 ### Configuration Parameters
 
 - **username** (required): Your Datadis account username
 - **password** (required): Your Datadis account password
+- **cups** (optional): Comma-separated list of CUPS identifiers to filter which supplies to fetch. If not set or empty, fetches data for all supplies in the account. Example: `'ES0021000000000001AA,ES0021000000000002BB'`
 - **interval**: How often to fetch data (default: 24h). Since consumption data is typically updated daily, fetching more frequently is not recommended.
 
 ## Data Collection
 
 The datasource:
 1. Authenticates with the Datadis API using your credentials
 2. Retrieves all electricity supplies associated with your account
-3. For each supply, fetches hourly consumption data for the current month
-4. Creates a block for each hourly measurement
+3. Filters supplies based on the `cups` configuration (if specified)
+4. For each supply, fetches hourly consumption data for the current month
+5. Creates a block for each hourly measurement
 
 ## Block Structure
 

pkg/config/config.toml.sample

@@ -145,6 +145,8 @@ max_items = 50  # Maximum items to fetch across all feeds (default: 50, max: 200
 # [datasources.datadis.config]
 # username = ''  # Required: Your Datadis username
 # password = ''  # Required: Your Datadis password
+# cups = ''      # Optional: Comma-separated list of CUPS to filter (e.g., 'ES0000000000000001AA,ES0000000000000002BB')
+#                # If not set or empty, fetches data for all supplies in the account
 
 # # Importer - Generic datasource for importing blocks from external sources
 # # This allows external tools to push blocks via HTTP API

pkg/datasources/datadis/datasource.go

@@ -20,6 +20,7 @@ func init() {
 type Config struct {
 	Username string `toml:"username"`
 	Password string `toml:"password"`
+	CUPS     string `toml:"cups,omitempty"` // Optional: comma-separated list of CUPS to filter
 }
 
 // Validate checks if the configuration is valid
@@ -175,7 +176,14 @@ func (d *Datasource) FetchBlocks(ctx context.Context, blockCh chan<- core.Block)
 
 	blockCount := 0
 
-	for _, supply := range d.supplies {
+	// Filter supplies if CUPS is configured
+	suppliesToFetch := d.supplies
+	if d.config.CUPS != "" {
+		suppliesToFetch = d.filterSuppliesByConfig()
+		l.Debugf("Filtering to %d supplies based on config", len(suppliesToFetch))
+	}
+
+	for _, supply := range suppliesToFetch {
 		select {
 		case <-ctx.Done():
 			return ctx.Err()
@@ -268,6 +276,74 @@ func (d *Datasource) Close() error {
 	return nil
 }
 
+// filterSuppliesByConfig filters supplies based on configured CUPS
+func (d *Datasource) filterSuppliesByConfig() []datadis.Supply {
+	if d.config.CUPS == "" {
+		return d.supplies
+	}
+
+	// Parse comma-separated CUPS list
+	configuredCUPS := make(map[string]bool)
+	for _, cups := range splitAndTrim(d.config.CUPS, ",") {
+		configuredCUPS[cups] = true
+	}
+
+	var filtered []datadis.Supply
+	for _, supply := range d.supplies {
+		if configuredCUPS[supply.Cups] {
+			filtered = append(filtered, supply)
+		}
+	}
+
+	return filtered
+}
+
+// splitAndTrim splits a string by delimiter and trims whitespace
+func splitAndTrim(s, delimiter string) []string {
+	var result []string
+	for _, item := range splitString(s, delimiter) {
+		trimmed := trimSpace(item)
+		if trimmed != "" {
+			result = append(result, trimmed)
+		}
+	}
+	return result
+}
+
+// splitString splits a string by delimiter
+func splitString(s, delimiter string) []string {
+	if s == "" {
+		return nil
+	}
+	var result []string
+	start := 0
+	for i := 0; i < len(s); i++ {
+		if i+len(delimiter) <= len(s) && s[i:i+len(delimiter)] == delimiter {
+			result = append(result, s[start:i])
+			start = i + len(delimiter)
+			i += len(delimiter) - 1
+		}
+	}
+	result = append(result, s[start:])
+	return result
+}
+
+// trimSpace removes leading and trailing whitespace
+func trimSpace(s string) string {
+	start := 0
+	end := len(s)
+
+	for start < end && (s[start] == ' ' || s[start] == '\t' || s[start] == '\n' || s[start] == '\r') {
+		start++
+	}
+
+	for end > start && (s[end-1] == ' ' || s[end-1] == '\t' || s[end-1] == '\n' || s[end-1] == '\r') {
+		end--
+	}
+
+	return s[start:end]
+}
+
 // Factory creates a new instance of the datasource
 func (d *Datasource) Factory(instanceName string, config interface{}) (core.Datasource, error) {
 	return NewDatasource(instanceName, config)