@squonk/account-server-client 4.7.0-trunk.2383504127 → 4.7.2

package/src/api/charges/charges.fetch.ts

@@ -1,11 +1,11 @@
 /**
- * Generated by orval v7.17.0 🍺
+ * Generated by orval v8.22.0 🍺
  * Do not edit manually.
  * Account Server API
  * The Informatics Matters Account Server API.
-
-A service that provides access to the Account Server, which gives *registered* users access to and management of **Organisations**, **Units**, **Products**, **Users**, and **Assets**.
-
+ *
+ * A service that provides access to the Account Server, which gives *registered* users access to and management of **Organisations**, **Units**, **Products**, **Users**, and **Assets**.
+ *
  * OpenAPI spec version: 4.7
  */
 import { useQuery, useSuspenseQuery } from "@tanstack/react-query";
@@ -34,20 +34,28 @@ import type {
   OrganisationChargesGetResponse,
   ProductChargesGetResponse,
   UnitChargesGetResponse,
-} from ".././api-schemas";
+} from "../api-schemas";
 
 import { customFetch } from "../../custom-fetch";
 import type { ErrorType } from "../../custom-fetch";
 
 type SecondParameter<T extends (...args: never) => unknown> = Parameters<T>[1];
 
-/**
- * Gets global Charges.
-
-You need admin rights to use this path.
+const withQueryKey = <T extends object, K>(query: T, queryKey: K): T & { queryKey: K } => {
+  const result = { queryKey } as T & { queryKey: K };
+  for (const key of Object.keys(query)) {
+    // The explicit queryKey always wins, matching the previous
+    // `{ ...query, queryKey }` spread where it was set last.
+    if (key === "queryKey") continue;
+    Object.defineProperty(result, key, {
+      enumerable: true,
+      configurable: true,
+      get: () => (query as Record<string, unknown>)[key],
+    });
+  }
+  return result;
+};
 
- * @summary Gets charges for all Organisations
- */
 export type getChargesResponse200 = { data: ChargesGetResponse; status: 200 };
 
 export type getChargesResponse401 = { data: void; status: 401 };
@@ -70,7 +78,7 @@ export const getGetChargesUrl = (params?: GetChargesParams) => {
 
   Object.entries(params || {}).forEach(([key, value]) => {
     if (value !== undefined) {
-      normalizedParams.append(key, value === null ? "null" : value.toString());
+      normalizedParams.append(key, value === null ? "null" : String(value));
     }
   });
 
@@ -79,6 +87,12 @@ export const getGetChargesUrl = (params?: GetChargesParams) => {
   return stringifiedParams.length > 0 ? `/charges?${stringifiedParams}` : `/charges`;
 };
 
+/**
+ * Gets global Charges.
+ *
+ * You need admin rights to use this path.
+ * @summary Gets charges for all Organisations
+ */
 export const getCharges = async (
   params?: GetChargesParams,
   options?: RequestInit,
@@ -111,7 +125,7 @@ export const getGetChargesQueryOptions = <
     Awaited<ReturnType<typeof getCharges>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetChargesQueryResult = NonNullable<Awaited<ReturnType<typeof getCharges>>>;
@@ -135,7 +149,7 @@ export function useGetCharges<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetCharges<
   TData = Awaited<ReturnType<typeof getCharges>>,
   TError = ErrorType<void | AsError>,
@@ -154,7 +168,7 @@ export function useGetCharges<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetCharges<
   TData = Awaited<ReturnType<typeof getCharges>>,
   TError = ErrorType<void | AsError>,
@@ -165,7 +179,7 @@ export function useGetCharges<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets charges for all Organisations
  */
@@ -180,16 +194,14 @@ export function useGetCharges<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetChargesQueryOptions(params, options);
 
   const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
-    queryKey: DataTag<QueryKey, TData>;
+    queryKey: DataTag<QueryKey, TData, TError>;
   };
 
-  query.queryKey = queryOptions.queryKey;
-
-  return query;
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 /**
@@ -226,7 +238,7 @@ export const getGetChargesSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getCharges>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetChargesSuspenseQueryResult = NonNullable<Awaited<ReturnType<typeof getCharges>>>;
@@ -242,7 +254,7 @@ export function useGetChargesSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetChargesSuspense<
   TData = Awaited<ReturnType<typeof getCharges>>,
   TError = ErrorType<void | AsError>,
@@ -253,7 +265,7 @@ export function useGetChargesSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetChargesSuspense<
   TData = Awaited<ReturnType<typeof getCharges>>,
   TError = ErrorType<void | AsError>,
@@ -264,7 +276,7 @@ export function useGetChargesSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets charges for all Organisations
  */
@@ -279,26 +291,17 @@ export function useGetChargesSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetChargesSuspenseQueryOptions(params, options);
 
   const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult<
     TData,
     TError
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  query.queryKey = queryOptions.queryKey;
-
-  return query;
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
-/**
- * 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
-
- * @summary Gets charges for all Units in an Organisation
- */
 export type getOrganisationChargesResponse200 = {
   data: OrganisationChargesGetResponse;
   status: 200;
@@ -331,7 +334,7 @@ export const getGetOrganisationChargesUrl = (
 
   Object.entries(params || {}).forEach(([key, value]) => {
     if (value !== undefined) {
-      normalizedParams.append(key, value === null ? "null" : value.toString());
+      normalizedParams.append(key, value === null ? "null" : String(value));
     }
   });
 
@@ -342,6 +345,12 @@ export const getGetOrganisationChargesUrl = (
     : `/charges/organisation/${orgId}`;
 };
 
+/**
+ * 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
+ * @summary Gets charges for all Units in an Organisation
+ */
 export const getOrganisationCharges = async (
   orgId: string,
   params?: GetOrganisationChargesParams,
@@ -354,7 +363,7 @@ export const getOrganisationCharges = async (
 };
 
 export const getGetOrganisationChargesQueryKey = (
-  orgId?: string,
+  orgId: string,
   params?: GetOrganisationChargesParams,
 ) => {
   return ["account-server", "charges", "organisation", orgId, ...(params ? [params] : [])] as const;
@@ -380,11 +389,14 @@ export const getGetOrganisationChargesQueryOptions = <
   const queryFn: QueryFunction<Awaited<ReturnType<typeof getOrganisationCharges>>> = ({ signal }) =>
     getOrganisationCharges(orgId, params, { signal, ...requestOptions });
 
-  return { queryKey, queryFn, enabled: !!orgId, ...queryOptions } as UseQueryOptions<
-    Awaited<ReturnType<typeof getOrganisationCharges>>,
-    TError,
-    TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  return {
+    queryKey,
+    queryFn,
+    enabled: orgId !== null && orgId !== undefined,
+    ...queryOptions,
+  } as UseQueryOptions<Awaited<ReturnType<typeof getOrganisationCharges>>, TError, TData> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
 };
 
 export type GetOrganisationChargesQueryResult = NonNullable<
@@ -413,7 +425,7 @@ export function useGetOrganisationCharges<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetOrganisationCharges<
   TData = Awaited<ReturnType<typeof getOrganisationCharges>>,
   TError = ErrorType<void | AsError>,
@@ -435,7 +447,7 @@ export function useGetOrganisationCharges<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetOrganisationCharges<
   TData = Awaited<ReturnType<typeof getOrganisationCharges>>,
   TError = ErrorType<void | AsError>,
@@ -449,7 +461,7 @@ export function useGetOrganisationCharges<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets charges for all Units in an Organisation
  */
@@ -467,16 +479,14 @@ export function useGetOrganisationCharges<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetOrganisationChargesQueryOptions(orgId, params, options);
 
   const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
-    queryKey: DataTag<QueryKey, TData>;
+    queryKey: DataTag<QueryKey, TData, TError>;
   };
 
-  query.queryKey = queryOptions.queryKey;
-
-  return query;
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 /**
@@ -520,7 +530,7 @@ export const getGetOrganisationChargesSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getOrganisationCharges>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetOrganisationChargesSuspenseQueryResult = NonNullable<
@@ -541,7 +551,7 @@ export function useGetOrganisationChargesSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetOrganisationChargesSuspense<
   TData = Awaited<ReturnType<typeof getOrganisationCharges>>,
   TError = ErrorType<void | AsError>,
@@ -555,7 +565,7 @@ export function useGetOrganisationChargesSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetOrganisationChargesSuspense<
   TData = Awaited<ReturnType<typeof getOrganisationCharges>>,
   TError = ErrorType<void | AsError>,
@@ -569,7 +579,7 @@ export function useGetOrganisationChargesSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets charges for all Units in an Organisation
  */
@@ -587,29 +597,17 @@ export function useGetOrganisationChargesSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetOrganisationChargesSuspenseQueryOptions(orgId, params, options);
 
   const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult<
     TData,
     TError
-  > & { queryKey: DataTag<QueryKey, TData> };
-
-  query.queryKey = queryOptions.queryKey;
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  return query;
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
-/**
- * Get the charges made against a Product with optional **from** (inclusive) and **until** (exclusive) dates. If no dates are provided, the charges for the current billing period are returned.
-
-Dates are interpreted using the Python `dateutil` parser, so the input strings are extremely flexible with, for example, `1 December 2021` as an acceptable input.
-
-**From** must be a date (day) prior to **until**. For example, to see the charges for the 11th July 2022 set **from** to `11 July 2022` and **until** to `12 July 2022`. As an alternative to **From** and **Until** you can provide a **Prior Billing Period**, a value that identifies the prior period to retrieve. A value of `-1` would indicate the *prior period* (month) with an oldest retrieval value of `-23` allowing you to obtain charges for up to two years.
-
-You need to be part of the **Unit** or **Organisation** to use this method
- * @summary Get charges made against a Product
- */
 export type getProductChargesResponse200 = { data: ProductChargesGetResponse; status: 200 };
 
 export type getProductChargesResponse400 = { data: AsError; status: 400 };
@@ -634,7 +632,7 @@ export const getGetProductChargesUrl = (productId: string, params?: GetProductCh
 
   Object.entries(params || {}).forEach(([key, value]) => {
     if (value !== undefined) {
-      normalizedParams.append(key, value === null ? "null" : value.toString());
+      normalizedParams.append(key, value === null ? "null" : String(value));
     }
   });
 
@@ -645,6 +643,16 @@ export const getGetProductChargesUrl = (productId: string, params?: GetProductCh
     : `/charges/product/${productId}`;
 };
 
+/**
+ * Get the charges made against a Product with optional **from** (inclusive) and **until** (exclusive) dates. If no dates are provided, the charges for the current billing period are returned.
+ *
+ * Dates are interpreted using the Python `dateutil` parser, so the input strings are extremely flexible with, for example, `1 December 2021` as an acceptable input.
+ *
+ * **From** must be a date (day) prior to **until**. For example, to see the charges for the 11th July 2022 set **from** to `11 July 2022` and **until** to `12 July 2022`. As an alternative to **From** and **Until** you can provide a **Prior Billing Period**, a value that identifies the prior period to retrieve. A value of `-1` would indicate the *prior period* (month) with an oldest retrieval value of `-23` allowing you to obtain charges for up to two years.
+ *
+ * You need to be part of the **Unit** or **Organisation** to use this method
+ * @summary Get charges made against a Product
+ */
 export const getProductCharges = async (
   productId: string,
   params?: GetProductChargesParams,
@@ -657,7 +665,7 @@ export const getProductCharges = async (
 };
 
 export const getGetProductChargesQueryKey = (
-  productId?: string,
+  productId: string,
   params?: GetProductChargesParams,
 ) => {
   return ["account-server", "charges", "product", productId, ...(params ? [params] : [])] as const;
@@ -681,11 +689,14 @@ export const getGetProductChargesQueryOptions = <
   const queryFn: QueryFunction<Awaited<ReturnType<typeof getProductCharges>>> = ({ signal }) =>
     getProductCharges(productId, params, { signal, ...requestOptions });
 
-  return { queryKey, queryFn, enabled: !!productId, ...queryOptions } as UseQueryOptions<
-    Awaited<ReturnType<typeof getProductCharges>>,
-    TError,
-    TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  return {
+    queryKey,
+    queryFn,
+    enabled: productId !== null && productId !== undefined,
+    ...queryOptions,
+  } as UseQueryOptions<Awaited<ReturnType<typeof getProductCharges>>, TError, TData> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
 };
 
 export type GetProductChargesQueryResult = NonNullable<
@@ -712,7 +723,7 @@ export function useGetProductCharges<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetProductCharges<
   TData = Awaited<ReturnType<typeof getProductCharges>>,
   TError = ErrorType<AsError | void>,
@@ -732,7 +743,7 @@ export function useGetProductCharges<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetProductCharges<
   TData = Awaited<ReturnType<typeof getProductCharges>>,
   TError = ErrorType<AsError | void>,
@@ -744,7 +755,7 @@ export function useGetProductCharges<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Get charges made against a Product
  */
@@ -760,16 +771,14 @@ export function useGetProductCharges<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetProductChargesQueryOptions(productId, params, options);
 
   const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
-    queryKey: DataTag<QueryKey, TData>;
+    queryKey: DataTag<QueryKey, TData, TError>;
   };
 
-  query.queryKey = queryOptions.queryKey;
-
-  return query;
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 /**
@@ -813,7 +822,7 @@ export const getGetProductChargesSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getProductCharges>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetProductChargesSuspenseQueryResult = NonNullable<
@@ -834,7 +843,7 @@ export function useGetProductChargesSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetProductChargesSuspense<
   TData = Awaited<ReturnType<typeof getProductCharges>>,
   TError = ErrorType<AsError | void>,
@@ -848,7 +857,7 @@ export function useGetProductChargesSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetProductChargesSuspense<
   TData = Awaited<ReturnType<typeof getProductCharges>>,
   TError = ErrorType<AsError | void>,
@@ -862,7 +871,7 @@ export function useGetProductChargesSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Get charges made against a Product
  */
@@ -880,28 +889,17 @@ export function useGetProductChargesSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetProductChargesSuspenseQueryOptions(productId, params, options);
 
   const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult<
     TData,
     TError
-  > & { queryKey: DataTag<QueryKey, TData> };
-
-  query.queryKey = queryOptions.queryKey;
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  return query;
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
-/**
- * Get the charges made against a Unit with optional **from** (inclusive) and **until** (exclusive) dates. If no dates are provided, the charges for the current billing period are returned.
-Dates are interpreted using the Python `dateutil` parser, so the input strings are extremely flexible with, for example, `1 December 2021` as an acceptable input.
-
-**From** must be a date (day) prior to **until**. For example, to see the charges for the 11th July 2022 set **from** to `11 July 2022` and **until** to `12 July 2022`. As an alternative to **From** and **Until** you can provide a **Prior Billing Period**, a value that identifies the prior period to retrieve. A value of `-1` would indicate the *prior period* (month) with an oldest retrieval value of `-23` allowing you to obtain charges for up to two years.
-
-You need to be part of the **Unit** or **Organisation** to use this method
- * @summary Get charges made against a Unit
- */
 export type getUnitChargesResponse200 = { data: UnitChargesGetResponse; status: 200 };
 
 export type getUnitChargesResponse400 = { data: AsError; status: 400 };
@@ -924,7 +922,7 @@ export const getGetUnitChargesUrl = (unitId: string, params?: GetUnitChargesPara
 
   Object.entries(params || {}).forEach(([key, value]) => {
     if (value !== undefined) {
-      normalizedParams.append(key, value === null ? "null" : value.toString());
+      normalizedParams.append(key, value === null ? "null" : String(value));
     }
   });
 
@@ -935,6 +933,15 @@ export const getGetUnitChargesUrl = (unitId: string, params?: GetUnitChargesPara
     : `/charges/unit/${unitId}`;
 };
 
+/**
+ * Get the charges made against a Unit with optional **from** (inclusive) and **until** (exclusive) dates. If no dates are provided, the charges for the current billing period are returned.
+ * Dates are interpreted using the Python `dateutil` parser, so the input strings are extremely flexible with, for example, `1 December 2021` as an acceptable input.
+ *
+ * **From** must be a date (day) prior to **until**. For example, to see the charges for the 11th July 2022 set **from** to `11 July 2022` and **until** to `12 July 2022`. As an alternative to **From** and **Until** you can provide a **Prior Billing Period**, a value that identifies the prior period to retrieve. A value of `-1` would indicate the *prior period* (month) with an oldest retrieval value of `-23` allowing you to obtain charges for up to two years.
+ *
+ * You need to be part of the **Unit** or **Organisation** to use this method
+ * @summary Get charges made against a Unit
+ */
 export const getUnitCharges = async (
   unitId: string,
   params?: GetUnitChargesParams,
@@ -946,7 +953,7 @@ export const getUnitCharges = async (
   });
 };
 
-export const getGetUnitChargesQueryKey = (unitId?: string, params?: GetUnitChargesParams) => {
+export const getGetUnitChargesQueryKey = (unitId: string, params?: GetUnitChargesParams) => {
   return ["account-server", "charges", "unit", unitId, ...(params ? [params] : [])] as const;
 };
 
@@ -968,11 +975,14 @@ export const getGetUnitChargesQueryOptions = <
   const queryFn: QueryFunction<Awaited<ReturnType<typeof getUnitCharges>>> = ({ signal }) =>
     getUnitCharges(unitId, params, { signal, ...requestOptions });
 
-  return { queryKey, queryFn, enabled: !!unitId, ...queryOptions } as UseQueryOptions<
-    Awaited<ReturnType<typeof getUnitCharges>>,
-    TError,
-    TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  return {
+    queryKey,
+    queryFn,
+    enabled: unitId !== null && unitId !== undefined,
+    ...queryOptions,
+  } as UseQueryOptions<Awaited<ReturnType<typeof getUnitCharges>>, TError, TData> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
 };
 
 export type GetUnitChargesQueryResult = NonNullable<Awaited<ReturnType<typeof getUnitCharges>>>;
@@ -997,7 +1007,7 @@ export function useGetUnitCharges<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetUnitCharges<
   TData = Awaited<ReturnType<typeof getUnitCharges>>,
   TError = ErrorType<AsError | void>,
@@ -1017,7 +1027,7 @@ export function useGetUnitCharges<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetUnitCharges<
   TData = Awaited<ReturnType<typeof getUnitCharges>>,
   TError = ErrorType<AsError | void>,
@@ -1029,7 +1039,7 @@ export function useGetUnitCharges<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Get charges made against a Unit
  */
@@ -1045,16 +1055,14 @@ export function useGetUnitCharges<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetUnitChargesQueryOptions(unitId, params, options);
 
   const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
-    queryKey: DataTag<QueryKey, TData>;
+    queryKey: DataTag<QueryKey, TData, TError>;
   };
 
-  query.queryKey = queryOptions.queryKey;
-
-  return query;
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 /**
@@ -1098,7 +1106,7 @@ export const getGetUnitChargesSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getUnitCharges>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetUnitChargesSuspenseQueryResult = NonNullable<
@@ -1119,7 +1127,7 @@ export function useGetUnitChargesSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetUnitChargesSuspense<
   TData = Awaited<ReturnType<typeof getUnitCharges>>,
   TError = ErrorType<AsError | void>,
@@ -1133,7 +1141,7 @@ export function useGetUnitChargesSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetUnitChargesSuspense<
   TData = Awaited<ReturnType<typeof getUnitCharges>>,
   TError = ErrorType<AsError | void>,
@@ -1147,7 +1155,7 @@ export function useGetUnitChargesSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Get charges made against a Unit
  */
@@ -1165,15 +1173,13 @@ export function useGetUnitChargesSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetUnitChargesSuspenseQueryOptions(unitId, params, options);
 
   const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult<
     TData,
     TError
-  > & { queryKey: DataTag<QueryKey, TData> };
-
-  query.queryKey = queryOptions.queryKey;
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  return query;
+  return withQueryKey(query, queryOptions.queryKey);
 }