fix: Fix the data loss

RomualdRousseau · Dec 9, 2024 · f107667 · f107667
1 parent dca9350
commit f107667
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 211 deletions.
diff --git a/...y-commons/src/main/java/com/github/romualdrousseau/archery/commons/behavior/Scenario.java b/...y-commons/src/main/java/com/github/romualdrousseau/archery/commons/behavior/Scenario.java
diff --git a/archery-commons/src/main/java/com/github/romualdrousseau/archery/commons/redux/Action.java b/archery-commons/src/main/java/com/github/romualdrousseau/archery/commons/redux/Action.java
diff --git a/archery-commons/src/main/java/com/github/romualdrousseau/archery/commons/redux/Reducer.java b/archery-commons/src/main/java/com/github/romualdrousseau/archery/commons/redux/Reducer.java
diff --git a/archery-commons/src/main/java/com/github/romualdrousseau/archery/commons/redux/Store.java b/archery-commons/src/main/java/com/github/romualdrousseau/archery/commons/redux/Store.java
diff --git a/...ry-commons/src/main/java/com/github/romualdrousseau/archery/commons/redux/Subscriber.java b/...ry-commons/src/main/java/com/github/romualdrousseau/archery/commons/redux/Subscriber.java
diff --git a/...-commons/src/test/java/com/github/romualdrousseau/archery/commons/python/Test_Python.java b/...-commons/src/test/java/com/github/romualdrousseau/archery/commons/python/Test_Python.java
@@ -6,6 +6,7 @@
 import java.time.LocalDate;
 import java.time.ZoneId;
 import java.util.Date;
+import java.util.Locale;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Tag;
@@ -15,8 +16,18 @@ public class Test_Python {
     @Test
     @Tag("unit")
     public void testPythonSimpleDateformat() throws ParseException {
-        final PythonSimpleDateFormat formatter = new PythonSimpleDateFormat("%a,%d/%m/%y");
+        final var formatter = new PythonSimpleDateFormat("%a,%d/%m/%y");
         assertEquals("Sun,24/09/23", formatter.format(Date.from(LocalDate.of(2023, 9, 24).atStartOfDay(ZoneId.systemDefault()).toInstant())));
         assertEquals("Sun,05/12/99", formatter.format(formatter.parse("Sun,05/12/99")));
     }
+
+    @Test
+    @Tag("unit")
+    public void testPythonSimpleDateformatWithLocale() throws ParseException {
+        final var formatterGB = new PythonSimpleDateFormat("%b, %Y", Locale.forLanguageTag("en-GB"));
+        assertEquals("Sept, 2023", formatterGB.format(formatterGB.parse("Sept, 2023")));
+
+        final var formatterUS = new PythonSimpleDateFormat("%b, %Y", Locale.forLanguageTag("en-US"));
+        assertEquals("Sep, 2023", formatterUS.format(formatterUS.parse("Sep, 2023")));
+    }
 }
diff --git a/...ry-commons/src/test/java/com/github/romualdrousseau/archery/commons/redux/Test_Redux.java b/...ry-commons/src/test/java/com/github/romualdrousseau/archery/commons/redux/Test_Redux.java
diff --git a/archery/src/main/java/com/github/romualdrousseau/archery/header/PivotKeyHeader.java b/archery/src/main/java/com/github/romualdrousseau/archery/header/PivotKeyHeader.java
@@ -54,9 +54,12 @@ public Set<String> getEntryTypeValues() {
     }
 
     public void setEntryTypeValues(final Set<String> entryTypeValues) {
+        final var newEntries = entryTypeValues.stream()
+                .flatMap(x -> this.entries.stream()
+                        .map(y -> new PivotEntry(y.getCell(), this.pivotEntityName).setTypeValue(x)))
+                .toList();
         this.entries.clear();
-        this.entries.addAll(entryTypeValues.stream()
-                .map(x -> new PivotEntry(this.getCell(), this.pivotEntityName).setTypeValue(x)).toList());
+        this.entries.addAll(newEntries);
     }
 
     public Set<String> getEntryPivotValues() {