Add default value for MergePrecedence

Author: CTMBNara

src/main/java/org/prebid/server/settings/helper/DatabaseProfilesResultMapper.java

@@ -75,15 +75,17 @@ public static StoredDataResult<Profile> map(RowSet<Row> rowSet,
             final String fetchedAccountId = Objects.toString(row.getValue(0), null);
             final String id = Objects.toString(row.getValue(1), null);
             final String profileBodyAsString = Objects.toString(row.getValue(2), StringUtils.EMPTY);
-            final String mergePrecedenceAsString = Objects.toString(row.getValue(3), StringUtils.EMPTY);
+            final String mergePrecedenceAsString = Objects.toString(row.getValue(3), null);
             final String typeAsString = Objects.toString(row.getValue(4), StringUtils.EMPTY);
 
             final JsonNode profileBody;
             final Profile.MergePrecedence mergePrecedence;
             final Profile.Type type;
             try {
                 profileBody = ObjectMapperProvider.mapper().readTree(profileBodyAsString);
-                mergePrecedence = Profile.MergePrecedence.valueOf(mergePrecedenceAsString.toUpperCase());
+                mergePrecedence = mergePrecedenceAsString != null
+                        ? Profile.MergePrecedence.valueOf(mergePrecedenceAsString.toUpperCase())
+                        : Profile.MergePrecedence.REQUEST;
                 type = Profile.Type.valueOf(typeAsString.toUpperCase());
             } catch (IllegalArgumentException e) {
                 logger.error("Profile with id={} has invalid value: type={}, mergePrecedence={} and will be ignored.",

src/main/java/org/prebid/server/settings/model/Profile.java

@@ -3,18 +3,31 @@
 import com.fasterxml.jackson.annotation.JsonAlias;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.JsonNode;
+import lombok.Builder;
 import lombok.Value;
+import lombok.extern.jackson.Jacksonized;
 
-@Value(staticConstructor = "of")
+@Value
+@Builder
+@Jacksonized
 public class Profile {
 
     Type type;
 
     @JsonProperty("mergeprecedence")
-    MergePrecedence mergePrecedence;
+    @Builder.Default
+    MergePrecedence mergePrecedence = MergePrecedence.REQUEST;
 
     JsonNode body;
 
+    public static Profile of(Type type, MergePrecedence mergePrecedence, JsonNode body) {
+        return Profile.builder()
+                .type(type)
+                .mergePrecedence(mergePrecedence)
+                .body(body)
+                .build();
+    }
+
     public enum Type {
 
         @JsonAlias("request")

src/test/java/org/prebid/server/settings/helper/DatabaseProfilesResultMapperTest.java

@@ -151,6 +151,28 @@ public void mapShouldSkipProfileWithInvalidMergePrecedence() {
         assertThat(result.getErrors()).isEmpty();
     }
 
+    @Test
+    public void mapShouldUseDefaultMergePrecedence() {
+        // given
+        givenRowSet(givenRow("accountId", "id1", "{}", null, "request"));
+
+        // when
+        final StoredDataResult<Profile> result = DatabaseProfilesResultMapper.map(
+                rowSet,
+                "accountId",
+                singleton("id1"),
+                emptySet());
+
+        // then
+        assertThat(result.getStoredIdToRequest())
+                .containsExactly(entry("id1", Profile.of(
+                        Profile.Type.REQUEST,
+                        Profile.MergePrecedence.REQUEST,
+                        mapper.createObjectNode())));
+        assertThat(result.getStoredIdToImp()).isEmpty();
+        assertThat(result.getErrors()).isEmpty();
+    }
+
     @Test
     public void mapShouldSkipProfileWithInvalidType() {
         // given