Merge pull request #32 from andywaltlova/merge-metadata

Merge received message metadata with ours
oamg · Jun 30, 2023 · 38ba682 · 38ba682
2 parents 5cd8dbd + fac614f
commit 38ba682
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/src/server.go b/src/server.go
@@ -62,11 +62,9 @@ func (s *jobServer) Send(ctx context.Context, d *pb.Data) (*pb.Receipt, error) {
 			data = &pb.Data{
 				MessageId:  uuid.New().String(),
 				ResponseTo: d.GetMessageId(),
-				Metadata: map[string]string{
-					"Content-Type": contentType,
-				},
-				Content:   fileContent.Bytes(),
-				Directive: d.GetMetadata()["return_url"],
+				Metadata:   constructMetadata(d.GetMetadata(), contentType),
+				Content:    fileContent.Bytes(),
+				Directive:  d.GetMetadata()["return_url"],
 			}
 		} else {
 			data = &pb.Data{

diff --git a/src/util.go b/src/util.go
@@ -67,3 +67,13 @@ func readOutputFile(filePath string) (*bytes.Buffer, string) {
 	log.Infoln("form-data created, returning body: ", body)
 	return body, writer.Boundary()
 }
+
+func constructMetadata(receivedMetadata map[string]string, contentType string) map[string]string {
+	ourMetadata := map[string]string{
+		"Content-Type": contentType,
+	}
+	for k, v := range receivedMetadata {
+		ourMetadata[k] = v
+	}
+	return ourMetadata
+}