@squonk/account-server-client 4.0.1-rc.3 → 4.1.1-rc.1

package/src/account-server-api.schemas.ts

@@ -1,13 +1,13 @@
 // @ts-nocheck
 /**
- * Generated by orval v7.2.0 🍺
+ * Generated by orval v7.4.1 🍺
  * 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**.
 
- * OpenAPI spec version: 4.0
+ * OpenAPI spec version: 4.1
  */
 export type DetachAssetParams = {
 /**
@@ -23,30 +23,29 @@ export type AttachAssetParams = {
 m_id?: QMIdParameter;
 };
 
+export type GetUnitsParams = {
 /**
- * A date where assets prior to this will be returned. This can be a date-time string but it is interpreted as a date, i.e. `2020-01-01T00:00:00Z` is interpreted as `2020-01-01`. Any asset that occurs prior this date will be returned. UTC is assumed if no timezone is provided
+ * An object name
  */
-export type QUntilParameter = string;
+name?: QNameParameter;
+};
 
+export type GetOrganisationsParams = {
 /**
- * A date from which to retrieve assets. This can be a date-time string but it is interpreted as a date, i.e. `2020-01-01T00:00:00Z` is interpreted as `2020-01-01`. Any asset that occurs on ar after this date will be returned. UTC is assumed if no timezone is provided
+ * An object name
  */
-export type QFromParameter = string;
+name?: QNameParameter;
+};
 
-export type GetUnitChargesParams = {
-/**
- * A date from which to retrieve assets. This can be a date-time string but it is interpreted as a date, i.e. `2020-01-01T00:00:00Z` is interpreted as `2020-01-01`. Any asset that occurs on ar after this date will be returned. UTC is assumed if no timezone is provided
- */
-from?: QFromParameter;
 /**
  * A date where assets prior to this will be returned. This can be a date-time string but it is interpreted as a date, i.e. `2020-01-01T00:00:00Z` is interpreted as `2020-01-01`. Any asset that occurs prior this date will be returned. UTC is assumed if no timezone is provided
  */
-until?: QUntilParameter;
+export type QUntilParameter = string;
+
 /**
- * A charge Prior Billing Period, 0 implies "current" and -23 is for the period 23 months ago.
+ * A date from which to retrieve assets. This can be a date-time string but it is interpreted as a date, i.e. `2020-01-01T00:00:00Z` is interpreted as `2020-01-01`. Any asset that occurs on ar after this date will be returned. UTC is assumed if no timezone is provided
  */
-pbp?: QPbpParameter;
-};
+export type QFromParameter = string;
 
 export type GetProductChargesParams = {
 /**
@@ -108,6 +107,21 @@ export type QProductIdParameter = string;
  */
 export type QUnitIdParameter = string;
 
+/**
+ * An object name
+ */
+export type QNameParameter = string;
+
+/**
+ * A Merchant Identity
+ */
+export type QMIdParameter = number;
+
+/**
+ * An Organisation Identity
+ */
+export type QOrgIdParameter = string;
+
 export type GetAssetParams = {
 /**
  * A User Identity
@@ -128,21 +142,31 @@ org_id?: QOrgIdParameter;
 };
 
 /**
- * A Merchant Identity
+ * A charge Prior Billing Period, 0 implies "current" and -23 is for the period 23 months ago.
  */
-export type QMIdParameter = number;
+export type QPbpParameter = number;
 
+export type GetUnitChargesParams = {
 /**
- * An Organisation Identity
+ * A date from which to retrieve assets. This can be a date-time string but it is interpreted as a date, i.e. `2020-01-01T00:00:00Z` is interpreted as `2020-01-01`. Any asset that occurs on ar after this date will be returned. UTC is assumed if no timezone is provided
  */
-export type QOrgIdParameter = string;
-
+from?: QFromParameter;
+/**
+ * A date where assets prior to this will be returned. This can be a date-time string but it is interpreted as a date, i.e. `2020-01-01T00:00:00Z` is interpreted as `2020-01-01`. Any asset that occurs prior this date will be returned. UTC is assumed if no timezone is provided
+ */
+until?: QUntilParameter;
 /**
  * A charge Prior Billing Period, 0 implies "current" and -23 is for the period 23 months ago.
  */
-export type QPbpParameter = number;
+pbp?: QPbpParameter;
+};
 
 export type ProductPatchBodyBody = {
+  /**
+   * The name you want to give the Product
+   * @maxLength 80
+   */
+  name?: string;
   /**
    * The Product's built-in coin allowance. Product allowances cannot be reduced
    * @minimum 1
@@ -153,27 +177,8 @@ export type ProductPatchBodyBody = {
    * @minimum 1
    */
   limit?: number;
-  /**
-   * The name you want to give the Product
-   * @maxLength 80
-   */
-  name?: string;
 };
 
-/**
- * The Type of Product. Storage subscriptions require an **Allowance** to be defined and the **Flavour** must not be provided.
-
-Project Tier subscriptions have built-in allowances and Limits so you must not provide values for these for these products
- */
-export type UnitProductPostBodyBodyType = typeof UnitProductPostBodyBodyType[keyof typeof UnitProductPostBodyBodyType];
-
-
-// eslint-disable-next-line @typescript-eslint/no-redeclare
-export const UnitProductPostBodyBodyType = {
-  DATA_MANAGER_PROJECT_TIER_SUBSCRIPTION: 'DATA_MANAGER_PROJECT_TIER_SUBSCRIPTION',
-  DATA_MANAGER_STORAGE_SUBSCRIPTION: 'DATA_MANAGER_STORAGE_SUBSCRIPTION',
-} as const;
-
 /**
  * The Flavour of the Product. Used only for Project Tier Products. Do not set this for Storage products
  */
@@ -188,28 +193,42 @@ export const UnitProductPostBodyBodyFlavour = {
   GOLD: 'GOLD',
 } as const;
 
+/**
+ * The Type of Product. Storage subscriptions require an **Allowance** to be defined and the **Flavour** must not be provided.
+
+Project Tier subscriptions have built-in allowances and Limits so you must not provide values for these for these products
+ */
+export type UnitProductPostBodyBodyType = typeof UnitProductPostBodyBodyType[keyof typeof UnitProductPostBodyBodyType];
+
+
+// eslint-disable-next-line @typescript-eslint/no-redeclare
+export const UnitProductPostBodyBodyType = {
+  DATA_MANAGER_PROJECT_TIER_SUBSCRIPTION: 'DATA_MANAGER_PROJECT_TIER_SUBSCRIPTION',
+  DATA_MANAGER_STORAGE_SUBSCRIPTION: 'DATA_MANAGER_STORAGE_SUBSCRIPTION',
+} as const;
+
 export type UnitProductPostBodyBody = {
+  /**
+   * The name you want to give the Product
+   * @maxLength 80
+   */
+  name: string;
+  /** The Type of Product. Storage subscriptions require an **Allowance** to be defined and the **Flavour** must not be provided.
+
+Project Tier subscriptions have built-in allowances and Limits so you must not provide values for these for these products */
+  type: UnitProductPostBodyBodyType;
+  /** The Flavour of the Product. Used only for Project Tier Products. Do not set this for Storage products */
+  flavour?: UnitProductPostBodyBodyFlavour;
   /**
    * The Product's coin allowance. You must provide this for Storage products but you must not provide a value for Project Tier Products
    * @minimum 1
    */
   allowance?: number;
-  /** The Flavour of the Product. Used only for Project Tier Products. Do not set this for Storage products */
-  flavour?: UnitProductPostBodyBodyFlavour;
   /**
    * The Product's built-in coin limit. If set it must not be less than the allowance. If not set the allowance is used. You can provide this for Storage products but you must not provide a value for Project Tier Products
    * @minimum 1
    */
   limit?: number;
-  /**
-   * The name you want to give the Product
-   * @maxLength 80
-   */
-  name: string;
-  /** The Type of Product. Storage subscriptions require an **Allowance** to be defined and the **Flavour** must not be provided.
-
-Project Tier subscriptions have built-in allowances and Limits so you must not provide values for these for these products */
-  type: UnitProductPostBodyBodyType;
 };
 
 /**
@@ -229,12 +248,12 @@ export const UnitPatchBodyBodyDefaultProductPrivacy = {
 } as const;
 
 export type UnitPatchBodyBody = {
+  /** The new name for the Unit */
+  name?: string;
   /** The new default **Product** privacy applied to all products that belong to this Unit. Privacy is also controlled at the **Organisation** level. As an example, the Unit can declare its Products to be `DEFAULT_PRIVATE`, but the Organisation can declare its value to be `DEFAULT_PUBLIC`.
 
 Whether the privacy can be honoured will depend on the organisation's value */
   default_product_privacy?: UnitPatchBodyBodyDefaultProductPrivacy;
-  /** The new name for the Unit */
-  name?: string;
 };
 
 /**
@@ -254,12 +273,12 @@ export const OrganisationPatchBodyBodyDefaultProductPrivacy = {
 } as const;
 
 export type OrganisationPatchBodyBody = {
+  /** The new name for the Organisational */
+  name?: string;
   /** The new default **Product** privacy applied to all products that belong to this Organisation. Privacy is also controlled at the **Unit** level. As an example the Organisation level privacy can be `DEFAULT_PRIVATE`, but the unit can declare its Products to be `ALWAYS_PRIVATE`.
 
 Whether the privacy can be honoured will depend on the value in any of the organisation's existing units */
   default_product_privacy?: OrganisationPatchBodyBodyDefaultProductPrivacy;
-  /** The new name for the Organisational */
-  name?: string;
 };
 
 /**
@@ -277,6 +296,11 @@ export const OrganisationUnitPostBodyBodyDefaultProductPrivacy = {
 } as const;
 
 export type OrganisationUnitPostBodyBody = {
+  /**
+   * The name of the unit
+   * @maxLength 80
+   */
+  name: string;
   /**
    * The day you would like to be billed for the Unit's Products (a value from 1 and 28)
    * @minimum 1
@@ -285,11 +309,6 @@ export type OrganisationUnitPostBodyBody = {
   billing_day: number;
   /** The default product privacy setting for products in the unit. Whether the privacy can be honoured will depend on the organisation's value */
   default_product_privacy?: OrganisationUnitPostBodyBodyDefaultProductPrivacy;
-  /**
-   * The name of the unit
-   * @maxLength 80
-   */
-  name: string;
 };
 
 export type PersonalUnitPutBodyBody = {
@@ -316,8 +335,6 @@ export const OrganisationPostBodyBodyDefaultProductPrivacy = {
 } as const;
 
 export type OrganisationPostBodyBody = {
-  /** The default product privacy setting for the Organisation */
-  default_product_privacy?: OrganisationPostBodyBodyDefaultProductPrivacy;
   /**
    * The name of the organisation
    * @maxLength 80
@@ -325,6 +342,8 @@ export type OrganisationPostBodyBody = {
   name: string;
   /** The name of the organisation owner. A user ID */
   owner: string;
+  /** The default product privacy setting for the Organisation */
+  default_product_privacy?: OrganisationPostBodyBodyDefaultProductPrivacy;
 };
 
 export type AssetPostBodyBodyScope = typeof AssetPostBodyBodyScope[keyof typeof AssetPostBodyBodyScope];
@@ -340,23 +359,23 @@ export const AssetPostBodyBodyScope = {
 } as const;
 
 export type AssetPostBodyBody = {
-  /** A file containing the content for the asset. You must provide a value here or in content_string */
-  content_file?: Blob;
-  /** The textual content of the asset. You must provide a value here or in content_file */
-  content_string?: string;
-  /** An optional description for the Asset */
-  description?: string;
   /**
    * The name of the asset. This must be unique within its scope. For example, only one asset can be called "asset-1" within a given Unit. Asset names must be valid RFC 1123 Label Names
    * @maxLength 80
    * @pattern ^[a-z0-9-]{1,63}$
    */
   name: string;
+  /** A file containing the content for the asset. You must provide a value here or in content_string */
+  content_file?: Blob;
+  /** The textual content of the asset. You must provide a value here or in content_file */
+  content_string?: string;
   scope: AssetPostBodyBodyScope;
   /** The unique identity based on the Scope of the asset. For example, this will be the Unit ID if it's a UNIT. A scope_id is required if the scope is USER as it will be automatically set to your username. Global assets do not have a scope. */
   scope_id?: string;
   /** Is this a secret asset? */
   secret: boolean;
+  /** An optional description for the Asset */
+  description?: string;
 };
 
 export type AssetPatchBodyBody = {
@@ -374,11 +393,11 @@ export interface UserDetail {
 }
 
 export interface UserAccountDetail {
-  /** The roles assigned to the user recognised by the Account Server */
-  account_server_roles: string[];
+  user: UserDetail;
   /** Whether the caller has admin privilege */
   caller_has_admin_privilege: boolean;
-  user: UserDetail;
+  /** The roles assigned to the user recognised by the Account Server */
+  account_server_roles: string[];
 }
 
 /**
@@ -396,13 +415,8 @@ export const UnitDetailDefaultProductPrivacy = {
 } as const;
 
 export interface UnitDetail {
-  /** The Unit's billing day */
-  billing_day: number;
   /** Whether the user making the API call is a member of the Unit */
   caller_is_member: boolean;
-  created: string;
-  /** The Unit's default product privacy setting */
-  default_product_privacy: UnitDetailDefaultProductPrivacy;
   /** The Unit's unique identity */
   id: string;
   /** The Unit's name */
@@ -411,6 +425,11 @@ export interface UnitDetail {
   owner_id: string;
   /** True if the Unit is private */
   private: boolean;
+  created: string;
+  /** The Unit's billing day */
+  billing_day: number;
+  /** The Unit's default product privacy setting */
+  default_product_privacy: UnitDetailDefaultProductPrivacy;
 }
 
 /**
@@ -428,13 +447,8 @@ export const UnitAllDetailDefaultProductPrivacy = {
 } as const;
 
 export interface UnitAllDetail {
-  /** The Unit's billing day */
-  billing_day: number;
   /** Whether the user making the API call is a member of the Unit */
   caller_is_member: boolean;
-  created: string;
-  /** The Unit's default product privacy setting */
-  default_product_privacy: UnitAllDetailDefaultProductPrivacy;
   /** The Unit's unique identity */
   id: string;
   /** The Unit's name */
@@ -443,6 +457,11 @@ export interface UnitAllDetail {
   owner_id: string;
   /** True if the Unit is private */
   private: boolean;
+  created: string;
+  /** The Unit's billing day */
+  billing_day: number;
+  /** The Unit's default product privacy setting */
+  default_product_privacy: UnitAllDetailDefaultProductPrivacy;
   /** A list of users that are members of the Unit */
   users: UserDetail[];
 }
@@ -459,15 +478,15 @@ export const MerchantDetailKind = {
 } as const;
 
 export interface MerchantDetail {
-  /** The hostname used by the Service */
-  api_hostname: string;
-  created: string;
   /** The unique ID of the Service */
   id: number;
+  created: string;
   /** The kind of Service */
   kind: MerchantDetailKind;
   /** The name assigned to the Service */
   name: string;
+  /** The hostname used by the Service */
+  api_hostname: string;
 }
 
 export type MerchantGetResponse = MerchantDetail;
@@ -496,9 +515,6 @@ export const OrganisationDetailDefaultProductPrivacy = {
 export interface OrganisationDetail {
   /** Whether the user making the API call is a member of the Unit */
   caller_is_member: boolean;
-  created: string;
-  /** The Organisation's default product privacy setting */
-  default_product_privacy: OrganisationDetailDefaultProductPrivacy;
   /** The Organisation's unique ID */
   id: string;
   /** The Organisation's name */
@@ -507,6 +523,9 @@ export interface OrganisationDetail {
   owner_id?: string;
   /** True if the Unit is private */
   private: boolean;
+  created: string;
+  /** The Organisation's default product privacy setting */
+  default_product_privacy: OrganisationDetailDefaultProductPrivacy;
 }
 
 /**
@@ -526,9 +545,6 @@ export const OrganisationAllDetailDefaultProductPrivacy = {
 export interface OrganisationAllDetail {
   /** Whether the user making the API call is a member of the Unit */
   caller_is_member: boolean;
-  created: string;
-  /** The Organisation's default product privacy setting */
-  default_product_privacy: OrganisationAllDetailDefaultProductPrivacy;
   /** The Organisation's unique ID */
   id: string;
   /** The Organisation's name */
@@ -537,6 +553,9 @@ export interface OrganisationAllDetail {
   owner_id?: string;
   /** True if the Unit is private */
   private: boolean;
+  created: string;
+  /** The Organisation's default product privacy setting */
+  default_product_privacy: OrganisationAllDetailDefaultProductPrivacy;
   /** A list of users that are members of the Organisation */
   users: UserDetail[];
 }
@@ -553,12 +572,12 @@ export const ProductTypeServiceKind = {
 } as const;
 
 export interface ProductType {
+  /** A product type, this is a unique string amongst all types known to the Account Server */
+  type: string;
   /** A product flavour. Not all types have a flavour, those that do have a type-specific flavour string */
   flavour?: string;
   /** The kind of service that can use the Product */
   service_kind?: ProductTypeServiceKind;
-  /** A product type, this is a unique string amongst all types known to the Account Server */
-  type: string;
 }
 
 export type ProductInstanceDetailCoins = {
@@ -572,72 +591,72 @@ export interface ProductInstanceDetail {
 }
 
 /**
- * The Product Type
+ * The Product Type flavour. Not all products have flavours
 
  */
-export type ProductDetailType = typeof ProductDetailType[keyof typeof ProductDetailType];
+export type ProductDetailFlavour = typeof ProductDetailFlavour[keyof typeof ProductDetailFlavour];
 
 
 // eslint-disable-next-line @typescript-eslint/no-redeclare
-export const ProductDetailType = {
-  DATA_MANAGER_PROJECT_TIER_SUBSCRIPTION: 'DATA_MANAGER_PROJECT_TIER_SUBSCRIPTION',
-  DATA_MANAGER_STORAGE_SUBSCRIPTION: 'DATA_MANAGER_STORAGE_SUBSCRIPTION',
+export const ProductDetailFlavour = {
+  EVALUATION: 'EVALUATION',
+  BRONZE: 'BRONZE',
+  SILVER: 'SILVER',
+  GOLD: 'GOLD',
 } as const;
 
 /**
- * The Product Type flavour. Not all products have flavours
+ * The Product Type
 
  */
-export type ProductDetailFlavour = typeof ProductDetailFlavour[keyof typeof ProductDetailFlavour];
+export type ProductDetailType = typeof ProductDetailType[keyof typeof ProductDetailType];
 
 
 // eslint-disable-next-line @typescript-eslint/no-redeclare
-export const ProductDetailFlavour = {
-  EVALUATION: 'EVALUATION',
-  BRONZE: 'BRONZE',
-  SILVER: 'SILVER',
-  GOLD: 'GOLD',
+export const ProductDetailType = {
+  DATA_MANAGER_PROJECT_TIER_SUBSCRIPTION: 'DATA_MANAGER_PROJECT_TIER_SUBSCRIPTION',
+  DATA_MANAGER_STORAGE_SUBSCRIPTION: 'DATA_MANAGER_STORAGE_SUBSCRIPTION',
 } as const;
 
 export interface ProductDetail {
+  /** The Product ID
+ */
+  id: string;
   created: string;
+  /** The Product Type
+ */
+  type: ProductDetailType;
   /** The Product Type flavour. Not all products have flavours
  */
   flavour?: ProductDetailFlavour;
-  /** The Product ID
- */
-  id: string;
   /** The name of the Product
  */
   name?: string;
-  /** The Product Type
- */
-  type: ProductDetailType;
 }
 
 export interface ProductCoinsDetail {
   /** The billing allowance. When you exceed this during the current billing period the *cost multiplier* will increase */
   allowance: number;
-  /** A multiplier applied to your coin usage within your allowance */
-  allowance_multiplier: number;
+  /** The limit on your billing period spend. You can exceed the allowance but you cannot exceed the spend limit. Once reached the dependent may be restricted */
+  limit: number;
+  /** The total number of coins consumed (in this billing period), excluding the coins that have been consumed for the current day */
+  used: number;
   /** True if the product is operating at or beyond its coin limit. When it is authority to perform actions using the product are severely limited. */
   at_limit: boolean;
-  /** The day of the month when the bill is due, and the end of the current billing period */
-  billing_day: number;
+  /** The current burn rate, the approximate amount of coins you are currently consuming each day */
+  current_burn_rate: number;
   /** The predicted total billing period amount, if costs continue at the current burn rate until the end of the billing period. This is an estimate */
   billing_prediction: number;
   /** The predicted storage contribution to the billing period amount, if costs continue at the current burn rate until the end of the billing period. This is an estimate */
   billing_prediction_storage_contribution: number;
-  /** The current burn rate, the approximate amount of coins you are currently consuming each day */
-  current_burn_rate: number;
-  /** The limit on your billing period spend. You can exceed the allowance but you cannot exceed the spend limit. Once reached the dependent may be restricted */
-  limit: number;
+  /** The day of the month when the bill is due, and the end of the current billing period */
+  billing_day: number;
+  /** A multiplier applied to your coin usage within your allowance */
+  allowance_multiplier: number;
   /** A multiplier that will be applied to coin used beyond your allowance */
   overspend_multiplier: number;
   /** The number of days remaining, in the current billing period */
   remaining_days: number;
-  /** The total number of coins consumed (in this billing period), excluding the coins that have been consumed for the current day */
-  used: number;
 }
 
 export interface ProductClaimDetail {
@@ -649,83 +668,83 @@ export interface ProductClaimDetail {
   name?: string;
 }
 
+export type ProductDmStorageDetailCoins = {
+  /** The number of coins currently committed for the current day. This is added to the accumulated coins at the start of each day */
+  used: number;
+  /** The coin cost of a 'unit' of storage or part thereof. The unit size is defined in the storage section of the response */
+  unit_cost: number;
+};
+
 export type ProductDmStorageDetailSize = {
-  /** The humanised size of the current storage used for the current day and used to calculate the 'burn rate' */
-  current: string;
   /** The humanised size of the peak storage used for the current day. The value is reset at the start of each day */
   peak: string;
+  /** The humanised size of the current storage used for the current day and used to calculate the 'burn rate' */
+  current: string;
   /** The humanised storage unit. The cost of storage is based on the daily peak of the number of units (or part thereof) used */
   unit_size: string;
   /** The peak number of storage units used today */
   units_used: number;
 };
 
-export type ProductDmStorageDetailCoins = {
-  /** The coin cost of a 'unit' of storage or part thereof. The unit size is defined in the storage section of the response */
-  unit_cost: number;
-  /** The number of coins currently committed for the current day. This is added to the accumulated coins at the start of each day */
-  used: number;
-};
-
 export interface ProductDmStorageDetail {
-  coins: ProductDmStorageDetailCoins;
   size: ProductDmStorageDetailSize;
+  coins: ProductDmStorageDetailCoins;
 }
 
 export interface ProductDmProjectTier {
-  claim?: ProductClaimDetail;
-  /** True if the product can be (needs to be) claimed. */
-  claimable: boolean;
-  coins: ProductCoinsDetail;
-  instance: ProductInstanceDetail;
-  organisation: OrganisationAllDetail;
   product: ProductDetail;
-  storage: ProductDmStorageDetail;
+  organisation: OrganisationAllDetail;
   unit: UnitAllDetail;
+  storage: ProductDmStorageDetail;
+  coins: ProductCoinsDetail;
+  instance: ProductInstanceDetail;
+  /** True if the product can be (needs to be) claimed. */
+  claimable: boolean;
+  claim?: ProductClaimDetail;
 }
 
 export interface ProductDmStorage {
-  /** True if the product can be (needs to be) claimed. */
-  claimable: boolean;
-  coins: ProductCoinsDetail;
-  organisation: OrganisationAllDetail;
   product: ProductDetail;
-  storage: ProductDmStorageDetail;
+  organisation: OrganisationAllDetail;
   unit: UnitAllDetail;
+  storage: ProductDmStorageDetail;
+  coins: ProductCoinsDetail;
+  /** True if the product can be (needs to be) claimed. */
+  claimable: boolean;
 }
 
 export interface ChargeAdditionalData { [key: string]: unknown }
 
 export interface StorageChargeItem {
-  additional_data?: ChargeAdditionalData;
-  /** The date when the charges concluded */
-  closed?: string;
+  item_number: number;
+  /** The date and time of the processing charge */
+  date: string;
   /** The coin-cost of the storage */
   coins: string;
   /** The current burn rate, the approximate amount of coins you are currently consuming each day */
   current_burn_rate?: string;
-  /** The date and time of the processing charge */
-  date: string;
-  item_number: number;
+  /** The date when the charges concluded */
+  closed?: string;
+  additional_data?: ChargeAdditionalData;
 }
 
 export interface StorageCharges {
-  items: StorageChargeItem[];
   num_items: number;
+  items: StorageChargeItem[];
 }
 
 export interface ProcessingChargeItem {
-  additional_data?: ChargeAdditionalData;
-  /** The coin-cost of the storage */
-  coins: string;
   /** The charge record number */
   id: number;
-  name?: string;
   /** The most recent sequence number for this charge */
   sqn: number;
+  name?: string;
+  username: string;
   /** The date and time of the processing charge */
   timestamp: string;
-  username: string;
+  /** The coin-cost of the storage */
+  coins: string;
+  additional_data?: ChargeAdditionalData;
 }
 
 export type ProcessingChargesMerchantKind = typeof ProcessingChargesMerchantKind[keyof typeof ProcessingChargesMerchantKind];
@@ -737,16 +756,16 @@ export const ProcessingChargesMerchantKind = {
 } as const;
 
 export interface ProcessingCharges {
-  charge: ProcessingChargeItem;
+  merchant_name: string;
+  merchant_kind: ProcessingChargesMerchantKind;
+  merchant_api_hostname: string;
   /** The date when the process stopped */
   closed?: string;
   /** True if no further change to the charges can occur. Typically True after the charge has been closed for a pre-configured period of time. */
   final: boolean;
-  merchant_api_hostname: string;
-  merchant_kind: ProcessingChargesMerchantKind;
-  merchant_name: string;
   /** True if charges were received after the charge record was finalised */
   post_final_charges?: boolean;
+  charge: ProcessingChargeItem;
 }
 
 export type AssetDetailScope = typeof AssetDetailScope[keyof typeof AssetDetailScope];
@@ -762,18 +781,18 @@ export const AssetDetailScope = {
 } as const;
 
 export interface AssetDetail {
-  content: string;
-  content_modified?: string;
-  created: string;
   creator: string;
-  description?: string;
-  disabled: boolean;
   id: string;
-  merchants: MerchantDetail[];
   name: string;
   scope: AssetDetailScope;
   scope_id: string;
   secret: boolean;
+  disabled: boolean;
+  content: string;
+  created: string;
+  content_modified?: string;
+  description?: string;
+  merchants: MerchantDetail[];
 }
 
 export type UserAccountGetResponse = UserAccountDetail;
@@ -804,16 +823,16 @@ export const ChargeSummaryType = {
 } as const;
 
 export interface ChargeSummary {
-  /** The cost, in coins of the charge */
-  coins: string;
   /** The type of charge */
   type: ChargeSummaryType;
+  /** The cost, in coins of the charge */
+  coins: string;
 }
 
 export interface UnitProductChargeSummary {
-  charges: ChargeSummary[];
   product_id: string;
   product_type: string;
+  charges: ChargeSummary[];
 }
 
 export interface UnitChargeSummary {
@@ -821,28 +840,28 @@ export interface UnitChargeSummary {
 }
 
 export interface UnitChargesGetResponse {
-  /**
-   * @minimum 1
-   * @maximum 28
-   */
-  billing_day: number;
   /** Whether the user making the API call is a member of the Unit */
   caller_is_member: boolean;
-  coins: string;
-  count: number;
-  created: string;
-  /** The start of the charge period */
-  from: string;
+  unit_id: string;
   name?: string;
   /** The Unit's owner (a username) */
   owner_id: string;
   /** True if the Unit is private */
   private: boolean;
-  products: UnitProductChargeSummary[];
-  summary: UnitChargeSummary;
-  unit_id: string;
+  created: string;
+  coins: string;
+  count: number;
+  /**
+   * @minimum 1
+   * @maximum 28
+   */
+  billing_day: number;
+  /** The start of the charge period */
+  from: string;
   /** The date where of first day after the charge period */
   until: string;
+  summary: UnitChargeSummary;
+  products: UnitProductChargeSummary[];
 }
 
 /**
@@ -864,8 +883,8 @@ export interface ProductsGetTypesResponse {
 
 export type ProductsGetDefaultStorageCostDefaultStorageCost = {
   cost: string;
-  description: string;
   units: string;
+  description: string;
 };
 
 export interface ProductsGetDefaultStorageCost {
@@ -890,25 +909,25 @@ export const ProductChargesGetResponseProductType = {
 } as const;
 
 export interface ProductChargesGetResponse {
+  product_id: string;
+  product_type: ProductChargesGetResponseProductType;
   /**
    * @minimum 1
    * @maximum 28
    */
   billing_day: number;
-  claim?: ProductClaimDetail;
   /** True if the product can be (needs to be) claimed. */
   claimable: boolean;
-  /** The total number of coins consumed by this product for the invoice period */
-  coins: string;
+  claim?: ProductClaimDetail;
   count: number;
   /** The start of the charge period */
   from: string;
-  processing_charges: ProcessingCharges[];
-  product_id: string;
-  product_type: ProductChargesGetResponseProductType;
-  storage_charges: StorageCharges;
   /** The date where of first day after the charge period */
   until: string;
+  /** The total number of coins consumed by this product for the invoice period */
+  coins: string;
+  processing_charges: ProcessingCharges[];
+  storage_charges: StorageCharges;
 }
 
 export type OrganisationGetResponse = OrganisationAllDetail;
@@ -920,6 +939,8 @@ export interface OrganisationsGetResponse {
 }
 
 export interface OrganisationUnitChargeSummary {
+  unit_id: string;
+  name: string;
   /**
    * @minimum 1
    * @maximum 28
@@ -927,17 +948,15 @@ export interface OrganisationUnitChargeSummary {
   billing_day: number;
   /** The start of the charge period */
   from: string;
-  name: string;
-  summary: ChargeSummary[];
-  unit_id: string;
   /** The date where of first day after the charge period */
   until: string;
+  summary: ChargeSummary[];
 }
 
 export interface OrganisationChargesGetResponse {
-  coins: string;
-  name: string;
   organisation_id: string;
+  name: string;
+  coins: string;
   summary: ChargeSummary[];
   unit_charges: OrganisationUnitChargeSummary[];
 }
@@ -951,16 +970,16 @@ export interface OrganisationUnitsGetResponse {
 }
 
 export interface OrganisationChargeSummary {
-  name: string;
   organisation_id: string;
+  name: string;
   summary: ChargeSummary[];
 }
 
 export interface PersonalUnitPutResponse {
-  /** The unit's unique ID */
-  id: string;
   /** The unit's Organisation. Used to identify the Default organisation */
   organisation_id: string;
+  /** The unit's unique ID */
+  id: string;
 }
 
 export interface OrganisationUnitPostResponse {
@@ -985,9 +1004,6 @@ export const OrganisationGetDefaultResponseDefaultProductPrivacy = {
 export interface OrganisationGetDefaultResponse {
   /** Whether the user making the API call is a member of the Default Organisation. Only admin users are members of the Default organisation */
   caller_is_member?: boolean;
-  created?: string;
-  /** The Organisation's default product privacy setting */
-  default_product_privacy?: OrganisationGetDefaultResponseDefaultProductPrivacy;
   /** The Default Organisation ID
  */
   id?: string;
@@ -997,6 +1013,9 @@ export interface OrganisationGetDefaultResponse {
   /** True if the Organisation is private. The Default organisation is always public, although it does not contain a membership (unless you're admin) and only houses Personal Units
  */
   private?: boolean;
+  created?: string;
+  /** The Organisation's default product privacy setting */
+  default_product_privacy?: OrganisationGetDefaultResponseDefaultProductPrivacy;
 }
 
 export interface UsersGetResponse {
@@ -1029,8 +1048,8 @@ export interface EventStreamGetPostResponse {
 export interface ChargesGetResponse {
   coins: string;
   count: number;
-  organisation_charges: OrganisationChargeSummary[];
   summary: ChargeSummary[];
+  organisation_charges: OrganisationChargeSummary[];
 }
 
 export interface AssetPostResponse {