Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions src/main/java/co/featbit/server/DataModel.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import java.util.Collections;
import java.util.Date;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
Expand Down Expand Up @@ -152,17 +153,20 @@ public Long getTimestamp() {
}

Map<DataStorageTypes.Category, Map<String, DataStorageTypes.Item>> toStorageType() {
ImmutableMap.Builder<String, DataStorageTypes.Item> flags = ImmutableMap.builder();
Map<String, DataStorageTypes.Item> flags = new LinkedHashMap<>();
for (FeatureFlag flag : getFeatureFlags()) {
DataStorageTypes.Item item = flag.isArchived ? flag.toArchivedItem() : flag;
flags.put(item.getId(), item);
flags.merge(flag.getKey(), item,
(existing, incoming) -> existing.getTimestamp() > incoming.getTimestamp() ? existing : incoming);
Comment thread
deleteLater marked this conversation as resolved.
Resolved
}
ImmutableMap.Builder<String, DataStorageTypes.Item> segments = ImmutableMap.builder();
Map<String, DataStorageTypes.Item> segments = new LinkedHashMap<>();
for (Segment segment : getSegments()) {
DataStorageTypes.Item item = segment.isArchived() ? segment.toArchivedItem() : segment;
segments.put(item.getId(), item);
segments.merge(segment.getId(), item,
(existing, incoming) -> existing.getTimestamp() > incoming.getTimestamp() ? existing : incoming);
}
return ImmutableMap.of(DataStorageTypes.FEATURES, flags.build(), DataStorageTypes.SEGMENTS, segments.build());
return ImmutableMap.of(DataStorageTypes.FEATURES, ImmutableMap.copyOf(flags),
DataStorageTypes.SEGMENTS, ImmutableMap.copyOf(segments));
}
}

Expand Down
45 changes: 45 additions & 0 deletions src/test/java/co/featbit/server/DataModelTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
package co.featbit.server;

import co.featbit.server.exterior.DataStorageTypes;
import org.junit.jupiter.api.Test;

import java.util.Arrays;
import java.util.Collections;
import java.util.Date;

import static org.junit.jupiter.api.Assertions.assertSame;

class DataModelTest {

@Test
void toStorageTypeKeepsFlagWithLatestTimestampForDuplicateKey() {
DataModel.FeatureFlag newestFlag = new DataModel.FeatureFlag(
"new-id", new Date(2000), false, true, "flag", "same-key", "boolean",
Collections.emptyList(), Collections.emptyList(), Collections.emptyList(), null, null);
DataModel.FeatureFlag olderFlag = new DataModel.FeatureFlag(
"old-id", new Date(1000), false, true, "flag", "same-key", "boolean",
Collections.emptyList(), Collections.emptyList(), Collections.emptyList(), null, null);
newestFlag.afterDeserialization();
olderFlag.afterDeserialization();
DataModel.Data data = new DataModel.Data(
"full", Arrays.asList(newestFlag, olderFlag), Collections.emptyList());

assertSame(newestFlag, data.toStorageType().get(DataStorageTypes.FEATURES).get("same-key"));
}

@Test
void toStorageTypeKeepsSegmentWithLatestTimestampForDuplicateId() {
DataModel.Segment newestSegment = new DataModel.Segment(
"same-id", false, new Date(2000),
Collections.emptyList(), Collections.emptyList(), Collections.emptyList());
DataModel.Segment olderSegment = new DataModel.Segment(
"same-id", false, new Date(1000),
Collections.emptyList(), Collections.emptyList(), Collections.emptyList());
newestSegment.afterDeserialization();
olderSegment.afterDeserialization();
DataModel.Data data = new DataModel.Data(
"full", Collections.emptyList(), Arrays.asList(newestSegment, olderSegment));

assertSame(newestSegment, data.toStorageType().get(DataStorageTypes.SEGMENTS).get("same-id"));
}
}
Loading