#97 mCSD admin: Connect endpoint to Organization (#114)

Author: Dirklectisch

component/mcsdadmin/component.go

@@ -13,6 +13,8 @@ import (
 	"github.com/nuts-foundation/nuts-knooppunt/component/mcsdadmin/static"
 	tmpls "github.com/nuts-foundation/nuts-knooppunt/component/mcsdadmin/templates"
 	"github.com/nuts-foundation/nuts-knooppunt/component/mcsdadmin/valuesets"
+	"github.com/nuts-foundation/nuts-knooppunt/lib/coding"
+	"github.com/nuts-foundation/nuts-knooppunt/lib/to"
 	"github.com/rs/zerolog/log"
 	"github.com/zorgbijjou/golang-fhir-models/fhir-models/caramel"
 	"github.com/zorgbijjou/golang-fhir-models/fhir-models/fhir"
@@ -198,6 +200,14 @@ func newOrganizationPost(w http.ResponseWriter, r *http.Request) {
 	var org fhir.Organization
 	name := r.PostForm.Get("name")
 	org.Name = &name
+	uraString := r.PostForm.Get("identifier")
+	if uraString == "" {
+		http.Error(w, "Bad request: missing URA identifier", http.StatusBadRequest)
+		return
+	}
+	org.Identifier = []fhir.Identifier{
+		uraIdentifier(uraString),
+	}
 
 	orgTypeCode := r.PostForm.Get("type")
 	orgType, ok := valuesets.CodableFrom("organization-type", orgTypeCode)
@@ -280,6 +290,10 @@ func newEndpointPost(w http.ResponseWriter, r *http.Request) {
 
 	var endpoint fhir.Endpoint
 	address := r.PostForm.Get("address")
+	if address == "" {
+		http.Error(w, "bad request: missing address", http.StatusBadRequest)
+		return
+	}
 	endpoint.Address = address
 
 	var payloadType fhir.CodeableConcept
@@ -288,7 +302,8 @@ func newEndpointPost(w http.ResponseWriter, r *http.Request) {
 	if ok {
 		endpoint.PayloadType = []fhir.CodeableConcept{payloadType}
 	} else {
-		log.Warn().Msg("Failed to find referred payload type")
+		http.Error(w, "bad request: missing payload type", http.StatusBadRequest)
+		return
 	}
 
 	periodStart := r.PostForm.Get("period-start")
@@ -298,8 +313,6 @@ func newEndpointPost(w http.ResponseWriter, r *http.Request) {
 			Start: &periodStart,
 			End:   &periodEnd,
 		}
-	} else {
-		log.Warn().Msg("Missing period")
 	}
 
 	contactValue := r.PostForm.Get("contact")
@@ -308,8 +321,6 @@ func newEndpointPost(w http.ResponseWriter, r *http.Request) {
 			Value: &contactValue,
 		}
 		endpoint.Contact = []fhir.ContactPoint{contact}
-	} else {
-		log.Warn().Msg("Missing contact value")
 	}
 
 	orgFormStr := r.PostForm.Get("managing-org")
@@ -323,12 +334,13 @@ func newEndpointPost(w http.ResponseWriter, r *http.Request) {
 		}
 		err = client.Read(reference, &managingOrg)
 		if err != nil {
-			log.Error().Err(err).Msg("Failed to find referred organisation")
+			http.Error(w, "internal error: could not find organization", http.StatusInternalServerError)
 			return
 		}
 		endpoint.ManagingOrganization.Display = managingOrg.Name
 	} else {
-		log.Warn().Msg("Missing organisation value")
+		http.Error(w, "bad request: missing managing organization", http.StatusBadRequest)
+		return
 	}
 
 	var connectionType fhir.Coding
@@ -337,7 +349,8 @@ func newEndpointPost(w http.ResponseWriter, r *http.Request) {
 	if ok {
 		endpoint.ConnectionType = connectionType
 	} else {
-		log.Warn().Msg("Failed to find referred connection type")
+		http.Error(w, "bad request: missing connection type", http.StatusBadRequest)
+		return
 	}
 
 	purposeOfUseId := r.PostForm.Get("purpose-of-use")
@@ -348,14 +361,23 @@ func newEndpointPost(w http.ResponseWriter, r *http.Request) {
 			ValueCodeableConcept: &purposeOfUse,
 		}
 		endpoint.Extension = append(endpoint.Extension, extension)
-	} else {
-		log.Warn().Msg("Failed to find referred purpose of use")
 	}
 
 	status := r.PostForm.Get("status")
 	endpoint.Status, ok = valuesets.EndpointStatusFrom(status)
 	if !ok {
-		log.Warn().Msg("Failed to determine status, default to active")
+		http.Error(w, "bad request: missing status", http.StatusBadRequest)
+		return
+	}
+
+	forOrgStr := r.PostForm.Get("endpoint-for")
+	var owningOrg fhir.Organization
+	if len(forOrgStr) > 0 {
+		err = client.Read("Organization/"+forOrgStr, &owningOrg)
+		if err != nil {
+			http.Error(w, "bad request: could not find organization", http.StatusBadRequest)
+			return
+		}
 	}
 
 	var resEp fhir.Endpoint
@@ -365,6 +387,18 @@ func newEndpointPost(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	var epRef fhir.Reference
+	epRef.Type = to.Ptr("Endpoint")
+	epRef.Reference = to.Ptr("Endpoint/" + *resEp.Id)
+
+	owningOrg.Endpoint = append(owningOrg.Endpoint, epRef)
+
+	var updatedOrg fhir.Organization
+	err = client.Update("Organization/"+*owningOrg.Id, owningOrg, updatedOrg)
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+	}
+
 	w.WriteHeader(http.StatusCreated)
 	renderList[fhir.Endpoint, tmpls.EpListProps](client, w, tmpls.MakeEpListXsProps)
 }
@@ -528,3 +562,10 @@ func renderList[R any, DTO any](fhirClient fhirclient.Client, httpResponse http.
 		Items: dtoFunc(items),
 	})
 }
+
+func uraIdentifier(uraString string) fhir.Identifier {
+	var identifier fhir.Identifier
+	identifier.Value = to.Ptr(uraString)
+	identifier.System = to.Ptr(coding.URANamingSystem)
+	return identifier
+}

component/mcsdadmin/templates/endpoint_edit.html

@@ -73,6 +73,15 @@ <h4>Edit Endpoint</h4>
                 {{ end }}
             </select>
         </div>
+        <div class="mb-3">
+            <label for="endpoint-for" class="form-label">Endpoint of:</label>
+            <select name="endpoint-for" id="endpoint-for" class="form-select">
+                <option value="">--Please choose an option--</option>
+                {{range .Organizations}}
+                <option value="{{ .Id }}">{{ .Name }}</option>
+                {{ end }}
+            </select>
+        </div>
         <div class="mb-3">
             <button type="submit" class="btn btn-primary">Submit</button>
         </div>

component/mcsdadmin/templates/organization_edit.html

@@ -9,6 +9,10 @@ <h4>Edit Organization</h4>
             <label for="name" class="form-label">Name of the organization:</label>
             <input id="name" type="text" name="name" class="form-control" placeholder="Enter name here" required>
         </div>
+        <div class="mb-3">
+            <label for="identifier" class="form-label">URA identifier:</label>
+            <input id="identifier" type="text" name="identifier" class="form-control" placeholder="Enter identifier here" required>
+        </div>
         <div class="mb-3">
             <label for="type-select" class="form-label">Choose a type:</label>
             <select name="type" id="type-select" class="form-select">

component/mcsdadmin/templates/organization_list.html

@@ -9,6 +9,7 @@ <h2>Organizations</h2>
             <thead class="table-light">
             <tr>
                 <th scope="col">Name</th>
+                <th scope="col">URA</th>
                 <th scope="col">Type</th>
                 <th scope="col">Active</th>
                 <th scope="col">Actions</th>
@@ -18,6 +19,7 @@ <h2>Organizations</h2>
             {{range .Items}}
             <tr id="row-{{.Id}}">
                 <th scope="row">{{ .Name }}</th>
+                <th scope="row">{{ .Ura }}</th>
                 <td>{{.Type}}</td>
                 <td>
                     {{if .Active }}

component/mcsdadmin/templates/templates.go

@@ -5,6 +5,7 @@ import (
 	"html/template"
 	"io"
 
+	"github.com/nuts-foundation/nuts-knooppunt/lib/coding"
 	"github.com/rs/zerolog/log"
 	"github.com/zorgbijjou/golang-fhir-models/fhir-models/fhir"
 )
@@ -120,6 +121,7 @@ func MakeEpListXsProps(eps []fhir.Endpoint) []EpListProps {
 type OrgListProps struct {
 	Id     string
 	Name   string
+	URA    string
 	Type   string
 	Active bool
 }
@@ -135,6 +137,14 @@ func MakeOrgListProps(org fhir.Organization) (out OrgListProps) {
 		out.Name = unknownStr
 	}
 
+	for _, idn := range org.Identifier {
+		if idn.System != nil && idn.Value != nil {
+			if *idn.System == coding.URANamingSystem {
+				out.URA = *idn.Value
+			}
+		}
+	}
+
 	if len(org.Type) > 0 {
 		out.Type = fmtCodable(org.Type[0])
 	} else {