Merge pull request #3562 from uselagoon/organizationById_update

Change: Updated argument naming organizationByID
uselagoon · Oct 10, 2023 · 06f6da1 · 06f6da1
2 parents 893c1cb + 246e967
commit 06f6da1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/node-packages/commons/src/api.ts b/node-packages/commons/src/api.ts
@@ -1256,10 +1256,10 @@ export const getEnvironmentsForProject = (
   }
 `);
 
-export async function getOrganizationById(organization: number): Promise<any> {
+export async function getOrganizationById(id: number): Promise<any> {
   const result = await graphqlapi.query(`
     {
-      organization:organizationById(organization: ${organization}) {
+      organization:organizationById(id: ${id}) {
         id
         name
         friendlyName
@@ -1282,7 +1282,7 @@ export async function getOrganizationById(organization: number): Promise<any> {
   `);
 
   if (!result || !result.organization) {
-    throw new OrganizationNotFound(`Cannot find organization ${organization}`);
+    throw new OrganizationNotFound(`Cannot find organization ${id}`);
   }
 
   return result.organization;

diff --git a/services/api/src/resources/organization/resolvers.ts b/services/api/src/resources/organization/resolvers.ts
@@ -219,17 +219,17 @@ export const updateOrganization: ResolverFn = async (
 };
 
 export const getOrganizationById: ResolverFn = async (
-    organization,
+    id,
     args,
     { sqlClientPool, hasPermission }
 ) => {
-    let oid = args.organization;
-    if (organization) {
-      oid = organization;
+    let oid = args.id;
+    if (id) {
+      oid = id;
     }
 
     await hasPermission('organization', 'view', {
-        organization: oid,
+      organization: oid,
     });
 
     const rows = await query(sqlClientPool, Sql.selectOrganization(oid));

diff --git a/services/api/src/typeDefs.js b/services/api/src/typeDefs.js
@@ -1415,7 +1415,7 @@ const typeDefs = gql`
     """
     Get an organization by its ID
     """
-    organizationById(organization: Int!): Organization
+    organizationById(id: Int!): Organization
     organizationByName(name: String!): Organization
     getGroupProjectOrganizationAssociation(input: AddGroupInput!): String
     getProjectGroupOrganizationAssociation(input: ProjectOrgGroupsInput!): String