Accept message handler

To allow the application to handle the incoming requests the way it wants (log/save the data) we make the handler function accept the a function that gets the data from the request.
fractalsoft · Jun 13, 2024 · 2bddda0 · 2bddda0
1 parent 399e072
commit 2bddda0
Show file tree

Hide file tree

Showing 4 changed files with 75 additions and 53 deletions.
diff --git a/cmd/gobl.fatturapa/server.go b/cmd/gobl.fatturapa/server.go
@@ -91,7 +91,9 @@ func (c *serverOpts) runE(cmd *cobra.Command, args []string) error {
 		ClientAuth: clientAuth,
 	}
 
-	err = sdi.RunServer(config, sdi.MessageHandler)
+	messageHandler := sdi.MessageHandler(handleRequest)
+
+	err = sdi.RunServer(config, messageHandler)
 	if err != nil {
 		return fmt.Errorf("server error: %w", err)
 	}
@@ -122,6 +124,18 @@ func loadTLSCert(publicCertPEM, privateKeyPEM []byte) (tls.Certificate, error) {
 	return serverTLSCert, nil
 }
 
+func handleRequest(env *sdi.SDIEnvelope) {
+	if env.Body.FileSubmissionMetadata != nil {
+		log.Printf("parsing MetadatiInvioFile:\n")
+	}
+	if env.Body.NonDeliveryNotificationMessage != nil {
+		log.Printf("parsing NotificaMancataConsegna:\n")
+	}
+	if env.Body.InvoiceTransmissionCertificate != nil {
+		log.Printf("parsing AttestazioneTrasmissioneFattura:\n")
+	}
+}
+
 func loadCertPoolFromPEM(caCertPEM []byte) (*x509.CertPool, error) {
 	caCertPool, err := x509.SystemCertPool()
 	if err != nil {

diff --git a/sdi/helper.go b/sdi/helper.go
@@ -5,14 +5,16 @@ import (
 	"encoding/xml"
 	"fmt"
 	"io"
-	"log"
 	"mime"
 	"mime/multipart"
 	"strings"
 
 	resty "github.com/go-resty/resty/v2"
 )
 
+// HandleSOAPRequest
+type HandleSOAPRequest func(*SDIEnvelope)
+
 // SDIEnvelope defines messages received by
 type SDIEnvelope struct {
 	XMLName xml.Name `xml:"Envelope"`
@@ -61,7 +63,7 @@ func parseMultipartResponse(resp *resty.Response, response interface{}) error {
 	return nil
 }
 
-func ParseMessage(body io.ReadCloser) error {
+func ParseMessage(body io.ReadCloser, handler HandleSOAPRequest) error {
 	data, err := io.ReadAll(body)
 	if err != nil {
 		return err
@@ -71,15 +73,7 @@ func ParseMessage(body io.ReadCloser) error {
 	if err != nil {
 		return err
 	}
-	if env.Body.FileSubmissionMetadata != nil {
-		log.Printf("parsing MetadatiInvioFile:\n")
-	}
-	if env.Body.NonDeliveryNotificationMessage != nil {
-		log.Printf("parsing NotificaMancataConsegna:\n")
-	}
-	if env.Body.InvoiceTransmissionCertificate != nil {
-		log.Printf("parsing AttestazioneTrasmissioneFattura:\n")
-	}
+	handler(env)
 
 	return nil
 }
diff --git a/sdi/helper_test.go b/sdi/helper_test.go
@@ -12,6 +12,18 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
+func handlerFunc(env *sdi.SDIEnvelope) {
+	if env.Body.FileSubmissionMetadata != nil {
+		log.Printf("parsing MetadatiInvioFile:\n")
+	}
+	if env.Body.NonDeliveryNotificationMessage != nil {
+		log.Printf("parsing NotificaMancataConsegna:\n")
+	}
+	if env.Body.InvoiceTransmissionCertificate != nil {
+		log.Printf("parsing AttestazioneTrasmissioneFattura:\n")
+	}
+}
+
 func TestParseMessage(t *testing.T) {
 	t.Run("parse MetadatiInvioFile", func(t *testing.T) {
 		var buf bytes.Buffer
@@ -36,7 +48,7 @@ func TestParseMessage(t *testing.T) {
 			`</soapenv:Envelope>`
 		reader := strings.NewReader(message)
 
-		sdi.ParseMessage(io.NopCloser(reader))
+		sdi.ParseMessage(io.NopCloser(reader), handlerFunc)
 
 		assert.Contains(t, buf.String(), "parsing MetadatiInvioFile")
 	})
@@ -64,7 +76,7 @@ func TestParseMessage(t *testing.T) {
 			`</soapenv:Envelope>`
 		reader := strings.NewReader(message)
 
-		sdi.ParseMessage(io.NopCloser(reader))
+		sdi.ParseMessage(io.NopCloser(reader), handlerFunc)
 
 		assert.Contains(t, buf.String(), "parsing NotificaMancataConsegna")
 	})
@@ -96,7 +108,7 @@ func TestParseMessage(t *testing.T) {
 			`</soapenv:Envelope>`
 		reader := strings.NewReader(message)
 
-		sdi.ParseMessage(io.NopCloser(reader))
+		sdi.ParseMessage(io.NopCloser(reader), handlerFunc)
 
 		assert.Contains(t, buf.String(), "parsing AttestazioneTrasmissioneFattura")
 	})

diff --git a/sdi/message.go b/sdi/message.go
@@ -9,48 +9,50 @@ import (
 )
 
 // MessageHandler processes SOAP requests from SdI (Sistema di Interscambio)
-func MessageHandler(w http.ResponseWriter, req *http.Request) {
-	requestDump, err := httputil.DumpRequest(req, true)
-	if err != nil {
-		log.Printf("Failed to dump incoming request: %s\n", err)
-		http.Error(w, "Internal Server Error", http.StatusInternalServerError)
-		return
-	}
-	log.Printf("Incoming request:\n%s", requestDump)
+func MessageHandler(handler HandleSOAPRequest) http.HandlerFunc {
+	return func(w http.ResponseWriter, req *http.Request) {
+		requestDump, err := httputil.DumpRequest(req, true)
+		if err != nil {
+			log.Printf("Failed to dump incoming request: %s\n", err)
+			http.Error(w, "Internal Server Error", http.StatusInternalServerError)
+			return
+		}
+		log.Printf("Incoming request:\n%s", requestDump)
 
-	err = ParseMessage(req.Body)
-	if err != nil {
-		log.Printf("Failed to parse body: %s\n", err)
-		http.Error(w, "Internal Server Error", http.StatusInternalServerError)
-		return
-	}
+		err = ParseMessage(req.Body, handler)
+		if err != nil {
+			log.Printf("Failed to parse body: %s\n", err)
+			http.Error(w, "Internal Server Error", http.StatusInternalServerError)
+			return
+		}
 
-	responseBody := []byte(soapEmptyResponse())
-	response := &http.Response{
-		Status:        "200 OK",
-		StatusCode:    http.StatusOK,
-		Proto:         "HTTP/2.0",
-		ProtoMajor:    2,
-		ProtoMinor:    0,
-		Body:          io.NopCloser(bytes.NewReader(responseBody)),
-		ContentLength: int64(len(responseBody)),
-		Header:        make(http.Header),
-	}
-	// contentType := http.DetectContentType(responseBody)
-	response.Header.Set("Content-Type", "application/soap+xml")
+		responseBody := []byte(soapEmptyResponse())
+		response := &http.Response{
+			Status:        "200 OK",
+			StatusCode:    http.StatusOK,
+			Proto:         "HTTP/2.0",
+			ProtoMajor:    2,
+			ProtoMinor:    0,
+			Body:          io.NopCloser(bytes.NewReader(responseBody)),
+			ContentLength: int64(len(responseBody)),
+			Header:        make(http.Header),
+		}
+		// contentType := http.DetectContentType(responseBody)
+		response.Header.Set("Content-Type", "application/soap+xml")
 
-	responseDump, err := httputil.DumpResponse(response, true)
-	if err != nil {
-		log.Printf("Failed to dump outgoing response: %v", err)
-		http.Error(w, "Internal Server Error", http.StatusInternalServerError)
-		return
-	}
-	log.Printf("Outgoing response:\n%s", responseDump)
+		responseDump, err := httputil.DumpResponse(response, true)
+		if err != nil {
+			log.Printf("Failed to dump outgoing response: %v", err)
+			http.Error(w, "Internal Server Error", http.StatusInternalServerError)
+			return
+		}
+		log.Printf("Outgoing response:\n%s", responseDump)
 
-	err = responseToWriter(w, response)
-	if err != nil {
-		log.Printf("Failed to send response: %v", err)
-		return
+		err = responseToWriter(w, response)
+		if err != nil {
+			log.Printf("Failed to send response: %v", err)
+			return
+		}
 	}
 }