Merge branch 'main' into test-data-for-demo

Author: Dirklectisch

DCO.md

@@ -0,0 +1,14 @@
+Developer Certificate of Origin
+Version 1.1
+
+By making a contribution to the Nuts Knooppunt project, I certify that:
+(a) The contribution was created in whole or in part by me and I
+have the right to submit it under the EUPL v1.2 license; or
+(b) The contribution is based upon previous work that is covered by
+an appropriate open source license and I have the right to submit
+that work with modifications under the EUPL v1.2 license; or
+(c) The contribution was provided directly to me by some other
+person who certified (a), (b) or (c) and I have not modified it.
+(d) I understand and agree that this project and the contribution
+are public and that a record of the contribution is maintained
+indefinitely and may be redistributed under the EUPL v1.2.

LICENSE

@@ -229,6 +229,11 @@ func (c *Component) updateFromDirectory(ctx context.Context, fhirBaseURLRaw stri
 
 	var report DirectoryUpdateReport
 	for i, entry := range deduplicatedEntries {
+		if entry.Request == nil {
+			msg := fmt.Sprintf("Skipping entry with no request: #%d", i)
+			report.Warnings = append(report.Warnings, msg)
+			continue
+		}
 		log.Ctx(ctx).Trace().Str("fhir_server", fhirBaseURLRaw).Msgf("Processing entry: %s", entry.Request.Url)
 		resourceType, err := buildUpdateTransaction(ctx, &tx, entry, allowedResourceTypes, allowDiscovery, fhirBaseURLRaw)
 		if err != nil {

component/mcsd/component.go

@@ -340,60 +340,6 @@ func TestComponent_incrementalUpdates(t *testing.T) {
 	require.Equal(t, lastUpdate, sinceParams[2], "_since parameter should match the stored lastUpdate timestamp")
 }
 
-func TestComponent_noDuplicateResourcesInTransactionBundle(t *testing.T) {
-	// This test verifies that when _history returns multiple versions of the same resource,
-	// the transaction bundle sent to the query directory contains no duplicates.
-	// This addresses the HAPI error: "Transaction bundle contains multiple resources with ID: urn:uuid:..."
-	emptyResponse, err := os.ReadFile("test/regression_lrza_empty_history_response.json")
-	require.NoError(t, err)
-	historyWithDuplicatesBytes, err := os.ReadFile("test/history_with_duplicates.json")
-	require.NoError(t, err)
-
-	mockMux := http.NewServeMux()
-	// Convert []byte responses to strings for pointer approach
-	historyWithDuplicatesStr := string(historyWithDuplicatesBytes)
-	emptyResponseStr3 := string(emptyResponse)
-
-	mockHistoryEndpoints(mockMux, map[string]*string{
-		"/Organization/_history":      &historyWithDuplicatesStr,
-		"/Location/_history":          &emptyResponseStr3,
-		"/Endpoint/_history":          &emptyResponseStr3,
-		"/HealthcareService/_history": &emptyResponseStr3,
-	})
-	mockServer := httptest.NewServer(mockMux)
-	defer mockServer.Close()
-
-	capturingClient := &test.StubFHIRClient{}
-	component, err := New(Config{
-		QueryDirectory: DirectoryConfig{FHIRBaseURL: "http://example.com/local/fhir"},
-	})
-	require.NoError(t, err)
-
-	// Register as discovered directory to avoid Organization filtering
-	err = component.registerAdministrationDirectory(context.Background(), mockServer.URL, []string{"Organization", "Endpoint"}, false)
-	require.NoError(t, err)
-
-	component.fhirClientFn = func(baseURL *url.URL) fhirclient.Client {
-		if baseURL.String() == mockServer.URL {
-			return fhirclient.New(baseURL, http.DefaultClient, &fhirclient.Config{UsePostSearch: false})
-		}
-		if baseURL.String() == "http://example.com/local/fhir" {
-			return capturingClient
-		}
-		return &test.StubFHIRClient{Error: errors.New("unknown URL")}
-	}
-
-	ctx := context.Background()
-	report, err := component.update(ctx)
-
-	require.NoError(t, err)
-	require.Empty(t, report[mockServer.URL].Errors, "Should not have errors after deduplication")
-
-	// Should have 0 Organizations because the DELETE operation is the most recent
-	orgs := capturingClient.CreatedResources["Organization"]
-	require.Len(t, orgs, 0, "Should have 0 Organizations after deduplication (DELETE is most recent operation)")
-}
-
 func TestExtractResourceIDFromURL(t *testing.T) {
 	tests := []struct {
 		name     string
@@ -604,3 +550,82 @@ func TestGetLastUpdated(t *testing.T) {
 		})
 	}
 }
+
+func TestComponent_updateFromDirectory(t *testing.T) {
+	ctx := context.Background()
+
+	t.Run("#233: no entry.Request in _history results", func(t *testing.T) {
+		t.Log("See https://github.com/nuts-foundation/nuts-knooppunt/issues/233")
+		server := startMockServer(t, map[string]string{
+			"/fhir/Organization/_history": "test/bugs/233-no-bundle-request/organization_response.json",
+		})
+		component, err := New(Config{})
+		require.NoError(t, err)
+		report, err := component.updateFromDirectory(ctx, server.URL+"/fhir", []string{"Organization"}, false)
+		require.NoError(t, err)
+		require.NotNil(t, report)
+		require.Len(t, report.Warnings, 1)
+		assert.Equal(t, report.Warnings[0], "Skipping entry with no request: #0")
+		assert.Empty(t, report.Errors)
+		assert.Equal(t, 0, report.CountCreated)
+		assert.Equal(t, 0, report.CountUpdated)
+		assert.Equal(t, 0, report.CountDeleted)
+	})
+
+	t.Run("no duplicate resources in transaction bundle", func(t *testing.T) {
+		// This test verifies that when _history returns multiple versions of the same resource,
+		// the transaction bundle sent to the query directory contains no duplicates.
+		// This addresses the HAPI error: "Transaction bundle contains multiple resources with ID: urn:uuid:..."
+		server := startMockServer(t, map[string]string{
+			"/fhir/Organization/_history": "test/history_with_duplicates.json",
+		})
+		defer server.Close()
+
+		capturingClient := &test.StubFHIRClient{}
+		component, err := New(Config{})
+		require.NoError(t, err)
+
+		component.fhirClientFn = func(baseURL *url.URL) fhirclient.Client {
+			if baseURL.String() == server.URL+"/fhir" {
+				return fhirclient.New(baseURL, http.DefaultClient, &fhirclient.Config{UsePostSearch: false})
+			}
+			if baseURL.String() == "http://example.com/local/fhir" {
+				return capturingClient
+			}
+			return &test.StubFHIRClient{Error: errors.New("unknown URL")}
+		}
+
+		report, err := component.updateFromDirectory(ctx, server.URL+"/fhir", []string{"Organization", "Endpoint"}, false)
+
+		require.NoError(t, err)
+		require.Empty(t, report.Errors, "Should not have errors after deduplication")
+
+		// Should have 0 Organizations because the DELETE operation is the most recent
+		orgs := capturingClient.CreatedResources["Organization"]
+		require.Len(t, orgs, 0, "Should have 0 Organizations after deduplication (DELETE is most recent operation)")
+	})
+}
+
+func startMockServer(t *testing.T, filesToServe map[string]string) *httptest.Server {
+	mux := http.NewServeMux()
+	server := httptest.NewServer(mux)
+
+	emptyBundleData, err := os.ReadFile("test/empty_bundle_response.json")
+	require.NoError(t, err)
+	emptyResponseStr := string(emptyBundleData)
+	pathsToServe := map[string]*string{
+		"/fhir/Endpoint/_history":          &emptyResponseStr,
+		"/fhir/Organization/_history":      &emptyResponseStr,
+		"/fhir/Location/_history":          &emptyResponseStr,
+		"/fhir/HealthcareService/_history": &emptyResponseStr,
+	}
+	for path, filename := range filesToServe {
+		data, err := os.ReadFile(filename)
+		require.NoError(t, err)
+		dataStr := string(data)
+		pathsToServe[path] = &dataStr
+	}
+
+	mockHistoryEndpoints(mux, pathsToServe)
+	return server
+}

component/mcsd/component_test.go

@@ -0,0 +1,36 @@
+{
+  "resourceType": "Bundle",
+  "meta": {
+    "lastUpdated": "2025-08-14T10:00:00.000+00:00"
+  },
+  "type": "history",
+  "entry": [
+    {
+      "fullUrl": "Endpoint/ep-1",
+      "resource": {
+        "resourceType": "Endpoint",
+        "id": "ep-1",
+        "meta": {
+          "versionId": "1",
+          "lastUpdated": "2025-08-01T14:29:31.987+00:00",
+          "profile": [
+            "http://nuts-foundation.github.io/nl-generic-functions-ig/StructureDefinition/nl-gf-endpoint"
+          ]
+        },
+        "status": "active",
+        "connectionType": {
+          "system": "http://fhir.nl/fhir/NamingSystem/endpoint-connection-type",
+          "code": "http"
+        },
+        "name": "FHIR",
+        "managingOrganization": {
+          "reference": "Organization/org-1"
+        },
+        "period": {
+          "start": "2025-01-01"
+        },
+        "address": "http://example.com/fhir"
+      }
+    }
+  ]
+}

component/mcsd/test/bugs/233-no-bundle-request/organization_response.json

@@ -0,0 +1,10 @@
+{
+  "resourceType": "Bundle",
+  "id": "84b66851-14f9-4c9d-b79d-1d20620ceaa7",
+  "meta": {
+    "lastUpdated": "2025-09-11T13:21:12.499+00:00"
+  },
+  "type": "history",
+  "total": 0,
+  "entry": []
+}

component/mcsd/test/empty_bundle_response.json

@@ -1,6 +1,6 @@
 {{define "main"}}
 <div id="edit-associations">
-    <h3>Organization: Care4U Hospital</h3>
+    <h3>Organization: {{ .Organization.Name }}</h3>
     <label>Endpoints:</label>
     <div id="endpoints">
         {{ range .EndpointCards }}

component/mcsdadmin/templates/organization_endpoints.html

@@ -181,7 +181,7 @@ Set the `notify_endpoint` in your Knooppunt configuration (`knooppunt.yml`):
 
 ```yaml
 mitz:
-  mitzbase: "https://tst-api.mijn-mitz.nl"
+  mitzbase: "https://tst-api.mijn-mitz.nl/tst-us/mitz"
   notify_endpoint: "https://your-platform.example.com/mitz/notify"
   # ... other MITZ settings
 ```

docs/INTEGRATION.md

@@ -0,0 +1,53 @@
+@startuml
+
+title Authentication Sequence Diagram
+
+actor User
+participant Browser
+participant EHR
+participant Knooppunt
+
+participant RemoteXIS as "Remote XIS"
+
+User -> EHR : Interact
+group User AuthN - OpenID Authorized Code\n(e.g. EHR login)
+    EHR -> EHR : Make Auth Request\nURL
+    EHR -> Browser : Redirect\n/Open
+    Browser -> Knooppunt : OIDC Authorization Request\n(scope=openid profile)
+
+    group GF Auth (omitted for brevity)
+        Knooppunt --> Browser : Request authentication
+        Browser -> Knooppunt : Submit auth credential
+    end
+
+    Knooppunt --> Browser : OIDC Auth Response\n(auth code)
+    Browser -> EHR : Redirect\n(auth code)
+    EHR -> Knooppunt : OIDC Token Request\n(auth code)
+    Knooppunt --> EHR : OIDC Token Response\n(id_token)
+end
+
+group User data request
+    User -> EHR : Request data\nfrom remote source
+    group OAuth2 Client Credentials
+        EHR -> Knooppunt : OAuth2 Token Request\n(id_token)
+        Knooppunt --> EHR : OAuth2 Token Response\n(access token)
+    end
+
+    EHR -> RemoteXIS : Data request\n(access token)
+    RemoteXIS --> EHR : Data response\n(e.g. FHIR)
+    EHR --> User : Data response
+end
+
+group Non-user data request
+    EHR -> EHR : System-initiated\ndata request
+    group OAuth2 Client Credentials
+        EHR -> Knooppunt : OAuth2 Token Request
+        Knooppunt --> EHR : OAuth2 Token Response\n(access token)
+    end
+
+    EHR -> RemoteXIS : Data request\n(access token)
+    RemoteXIS --> EHR : Data response\n(e.g. FHIR)
+    EHR -> EHR : Process data
+end
+
+@enduml

docs/auth-sd.puml

@@ -18,6 +18,6 @@ docker run --rm -v "${PWD}:/docs:ro" -v "${PWD}/images_im:/diagrams" \
 # Post-processing: convert generated PlantUML files to SVG using PlantUML Docker image.
 # This will look for files with .puml or .plantuml extensions under docs/diagrams
 # and run PlantUML to produce .svg files alongside them.
-
+cp "${PWD}/"*.puml "${PWD}/images_im/"
 docker run --rm -v "${PWD}/images_im:/diagrams:ro" -v "${PWD}/images:/images" plantuml/plantuml:latest \
  plantuml -verbose -tsvg  -o /images /diagrams