@squonk/account-server-client 2.0.6 → 2.0.7

package/src/organisation/organisation.ts

@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.15.0 🍺
+ * Generated by orval v6.20.0 🍺
  * Do not edit manually.
  * Account Server API
  * The Informatics Matters Account Server API.
@@ -8,106 +8,105 @@ A service that provides access to the Account Server, which gives *registered* u
 
  * OpenAPI spec version: 2.0
  */
-import { useQuery, useMutation } from "@tanstack/react-query";
+import {
+  useMutation,
+  useQuery
+} from '@tanstack/react-query'
 import type {
-  UseQueryOptions,
-  UseMutationOptions,
-  QueryFunction,
   MutationFunction,
-  UseQueryResult,
+  QueryFunction,
   QueryKey,
-} from "@tanstack/react-query";
+  UseMutationOptions,
+  UseQueryOptions,
+  UseQueryResult
+} from '@tanstack/react-query'
 import type {
-  OrganisationsGetResponse,
   AsError,
-  OrganisationPostResponse,
-  OrganisationPostBodyBody,
-  OrganisationGetResponse,
-  OrganisationPatchBodyBody,
-  OrganisationChargesGetResponse,
   GetOrganisationChargesParams,
+  OrganisationChargesGetResponse,
+  OrganisationDetail,
   OrganisationGetDefaultResponse,
-} from "../account-server-api.schemas";
-import { customInstance } from ".././custom-instance";
-import type { ErrorType } from ".././custom-instance";
+  OrganisationPatchBodyBody,
+  OrganisationPostBodyBody,
+  OrganisationPostResponse,
+  OrganisationsGetResponse
+} from '../account-server-api.schemas'
+import { customInstance } from '.././custom-instance';
+import type { ErrorType } from '.././custom-instance';
+
 
 // eslint-disable-next-line
-type SecondParameter<T extends (...args: any) => any> = T extends (
+  type SecondParameter<T extends (...args: any) => any> = T extends (
   config: any,
-  args: infer P
+  args: infer P,
 ) => any
   ? P
   : never;
 
+
 /**
  * Gets all the Organisations that you are a member of or are public. Admin users are members of all Organisations
 
  * @summary Gets Organisations
  */
 export const getOrganisations = (
-  options?: SecondParameter<typeof customInstance>,
-  signal?: AbortSignal
+    
+ options?: SecondParameter<typeof customInstance>,signal?: AbortSignal
+) => {
+      
+      
+      return customInstance<OrganisationsGetResponse>(
+      {url: `/organisation`, method: 'get', signal
+    },
+      options);
+    }
+  
+
+export const getGetOrganisationsQueryKey = () => {
+    
+    return ["account-server-api", `/organisation`] as const;
+    }
+
+    
+export const getGetOrganisationsQueryOptions = <TData = Awaited<ReturnType<typeof getOrganisations>>, TError = ErrorType<void | AsError>>( options?: { query?:UseQueryOptions<Awaited<ReturnType<typeof getOrganisations>>, TError, TData>, request?: SecondParameter<typeof customInstance>}
 ) => {
-  return customInstance<OrganisationsGetResponse>(
-    { url: `/organisation`, method: "get", signal },
-    options
-  );
-};
-
-export const getGetOrganisationsQueryKey = () => ["account-server-api", `/organisation`] as const;
-
-export const getGetOrganisationsQueryOptions = <
-  TData = Awaited<ReturnType<typeof getOrganisations>>,
-  TError = ErrorType<void | AsError>
->(options?: {
-  query?: UseQueryOptions<
-    Awaited<ReturnType<typeof getOrganisations>>,
-    TError,
-    TData
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseQueryOptions<
-  Awaited<ReturnType<typeof getOrganisations>>,
-  TError,
-  TData
-> & { queryKey: QueryKey } => {
-  const { query: queryOptions, request: requestOptions } = options ?? {};
-
-  const queryKey = queryOptions?.queryKey ?? getGetOrganisationsQueryKey();
-
-  const queryFn: QueryFunction<
-    Awaited<ReturnType<typeof getOrganisations>>
-  > = ({ signal }) => getOrganisations(requestOptions, signal);
-
-  return { queryKey, queryFn, ...queryOptions };
-};
-
-export type GetOrganisationsQueryResult = NonNullable<
-  Awaited<ReturnType<typeof getOrganisations>>
->;
-export type GetOrganisationsQueryError = ErrorType<void | AsError>;
-
-export const useGetOrganisations = <
-  TData = Awaited<ReturnType<typeof getOrganisations>>,
-  TError = ErrorType<void | AsError>
->(options?: {
-  query?: UseQueryOptions<
-    Awaited<ReturnType<typeof getOrganisations>>,
-    TError,
-    TData
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseQueryResult<TData, TError> & { queryKey: QueryKey } => {
-  const queryOptions = getGetOrganisationsQueryOptions(options);
-
-  const query = useQuery(queryOptions) as UseQueryResult<TData, TError> & {
-    queryKey: QueryKey;
-  };
-
-  query.queryKey = queryOptions.queryKey;
+
+const {query: queryOptions, request: requestOptions} = options ?? {};
+
+  const queryKey =  queryOptions?.queryKey ?? getGetOrganisationsQueryKey();
+
+  
+
+    const queryFn: QueryFunction<Awaited<ReturnType<typeof getOrganisations>>> = ({ signal }) => getOrganisations(requestOptions, signal);
+
+      
+
+      
+
+   return  { queryKey, queryFn, ...queryOptions} as UseQueryOptions<Awaited<ReturnType<typeof getOrganisations>>, TError, TData> & { queryKey: QueryKey }
+}
+
+export type GetOrganisationsQueryResult = NonNullable<Awaited<ReturnType<typeof getOrganisations>>>
+export type GetOrganisationsQueryError = ErrorType<void | AsError>
+
+/**
+ * @summary Gets Organisations
+ */
+export const useGetOrganisations = <TData = Awaited<ReturnType<typeof getOrganisations>>, TError = ErrorType<void | AsError>>(
+  options?: { query?:UseQueryOptions<Awaited<ReturnType<typeof getOrganisations>>, TError, TData>, request?: SecondParameter<typeof customInstance>}
+
+  ):  UseQueryResult<TData, TError> & { queryKey: QueryKey } => {
+
+  const queryOptions = getGetOrganisationsQueryOptions(options)
+
+  const query = useQuery(queryOptions) as  UseQueryResult<TData, TError> & { queryKey: QueryKey };
+
+  query.queryKey = queryOptions.queryKey ;
 
   return query;
-};
+}
+
+
 
 /**
  * Creates a new Organisation
@@ -117,74 +116,57 @@ You need admin rights to use this method
  * @summary Create a new organisation
  */
 export const createOrganisation = (
-  organisationPostBodyBody: OrganisationPostBodyBody,
-  options?: SecondParameter<typeof customInstance>
-) => {
-  return customInstance<OrganisationPostResponse>(
-    {
-      url: `/organisation`,
-      method: "post",
-      headers: { "Content-Type": "application/json" },
-      data: organisationPostBodyBody,
+    organisationPostBodyBody: OrganisationPostBodyBody,
+ options?: SecondParameter<typeof customInstance>,) => {
+      
+      
+      return customInstance<OrganisationPostResponse>(
+      {url: `/organisation`, method: 'post',
+      headers: {'Content-Type': 'application/json', },
+      data: organisationPostBodyBody
     },
-    options
-  );
-};
-
-export const getCreateOrganisationMutationOptions = <
-  TError = ErrorType<AsError | void>,
-  TContext = unknown
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof createOrganisation>>,
-    TError,
-    { data: OrganisationPostBodyBody },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof createOrganisation>>,
-  TError,
-  { data: OrganisationPostBodyBody },
-  TContext
-> => {
-  const { mutation: mutationOptions, request: requestOptions } = options ?? {};
-
-  const mutationFn: MutationFunction<
-    Awaited<ReturnType<typeof createOrganisation>>,
-    { data: OrganisationPostBodyBody }
-  > = (props) => {
-    const { data } = props ?? {};
-
-    return createOrganisation(data, requestOptions);
-  };
-
-  return { mutationFn, ...mutationOptions };
-};
-
-export type CreateOrganisationMutationResult = NonNullable<
-  Awaited<ReturnType<typeof createOrganisation>>
->;
-export type CreateOrganisationMutationBody = OrganisationPostBodyBody;
-export type CreateOrganisationMutationError = ErrorType<AsError | void>;
-
-export const useCreateOrganisation = <
-  TError = ErrorType<AsError | void>,
-  TContext = unknown
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof createOrganisation>>,
-    TError,
-    { data: OrganisationPostBodyBody },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}) => {
-  const mutationOptions = getCreateOrganisationMutationOptions(options);
-
-  return useMutation(mutationOptions);
-};
-/**
+      options);
+    }
+  
+
+
+export const getCreateOrganisationMutationOptions = <TError = ErrorType<AsError | void>,
+    
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof createOrganisation>>, TError,{data: OrganisationPostBodyBody}, TContext>, request?: SecondParameter<typeof customInstance>}
+): UseMutationOptions<Awaited<ReturnType<typeof createOrganisation>>, TError,{data: OrganisationPostBodyBody}, TContext> => {
+ const {mutation: mutationOptions, request: requestOptions} = options ?? {};
+
+      
+
+
+      const mutationFn: MutationFunction<Awaited<ReturnType<typeof createOrganisation>>, {data: OrganisationPostBodyBody}> = (props) => {
+          const {data} = props ?? {};
+
+          return  createOrganisation(data,requestOptions)
+        }
+
+        
+
+
+   return  { mutationFn, ...mutationOptions }}
+
+    export type CreateOrganisationMutationResult = NonNullable<Awaited<ReturnType<typeof createOrganisation>>>
+    export type CreateOrganisationMutationBody = OrganisationPostBodyBody
+    export type CreateOrganisationMutationError = ErrorType<AsError | void>
+
+    /**
+ * @summary Create a new organisation
+ */
+export const useCreateOrganisation = <TError = ErrorType<AsError | void>,
+    
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof createOrganisation>>, TError,{data: OrganisationPostBodyBody}, TContext>, request?: SecondParameter<typeof customInstance>}
+) => {
+
+      const mutationOptions = getCreateOrganisationMutationOptions(options);
+
+      return useMutation(mutationOptions);
+    }
+    /**
  * Gets a specific Organisation. To see the Organisation you need admin rights or need to be a member of the Organisation.
 
 Members of an Organisation's **Unit** do not necessarily have access to the Organisation.
@@ -192,77 +174,63 @@ Members of an Organisation's **Unit** do not necessarily have access to the Orga
  * @summary Gets an Organisation
  */
 export const getOrganisation = (
-  orgId: string,
-  options?: SecondParameter<typeof customInstance>,
-  signal?: AbortSignal
+    orgId: string,
+ options?: SecondParameter<typeof customInstance>,signal?: AbortSignal
 ) => {
-  return customInstance<OrganisationGetResponse>(
-    { url: `/organisation/${orgId}`, method: "get", signal },
-    options
-  );
-};
-
-export const getGetOrganisationQueryKey = (orgId: string) =>
-  ["account-server-api", `/organisation/${orgId}`] as const;
-
-export const getGetOrganisationQueryOptions = <
-  TData = Awaited<ReturnType<typeof getOrganisation>>,
-  TError = ErrorType<void | AsError>
->(
-  orgId: string,
-  options?: {
-    query?: UseQueryOptions<
-      Awaited<ReturnType<typeof getOrganisation>>,
-      TError,
-      TData
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  }
-): UseQueryOptions<
-  Awaited<ReturnType<typeof getOrganisation>>,
-  TError,
-  TData
-> & { queryKey: QueryKey } => {
-  const { query: queryOptions, request: requestOptions } = options ?? {};
-
-  const queryKey = queryOptions?.queryKey ?? getGetOrganisationQueryKey(orgId);
-
-  const queryFn: QueryFunction<Awaited<ReturnType<typeof getOrganisation>>> = ({
-    signal,
-  }) => getOrganisation(orgId, requestOptions, signal);
-
-  return { queryKey, queryFn, enabled: !!orgId, ...queryOptions };
-};
-
-export type GetOrganisationQueryResult = NonNullable<
-  Awaited<ReturnType<typeof getOrganisation>>
->;
-export type GetOrganisationQueryError = ErrorType<void | AsError>;
-
-export const useGetOrganisation = <
-  TData = Awaited<ReturnType<typeof getOrganisation>>,
-  TError = ErrorType<void | AsError>
->(
-  orgId: string,
-  options?: {
-    query?: UseQueryOptions<
-      Awaited<ReturnType<typeof getOrganisation>>,
-      TError,
-      TData
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  }
-): UseQueryResult<TData, TError> & { queryKey: QueryKey } => {
-  const queryOptions = getGetOrganisationQueryOptions(orgId, options);
-
-  const query = useQuery(queryOptions) as UseQueryResult<TData, TError> & {
-    queryKey: QueryKey;
-  };
-
-  query.queryKey = queryOptions.queryKey;
+      
+      
+      return customInstance<OrganisationDetail>(
+      {url: `/organisation/${orgId}`, method: 'get', signal
+    },
+      options);
+    }
+  
+
+export const getGetOrganisationQueryKey = (orgId: string,) => {
+    
+    return ["account-server-api", `/organisation/${orgId}`] as const;
+    }
+
+    
+export const getGetOrganisationQueryOptions = <TData = Awaited<ReturnType<typeof getOrganisation>>, TError = ErrorType<void | AsError>>(orgId: string, options?: { query?:UseQueryOptions<Awaited<ReturnType<typeof getOrganisation>>, TError, TData>, request?: SecondParameter<typeof customInstance>}
+) => {
+
+const {query: queryOptions, request: requestOptions} = options ?? {};
+
+  const queryKey =  queryOptions?.queryKey ?? getGetOrganisationQueryKey(orgId);
+
+  
+
+    const queryFn: QueryFunction<Awaited<ReturnType<typeof getOrganisation>>> = ({ signal }) => getOrganisation(orgId, requestOptions, signal);
+
+      
+
+      
+
+   return  { queryKey, queryFn, enabled: !!(orgId), ...queryOptions} as UseQueryOptions<Awaited<ReturnType<typeof getOrganisation>>, TError, TData> & { queryKey: QueryKey }
+}
+
+export type GetOrganisationQueryResult = NonNullable<Awaited<ReturnType<typeof getOrganisation>>>
+export type GetOrganisationQueryError = ErrorType<void | AsError>
+
+/**
+ * @summary Gets an Organisation
+ */
+export const useGetOrganisation = <TData = Awaited<ReturnType<typeof getOrganisation>>, TError = ErrorType<void | AsError>>(
+ orgId: string, options?: { query?:UseQueryOptions<Awaited<ReturnType<typeof getOrganisation>>, TError, TData>, request?: SecondParameter<typeof customInstance>}
+
+  ):  UseQueryResult<TData, TError> & { queryKey: QueryKey } => {
+
+  const queryOptions = getGetOrganisationQueryOptions(orgId,options)
+
+  const query = useQuery(queryOptions) as  UseQueryResult<TData, TError> & { queryKey: QueryKey };
+
+  query.queryKey = queryOptions.queryKey ;
 
   return query;
-};
+}
+
+
 
 /**
  * Used to update existing Organisation.
@@ -272,75 +240,58 @@ You have to be the Organisation owner (or an administrator) to patch an Organisa
  * @summary Adjust an existing Organisation
  */
 export const patchOrganisation = (
-  orgId: string,
-  organisationPatchBodyBody: OrganisationPatchBodyBody,
-  options?: SecondParameter<typeof customInstance>
-) => {
-  return customInstance<void>(
-    {
-      url: `/organisation/${orgId}`,
-      method: "patch",
-      headers: { "Content-Type": "application/json" },
-      data: organisationPatchBodyBody,
+    orgId: string,
+    organisationPatchBodyBody: OrganisationPatchBodyBody,
+ options?: SecondParameter<typeof customInstance>,) => {
+      
+      
+      return customInstance<void>(
+      {url: `/organisation/${orgId}`, method: 'patch',
+      headers: {'Content-Type': 'application/json', },
+      data: organisationPatchBodyBody
     },
-    options
-  );
-};
-
-export const getPatchOrganisationMutationOptions = <
-  TError = ErrorType<AsError>,
-  TContext = unknown
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof patchOrganisation>>,
-    TError,
-    { orgId: string; data: OrganisationPatchBodyBody },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof patchOrganisation>>,
-  TError,
-  { orgId: string; data: OrganisationPatchBodyBody },
-  TContext
-> => {
-  const { mutation: mutationOptions, request: requestOptions } = options ?? {};
-
-  const mutationFn: MutationFunction<
-    Awaited<ReturnType<typeof patchOrganisation>>,
-    { orgId: string; data: OrganisationPatchBodyBody }
-  > = (props) => {
-    const { orgId, data } = props ?? {};
-
-    return patchOrganisation(orgId, data, requestOptions);
-  };
-
-  return { mutationFn, ...mutationOptions };
-};
-
-export type PatchOrganisationMutationResult = NonNullable<
-  Awaited<ReturnType<typeof patchOrganisation>>
->;
-export type PatchOrganisationMutationBody = OrganisationPatchBodyBody;
-export type PatchOrganisationMutationError = ErrorType<AsError>;
-
-export const usePatchOrganisation = <
-  TError = ErrorType<AsError>,
-  TContext = unknown
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof patchOrganisation>>,
-    TError,
-    { orgId: string; data: OrganisationPatchBodyBody },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}) => {
-  const mutationOptions = getPatchOrganisationMutationOptions(options);
-
-  return useMutation(mutationOptions);
-};
-/**
+      options);
+    }
+  
+
+
+export const getPatchOrganisationMutationOptions = <TError = ErrorType<AsError>,
+    
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof patchOrganisation>>, TError,{orgId: string;data: OrganisationPatchBodyBody}, TContext>, request?: SecondParameter<typeof customInstance>}
+): UseMutationOptions<Awaited<ReturnType<typeof patchOrganisation>>, TError,{orgId: string;data: OrganisationPatchBodyBody}, TContext> => {
+ const {mutation: mutationOptions, request: requestOptions} = options ?? {};
+
+      
+
+
+      const mutationFn: MutationFunction<Awaited<ReturnType<typeof patchOrganisation>>, {orgId: string;data: OrganisationPatchBodyBody}> = (props) => {
+          const {orgId,data} = props ?? {};
+
+          return  patchOrganisation(orgId,data,requestOptions)
+        }
+
+        
+
+
+   return  { mutationFn, ...mutationOptions }}
+
+    export type PatchOrganisationMutationResult = NonNullable<Awaited<ReturnType<typeof patchOrganisation>>>
+    export type PatchOrganisationMutationBody = OrganisationPatchBodyBody
+    export type PatchOrganisationMutationError = ErrorType<AsError>
+
+    /**
+ * @summary Adjust an existing Organisation
+ */
+export const usePatchOrganisation = <TError = ErrorType<AsError>,
+    
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof patchOrganisation>>, TError,{orgId: string;data: OrganisationPatchBodyBody}, TContext>, request?: SecondParameter<typeof customInstance>}
+) => {
+
+      const mutationOptions = getPatchOrganisationMutationOptions(options);
+
+      return useMutation(mutationOptions);
+    }
+    /**
  * Before an Organisation can be deleted all its underlying **Units** must also be deleted, remembering that **Units** that have undeleted **Products** cannot be deleted.
 
 You need admin rights to use this method
@@ -348,69 +299,55 @@ You need admin rights to use this method
  * @summary Deletes an Organisation
  */
 export const deleteOrganisation = (
-  orgId: string,
-  options?: SecondParameter<typeof customInstance>
+    orgId: string,
+ options?: SecondParameter<typeof customInstance>,) => {
+      
+      
+      return customInstance<void>(
+      {url: `/organisation/${orgId}`, method: 'delete'
+    },
+      options);
+    }
+  
+
+
+export const getDeleteOrganisationMutationOptions = <TError = ErrorType<AsError>,
+    
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof deleteOrganisation>>, TError,{orgId: string}, TContext>, request?: SecondParameter<typeof customInstance>}
+): UseMutationOptions<Awaited<ReturnType<typeof deleteOrganisation>>, TError,{orgId: string}, TContext> => {
+ const {mutation: mutationOptions, request: requestOptions} = options ?? {};
+
+      
+
+
+      const mutationFn: MutationFunction<Awaited<ReturnType<typeof deleteOrganisation>>, {orgId: string}> = (props) => {
+          const {orgId} = props ?? {};
+
+          return  deleteOrganisation(orgId,requestOptions)
+        }
+
+        
+
+
+   return  { mutationFn, ...mutationOptions }}
+
+    export type DeleteOrganisationMutationResult = NonNullable<Awaited<ReturnType<typeof deleteOrganisation>>>
+    
+    export type DeleteOrganisationMutationError = ErrorType<AsError>
+
+    /**
+ * @summary Deletes an Organisation
+ */
+export const useDeleteOrganisation = <TError = ErrorType<AsError>,
+    
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof deleteOrganisation>>, TError,{orgId: string}, TContext>, request?: SecondParameter<typeof customInstance>}
 ) => {
-  return customInstance<void>(
-    { url: `/organisation/${orgId}`, method: "delete" },
-    options
-  );
-};
-
-export const getDeleteOrganisationMutationOptions = <
-  TError = ErrorType<AsError>,
-  TContext = unknown
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof deleteOrganisation>>,
-    TError,
-    { orgId: string },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof deleteOrganisation>>,
-  TError,
-  { orgId: string },
-  TContext
-> => {
-  const { mutation: mutationOptions, request: requestOptions } = options ?? {};
-
-  const mutationFn: MutationFunction<
-    Awaited<ReturnType<typeof deleteOrganisation>>,
-    { orgId: string }
-  > = (props) => {
-    const { orgId } = props ?? {};
-
-    return deleteOrganisation(orgId, requestOptions);
-  };
-
-  return { mutationFn, ...mutationOptions };
-};
-
-export type DeleteOrganisationMutationResult = NonNullable<
-  Awaited<ReturnType<typeof deleteOrganisation>>
->;
-
-export type DeleteOrganisationMutationError = ErrorType<AsError>;
-
-export const useDeleteOrganisation = <
-  TError = ErrorType<AsError>,
-  TContext = unknown
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof deleteOrganisation>>,
-    TError,
-    { orgId: string },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}) => {
-  const mutationOptions = getDeleteOrganisationMutationOptions(options);
-
-  return useMutation(mutationOptions);
-};
-/**
+
+      const mutationOptions = getDeleteOrganisationMutationOptions(options);
+
+      return useMutation(mutationOptions);
+    }
+    /**
  * Gets a Organisation charges.
 
 The Organisation cannot be the **Default Organisation** and you need to be a member of the Organisation to use this endpoint
@@ -418,88 +355,68 @@ The Organisation cannot be the **Default Organisation** and you need to be a mem
  * @summary Gets charges for all Units in an Organisation
  */
 export const getOrganisationCharges = (
-  orgId: string,
-  params?: GetOrganisationChargesParams,
-  options?: SecondParameter<typeof customInstance>,
-  signal?: AbortSignal
+    orgId: string,
+    params?: GetOrganisationChargesParams,
+ options?: SecondParameter<typeof customInstance>,signal?: AbortSignal
 ) => {
-  return customInstance<OrganisationChargesGetResponse>(
-    { url: `/organisation/${orgId}/charges`, method: "get", params, signal },
-    options
-  );
-};
-
-export const getGetOrganisationChargesQueryKey = (
-  orgId: string,
-  params?: GetOrganisationChargesParams
-) => ["account-server-api", `/organisation/${orgId}/charges`, ...(params ? [params] : [])] as const;
-
-export const getGetOrganisationChargesQueryOptions = <
-  TData = Awaited<ReturnType<typeof getOrganisationCharges>>,
-  TError = ErrorType<void | AsError>
->(
-  orgId: string,
-  params?: GetOrganisationChargesParams,
-  options?: {
-    query?: UseQueryOptions<
-      Awaited<ReturnType<typeof getOrganisationCharges>>,
-      TError,
-      TData
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  }
-): UseQueryOptions<
-  Awaited<ReturnType<typeof getOrganisationCharges>>,
-  TError,
-  TData
-> & { queryKey: QueryKey } => {
-  const { query: queryOptions, request: requestOptions } = options ?? {};
-
-  const queryKey =
-    queryOptions?.queryKey ?? getGetOrganisationChargesQueryKey(orgId, params);
-
-  const queryFn: QueryFunction<
-    Awaited<ReturnType<typeof getOrganisationCharges>>
-  > = ({ signal }) =>
-    getOrganisationCharges(orgId, params, requestOptions, signal);
-
-  return { queryKey, queryFn, enabled: !!orgId, ...queryOptions };
-};
-
-export type GetOrganisationChargesQueryResult = NonNullable<
-  Awaited<ReturnType<typeof getOrganisationCharges>>
->;
-export type GetOrganisationChargesQueryError = ErrorType<void | AsError>;
-
-export const useGetOrganisationCharges = <
-  TData = Awaited<ReturnType<typeof getOrganisationCharges>>,
-  TError = ErrorType<void | AsError>
->(
-  orgId: string,
-  params?: GetOrganisationChargesParams,
-  options?: {
-    query?: UseQueryOptions<
-      Awaited<ReturnType<typeof getOrganisationCharges>>,
-      TError,
-      TData
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  }
-): UseQueryResult<TData, TError> & { queryKey: QueryKey } => {
-  const queryOptions = getGetOrganisationChargesQueryOptions(
-    orgId,
-    params,
-    options
-  );
-
-  const query = useQuery(queryOptions) as UseQueryResult<TData, TError> & {
-    queryKey: QueryKey;
-  };
-
-  query.queryKey = queryOptions.queryKey;
+      
+      
+      return customInstance<OrganisationChargesGetResponse>(
+      {url: `/organisation/${orgId}/charges`, method: 'get',
+        params, signal
+    },
+      options);
+    }
+  
+
+export const getGetOrganisationChargesQueryKey = (orgId: string,
+    params?: GetOrganisationChargesParams,) => {
+    
+    return ["account-server-api", `/organisation/${orgId}/charges`, ...(params ? [params]: [])] as const;
+    }
+
+    
+export const getGetOrganisationChargesQueryOptions = <TData = Awaited<ReturnType<typeof getOrganisationCharges>>, TError = ErrorType<void | AsError>>(orgId: string,
+    params?: GetOrganisationChargesParams, options?: { query?:UseQueryOptions<Awaited<ReturnType<typeof getOrganisationCharges>>, TError, TData>, request?: SecondParameter<typeof customInstance>}
+) => {
+
+const {query: queryOptions, request: requestOptions} = options ?? {};
+
+  const queryKey =  queryOptions?.queryKey ?? getGetOrganisationChargesQueryKey(orgId,params);
+
+  
+
+    const queryFn: QueryFunction<Awaited<ReturnType<typeof getOrganisationCharges>>> = ({ signal }) => getOrganisationCharges(orgId,params, requestOptions, signal);
+
+      
+
+      
+
+   return  { queryKey, queryFn, enabled: !!(orgId), ...queryOptions} as UseQueryOptions<Awaited<ReturnType<typeof getOrganisationCharges>>, TError, TData> & { queryKey: QueryKey }
+}
+
+export type GetOrganisationChargesQueryResult = NonNullable<Awaited<ReturnType<typeof getOrganisationCharges>>>
+export type GetOrganisationChargesQueryError = ErrorType<void | AsError>
+
+/**
+ * @summary Gets charges for all Units in an Organisation
+ */
+export const useGetOrganisationCharges = <TData = Awaited<ReturnType<typeof getOrganisationCharges>>, TError = ErrorType<void | AsError>>(
+ orgId: string,
+    params?: GetOrganisationChargesParams, options?: { query?:UseQueryOptions<Awaited<ReturnType<typeof getOrganisationCharges>>, TError, TData>, request?: SecondParameter<typeof customInstance>}
+
+  ):  UseQueryResult<TData, TError> & { queryKey: QueryKey } => {
+
+  const queryOptions = getGetOrganisationChargesQueryOptions(orgId,params,options)
+
+  const query = useQuery(queryOptions) as  UseQueryResult<TData, TError> & { queryKey: QueryKey };
+
+  query.queryKey = queryOptions.queryKey ;
 
   return query;
-};
+}
+
+
 
 /**
  * Gets the Default Organisation, a built-in Organisation used exclusively for **Personal Units**.
@@ -509,68 +426,61 @@ Any authorised user can see the Default Organisation.
  * @summary Gets the Default Organisation
  */
 export const getDefaultOrganisation = (
-  options?: SecondParameter<typeof customInstance>,
-  signal?: AbortSignal
+    
+ options?: SecondParameter<typeof customInstance>,signal?: AbortSignal
+) => {
+      
+      
+      return customInstance<OrganisationGetDefaultResponse>(
+      {url: `/organisation/default`, method: 'get', signal
+    },
+      options);
+    }
+  
+
+export const getGetDefaultOrganisationQueryKey = () => {
+    
+    return ["account-server-api", `/organisation/default`] as const;
+    }
+
+    
+export const getGetDefaultOrganisationQueryOptions = <TData = Awaited<ReturnType<typeof getDefaultOrganisation>>, TError = ErrorType<void | AsError>>( options?: { query?:UseQueryOptions<Awaited<ReturnType<typeof getDefaultOrganisation>>, TError, TData>, request?: SecondParameter<typeof customInstance>}
 ) => {
-  return customInstance<OrganisationGetDefaultResponse>(
-    { url: `/organisation/default`, method: "get", signal },
-    options
-  );
-};
-
-export const getGetDefaultOrganisationQueryKey = () =>
-  ["account-server-api", `/organisation/default`] as const;
-
-export const getGetDefaultOrganisationQueryOptions = <
-  TData = Awaited<ReturnType<typeof getDefaultOrganisation>>,
-  TError = ErrorType<void | AsError>
->(options?: {
-  query?: UseQueryOptions<
-    Awaited<ReturnType<typeof getDefaultOrganisation>>,
-    TError,
-    TData
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseQueryOptions<
-  Awaited<ReturnType<typeof getDefaultOrganisation>>,
-  TError,
-  TData
-> & { queryKey: QueryKey } => {
-  const { query: queryOptions, request: requestOptions } = options ?? {};
-
-  const queryKey =
-    queryOptions?.queryKey ?? getGetDefaultOrganisationQueryKey();
-
-  const queryFn: QueryFunction<
-    Awaited<ReturnType<typeof getDefaultOrganisation>>
-  > = ({ signal }) => getDefaultOrganisation(requestOptions, signal);
-
-  return { queryKey, queryFn, ...queryOptions };
-};
-
-export type GetDefaultOrganisationQueryResult = NonNullable<
-  Awaited<ReturnType<typeof getDefaultOrganisation>>
->;
-export type GetDefaultOrganisationQueryError = ErrorType<void | AsError>;
-
-export const useGetDefaultOrganisation = <
-  TData = Awaited<ReturnType<typeof getDefaultOrganisation>>,
-  TError = ErrorType<void | AsError>
->(options?: {
-  query?: UseQueryOptions<
-    Awaited<ReturnType<typeof getDefaultOrganisation>>,
-    TError,
-    TData
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseQueryResult<TData, TError> & { queryKey: QueryKey } => {
-  const queryOptions = getGetDefaultOrganisationQueryOptions(options);
-
-  const query = useQuery(queryOptions) as UseQueryResult<TData, TError> & {
-    queryKey: QueryKey;
-  };
-
-  query.queryKey = queryOptions.queryKey;
+
+const {query: queryOptions, request: requestOptions} = options ?? {};
+
+  const queryKey =  queryOptions?.queryKey ?? getGetDefaultOrganisationQueryKey();
+
+  
+
+    const queryFn: QueryFunction<Awaited<ReturnType<typeof getDefaultOrganisation>>> = ({ signal }) => getDefaultOrganisation(requestOptions, signal);
+
+      
+
+      
+
+   return  { queryKey, queryFn, ...queryOptions} as UseQueryOptions<Awaited<ReturnType<typeof getDefaultOrganisation>>, TError, TData> & { queryKey: QueryKey }
+}
+
+export type GetDefaultOrganisationQueryResult = NonNullable<Awaited<ReturnType<typeof getDefaultOrganisation>>>
+export type GetDefaultOrganisationQueryError = ErrorType<void | AsError>
+
+/**
+ * @summary Gets the Default Organisation
+ */
+export const useGetDefaultOrganisation = <TData = Awaited<ReturnType<typeof getDefaultOrganisation>>, TError = ErrorType<void | AsError>>(
+  options?: { query?:UseQueryOptions<Awaited<ReturnType<typeof getDefaultOrganisation>>, TError, TData>, request?: SecondParameter<typeof customInstance>}
+
+  ):  UseQueryResult<TData, TError> & { queryKey: QueryKey } => {
+
+  const queryOptions = getGetDefaultOrganisationQueryOptions(options)
+
+  const query = useQuery(queryOptions) as  UseQueryResult<TData, TError> & { queryKey: QueryKey };
+
+  query.queryKey = queryOptions.queryKey ;
 
   return query;
-};
+}
+
+
+