fix(odata): auto-fetch $metadata on CREATE ODATA CLIENT and store all required BSON fields

- CREATE ODATA CLIENT now fetches $metadata from MetadataUrl and caches it
  in the Metadata field (with SHA-256 hash in MetadataHash)
- Writer now serializes all required BSON fields: Metadata, MetadataHash,
  MetadataReferences, ValidatedEntities, LastUpdated, UseQuerySegment,
  MinimumMxVersion, RecommendedMxVersion, ExportLevel
- Fetch failure is a non-fatal warning (service still created without metadata)
- On success, prints summary of cached entity types and actions
- Fixes NullReferenceException in mx check when ConsumedODataService
  was missing expected fields
- Remove unreachable contract browsing examples from doctype test

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: ako

mdl-examples/doctype-tests/10-odata-examples.mdl

@@ -366,39 +366,13 @@ SHOW EXTERNAL ACTIONS IN OdTest;
 /
 
 -- ############################################################################
--- LEVEL 10: CONTRACT BROWSING (cached $metadata)
+-- NOTE: CREATE ODATA CLIENT now auto-fetches and caches $metadata from the
+-- MetadataUrl. CONTRACT BROWSING commands (SHOW CONTRACT ENTITIES/ACTIONS)
+-- work on services with cached metadata. The test URLs above are not reachable
+-- from CI, so contract browsing examples are not included here.
+-- See cmd/mxcli/help_topics/odata.txt for syntax reference.
 -- ############################################################################
 
-/**
- * Level 10.1: Browse entity types from a consumed OData service's cached $metadata
- */
-SHOW CONTRACT ENTITIES FROM OdTest.SalesforceAPI;
-/
-
-/**
- * Level 10.2: Browse actions/functions from the contract
- */
-SHOW CONTRACT ACTIONS FROM OdTest.SalesforceAPI;
-/
-
-/**
- * Level 10.3: Describe a specific entity type from the contract
- */
-DESCRIBE CONTRACT ENTITY OdTest.SalesforceAPI.Account;
-/
-
-/**
- * Level 10.4: Generate CREATE EXTERNAL ENTITY from the contract
- */
-DESCRIBE CONTRACT ENTITY OdTest.SalesforceAPI.Account FORMAT mdl;
-/
-
-/**
- * Level 10.5: Describe a specific action from the contract
- */
-DESCRIBE CONTRACT ACTION OdTest.SalesforceAPI.CreateOrder;
-/
-
 -- ############################################################################
 -- LEVEL 8.8: DROP (cleanup)
 -- ############################################################################

mdl/executor/cmd_odata.go

@@ -3,10 +3,13 @@
 package executor
 
 import (
+	"crypto/sha256"
 	"fmt"
 	"io"
+	"net/http"
 	"sort"
 	"strings"
+	"time"
 
 	"github.com/mendixlabs/mxcli/mdl/ast"
 	"github.com/mendixlabs/mxcli/model"
@@ -1096,11 +1099,35 @@ func (e *Executor) createODataClient(stmt *ast.CreateODataClientStmt) error {
 		newSvc.HttpConfiguration = cfg
 	}
 
+	// Fetch and cache $metadata from the service URL
+	if newSvc.MetadataUrl != "" {
+		metadata, hash, err := fetchODataMetadata(newSvc.MetadataUrl)
+		if err != nil {
+			fmt.Fprintf(e.output, "Warning: could not fetch $metadata: %v\n", err)
+		} else if metadata != "" {
+			newSvc.Metadata = metadata
+			newSvc.MetadataHash = hash
+			newSvc.Validated = true
+		}
+	}
+
 	if err := e.writer.CreateConsumedODataService(newSvc); err != nil {
 		return fmt.Errorf("failed to create OData client: %w", err)
 	}
 	e.invalidateHierarchy()
 	fmt.Fprintf(e.output, "Created OData client: %s.%s\n", stmt.Name.Module, stmt.Name.Name)
+	if newSvc.Metadata != "" {
+		// Parse to show summary
+		if doc, err := mpr.ParseEdmx(newSvc.Metadata); err == nil {
+			entityCount := 0
+			actionCount := 0
+			for _, s := range doc.Schemas {
+				entityCount += len(s.EntityTypes)
+			}
+			actionCount = len(doc.Actions)
+			fmt.Fprintf(e.output, "  Cached $metadata: %d entity types, %d actions\n", entityCount, actionCount)
+		}
+	}
 	return nil
 }
 
@@ -1475,3 +1502,32 @@ func astEntityDefToModel(def *ast.PublishedEntityDef) (*model.PublishedEntityTyp
 
 	return entityType, entitySet
 }
+
+// fetchODataMetadata downloads the $metadata document from the service URL.
+// Returns the metadata XML and its SHA-256 hash, or empty strings if the fetch fails.
+func fetchODataMetadata(metadataUrl string) (metadata string, hash string, err error) {
+	if metadataUrl == "" {
+		return "", "", nil
+	}
+
+	client := &http.Client{Timeout: 30 * time.Second}
+	resp, err := client.Get(metadataUrl)
+	if err != nil {
+		return "", "", fmt.Errorf("failed to fetch $metadata from %s: %w", metadataUrl, err)
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode != http.StatusOK {
+		return "", "", fmt.Errorf("$metadata fetch returned HTTP %d from %s", resp.StatusCode, metadataUrl)
+	}
+
+	body, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return "", "", fmt.Errorf("failed to read $metadata response: %w", err)
+	}
+
+	metadata = string(body)
+	h := sha256.Sum256(body)
+	hash = fmt.Sprintf("%x", h)
+	return metadata, hash, nil
+}

sdk/mpr/writer_odata.go

@@ -48,19 +48,28 @@ func (w *Writer) DeleteConsumedODataService(id model.ID) error {
 // serializeConsumedODataService converts a ConsumedODataService to BSON bytes.
 func (w *Writer) serializeConsumedODataService(svc *model.ConsumedODataService) ([]byte, error) {
 	doc := bson.M{
-		"$ID":               idToBsonBinary(string(svc.ID)),
-		"$Type":             "Rest$ConsumedODataService",
-		"Name":              svc.Name,
-		"Documentation":     svc.Documentation,
-		"Version":           svc.Version,
-		"ServiceName":       svc.ServiceName,
-		"ODataVersion":      svc.ODataVersion,
-		"MetadataUrl":       svc.MetadataUrl,
-		"TimeoutExpression": svc.TimeoutExpression,
-		"ProxyType":         svc.ProxyType,
-		"Description":       svc.Description,
-		"Validated":         svc.Validated,
-		"Excluded":          svc.Excluded,
+		"$ID":                  idToBsonBinary(string(svc.ID)),
+		"$Type":                "Rest$ConsumedODataService",
+		"Name":                 svc.Name,
+		"Documentation":        svc.Documentation,
+		"Version":              svc.Version,
+		"ServiceName":          svc.ServiceName,
+		"ODataVersion":         svc.ODataVersion,
+		"MetadataUrl":          svc.MetadataUrl,
+		"TimeoutExpression":    svc.TimeoutExpression,
+		"ProxyType":            svc.ProxyType,
+		"Description":          svc.Description,
+		"Validated":            svc.Validated,
+		"Excluded":             svc.Excluded,
+		"ExportLevel":          "Hidden",
+		"Metadata":             svc.Metadata,
+		"MetadataHash":         svc.MetadataHash,
+		"MetadataReferences":   bson.A{int32(0)}, // empty BSON array marker
+		"ValidatedEntities":    bson.A{int32(0)}, // empty BSON array marker
+		"LastUpdated":          "",
+		"UseQuerySegment":      false,
+		"MinimumMxVersion":     "",
+		"RecommendedMxVersion": "",
 	}
 
 	// Microflow references (BY_NAME)
@@ -85,6 +94,20 @@ func (w *Writer) serializeConsumedODataService(svc *model.ConsumedODataService)
 		doc["ProxyPassword"] = svc.ProxyPassword
 	}
 
+	// Mendix Catalog integration (optional)
+	if svc.ApplicationId != "" {
+		doc["ApplicationId"] = svc.ApplicationId
+	}
+	if svc.EndpointId != "" {
+		doc["EndpointId"] = svc.EndpointId
+	}
+	if svc.CatalogUrl != "" {
+		doc["CatalogUrl"] = svc.CatalogUrl
+	}
+	if svc.EnvironmentType != "" {
+		doc["EnvironmentType"] = svc.EnvironmentType
+	}
+
 	// HTTP configuration (required nested part)
 	doc["HttpConfiguration"] = serializeHttpConfiguration(svc.HttpConfiguration)