Merge pull request #79 from dhruv-bansal/main

metadata builder changes for missing fields

wrpmeta/metadata.go

@@ -109,8 +109,10 @@ func (b *builder) Apply(source Source, fields ...Field) Builder {
 
 			if present {
 				b.product[to] = value
-			} else if len(f.Default) > 0 {
-				b.product[to] = f.Default
+			} else {
+				if len(f.Default) > 0 {
+					b.product[to] = f.Default
+				}
 				b.allFieldsPresent = false
 			}
 		}

wrpmeta/metadata_test.go

@@ -129,7 +129,63 @@ func testBuilderSomeInitialFieldsAbsent(t *testing.T) {
 	assert.False(allPresent)
 }
 
+func testBuilderWithMissingField(t *testing.T) {
+	var (
+		assert  = assert.New(t)
+		require = require.New(t)
+
+		source = SourceMap{
+			"key1":   "value1",
+			"key2":   123,
+			"key3":   -17.6,
+			"unused": "unused",
+		}
+
+		builder = NewBuilder()
+	)
+
+	require.NotNil(builder)
+
+	metadata, allPresent := builder.Apply(source,
+		Field{From: "key1"},
+		Field{From: "key2", To: "/key2"},
+		Field{From: "key3", To: "asdf", Default: "default"},
+		Field{From: "missing2", To: "/missing2"},
+	).Set("key4", "value4").Add(map[string]string{"key5": "value5"}, true).Build()
+
+	assert.Equal(
+		map[string]string{
+			"key1":  "value1",
+			"/key2": "123",
+			"asdf":  "-17.6",
+			"key4":  "value4",
+			"key5":  "value5",
+		},
+		metadata,
+	)
+
+	assert.False(allPresent)
+
+	metadata, allPresent = builder.Add(map[string]string{"key6": "value6"}, false).Build()
+
+	assert.Equal(
+		map[string]string{
+			"key1":  "value1",
+			"/key2": "123",
+			"asdf":  "-17.6",
+			"key4":  "value4",
+			"key5":  "value5",
+			"key6":  "value6",
+		},
+		metadata,
+	)
+
+	assert.False(allPresent)
+
+}
+
 func TestBuilder(t *testing.T) {
 	t.Run("InitialFieldsPresent", testBuilderInitialFieldsPresent)
 	t.Run("SomeInitialFieldsAbsent", testBuilderSomeInitialFieldsAbsent)
+	t.Run("SomeInitialFieldsAbsent", testBuilderWithMissingField)
 }