Update argument of qrExists query for consistency

boxwise · Sep 9, 2024 · 7ee08fb · 7ee08fb
1 parent 4a5e8e5
commit 7ee08fb
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/back/boxtribute_server/business_logic/warehouse/qr_code/queries.py b/back/boxtribute_server/business_logic/warehouse/qr_code/queries.py
@@ -8,10 +8,10 @@
 
 
 @query.field("qrExists")
-def resolve_qr_exists(*_, qr_code):
+def resolve_qr_exists(*_, code):
     authorize(permission="qr:read")
     try:
-        QrCode.get_id_from_code(qr_code)
+        QrCode.get_id_from_code(code)
     except QrCode.DoesNotExist:
         return False
     return True

diff --git a/back/boxtribute_server/graph_ql/definitions/protected/queries.graphql b/back/boxtribute_server/graph_ql/definitions/protected/queries.graphql
@@ -17,7 +17,7 @@ type Query {
   boxes(baseId: ID!, paginationInput: PaginationInput, filterInput: FilterBoxInput): BoxPage!
   " Return [`QrCode`]({{Types.QrCode}}) with specified code (an MD5 hash in hex format of length 32), or an error in case of insufficient permission or missing resource. "
   qrCode(code: String!): QrCodeResult!
-  qrExists(qrCode: String): Boolean
+  qrExists(code: String): Boolean
   " Return [`ClassicLocation`]({{Types.ClassicLocation}}) with specified ID. Accessible for clients who are members of the location's base "
   location(id: ID!): ClassicLocation
   " Return all [`ClassicLocations`]({{Types.ClassicLocation}}) that the client is authorized to view. "

diff --git a/back/test/endpoint_tests/test_permissions.py b/back/test/endpoint_tests/test_permissions.py
@@ -59,7 +59,7 @@ def operation_name(operation):
         # Test case 8.1.3
         """box( labelIdentifier: "12345678") { id }""",
         # Test case 8.1.35
-        """qrExists( qrCode: "1337beef" )""",
+        """qrExists( code: "1337beef" )""",
     ],
     ids=operation_name,
 )

diff --git a/back/test/endpoint_tests/test_qr.py b/back/test/endpoint_tests/test_qr.py
@@ -8,14 +8,14 @@ def test_qr_exists_query(read_only_client, default_qr_code):
     # Test case 8.1.33
     code = default_qr_code["code"]
     query = f"""query CheckQrExistence {{
-                qrExists(qrCode: "{code}")
+                qrExists(code: "{code}")
             }}"""
     qr_exists = assert_successful_request(read_only_client, query)
     assert qr_exists
 
     # Test case 8.1.34
     query = """query CheckQrExistence {
-                qrExists(qrCode: "000")
+                qrExists(code: "000")
             }"""
     qr_exists = assert_successful_request(read_only_client, query)
     assert not qr_exists

diff --git a/front/src/queries/queries.ts b/front/src/queries/queries.ts
@@ -67,7 +67,7 @@ export const GET_BOX_LABEL_IDENTIFIER_BY_QR_CODE = gql`
 
 export const CHECK_IF_QR_EXISTS_IN_DB = gql`
   query CheckIfQrExistsInDb($qrCode: String!) {
-    qrExists(qrCode: $qrCode)
+    qrExists(code: $qrCode)
   }
 `;
 

diff --git a/front/src/types/generated/graphql.ts b/front/src/types/generated/graphql.ts
@@ -1382,7 +1382,7 @@ export type QueryQrCodeArgs = {
 
 
 export type QueryQrExistsArgs = {
-  qrCode?: InputMaybe<Scalars['String']>;
+  code?: InputMaybe<Scalars['String']>;
 };