From f10932709bc5153f5e4bd1ccbeb3e2c27130d096 Mon Sep 17 00:00:00 2001
From: EddieLF <34049565+EddieLF@users.noreply.github.com>
Date: Wed, 25 Oct 2023 13:04:52 +1100
Subject: [PATCH 1/2] Update sequencing group 'project:' filter to parse names,
 not ids (#585)

* Update sequencing group 'project:' filter to parse project names, not ids

* Update sequencing group 'project:' filter to parse names, not ids

* Add project filter into test_sg_analyses_query

* Update gql schema sample project filter
---
 api/graphql/schema.py | 12 ++++++------
 test/test_graphql.py  |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/api/graphql/schema.py b/api/graphql/schema.py
index c2b458511..7b9a030f8 100644
--- 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/test/test_graphql.py b/test/test_graphql.py
index 2078b1184..294e1ad56 100644
--- 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

From 91db84a65f6d5743999984e7ed85ee1d67f6b1fc Mon Sep 17 00:00:00 2001
From: Michael Franklin <22381693+illusional@users.noreply.github.com>
Date: Wed, 25 Oct 2023 15:57:36 +1100
Subject: [PATCH 2/2] =?UTF-8?q?Bump=20version:=206.4.0=20=E2=86=92=206.5.0?=
 =?UTF-8?q?=20(#586)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Michael Franklin <illusional@users.noreply.github.com>
---
 .bumpversion.cfg          | 2 +-
 api/server.py             | 2 +-
 deploy/python/version.txt | 2 +-
 setup.py                  | 2 +-
 web/package.json          | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index cfaa3571e..c66ac522c 100644
--- 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/server.py b/api/server.py
index 444d65650..62325807e 100644
--- 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
index 19b860c18..f22d756da 100644
--- 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
index a8d121b80..fc47d5a14 100644
--- 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/web/package.json b/web/package.json
index 3e7b64fe8..6dfaccc1d 100644
--- 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",