chore: enhance test coverage by updating endpoint logic and adding new test cases for timestamp fields

Author: burmecia

wrappers/dockerfiles/logflare/data.json

@@ -64,7 +64,7 @@
             "float8_field": 1.23456789012345,
             "numeric_field": 1234.5678,
             "date_field": "2023-07-19",
-            "ts_field": "2023-07-19T06:39:15.000Z",
+            "ts_field": "2023-07-19T06:39:15",
             "tstz_field": "2023-07-19T06:39:15.000Z"
         },
         {
@@ -131,7 +131,7 @@
             "float8_field": 1.23456789012345,
             "numeric_field": 1234.5678,
             "date_field": "2023-07-19",
-            "ts_field": "2023-07-19T06:39:15.000Z",
+            "ts_field": "2023-07-19T06:39:15",
             "tstz_field": "2023-07-19T06:39:15.000Z"
         }
     ]

wrappers/dockerfiles/logflare/server.py

@@ -11,7 +11,45 @@
 data = json.loads(open("data.json").read())
 
 @router.get("/{endpoint:path}")
-def endpoint():
+def endpoint(
+    endpoint: str,
+    id: str | None = None,
+    date_field: str | None = None,
+    ts_field: str | None = None,
+    tstz_field: str | None = None,
+):
+    if id is None and date_field is None and ts_field is None and tstz_field is None:
+        return data
+
+    def matches(item: dict) -> bool:
+        if id is not None and str(item.get("id")) != id:
+            return False
+        if date_field is not None and str(item.get("date_field")) != date_field:
+            return False
+        if ts_field is not None and str(item.get("ts_field")) != ts_field.replace(" ", "T"):
+            return False
+        if tstz_field is not None and str(item.get("tstz_field"))[:10] != tstz_field[:10]:
+            return False
+        return True
+
+    if isinstance(data, list):
+        return [item for item in data if isinstance(item, dict) and matches(item)]
+
+    if isinstance(data, dict):
+        if isinstance(data.get("result"), list):
+            return {
+                **data,
+                "result": [
+                    item for item in data["result"]
+                    if isinstance(item, dict) and matches(item)
+                ],
+            }
+
+        if matches(data):
+            return data
+
+        return {}
+
     return data
 
 app = FastAPI()

wrappers/src/fdw/logflare_fdw/tests.rs

@@ -41,6 +41,10 @@ mod tests {
                     date_field date,
                     ts_field timestamp,
                     tstz_field timestamptz,
+                    _param_id text,
+                    _param_date_field date,
+                    _param_ts_field timestamp,
+                    _param_tstz_field timestamptz,
                     _result text
                   )
                   SERVER logflare_server
@@ -66,6 +70,24 @@ mod tests {
                     "f45121ea-1738-46c9-a506-9ee52ff8220f"
                 ]
             );
+
+            let results = c
+                .select(
+                    "
+                    SELECT * FROM logflare_table
+                    WHERE _param_id = '84e1ed2a-3627-4d70-b311-c0e7c0bed313'
+                    AND _param_date_field = '2023-07-19'::date
+                    AND _param_ts_field = '2023-07-19T06:39:15'::timestamp
+                    AND _param_tstz_field = '2023-07-19T06:39:15.000Z'::timestamptz
+                ",
+                    None,
+                    &[],
+                )
+                .unwrap()
+                .filter_map(|r| r.get_by_name::<&str, _>("id").unwrap())
+                .collect::<Vec<_>>();
+
+            assert_eq!(results, vec!["84e1ed2a-3627-4d70-b311-c0e7c0bed313"]);
         });
     }
 }