Merge pull request #599 from populationgenomics/dev

Release
populationgenomics · Nov 1, 2023 · f222398 · f222398
2 parents 37618f1 + 85b0a63
commit f222398
Show file tree

Hide file tree

Showing 11 changed files with 457 additions and 510 deletions.
diff --git a/api/graphql/filters.py b/api/graphql/filters.py
@@ -14,6 +14,10 @@ class GraphQLFilter(Generic[T]):
     eq: T | None = None
     in_: list[T] | None = None
     nin: list[T] | None = None
+    gt: T | None = None
+    gte: T | None = None
+    lt: T | None = None
+    lte: T | None = None
 
     def all_values(self):
         """
@@ -26,6 +30,14 @@ def all_values(self):
             v.extend(self.in_)
         if self.nin:
             v.extend(self.nin)
+        if self.gt:
+            v.append(self.gt)
+        if self.gte:
+            v.append(self.gte)
+        if self.lt:
+            v.append(self.lt)
+        if self.lte:
+            v.append(self.lte)
 
         return v
 
@@ -37,9 +49,21 @@ def to_internal_filter(self, f: Callable[[T], Any] = None):
                 eq=f(self.eq) if self.eq else None,
                 in_=list(map(f, self.in_)) if self.in_ else None,
                 nin=list(map(f, self.nin)) if self.nin else None,
+                gt=f(self.gt) if self.gt else None,
+                gte=f(self.gte) if self.gte else None,
+                lt=f(self.lt) if self.lt else None,
+                lte=f(self.lte) if self.lte else None,
             )
 
-        return GenericFilter(eq=self.eq, in_=self.in_, nin=self.nin)
+        return GenericFilter(
+            eq=self.eq,
+            in_=self.in_,
+            nin=self.nin,
+            gt=self.gt,
+            gte=self.gte,
+            lt=self.lt,
+            lte=self.lte,
+        )
 
 
 GraphQLMetaFilter = strawberry.scalars.JSON
diff --git a/api/graphql/schema.py b/api/graphql/schema.py
@@ -7,6 +7,7 @@
 Note, we silence a lot of linting here because GraphQL looks at type annotations
 and defaults to decide the GraphQL schema, so it might not necessarily look correct.
 """
+import datetime
 from inspect import isclass
 
 import strawberry
@@ -182,6 +183,7 @@ async def analyses(
         status: GraphQLFilter[strawberry.enum(AnalysisStatus)] | None = None,
         active: GraphQLFilter[bool] | None = None,
         meta: GraphQLMetaFilter | None = None,
+        timestamp_completed: GraphQLFilter[datetime.datetime] | None = None,
     ) -> list['GraphQLAnalysis']:
         connection = info.context['connection']
         connection.project = root.id
@@ -194,6 +196,9 @@ async def analyses(
                 active=active.to_internal_filter() if active else None,
                 project=GenericFilter(eq=root.id),
                 meta=meta,
+                timestamp_completed=timestamp_completed.to_internal_filter()
+                if timestamp_completed
+                else None,
             )
         )
         return [GraphQLAnalysis.from_internal(a) for a in internal_analysis]
@@ -207,7 +212,7 @@ class GraphQLAnalysis:
     type: str
     status: strawberry.enum(AnalysisStatus)
     output: str | None
-    timestamp_completed: str | None = None
+    timestamp_completed: datetime.datetime | None = None
     active: bool
     meta: strawberry.scalars.JSON
     author: str