Fixes and updates for March 2024 Part 4 (#109)

faluapp · May 28, 2024 · e54eb9e · e54eb9e
1 parent 08d48f8
commit e54eb9e
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 4 deletions.
diff --git a/src/main/java/io/falu/common/BasicListOptions.java b/src/main/java/io/falu/common/BasicListOptions.java
@@ -14,7 +14,7 @@ public class BasicListOptions {
     /**
      * The order to use for sorting the objects returned.
      */
-    private String sorting;
+    private String[] sorting;
 
     /**
      * The maximum number of objects to return.
@@ -36,7 +36,7 @@ public void populate(QueryValues values) {
         if (values == null) return;
 
         values
-                .add("sort", new String[] {sorting})
+                .add("sort", sorting)
                 .add("count", count)
                 .add("created", new QueryValues().fromRange(created))
                 .add("updated", new QueryValues().fromRange(updated));

diff --git a/src/main/java/io/falu/common/QueryValues.java b/src/main/java/io/falu/common/QueryValues.java
@@ -82,8 +82,10 @@ public <T> QueryValues fromRange(RangeFilteringOptions<T> options) {
             add("lte", options.lessThanOrEqualTo);
             add("gt", options.greaterThan);
             add("gte", options.greaterThanOrEqualTo);
+
+            return this;
         }
-        return this;
+        return null;
     }
 
     /***/

diff --git a/src/main/java/io/falu/common/RangeFilteringOptions.java b/src/main/java/io/falu/common/RangeFilteringOptions.java
@@ -1,10 +1,16 @@
 package io.falu.common;
 
+import lombok.Builder;
+import lombok.Getter;
+import lombok.Setter;
 import org.jetbrains.annotations.Nullable;
 
 /**
  * Standard options for range filtering
  */
+@Getter
+@Setter
+@Builder
 public class RangeFilteringOptions<T> {
     public T lessThan;
 

diff --git a/src/test/java/io/falu/QueryValueTests.java b/src/test/java/io/falu/QueryValueTests.java
@@ -2,6 +2,8 @@
 
 import io.falu.common.BasicListOptions;
 import io.falu.common.QueryValues;
+import io.falu.common.RangeFilteringOptions;
+import io.falu.models.payments.PaymentsListOptions;
 import okhttp3.HttpUrl;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
@@ -10,6 +12,8 @@
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.ZoneOffset;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
@@ -45,7 +49,7 @@ public void test_QueryIsGenerated() {
     @Test
     public void test_BasicListOptionsWorks() {
         BasicListOptions opt = BasicListOptions.builder()
-                .sorting("descending")
+                .sorting(new String[]{"descending"})
                 .count(12)
                 .created(null)
                 .updated(null)
@@ -80,6 +84,34 @@ public void test_MultipleQueryValuesWorks() {
         Assertions.assertEquals("https://example.com/events?count=100&sort=desc&type=transfer.created&type=transfer.failed&type=transfer.succeeded", url);
     }
 
+    @Test
+    public void test_PopulatingPaymentListOptions() {
+        LocalDate startDate = LocalDate.parse("2018-05-05");
+        LocalDate endDate = LocalDate.parse("2018-05-07");
+
+        RangeFilteringOptions<Date> createdRangeFilter = RangeFilteringOptions.<Date>builder()
+                .greaterThan(Date.from(startDate.atStartOfDay().toInstant(ZoneOffset.MIN)))
+                .lessThan(Date.from(endDate.atStartOfDay().toInstant(ZoneOffset.MIN)))
+                .build();
+
+        PaymentsListOptions options = PaymentsListOptions.builder()
+                .created(createdRangeFilter)
+                .build();
+
+        HttpUrl.Builder builder = new HttpUrl.Builder();
+        builder.scheme("https");
+        builder.host("example.com");
+        builder.addPathSegments("payments");
+
+        QueryValues values = new QueryValues();
+        options.populate(values);
+        values.getQueryParameters(builder);
+
+        HttpUrl url = builder.build();
+        String expectation = "https://example.com/payments?created.gt=2018-05-05T18:00:00Z&created.lt=2018-05-07T18:00:00Z";
+        Assertions.assertEquals(expectation, url.url().toString());
+    }
+
     private Date toDate(String dateToConsider) {
         SimpleDateFormat formatter = new SimpleDateFormat("dd/MM/yyyy hh:mm:ssss");
         try {