eveal/gemory
2
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

cleanup and fix

Browse Source
This commit is contained in:
Sirttas
2026-06-13 13:07:49 +02:00
parent cc3bdccd9a
commit 6d2b5926bb
3 changed files with 80 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/mammon-api.yml
+28 -220
View File
@@ -19,7 +19,7 @@ paths:
required: true required: true
schema: schema:
type: string type: string
default: "" format: uuid
responses: responses:
"200": "200":
description: The rule book description: The rule book
@@ -29,13 +29,6 @@ paths:
$ref: "#/components/schemas/RuleBookResponse" $ref: "#/components/schemas/RuleBookResponse"
"404": "404":
description: No rule book with this id description: No rule book with this id
content:
'*/*':
schema:
type: string
additionalProperties:
default: ""
default: ""
put: put:
tags: tags:
- rule-book - rule-book
@@ -48,7 +41,7 @@ paths:
required: true required: true
schema: schema:
type: string type: string
default: "" format: uuid
requestBody: requestBody:
description: New state of the rule book description: New state of the rule book
content: content:
@@ -68,13 +61,6 @@ paths:
Returned when: Returned when:
- the request is invalid (e.g. blank name) - the request is invalid (e.g. blank name)
- the rule book is the default rule book, which cannot be modified - the rule book is the default rule book, which cannot be modified
content:
'*/*':
schema:
type: string
additionalProperties:
default: ""
default: ""
delete: delete:
tags: tags:
- rule-book - rule-book
@@ -87,29 +73,15 @@ paths:
required: true required: true
schema: schema:
type: string type: string
default: "" format: uuid
responses: responses:
"204": "204":
description: The rule book was deleted description: The rule book was deleted
content:
'*/*':
schema:
type: string
additionalProperties:
default: ""
default: ""
"400": "400":
description: |- description: |-
Returned when: Returned when:
- the rule book is associated to a character - the rule book is associated to a character
- the rule book is the default rule book, which cannot be deleted - the rule book is the default rule book, which cannot be deleted
content:
'*/*':
schema:
type: string
additionalProperties:
default: ""
default: ""
/ledgers/main/{ledgerId}: /ledgers/main/{ledgerId}:
put: put:
tags: tags:
@@ -123,7 +95,7 @@ paths:
required: true required: true
schema: schema:
type: string type: string
default: "" format: uuid
requestBody: requestBody:
description: New state of the main ledger description: New state of the main ledger
content: content:
@@ -143,22 +115,8 @@ paths:
Returned when: Returned when:
- the ledger is not a main ledger - the ledger is not a main ledger
- the request is invalid - the request is invalid
content:
'*/*':
schema:
type: string
additionalProperties:
default: ""
default: ""
"404": "404":
description: No ledger with this id description: No ledger with this id
content:
'*/*':
schema:
type: string
additionalProperties:
default: ""
default: ""
/ledgers/combined/{ledgerId}: /ledgers/combined/{ledgerId}:
put: put:
tags: tags:
@@ -172,7 +130,7 @@ paths:
required: true required: true
schema: schema:
type: string type: string
default: "" format: uuid
requestBody: requestBody:
description: New state of the combined ledger description: New state of the combined ledger
content: content:
@@ -192,22 +150,8 @@ paths:
Returned when: Returned when:
- the ledger is not a combined ledger - the ledger is not a combined ledger
- the request is invalid - the request is invalid
content:
'*/*':
schema:
type: string
additionalProperties:
default: ""
default: ""
"404": "404":
description: No ledger with this id description: No ledger with this id
content:
'*/*':
schema:
type: string
additionalProperties:
default: ""
default: ""
/characters/{characterId}/rule-book: /characters/{characterId}/rule-book:
get: get:
tags: tags:
@@ -220,8 +164,8 @@ paths:
description: Id of the character description: Id of the character
required: true required: true
schema: schema:
type: string type: integer
default: "" format: int64
responses: responses:
"200": "200":
description: The rule book assignment of the character description: The rule book assignment of the character
@@ -231,22 +175,8 @@ paths:
$ref: "#/components/schemas/CharacterRuleBookResponse" $ref: "#/components/schemas/CharacterRuleBookResponse"
"400": "400":
description: Invalid character id description: Invalid character id
content:
'*/*':
schema:
type: string
additionalProperties:
default: ""
default: ""
"404": "404":
description: No rule book assigned to this character description: No rule book assigned to this character
content:
'*/*':
schema:
type: string
additionalProperties:
default: ""
default: ""
put: put:
tags: tags:
- character-rule-book - character-rule-book
@@ -258,8 +188,8 @@ paths:
description: Id of the character description: Id of the character
required: true required: true
schema: schema:
type: string type: integer
default: "" format: int64
requestBody: requestBody:
description: Rule book and ledger bindings to assign description: Rule book and ledger bindings to assign
content: content:
@@ -281,13 +211,6 @@ paths:
- a bound ledger does not exist - a bound ledger does not exist
- a bound ledger is not a main or system ledger - a bound ledger is not a main or system ledger
- a required ledger binding is missing - a required ledger binding is missing
content:
'*/*':
schema:
type: string
additionalProperties:
default: ""
default: ""
/rule-books: /rule-books:
get: get:
tags: tags:
@@ -323,26 +246,14 @@ paths:
description: URL of the created rule book description: URL of the created rule book
style: simple style: simple
schema: schema:
type: array type: string
contains: format: uri
default: ""
items:
default: ""
unevaluatedItems:
default: ""
content: content:
'*/*': '*/*':
schema: schema:
$ref: "#/components/schemas/RuleBookResponse" $ref: "#/components/schemas/RuleBookResponse"
"400": "400":
description: Invalid request (e.g. blank name) description: Invalid request (e.g. blank name)
content:
'*/*':
schema:
type: string
additionalProperties:
default: ""
default: ""
/process-activities: /process-activities:
post: post:
tags: tags:
@@ -373,26 +284,14 @@ paths:
description: URL of the created main ledger description: URL of the created main ledger
style: simple style: simple
schema: schema:
type: array type: string
contains: format: uri
default: ""
items:
default: ""
unevaluatedItems:
default: ""
content: content:
'*/*': '*/*':
schema: schema:
$ref: "#/components/schemas/MainLedgerResponse" $ref: "#/components/schemas/MainLedgerResponse"
"400": "400":
description: Invalid request (e.g. blank name) description: Invalid request (e.g. blank name)
content:
'*/*':
schema:
type: string
additionalProperties:
default: ""
default: ""
/ledgers/combined: /ledgers/combined:
post: post:
tags: tags:
@@ -414,13 +313,8 @@ paths:
description: URL of the created combined ledger description: URL of the created combined ledger
style: simple style: simple
schema: schema:
type: array type: string
contains: format: uri
default: ""
items:
default: ""
unevaluatedItems:
default: ""
content: content:
'*/*': '*/*':
schema: schema:
@@ -428,13 +322,6 @@ paths:
"400": "400":
description: "Invalid request (e.g. blank name, a member ledger missing\ description: "Invalid request (e.g. blank name, a member ledger missing\
\ or already contained)" \ or already contained)"
content:
'*/*':
schema:
type: string
additionalProperties:
default: ""
default: ""
/activity/fetch: /activity/fetch:
post: post:
tags: tags:
@@ -456,20 +343,13 @@ paths:
description: Id of the character description: Id of the character
required: true required: true
schema: schema:
type: string type: integer
default: "" format: int64
responses: responses:
"200": "200":
description: New activities fetched and stored description: New activities fetched and stored
"400": "400":
description: No character with this id description: No character with this id
content:
'*/*':
schema:
type: string
additionalProperties:
default: ""
default: ""
/rule-books/script-definitions: /rule-books/script-definitions:
get: get:
tags: tags:
@@ -495,8 +375,8 @@ paths:
description: The market type id to scan description: The market type id to scan
required: true required: true
schema: schema:
type: string type: integer
default: "" format: int64
- name: days - name: days
in: query in: query
description: Number of most recent days of history to analyse description: Number of most recent days of history to analyse
@@ -535,13 +415,6 @@ paths:
$ref: "#/components/schemas/MarketScanResponse" $ref: "#/components/schemas/MarketScanResponse"
"400": "400":
description: The days parameter is not greater than 0 description: The days parameter is not greater than 0
content:
'*/*':
schema:
type: string
additionalProperties:
default: ""
default: ""
/market/{marketTypeId}/history: /market/{marketTypeId}/history:
get: get:
tags: tags:
@@ -554,8 +427,8 @@ paths:
description: Id of the market type description: Id of the market type
required: true required: true
schema: schema:
type: string type: integer
default: "" format: int64
- name: days - name: days
in: query in: query
description: Optional number of most recent days to return; omit for the full description: Optional number of most recent days to return; omit for the full
@@ -564,7 +437,6 @@ paths:
schema: schema:
type: integer type: integer
format: int32 format: int32
default: ""
minimum: 1 minimum: 1
responses: responses:
"200": "200":
@@ -577,13 +449,6 @@ paths:
$ref: "#/components/schemas/MarketHistoryResponse" $ref: "#/components/schemas/MarketHistoryResponse"
"400": "400":
description: The days parameter is not greater than 0 description: The days parameter is not greater than 0
content:
'*/*':
schema:
type: string
additionalProperties:
default: ""
default: ""
/market/scan: /market/scan:
get: get:
tags: tags:
@@ -632,13 +497,6 @@ paths:
$ref: "#/components/schemas/MarketScanResponse" $ref: "#/components/schemas/MarketScanResponse"
"400": "400":
description: The days parameter is not greater than 0 description: The days parameter is not greater than 0
content:
'*/*':
schema:
type: string
additionalProperties:
default: ""
default: ""
/market/prices: /market/prices:
get: get:
tags: tags:
@@ -652,8 +510,10 @@ paths:
description: "Market type ids to price, e.g. types=34,35" description: "Market type ids to price, e.g. types=34,35"
required: true required: true
schema: schema:
type: string type: array
default: "" items:
type: integer
format: int64
responses: responses:
"200": "200":
description: "The order book for each requested type, one entry per type" description: "The order book for each requested type, one entry per type"
@@ -668,13 +528,6 @@ paths:
Returned when: Returned when:
- the types parameter is missing - the types parameter is missing
- a types value is not a numeric id - a types value is not a numeric id
content:
'*/*':
schema:
type: string
additionalProperties:
default: ""
default: ""
/ledgers: /ledgers:
get: get:
tags: tags:
@@ -703,7 +556,7 @@ paths:
required: true required: true
schema: schema:
type: string type: string
default: "" format: uuid
responses: responses:
"200": "200":
description: The ledger description: The ledger
@@ -713,22 +566,8 @@ paths:
$ref: "#/components/schemas/LedgerResponse" $ref: "#/components/schemas/LedgerResponse"
"400": "400":
description: The ledger cannot be exposed (system ledger) description: The ledger cannot be exposed (system ledger)
content:
'*/*':
schema:
type: string
additionalProperties:
default: ""
default: ""
"404": "404":
description: No ledger with this id description: No ledger with this id
content:
'*/*':
schema:
type: string
additionalProperties:
default: ""
default: ""
/ledgers/{ledgerId}/transactions: /ledgers/{ledgerId}/transactions:
get: get:
tags: tags:
@@ -742,7 +581,7 @@ paths:
required: true required: true
schema: schema:
type: string type: string
default: "" format: uuid
responses: responses:
"200": "200":
description: All transactions in the ledger description: All transactions in the ledger
@@ -754,13 +593,6 @@ paths:
$ref: "#/components/schemas/TransactionResponse" $ref: "#/components/schemas/TransactionResponse"
"404": "404":
description: No ledger with this id description: No ledger with this id
content:
'*/*':
schema:
type: string
additionalProperties:
default: ""
default: ""
/ledgers/{ledgerId}/balance: /ledgers/{ledgerId}/balance:
get: get:
tags: tags:
@@ -774,7 +606,7 @@ paths:
required: true required: true
schema: schema:
type: string type: string
default: "" format: uuid
responses: responses:
"200": "200":
description: The balance of the ledger description: The balance of the ledger
@@ -784,13 +616,6 @@ paths:
$ref: "#/components/schemas/BalanceResponse" $ref: "#/components/schemas/BalanceResponse"
"404": "404":
description: No ledger with this id description: No ledger with this id
content:
'*/*':
schema:
type: string
additionalProperties:
default: ""
default: ""
/characters: /characters:
get: get:
tags: tags:
@@ -847,14 +672,9 @@ components:
type: boolean type: boolean
ledgerRefs: ledgerRefs:
type: array type: array
contains:
default: ""
items: items:
type: string type: string
default: ""
pattern: "[a-z][a-zA-Z0-9]*" pattern: "[a-z][a-zA-Z0-9]*"
unevaluatedItems:
default: ""
script: script:
type: string type: string
required: required:
@@ -874,14 +694,9 @@ components:
type: boolean type: boolean
ledgerRefs: ledgerRefs:
type: array type: array
contains:
default: ""
items: items:
type: string type: string
default: ""
pattern: "[a-z][a-zA-Z0-9]*" pattern: "[a-z][a-zA-Z0-9]*"
unevaluatedItems:
default: ""
script: script:
type: string type: string
required: required:
@@ -1009,14 +824,9 @@ components:
type: boolean type: boolean
ledgerRefs: ledgerRefs:
type: array type: array
contains:
default: ""
items: items:
type: string type: string
default: ""
pattern: "[a-z][a-zA-Z0-9]*" pattern: "[a-z][a-zA-Z0-9]*"
unevaluatedItems:
default: ""
script: script:
type: string type: string
required: required:
@@ -1125,7 +935,6 @@ components:
- orderCount - orderCount
- sell - sell
LedgerResponse: LedgerResponse:
default: null
discriminator: discriminator:
propertyName: type propertyName: type
mapping: mapping:
@@ -1203,7 +1012,6 @@ components:
- transactionId - transactionId
- transfers - transfers
TransferResponse: TransferResponse:
default: null
discriminator: discriminator:
propertyName: type propertyName: type
mapping: mapping:
src/generated/mammon/api.ts
+51 -53
View File
@@ -296,11 +296,11 @@ export const ActivityApiAxiosParamCreator = function (configuration?: Configurat
/** /**
* *
* @summary Fetch new activities for a character from the EVE API * @summary Fetch new activities for a character from the EVE API
* @param {string} characterId Id of the character * @param {number} characterId Id of the character
* @param {*} [options] Override http request option. * @param {*} [options] Override http request option.
* @throws {RequiredError} * @throws {RequiredError}
*/ */
fetchNewActivitiesForCharacter: async (characterId: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => { fetchNewActivitiesForCharacter: async (characterId: number, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
// verify required parameter 'characterId' is not null or undefined // verify required parameter 'characterId' is not null or undefined
assertParamExists('fetchNewActivitiesForCharacter', 'characterId', characterId) assertParamExists('fetchNewActivitiesForCharacter', 'characterId', characterId)
const localVarPath = `/activity/fetch/{characterId}` const localVarPath = `/activity/fetch/{characterId}`
@@ -316,7 +316,6 @@ export const ActivityApiAxiosParamCreator = function (configuration?: Configurat
const localVarHeaderParameter = {} as any; const localVarHeaderParameter = {} as any;
const localVarQueryParameter = {} as any; const localVarQueryParameter = {} as any;
localVarHeaderParameter['Accept'] = '*/*';
setSearchParams(localVarUrlObj, localVarQueryParameter); setSearchParams(localVarUrlObj, localVarQueryParameter);
let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
@@ -351,11 +350,11 @@ export const ActivityApiFp = function(configuration?: Configuration) {
/** /**
* *
* @summary Fetch new activities for a character from the EVE API * @summary Fetch new activities for a character from the EVE API
* @param {string} characterId Id of the character * @param {number} characterId Id of the character
* @param {*} [options] Override http request option. * @param {*} [options] Override http request option.
* @throws {RequiredError} * @throws {RequiredError}
*/ */
async fetchNewActivitiesForCharacter(characterId: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> { async fetchNewActivitiesForCharacter(characterId: number, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
const localVarAxiosArgs = await localVarAxiosParamCreator.fetchNewActivitiesForCharacter(characterId, options); const localVarAxiosArgs = await localVarAxiosParamCreator.fetchNewActivitiesForCharacter(characterId, options);
const localVarOperationServerIndex = configuration?.serverIndex ?? 0; const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
const localVarOperationServerBasePath = operationServerMap['ActivityApi.fetchNewActivitiesForCharacter']?.[localVarOperationServerIndex]?.url; const localVarOperationServerBasePath = operationServerMap['ActivityApi.fetchNewActivitiesForCharacter']?.[localVarOperationServerIndex]?.url;
@@ -382,11 +381,11 @@ export const ActivityApiFactory = function (configuration?: Configuration, baseP
/** /**
* *
* @summary Fetch new activities for a character from the EVE API * @summary Fetch new activities for a character from the EVE API
* @param {string} characterId Id of the character * @param {number} characterId Id of the character
* @param {*} [options] Override http request option. * @param {*} [options] Override http request option.
* @throws {RequiredError} * @throws {RequiredError}
*/ */
fetchNewActivitiesForCharacter(characterId: string, options?: RawAxiosRequestConfig): AxiosPromise<void> { fetchNewActivitiesForCharacter(characterId: number, options?: RawAxiosRequestConfig): AxiosPromise<void> {
return localVarFp.fetchNewActivitiesForCharacter(characterId, options).then((request) => request(axios, basePath)); return localVarFp.fetchNewActivitiesForCharacter(characterId, options).then((request) => request(axios, basePath));
}, },
}; };
@@ -409,11 +408,11 @@ export class ActivityApi extends BaseAPI {
/** /**
* *
* @summary Fetch new activities for a character from the EVE API * @summary Fetch new activities for a character from the EVE API
* @param {string} characterId Id of the character * @param {number} characterId Id of the character
* @param {*} [options] Override http request option. * @param {*} [options] Override http request option.
* @throws {RequiredError} * @throws {RequiredError}
*/ */
public fetchNewActivitiesForCharacter(characterId: string, options?: RawAxiosRequestConfig) { public fetchNewActivitiesForCharacter(characterId: number, options?: RawAxiosRequestConfig) {
return ActivityApiFp(this.configuration).fetchNewActivitiesForCharacter(characterId, options).then((request) => request(this.axios, this.basePath)); return ActivityApiFp(this.configuration).fetchNewActivitiesForCharacter(characterId, options).then((request) => request(this.axios, this.basePath));
} }
} }
@@ -552,11 +551,11 @@ export const CharacterRuleBookApiAxiosParamCreator = function (configuration?: C
/** /**
* *
* @summary Find the rule book assigned to a character * @summary Find the rule book assigned to a character
* @param {string} characterId Id of the character * @param {number} characterId Id of the character
* @param {*} [options] Override http request option. * @param {*} [options] Override http request option.
* @throws {RequiredError} * @throws {RequiredError}
*/ */
findCharacterRuleBookByCharacterId: async (characterId: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => { findCharacterRuleBookByCharacterId: async (characterId: number, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
// verify required parameter 'characterId' is not null or undefined // verify required parameter 'characterId' is not null or undefined
assertParamExists('findCharacterRuleBookByCharacterId', 'characterId', characterId) assertParamExists('findCharacterRuleBookByCharacterId', 'characterId', characterId)
const localVarPath = `/characters/{characterId}/rule-book` const localVarPath = `/characters/{characterId}/rule-book`
@@ -586,12 +585,12 @@ export const CharacterRuleBookApiAxiosParamCreator = function (configuration?: C
/** /**
* *
* @summary Assign a rule book to a character * @summary Assign a rule book to a character
* @param {string} characterId Id of the character * @param {number} characterId Id of the character
* @param {SetCharacterRuleBookRequest} setCharacterRuleBookRequest Rule book and ledger bindings to assign * @param {SetCharacterRuleBookRequest} setCharacterRuleBookRequest Rule book and ledger bindings to assign
* @param {*} [options] Override http request option. * @param {*} [options] Override http request option.
* @throws {RequiredError} * @throws {RequiredError}
*/ */
setCharacterRuleBookForCharacter: async (characterId: string, setCharacterRuleBookRequest: SetCharacterRuleBookRequest, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => { setCharacterRuleBookForCharacter: async (characterId: number, setCharacterRuleBookRequest: SetCharacterRuleBookRequest, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
// verify required parameter 'characterId' is not null or undefined // verify required parameter 'characterId' is not null or undefined
assertParamExists('setCharacterRuleBookForCharacter', 'characterId', characterId) assertParamExists('setCharacterRuleBookForCharacter', 'characterId', characterId)
// verify required parameter 'setCharacterRuleBookRequest' is not null or undefined // verify required parameter 'setCharacterRuleBookRequest' is not null or undefined
@@ -646,11 +645,11 @@ export const CharacterRuleBookApiFp = function(configuration?: Configuration) {
/** /**
* *
* @summary Find the rule book assigned to a character * @summary Find the rule book assigned to a character
* @param {string} characterId Id of the character * @param {number} characterId Id of the character
* @param {*} [options] Override http request option. * @param {*} [options] Override http request option.
* @throws {RequiredError} * @throws {RequiredError}
*/ */
async findCharacterRuleBookByCharacterId(characterId: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CharacterRuleBookResponse>> { async findCharacterRuleBookByCharacterId(characterId: number, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CharacterRuleBookResponse>> {
const localVarAxiosArgs = await localVarAxiosParamCreator.findCharacterRuleBookByCharacterId(characterId, options); const localVarAxiosArgs = await localVarAxiosParamCreator.findCharacterRuleBookByCharacterId(characterId, options);
const localVarOperationServerIndex = configuration?.serverIndex ?? 0; const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
const localVarOperationServerBasePath = operationServerMap['CharacterRuleBookApi.findCharacterRuleBookByCharacterId']?.[localVarOperationServerIndex]?.url; const localVarOperationServerBasePath = operationServerMap['CharacterRuleBookApi.findCharacterRuleBookByCharacterId']?.[localVarOperationServerIndex]?.url;
@@ -659,12 +658,12 @@ export const CharacterRuleBookApiFp = function(configuration?: Configuration) {
/** /**
* *
* @summary Assign a rule book to a character * @summary Assign a rule book to a character
* @param {string} characterId Id of the character * @param {number} characterId Id of the character
* @param {SetCharacterRuleBookRequest} setCharacterRuleBookRequest Rule book and ledger bindings to assign * @param {SetCharacterRuleBookRequest} setCharacterRuleBookRequest Rule book and ledger bindings to assign
* @param {*} [options] Override http request option. * @param {*} [options] Override http request option.
* @throws {RequiredError} * @throws {RequiredError}
*/ */
async setCharacterRuleBookForCharacter(characterId: string, setCharacterRuleBookRequest: SetCharacterRuleBookRequest, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CharacterRuleBookResponse>> { async setCharacterRuleBookForCharacter(characterId: number, setCharacterRuleBookRequest: SetCharacterRuleBookRequest, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CharacterRuleBookResponse>> {
const localVarAxiosArgs = await localVarAxiosParamCreator.setCharacterRuleBookForCharacter(characterId, setCharacterRuleBookRequest, options); const localVarAxiosArgs = await localVarAxiosParamCreator.setCharacterRuleBookForCharacter(characterId, setCharacterRuleBookRequest, options);
const localVarOperationServerIndex = configuration?.serverIndex ?? 0; const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
const localVarOperationServerBasePath = operationServerMap['CharacterRuleBookApi.setCharacterRuleBookForCharacter']?.[localVarOperationServerIndex]?.url; const localVarOperationServerBasePath = operationServerMap['CharacterRuleBookApi.setCharacterRuleBookForCharacter']?.[localVarOperationServerIndex]?.url;
@@ -691,22 +690,22 @@ export const CharacterRuleBookApiFactory = function (configuration?: Configurati
/** /**
* *
* @summary Find the rule book assigned to a character * @summary Find the rule book assigned to a character
* @param {string} characterId Id of the character * @param {number} characterId Id of the character
* @param {*} [options] Override http request option. * @param {*} [options] Override http request option.
* @throws {RequiredError} * @throws {RequiredError}
*/ */
findCharacterRuleBookByCharacterId(characterId: string, options?: RawAxiosRequestConfig): AxiosPromise<CharacterRuleBookResponse> { findCharacterRuleBookByCharacterId(characterId: number, options?: RawAxiosRequestConfig): AxiosPromise<CharacterRuleBookResponse> {
return localVarFp.findCharacterRuleBookByCharacterId(characterId, options).then((request) => request(axios, basePath)); return localVarFp.findCharacterRuleBookByCharacterId(characterId, options).then((request) => request(axios, basePath));
}, },
/** /**
* *
* @summary Assign a rule book to a character * @summary Assign a rule book to a character
* @param {string} characterId Id of the character * @param {number} characterId Id of the character
* @param {SetCharacterRuleBookRequest} setCharacterRuleBookRequest Rule book and ledger bindings to assign * @param {SetCharacterRuleBookRequest} setCharacterRuleBookRequest Rule book and ledger bindings to assign
* @param {*} [options] Override http request option. * @param {*} [options] Override http request option.
* @throws {RequiredError} * @throws {RequiredError}
*/ */
setCharacterRuleBookForCharacter(characterId: string, setCharacterRuleBookRequest: SetCharacterRuleBookRequest, options?: RawAxiosRequestConfig): AxiosPromise<CharacterRuleBookResponse> { setCharacterRuleBookForCharacter(characterId: number, setCharacterRuleBookRequest: SetCharacterRuleBookRequest, options?: RawAxiosRequestConfig): AxiosPromise<CharacterRuleBookResponse> {
return localVarFp.setCharacterRuleBookForCharacter(characterId, setCharacterRuleBookRequest, options).then((request) => request(axios, basePath)); return localVarFp.setCharacterRuleBookForCharacter(characterId, setCharacterRuleBookRequest, options).then((request) => request(axios, basePath));
}, },
}; };
@@ -729,23 +728,23 @@ export class CharacterRuleBookApi extends BaseAPI {
/** /**
* *
* @summary Find the rule book assigned to a character * @summary Find the rule book assigned to a character
* @param {string} characterId Id of the character * @param {number} characterId Id of the character
* @param {*} [options] Override http request option. * @param {*} [options] Override http request option.
* @throws {RequiredError} * @throws {RequiredError}
*/ */
public findCharacterRuleBookByCharacterId(characterId: string, options?: RawAxiosRequestConfig) { public findCharacterRuleBookByCharacterId(characterId: number, options?: RawAxiosRequestConfig) {
return CharacterRuleBookApiFp(this.configuration).findCharacterRuleBookByCharacterId(characterId, options).then((request) => request(this.axios, this.basePath)); return CharacterRuleBookApiFp(this.configuration).findCharacterRuleBookByCharacterId(characterId, options).then((request) => request(this.axios, this.basePath));
} }
/** /**
* *
* @summary Assign a rule book to a character * @summary Assign a rule book to a character
* @param {string} characterId Id of the character * @param {number} characterId Id of the character
* @param {SetCharacterRuleBookRequest} setCharacterRuleBookRequest Rule book and ledger bindings to assign * @param {SetCharacterRuleBookRequest} setCharacterRuleBookRequest Rule book and ledger bindings to assign
* @param {*} [options] Override http request option. * @param {*} [options] Override http request option.
* @throws {RequiredError} * @throws {RequiredError}
*/ */
public setCharacterRuleBookForCharacter(characterId: string, setCharacterRuleBookRequest: SetCharacterRuleBookRequest, options?: RawAxiosRequestConfig) { public setCharacterRuleBookForCharacter(characterId: number, setCharacterRuleBookRequest: SetCharacterRuleBookRequest, options?: RawAxiosRequestConfig) {
return CharacterRuleBookApiFp(this.configuration).setCharacterRuleBookForCharacter(characterId, setCharacterRuleBookRequest, options).then((request) => request(this.axios, this.basePath)); return CharacterRuleBookApiFp(this.configuration).setCharacterRuleBookForCharacter(characterId, setCharacterRuleBookRequest, options).then((request) => request(this.axios, this.basePath));
} }
} }
@@ -1280,11 +1279,11 @@ export const MarketApiAxiosParamCreator = function (configuration?: Configuratio
/** /**
* *
* @summary Return the current Jita order book (highest buy, lowest sell, order count) for each requested market type * @summary Return the current Jita order book (highest buy, lowest sell, order count) for each requested market type
* @param {string} types Market type ids to price, e.g. types&#x3D;34,35 * @param {Array<number>} types Market type ids to price, e.g. types&#x3D;34,35
* @param {*} [options] Override http request option. * @param {*} [options] Override http request option.
* @throws {RequiredError} * @throws {RequiredError}
*/ */
currentPrices: async (types: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => { currentPrices: async (types: Array<number>, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
// verify required parameter 'types' is not null or undefined // verify required parameter 'types' is not null or undefined
assertParamExists('currentPrices', 'types', types) assertParamExists('currentPrices', 'types', types)
const localVarPath = `/market/prices`; const localVarPath = `/market/prices`;
@@ -1299,7 +1298,7 @@ export const MarketApiAxiosParamCreator = function (configuration?: Configuratio
const localVarHeaderParameter = {} as any; const localVarHeaderParameter = {} as any;
const localVarQueryParameter = {} as any; const localVarQueryParameter = {} as any;
if (types !== undefined) { if (types) {
localVarQueryParameter['types'] = types; localVarQueryParameter['types'] = types;
} }
@@ -1317,12 +1316,12 @@ export const MarketApiAxiosParamCreator = function (configuration?: Configuratio
/** /**
* *
* @summary Find the market history of a type, most recent first * @summary Find the market history of a type, most recent first
* @param {string} marketTypeId Id of the market type * @param {number} marketTypeId Id of the market type
* @param {number} [days] Optional number of most recent days to return; omit for the full history * @param {number} [days] Optional number of most recent days to return; omit for the full history
* @param {*} [options] Override http request option. * @param {*} [options] Override http request option.
* @throws {RequiredError} * @throws {RequiredError}
*/ */
findHistory: async (marketTypeId: string, days?: number, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => { findHistory: async (marketTypeId: number, days?: number, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
// verify required parameter 'marketTypeId' is not null or undefined // verify required parameter 'marketTypeId' is not null or undefined
assertParamExists('findHistory', 'marketTypeId', marketTypeId) assertParamExists('findHistory', 'marketTypeId', marketTypeId)
const localVarPath = `/market/{marketTypeId}/history` const localVarPath = `/market/{marketTypeId}/history`
@@ -1401,14 +1400,14 @@ export const MarketApiAxiosParamCreator = function (configuration?: Configuratio
/** /**
* *
* @summary Scan a single market type, returning its volume-weighted price quartiles * @summary Scan a single market type, returning its volume-weighted price quartiles
* @param {string} marketTypeId The market type id to scan * @param {number} marketTypeId The market type id to scan
* @param {number} [days] Number of most recent days of history to analyse * @param {number} [days] Number of most recent days of history to analyse
* @param {number} [brokerFee] Broker fee as a fraction (e.g. 0.015 for 1.5%), paid on both buy and sell orders * @param {number} [brokerFee] Broker fee as a fraction (e.g. 0.015 for 1.5%), paid on both buy and sell orders
* @param {number} [salesTax] Sales tax as a fraction (e.g. 0.036 for 3.6%), paid on sell orders * @param {number} [salesTax] Sales tax as a fraction (e.g. 0.036 for 3.6%), paid on sell orders
* @param {*} [options] Override http request option. * @param {*} [options] Override http request option.
* @throws {RequiredError} * @throws {RequiredError}
*/ */
scanMarketType: async (marketTypeId: string, days?: number, brokerFee?: number, salesTax?: number, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => { scanMarketType: async (marketTypeId: number, days?: number, brokerFee?: number, salesTax?: number, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
// verify required parameter 'marketTypeId' is not null or undefined // verify required parameter 'marketTypeId' is not null or undefined
assertParamExists('scanMarketType', 'marketTypeId', marketTypeId) assertParamExists('scanMarketType', 'marketTypeId', marketTypeId)
const localVarPath = `/market/{marketTypeId}/scan` const localVarPath = `/market/{marketTypeId}/scan`
@@ -1459,11 +1458,11 @@ export const MarketApiFp = function(configuration?: Configuration) {
/** /**
* *
* @summary Return the current Jita order book (highest buy, lowest sell, order count) for each requested market type * @summary Return the current Jita order book (highest buy, lowest sell, order count) for each requested market type
* @param {string} types Market type ids to price, e.g. types&#x3D;34,35 * @param {Array<number>} types Market type ids to price, e.g. types&#x3D;34,35
* @param {*} [options] Override http request option. * @param {*} [options] Override http request option.
* @throws {RequiredError} * @throws {RequiredError}
*/ */
async currentPrices(types: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<MarketPriceResponse>>> { async currentPrices(types: Array<number>, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<MarketPriceResponse>>> {
const localVarAxiosArgs = await localVarAxiosParamCreator.currentPrices(types, options); const localVarAxiosArgs = await localVarAxiosParamCreator.currentPrices(types, options);
const localVarOperationServerIndex = configuration?.serverIndex ?? 0; const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
const localVarOperationServerBasePath = operationServerMap['MarketApi.currentPrices']?.[localVarOperationServerIndex]?.url; const localVarOperationServerBasePath = operationServerMap['MarketApi.currentPrices']?.[localVarOperationServerIndex]?.url;
@@ -1472,12 +1471,12 @@ export const MarketApiFp = function(configuration?: Configuration) {
/** /**
* *
* @summary Find the market history of a type, most recent first * @summary Find the market history of a type, most recent first
* @param {string} marketTypeId Id of the market type * @param {number} marketTypeId Id of the market type
* @param {number} [days] Optional number of most recent days to return; omit for the full history * @param {number} [days] Optional number of most recent days to return; omit for the full history
* @param {*} [options] Override http request option. * @param {*} [options] Override http request option.
* @throws {RequiredError} * @throws {RequiredError}
*/ */
async findHistory(marketTypeId: string, days?: number, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<MarketHistoryResponse>>> { async findHistory(marketTypeId: number, days?: number, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<MarketHistoryResponse>>> {
const localVarAxiosArgs = await localVarAxiosParamCreator.findHistory(marketTypeId, days, options); const localVarAxiosArgs = await localVarAxiosParamCreator.findHistory(marketTypeId, days, options);
const localVarOperationServerIndex = configuration?.serverIndex ?? 0; const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
const localVarOperationServerBasePath = operationServerMap['MarketApi.findHistory']?.[localVarOperationServerIndex]?.url; const localVarOperationServerBasePath = operationServerMap['MarketApi.findHistory']?.[localVarOperationServerIndex]?.url;
@@ -1501,14 +1500,14 @@ export const MarketApiFp = function(configuration?: Configuration) {
/** /**
* *
* @summary Scan a single market type, returning its volume-weighted price quartiles * @summary Scan a single market type, returning its volume-weighted price quartiles
* @param {string} marketTypeId The market type id to scan * @param {number} marketTypeId The market type id to scan
* @param {number} [days] Number of most recent days of history to analyse * @param {number} [days] Number of most recent days of history to analyse
* @param {number} [brokerFee] Broker fee as a fraction (e.g. 0.015 for 1.5%), paid on both buy and sell orders * @param {number} [brokerFee] Broker fee as a fraction (e.g. 0.015 for 1.5%), paid on both buy and sell orders
* @param {number} [salesTax] Sales tax as a fraction (e.g. 0.036 for 3.6%), paid on sell orders * @param {number} [salesTax] Sales tax as a fraction (e.g. 0.036 for 3.6%), paid on sell orders
* @param {*} [options] Override http request option. * @param {*} [options] Override http request option.
* @throws {RequiredError} * @throws {RequiredError}
*/ */
async scanMarketType(marketTypeId: string, days?: number, brokerFee?: number, salesTax?: number, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<MarketScanResponse>> { async scanMarketType(marketTypeId: number, days?: number, brokerFee?: number, salesTax?: number, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<MarketScanResponse>> {
const localVarAxiosArgs = await localVarAxiosParamCreator.scanMarketType(marketTypeId, days, brokerFee, salesTax, options); const localVarAxiosArgs = await localVarAxiosParamCreator.scanMarketType(marketTypeId, days, brokerFee, salesTax, options);
const localVarOperationServerIndex = configuration?.serverIndex ?? 0; const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
const localVarOperationServerBasePath = operationServerMap['MarketApi.scanMarketType']?.[localVarOperationServerIndex]?.url; const localVarOperationServerBasePath = operationServerMap['MarketApi.scanMarketType']?.[localVarOperationServerIndex]?.url;
@@ -1526,22 +1525,22 @@ export const MarketApiFactory = function (configuration?: Configuration, basePat
/** /**
* *
* @summary Return the current Jita order book (highest buy, lowest sell, order count) for each requested market type * @summary Return the current Jita order book (highest buy, lowest sell, order count) for each requested market type
* @param {string} types Market type ids to price, e.g. types&#x3D;34,35 * @param {Array<number>} types Market type ids to price, e.g. types&#x3D;34,35
* @param {*} [options] Override http request option. * @param {*} [options] Override http request option.
* @throws {RequiredError} * @throws {RequiredError}
*/ */
currentPrices(types: string, options?: RawAxiosRequestConfig): AxiosPromise<Array<MarketPriceResponse>> { currentPrices(types: Array<number>, options?: RawAxiosRequestConfig): AxiosPromise<Array<MarketPriceResponse>> {
return localVarFp.currentPrices(types, options).then((request) => request(axios, basePath)); return localVarFp.currentPrices(types, options).then((request) => request(axios, basePath));
}, },
/** /**
* *
* @summary Find the market history of a type, most recent first * @summary Find the market history of a type, most recent first
* @param {string} marketTypeId Id of the market type * @param {number} marketTypeId Id of the market type
* @param {number} [days] Optional number of most recent days to return; omit for the full history * @param {number} [days] Optional number of most recent days to return; omit for the full history
* @param {*} [options] Override http request option. * @param {*} [options] Override http request option.
* @throws {RequiredError} * @throws {RequiredError}
*/ */
findHistory(marketTypeId: string, days?: number, options?: RawAxiosRequestConfig): AxiosPromise<Array<MarketHistoryResponse>> { findHistory(marketTypeId: number, days?: number, options?: RawAxiosRequestConfig): AxiosPromise<Array<MarketHistoryResponse>> {
return localVarFp.findHistory(marketTypeId, days, options).then((request) => request(axios, basePath)); return localVarFp.findHistory(marketTypeId, days, options).then((request) => request(axios, basePath));
}, },
/** /**
@@ -1559,14 +1558,14 @@ export const MarketApiFactory = function (configuration?: Configuration, basePat
/** /**
* *
* @summary Scan a single market type, returning its volume-weighted price quartiles * @summary Scan a single market type, returning its volume-weighted price quartiles
* @param {string} marketTypeId The market type id to scan * @param {number} marketTypeId The market type id to scan
* @param {number} [days] Number of most recent days of history to analyse * @param {number} [days] Number of most recent days of history to analyse
* @param {number} [brokerFee] Broker fee as a fraction (e.g. 0.015 for 1.5%), paid on both buy and sell orders * @param {number} [brokerFee] Broker fee as a fraction (e.g. 0.015 for 1.5%), paid on both buy and sell orders
* @param {number} [salesTax] Sales tax as a fraction (e.g. 0.036 for 3.6%), paid on sell orders * @param {number} [salesTax] Sales tax as a fraction (e.g. 0.036 for 3.6%), paid on sell orders
* @param {*} [options] Override http request option. * @param {*} [options] Override http request option.
* @throws {RequiredError} * @throws {RequiredError}
*/ */
scanMarketType(marketTypeId: string, days?: number, brokerFee?: number, salesTax?: number, options?: RawAxiosRequestConfig): AxiosPromise<MarketScanResponse> { scanMarketType(marketTypeId: number, days?: number, brokerFee?: number, salesTax?: number, options?: RawAxiosRequestConfig): AxiosPromise<MarketScanResponse> {
return localVarFp.scanMarketType(marketTypeId, days, brokerFee, salesTax, options).then((request) => request(axios, basePath)); return localVarFp.scanMarketType(marketTypeId, days, brokerFee, salesTax, options).then((request) => request(axios, basePath));
}, },
}; };
@@ -1579,23 +1578,23 @@ export class MarketApi extends BaseAPI {
/** /**
* *
* @summary Return the current Jita order book (highest buy, lowest sell, order count) for each requested market type * @summary Return the current Jita order book (highest buy, lowest sell, order count) for each requested market type
* @param {string} types Market type ids to price, e.g. types&#x3D;34,35 * @param {Array<number>} types Market type ids to price, e.g. types&#x3D;34,35
* @param {*} [options] Override http request option. * @param {*} [options] Override http request option.
* @throws {RequiredError} * @throws {RequiredError}
*/ */
public currentPrices(types: string, options?: RawAxiosRequestConfig) { public currentPrices(types: Array<number>, options?: RawAxiosRequestConfig) {
return MarketApiFp(this.configuration).currentPrices(types, options).then((request) => request(this.axios, this.basePath)); return MarketApiFp(this.configuration).currentPrices(types, options).then((request) => request(this.axios, this.basePath));
} }
/** /**
* *
* @summary Find the market history of a type, most recent first * @summary Find the market history of a type, most recent first
* @param {string} marketTypeId Id of the market type * @param {number} marketTypeId Id of the market type
* @param {number} [days] Optional number of most recent days to return; omit for the full history * @param {number} [days] Optional number of most recent days to return; omit for the full history
* @param {*} [options] Override http request option. * @param {*} [options] Override http request option.
* @throws {RequiredError} * @throws {RequiredError}
*/ */
public findHistory(marketTypeId: string, days?: number, options?: RawAxiosRequestConfig) { public findHistory(marketTypeId: number, days?: number, options?: RawAxiosRequestConfig) {
return MarketApiFp(this.configuration).findHistory(marketTypeId, days, options).then((request) => request(this.axios, this.basePath)); return MarketApiFp(this.configuration).findHistory(marketTypeId, days, options).then((request) => request(this.axios, this.basePath));
} }
@@ -1615,14 +1614,14 @@ export class MarketApi extends BaseAPI {
/** /**
* *
* @summary Scan a single market type, returning its volume-weighted price quartiles * @summary Scan a single market type, returning its volume-weighted price quartiles
* @param {string} marketTypeId The market type id to scan * @param {number} marketTypeId The market type id to scan
* @param {number} [days] Number of most recent days of history to analyse * @param {number} [days] Number of most recent days of history to analyse
* @param {number} [brokerFee] Broker fee as a fraction (e.g. 0.015 for 1.5%), paid on both buy and sell orders * @param {number} [brokerFee] Broker fee as a fraction (e.g. 0.015 for 1.5%), paid on both buy and sell orders
* @param {number} [salesTax] Sales tax as a fraction (e.g. 0.036 for 3.6%), paid on sell orders * @param {number} [salesTax] Sales tax as a fraction (e.g. 0.036 for 3.6%), paid on sell orders
* @param {*} [options] Override http request option. * @param {*} [options] Override http request option.
* @throws {RequiredError} * @throws {RequiredError}
*/ */
public scanMarketType(marketTypeId: string, days?: number, brokerFee?: number, salesTax?: number, options?: RawAxiosRequestConfig) { public scanMarketType(marketTypeId: number, days?: number, brokerFee?: number, salesTax?: number, options?: RawAxiosRequestConfig) {
return MarketApiFp(this.configuration).scanMarketType(marketTypeId, days, brokerFee, salesTax, options).then((request) => request(this.axios, this.basePath)); return MarketApiFp(this.configuration).scanMarketType(marketTypeId, days, brokerFee, salesTax, options).then((request) => request(this.axios, this.basePath));
} }
} }
@@ -1785,7 +1784,6 @@ export const RuleBookApiAxiosParamCreator = function (configuration?: Configurat
const localVarHeaderParameter = {} as any; const localVarHeaderParameter = {} as any;
const localVarQueryParameter = {} as any; const localVarQueryParameter = {} as any;
localVarHeaderParameter['Accept'] = '*/*';
setSearchParams(localVarUrlObj, localVarQueryParameter); setSearchParams(localVarUrlObj, localVarQueryParameter);
let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
@@ -1958,7 +1956,7 @@ export const RuleBookApiFp = function(configuration?: Configuration) {
* @param {*} [options] Override http request option. * @param {*} [options] Override http request option.
* @throws {RequiredError} * @throws {RequiredError}
*/ */
async deleteRuleBook(ruleBookId: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<{ [key: string]: any; }>> { async deleteRuleBook(ruleBookId: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
const localVarAxiosArgs = await localVarAxiosParamCreator.deleteRuleBook(ruleBookId, options); const localVarAxiosArgs = await localVarAxiosParamCreator.deleteRuleBook(ruleBookId, options);
const localVarOperationServerIndex = configuration?.serverIndex ?? 0; const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
const localVarOperationServerBasePath = operationServerMap['RuleBookApi.deleteRuleBook']?.[localVarOperationServerIndex]?.url; const localVarOperationServerBasePath = operationServerMap['RuleBookApi.deleteRuleBook']?.[localVarOperationServerIndex]?.url;
@@ -2041,7 +2039,7 @@ export const RuleBookApiFactory = function (configuration?: Configuration, baseP
* @param {*} [options] Override http request option. * @param {*} [options] Override http request option.
* @throws {RequiredError} * @throws {RequiredError}
*/ */
deleteRuleBook(ruleBookId: string, options?: RawAxiosRequestConfig): AxiosPromise<{ [key: string]: any; }> { deleteRuleBook(ruleBookId: string, options?: RawAxiosRequestConfig): AxiosPromise<void> {
return localVarFp.deleteRuleBook(ruleBookId, options).then((request) => request(axios, basePath)); return localVarFp.deleteRuleBook(ruleBookId, options).then((request) => request(axios, basePath));
}, },
/** /**
src/pages/market/TypeInfo.vue
+1 -1
View File
@@ -28,7 +28,7 @@ const result = computedAsync(async () => {
} }
const { data } = await marketApi.scanMarketType( const { data } = await marketApi.scanMarketType(
String(item.value.id), item.value.id,
days.value, days.value,
marketTaxStore.brokerFee / 100, marketTaxStore.brokerFee / 100,
marketTaxStore.scc / 100 marketTaxStore.scc / 100