Merge pull request #587 from populationgenomics/dev

populationgenomics · Oct 25, 2023 · 24ae802 · 24ae802
2 parents cb53231 + 91db84a
commit 24ae802
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 6.4.0
+current_version = 6.5.0
 commit = True
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>[A-z0-9-]+)

diff --git a/api/graphql/schema.py b/api/graphql/schema.py
@@ -589,9 +589,9 @@ async def sample(
 
         project_name_map: dict[str, int] = {}
         if project:
-            project_ids = project.all_values()
-            projects = await ptable.get_and_check_access_to_projects_for_ids(
-                user=connection.author, project_ids=project_ids, readonly=True
+            project_names = project.all_values()
+            projects = await ptable.get_and_check_access_to_projects_for_names(
+                user=connection.author, project_names=project_names, readonly=True
             )
             project_name_map = {p.name: p.id for p in projects}
 
@@ -633,9 +633,9 @@ async def sequencing_groups(
         # we list project names, but internally we want project ids
         project_id_map = {}
         if project:
-            project_ids = project.all_values()
-            projects = await ptable.get_and_check_access_to_projects_for_ids(
-                user=connection.author, project_ids=project_ids, readonly=True
+            project_names = project.all_values()
+            projects = await ptable.get_and_check_access_to_projects_for_names(
+                user=connection.author, project_names=project_names, readonly=True
             )
             project_id_map = {p.name: p.id for p in projects}
 

diff --git a/api/server.py b/api/server.py
@@ -20,7 +20,7 @@
 from api.settings import PROFILE_REQUESTS, SKIP_DATABASE_CONNECTION
 
 # This tag is automatically updated by bump2version
-_VERSION = '6.4.0'
+_VERSION = '6.5.0'
 
 logger = get_logger()
 

diff --git a/deploy/python/version.txt b/deploy/python/version.txt
@@ -1 +1 @@
-6.4.0
+6.5.0
diff --git a/setup.py b/setup.py
@@ -19,7 +19,7 @@
 setup(
     name=PKG,
     # This tag is automatically updated by bump2version
-    version='6.4.0',
+    version='6.5.0',
     description='Python API for interacting with the Sample API system',
     long_description=readme,
     long_description_content_type='text/markdown',

diff --git a/test/test_graphql.py b/test/test_graphql.py
@@ -209,7 +209,7 @@ async def test_sg_analyses_query(self):
 
         q = """
 query MyQuery($sg_id: String!, $project: String!) {
-  sequencingGroups(id: {in_: [$sg_id]}) {
+  sequencingGroups(id: {in_: [$sg_id]}, project: {eq: $project}) {
     analyses(project: {eq: $project}) {
       id
       meta

diff --git a/web/package.json b/web/package.json
@@ -1,6 +1,6 @@
 {
     "name": "metamist",
-    "version": "6.4.0",
+    "version": "6.5.0",
     "private": true,
     "dependencies": {
         "@apollo/client": "^3.7.3",