feat: include Practitioner in default resource types for mCSD synchronization

- Updated default `DirectoryResourceTypes` to include `Practitioner`.
- Adjusted Helm charts, configuration files, and documentation to reflect the change.
- Refactored component initialization with `DefaultConfig()` for better default handling.
- Enhanced unit tests to verify functionality with updated defaults.

Author: rolandgroen

cmd/config.go

@@ -29,6 +29,7 @@ type Config struct {
 
 func DefaultConfig() Config {
 	return Config{
+		MCSD: mcsd.DefaultConfig(),
 		Nuts: nutsnode.Config{
 			Enabled: false,
 		},

cmd/config_test.go

@@ -16,6 +16,10 @@ func TestLoadConfig_Default(t *testing.T) {
 	// Should have default values
 	assert.False(t, config.Nuts.Enabled)
 	assert.Equal(t, "", config.MCSDAdmin.FHIRBaseURL)
+
+	// MCSD should have default DirectoryResourceTypes
+	expectedResourceTypes := []string{"Organization", "Endpoint", "Location", "HealthcareService", "PractitionerRole", "Practitioner"}
+	assert.Equal(t, expectedResourceTypes, config.MCSD.DirectoryResourceTypes)
 }
 
 func TestLoadConfig_FromYAML(t *testing.T) {

component/mcsd/component.go

@@ -24,7 +24,7 @@ import (
 var _ component.Lifecycle = &Component{}
 
 var rootDirectoryResourceTypes = []string{"Organization", "Endpoint"}
-var defaultDirectoryResourceTypes = []string{"Organization", "Endpoint", "Location", "HealthcareService", "PractitionerRole"}
+var defaultDirectoryResourceTypes = []string{"Organization", "Endpoint", "Location", "HealthcareService", "PractitionerRole", "Practitioner"}
 
 // clockSkewBuffer is subtracted from local time when Bundle meta.lastUpdated is not available
 // to account for potential clock differences between client and FHIR server
@@ -58,6 +58,12 @@ type Component struct {
 	updateMux                 *sync.RWMutex
 }
 
+func DefaultConfig() Config {
+	return Config{
+		DirectoryResourceTypes: defaultDirectoryResourceTypes,
+	}
+}
+
 type Config struct {
 	AdministrationDirectories map[string]DirectoryConfig `koanf:"admin"`
 	QueryDirectory            DirectoryConfig            `koanf:"query"`
@@ -87,20 +93,14 @@ type DirectoryUpdateReport struct {
 }
 
 func New(config Config) (*Component, error) {
-	// Use configured directory resource types, or default if not specified
-	directoryResourceTypes := config.DirectoryResourceTypes
-	if len(directoryResourceTypes) == 0 {
-		directoryResourceTypes = defaultDirectoryResourceTypes
-	}
-
 	result := &Component{
 		config: config,
 		fhirClientFn: func(baseURL *url.URL) fhirclient.Client {
 			return fhirclient.New(baseURL, http.DefaultClient, &fhirclient.Config{
 				UsePostSearch: false,
 			})
 		},
-		directoryResourceTypes: directoryResourceTypes,
+		directoryResourceTypes: config.DirectoryResourceTypes,
 		lastUpdateTimes:        make(map[string]string),
 		updateMux:              &sync.RWMutex{},
 	}

component/mcsd/component_test.go

@@ -59,13 +59,13 @@ func TestComponent_update_regression(t *testing.T) {
 	server := httptest.NewServer(mux)
 
 	localClient := &test.StubFHIRClient{}
-	component, err := New(Config{
-		AdministrationDirectories: map[string]DirectoryConfig{
-			"lrza": {
-				FHIRBaseURL: server.URL,
-			},
+	config := DefaultConfig()
+	config.AdministrationDirectories = map[string]DirectoryConfig{
+		"lrza": {
+			FHIRBaseURL: server.URL,
 		},
-	})
+	}
+	component, err := New(config)
 	require.NoError(t, err)
 	component.fhirClientFn = func(baseURL *url.URL) fhirclient.Client {
 		if baseURL.String() == server.URL {
@@ -113,6 +113,7 @@ func TestComponent_update(t *testing.T) {
 		"/HealthcareService/_history": &emptyResponseStr,
 		"/Location/_history":          &emptyResponseStr,
 		"/PractitionerRole/_history":  &emptyResponseStr,
+		"/Practitioner/_history":      &emptyResponseStr,
 	})
 
 	rootDirServer := httptest.NewServer(rootDirMux)
@@ -144,6 +145,7 @@ func TestComponent_update(t *testing.T) {
 		"/fhir/Location/_history":           &emptyResponseStr,
 		"/fhir/HealthcareService/_history":  &emptyResponseStr,
 		"/fhir/PractitionerRole/_history":   &emptyResponseStr,
+		"/fhir/Practitioner/_history":       &emptyResponseStr,
 	})
 
 	org1DirServer := httptest.NewServer(org1DirMux)
@@ -156,16 +158,16 @@ func TestComponent_update(t *testing.T) {
 	org1DirOrganizationHistoryPage1Response = strings.ReplaceAll(org1DirOrganizationHistoryPage1Response, "{{ORG1_DIR_BASEURL}}", orgDir1BaseURL)
 
 	localClient := &test.StubFHIRClient{}
-	component, err := New(Config{
-		AdministrationDirectories: map[string]DirectoryConfig{
-			"rootDir": {
-				FHIRBaseURL: rootDirServer.URL,
-			},
+	config := DefaultConfig()
+	config.AdministrationDirectories = map[string]DirectoryConfig{
+		"rootDir": {
+			FHIRBaseURL: rootDirServer.URL,
 		},
-		QueryDirectory: DirectoryConfig{
-			FHIRBaseURL: "http://example.com/local/fhir",
-		},
-	})
+	}
+	config.QueryDirectory = DirectoryConfig{
+		FHIRBaseURL: "http://example.com/local/fhir",
+	}
+	component, err := New(config)
 	require.NoError(t, err)
 
 	unknownFHIRServerClient := &test.StubFHIRClient{
@@ -290,16 +292,16 @@ func TestComponent_incrementalUpdates(t *testing.T) {
 	rootDirServer := httptest.NewServer(rootDirMux)
 
 	localClient := &test.StubFHIRClient{}
-	component, err := New(Config{
-		AdministrationDirectories: map[string]DirectoryConfig{
-			"rootDir": {
-				FHIRBaseURL: rootDirServer.URL,
-			},
+	config := DefaultConfig()
+	config.AdministrationDirectories = map[string]DirectoryConfig{
+		"rootDir": {
+			FHIRBaseURL: rootDirServer.URL,
 		},
-		QueryDirectory: DirectoryConfig{
-			FHIRBaseURL: "http://example.com/local/fhir",
-		},
-	})
+	}
+	config.QueryDirectory = DirectoryConfig{
+		FHIRBaseURL: "http://example.com/local/fhir",
+	}
+	component, err := New(config)
 	require.NoError(t, err)
 
 	component.fhirClientFn = func(baseURL *url.URL) fhirclient.Client {
@@ -688,6 +690,14 @@ func TestComponent_updateFromDirectory(t *testing.T) {
 			w.Header().Set("Content-Type", "application/json")
 			w.Write([]byte(`{"resourceType": "Bundle", "type": "history", "entry": []}`))
 		})
+		mux.HandleFunc("/fhir/PractitionerRole/_history", func(w http.ResponseWriter, r *http.Request) {
+			w.Header().Set("Content-Type", "application/json")
+			w.Write([]byte(`{"resourceType": "Bundle", "type": "history", "entry": []}`))
+		})
+		mux.HandleFunc("/fhir/Practitioner/_history", func(w http.ResponseWriter, r *http.Request) {
+			w.Header().Set("Content-Type", "application/json")
+			w.Write([]byte(`{"resourceType": "Bundle", "type": "history", "entry": []}`))
+		})
 
 		component, err := New(Config{
 			QueryDirectory: DirectoryConfig{
@@ -962,19 +972,18 @@ func TestComponent_updateFromDirectory(t *testing.T) {
 	})
 
 	t.Run("uses default DirectoryResourceTypes when not configured", func(t *testing.T) {
-		// This test verifies that when DirectoryResourceTypes is not configured,
-		// the default resource types are used.
+		// This test verifies that when using DefaultConfig(),
+		// the default resource types are set.
 
-		component, err := New(Config{
-			QueryDirectory: DirectoryConfig{
-				FHIRBaseURL: "http://example.com/local/fhir",
-			},
-			// DirectoryResourceTypes not specified
-		})
+		config := DefaultConfig()
+		config.QueryDirectory = DirectoryConfig{
+			FHIRBaseURL: "http://example.com/local/fhir",
+		}
+		component, err := New(config)
 		require.NoError(t, err)
 
 		// Verify the component uses default resource types
-		expectedDefaults := []string{"Organization", "Endpoint", "Location", "HealthcareService", "PractitionerRole"}
+		expectedDefaults := []string{"Organization", "Endpoint", "Location", "HealthcareService", "PractitionerRole", "Practitioner"}
 		assert.Equal(t, expectedDefaults, component.directoryResourceTypes)
 	})
 }
@@ -991,6 +1000,8 @@ func startMockServer(t *testing.T, filesToServe map[string]string) *httptest.Ser
 		"/fhir/Organization/_history":      &emptyResponseStr,
 		"/fhir/Location/_history":          &emptyResponseStr,
 		"/fhir/HealthcareService/_history": &emptyResponseStr,
+		"/fhir/PractitionerRole/_history":  &emptyResponseStr,
+		"/fhir/Practitioner/_history":      &emptyResponseStr,
 	}
 	for path, filename := range filesToServe {
 		data, err := os.ReadFile(filename)

config/knooppunt.yml

@@ -22,14 +22,14 @@ mcsd:
     # - "https://fhir.other-excluded.org/fhir"  # Add more exclusions as needed
 
   # Resource types to synchronize from discovered mCSD directories
-  # If not specified, defaults to: Organization, Endpoint, Location, HealthcareService, PractitionerRole
+  # If not specified, defaults to: Organization, Endpoint, Location, HealthcareService, PractitionerRole, Practitioner
   # directoryresourcetypes:
   #   - "Organization"
   #   - "Endpoint"
   #   - "Location"
   #   - "HealthcareService"
   #   - "PractitionerRole"
-  #   # - "Practitioner"  # Uncomment to also sync Practitioner resources
+  #   - "Practitioner"
 
 # mCSD Admin configuration
 mcsdadmin:

docs/CONFIGURATION.md

@@ -25,7 +25,7 @@ Environment variables use the prefix `KNPT_` followed by the configuration path
 | `KNPT_MCSD_QUERY_FHIRBASEURL`       | `mcsd.query.fhirbaseurl`       | FHIR base URL of the local mCSD Query Directory to synchronize to.                                                                                           |
 | `KNPT_MCSD_ADMIN_<KEY>_FHIRBASEURL` | `mcsd.admin.<key>.fhirbaseurl` | Map of root directories (mCSD Admin Directory FHIR base URLs) to synchronize from.                                                                           |
 | `KNPT_MCSD_ADMINEXCLUDE`            | `mcsd.adminexclude`            | (Optional) List of FHIR base URLs to exclude from being registered as administration directories. Useful to prevent self-referencing loops when the query directory is discovered as an Endpoint. Multiple values can be specified as a comma-separated list. |
-| `KNPT_MCSD_DIRECTORYRESOURCETYPES`  | `mcsd.directoryresourcetypes`  | (Optional) List of resource types to synchronize from discovered mCSD directories. Defaults to: `Organization`, `Endpoint`, `Location`, `HealthcareService`, `PractitionerRole`. Multiple values can be specified as a comma-separated list. |
+| `KNPT_MCSD_DIRECTORYRESOURCETYPES`  | `mcsd.directoryresourcetypes`  | (Optional) List of resource types to synchronize from discovered mCSD directories. Defaults to: `Organization`, `Endpoint`, `Location`, `HealthcareService`, `PractitionerRole`, `Practitioner`. Multiple values can be specified as a comma-separated list. |
 | **Localization / NVI**              |                                |                                                                                                                                                              |
 | `KNPT_NVI_BASEURL`                  | `nvi.baseurl`                  | Base URL of the NVI service.                                                                                                                                 |
 | `KNPT_NVI_AUDIENCE`                 | `nvi.audience`                 | Name of the NVI service, used for creating BSN transport tokens.<br/>Defaults to `nvi`.                                                                      |

helm/nuts-knooppunt/values.yaml

@@ -164,14 +164,14 @@ config:
       # - "https://fhir.other-excluded.org/fhir"  # Add more exclusions as needed
 
     # Resource types to synchronize from discovered mCSD directories
-    # If not specified, defaults to: Organization, Endpoint, Location, HealthcareService, PractitionerRole
+    # If not specified, defaults to: Organization, Endpoint, Location, HealthcareService, PractitionerRole, Practitioner
     # directoryresourcetypes:
     #   - "Organization"
     #   - "Endpoint"
     #   - "Location"
     #   - "HealthcareService"
     #   - "PractitionerRole"
-    #   # - "Practitioner"  # Uncomment to also sync Practitioner resources
+    #   - "Practitioner"
 
   # mCSD Admin configuration (web interface)
   # mcsdadmin: