Get most tests working.

Author: jgadling

test_app/conftest.py

@@ -134,23 +134,29 @@ async def query(
         query: str,
         user_id: Optional[int] = None,
         member_projects: Optional[list[int]] = None,
-        admin_projects: Optional[list[int]] = None,
+        owner_projects: Optional[list[int]] = None,
+        viewer_projects: Optional[list[int]] = None,
+        service_identity: Optional[str] = None,
     ) -> dict[str, typing.Any]:
         """
         Utility function for making GQL HTTP queries with authorization info.
         """
         if not user_id:
             user_id = 111
-        if not admin_projects:
-            admin_projects = []
+        if not owner_projects:
+            owner_projects = []
         if not member_projects:
             member_projects = []
+        if not viewer_projects:
+            viewer_projects = []
         gql_headers = {
             "content-type": "application/json",
             "accept": "application/json",
             "user_id": str(user_id),
             "member_projects": json.dumps(member_projects),
-            "admin_projects": json.dumps(admin_projects),
+            "owner_projects": json.dumps(owner_projects),
+            "viewer_projects": json.dumps(viewer_projects),
+            "service_identity": service_identity or "",
         }
         result = await self.http_client.post("/graphql", json={"query": query}, headers=gql_headers)
         return result.json()
@@ -196,7 +202,9 @@ async def patched_authprincipal(request: Request) -> Principal:
         attr={
             "user_id": int(user_id),
             "member_projects": json.loads(request.headers.get("member_projects", "[]")),
-            "admin_projects": json.loads(request.headers.get("admin_projects", "[]")),
+            "owner_projects": json.loads(request.headers.get("owner_projects", "[]")),
+            "viewer_projects": json.loads(request.headers.get("viewer_projects", "[]")),
+            "service_identity": request.headers.get("service_identity"),
         },
     )
     return principal

test_app/docker-compose.yml

@@ -22,7 +22,7 @@ services:
     command:
       ["server", "--config", "/platformics/config.yaml"]
   graphql-api:
-    image: "platformics-test-app"
+    image: "graphql-api"
     build:
       context: "."
       dockerfile: "Dockerfile"

test_app/tests/test_aggregate_queries.py

@@ -129,22 +129,22 @@ async def test_count_distinct_query(
         query MyQuery {
             samplesAggregate {
                 aggregate {
-                    count(columns: water_control)
+                    count(columns: waterControl)
                 }
             }
         }
     """
     results = await gql_client.query(query, user_id=111, member_projects=[888])
-    assert results["data"]["samplesAggregate"]["aggregate"]["count"] == 4
+    assert results["data"]["samplesAggregate"]["aggregate"][0]["count"] == 4
 
     query = """
         query MyQuery {
             samplesAggregate {
                 aggregate {
-                    count(columns: water_control, distinct: true)
+                    count(columns: waterControl, distinct: true)
                 }
             }
         }
     """
     results = await gql_client.query(query, user_id=111, member_projects=[888])
-    assert results["data"]["samplesAggregate"]["aggregate"]["count"] == 2
+    assert results["data"]["samplesAggregate"]["aggregate"][0]["count"] == 2