add basic validations for non-Organization resources

Author: cschuijt

component/mcsd/validator.go

@@ -62,17 +62,21 @@ func validateOrganizationResource(ctx context.Context, resource *fhir.Organizati
 	if len(uraIdentifiers) > 1 {
 		return fmt.Errorf("organization can't have multiple identifiers with system %s", coding.URANamingSystem)
 	}
-	// TODO: Enable check, fix test
 
 	if len(uraIdentifiers) == 0 && resource.PartOf == nil {
 		return fmt.Errorf("organization must have an identifier with system %s or refer to another organization through 'partOf'", coding.URANamingSystem)
 	}
 
 	// TODO: Support validation of organizations referring to a parent organization, without having a URA identifier
 
-	//if len(uraIdentifiers) == 0 && resource.PartOf != nil {
-	//
-	//}
+	// if len(uraIdentifiers) == 0 && resource.PartOf != nil {
+	//	response, err := http.NewRequest(http.MethodGet, *resource.PartOf.Reference, bytes.NewReader())
+	//	if err != nil {
+	//		return fmt.Errorf("could not follow reference to parent Organization %s", resource.PartOf)
+	//	}
+	//	response.Body
+	// }
+
 	return nil
 }
 
@@ -85,13 +89,25 @@ func validateHealthcareServiceResource(ctx context.Context, resource *fhir.Healt
 }
 
 func validatePractitionerRoleResource(ctx context.Context, resource *fhir.PractitionerRole) error {
+	if resource.Organization == nil {
+		return fmt.Errorf("practitioner role must have an organization reference")
+	}
+
 	return nil
 }
 
 func validateEndpointResource(ctx context.Context, resource *fhir.Endpoint) error {
+	if resource.ManagingOrganization == nil {
+		return fmt.Errorf("endpoint must have a 'managingOrganization' referencing an Organization")
+	}
+
 	return nil
 }
 
 func validateLocationResource(ctx context.Context, resource *fhir.Location) error {
+	if resource.ManagingOrganization == nil {
+		return fmt.Errorf("location must have a 'managingOrganization' referencing an Organization")
+	}
+
 	return nil
 }

component/mcsd/validator_test.go

@@ -8,6 +8,44 @@ import (
 	"github.com/zorgbijjou/golang-fhir-models/fhir-models/fhir"
 )
 
+// Test that the generic validators do their job. At this point, this only checks whether
+// the resource is of an allowed type before deferring to a resource-specific function.
+func TestGenericValidators(t *testing.T) {
+	resources := []struct {
+		name         string
+		resourceJSON []byte
+		valid        bool
+	}{
+		{
+			name:         "valid Organization",
+			resourceJSON: []byte(`{"resourceType":"Organization", "identifier":[{"system":"http://fhir.nl/fhir/NamingSystem/ura","value":"12345"}]}`),
+			valid:        true,
+		},
+		{
+			name:         "invalid resource type",
+			resourceJSON: []byte(`{"resourceType":"Patient"}`),
+			valid:        false,
+		},
+	}
+
+	for _, tt := range resources {
+		t.Run(tt.name, func(t *testing.T) {
+			err := ValidateUpdate(t.Context(), ValidationRules{AllowedResourceTypes: []string{"Organization"}}, tt.resourceJSON)
+
+			if tt.valid {
+				require.NoError(t, err)
+			} else {
+				require.Error(t, err)
+			}
+		})
+	}
+
+}
+
+// Test validator for Organization resources. An organization should either have an URA number
+// or should be a sub-organization to an Organization with an URA number.
+//
+// https://nuts-foundation.github.io/nl-generic-functions-ig/care-services.html#update-client
 func TestOrganizationValidator(t *testing.T) {
 	organizations := []struct {
 		name         string
@@ -79,12 +117,12 @@ func TestOrganizationValidator(t *testing.T) {
 
 	for _, tt := range organizations {
 		t.Run(tt.name, func(t *testing.T) {
-			err2 := validateOrganizationResource(t.Context(), &tt.organization)
+			err := validateOrganizationResource(t.Context(), &tt.organization)
 
 			if tt.valid {
-				require.NoError(t, err2)
+				require.NoError(t, err)
 			} else {
-				require.Error(t, err2)
+				require.Error(t, err)
 			}
 		})
 	}