feat(#10): Add per-ledger acquisitions view + ledger column

src/generated/mammon/api.ts

@@ -31,6 +31,10 @@ export interface AcquisitionResponse {
      * Unique acquisition identifier.
      */
     'acquisitionId': string;
+    /**
+     * Ledger the acquisition is held in.
+     */
+    'ledgerId': string;
     /**
      * Where the acquisition came from: a character, a corporation, or nothing.
      */
@@ -39,10 +43,6 @@ export interface AcquisitionResponse {
      * EVE market type (item) id that was acquired.
      */
     'marketTypeId': number;
-    /**
-     * How the item entered the inventory.
-     */
-    'origin': AcquisitionResponseOriginEnum;
     /**
      * When the acquisition occurred.
      */
@@ -60,14 +60,6 @@ export interface AcquisitionResponse {
      */
     'unitCost': number;
 }
-
-export const AcquisitionResponseOriginEnum = {
-    Bought: 'BOUGHT',
-    Manual: 'MANUAL',
-} as const;
-
-export type AcquisitionResponseOriginEnum = typeof AcquisitionResponseOriginEnum[keyof typeof AcquisitionResponseOriginEnum];
-
 /**
  * Where an activity or transaction came from: a character, a corporation wallet, or nothing (a manual entry).
  */
@@ -612,10 +604,6 @@ export interface RuleBookResponse {
      * Owning user identifier.
      */
     'userId': string;
-    /**
-     * Whether this rule book is used to derive acquisitions.
-     */
-    'usedForAcquisitions': boolean;
     /**
      * Ledger references the script writes to, each bound to one of the user\'s ledgers.
      */
@@ -682,10 +670,6 @@ export interface UpdateMainLedgerRequest {
  * Request to update the caller\'s rule book; replaces its mutable fields.
  */
 export interface UpdateRuleBookRequest {
-    /**
-     * Whether this rule book is used to derive acquisitions.
-     */
-    'usedForAcquisitions': boolean;
     /**
      * Ledger references the script writes to, each bound to one of the user\'s ledgers.
      */
@@ -703,13 +687,14 @@ export const AcquisitionApiAxiosParamCreator = function (configuration?: Configu
     return {
         /**
          * 
-         * @summary Find acquisitions, optionally filtered by market type and consumption state
+         * @summary Find the caller\'s acquisitions, optionally filtered by ledger, market type and consumption state
+         * @param {string} [ledgerId] Only return acquisitions held in this ledger
          * @param {number} [marketTypeId] Only return acquisitions of this market type
          * @param {boolean} [includeConsumed] Include fully consumed acquisitions (no remaining stock)
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        findAllAcquisitions: async (marketTypeId?: number, includeConsumed?: boolean, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
+        findAllAcquisitions: async (ledgerId?: string, marketTypeId?: number, includeConsumed?: boolean, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             const localVarPath = `/acquisitions`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -722,6 +707,10 @@ export const AcquisitionApiAxiosParamCreator = function (configuration?: Configu
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            if (ledgerId !== undefined) {
+                localVarQueryParameter['ledgerId'] = ledgerId;
+            }
+
             if (marketTypeId !== undefined) {
                 localVarQueryParameter['marketTypeId'] = marketTypeId;
             }
@@ -752,14 +741,15 @@ export const AcquisitionApiFp = function(configuration?: Configuration) {
     return {
         /**
          * 
-         * @summary Find acquisitions, optionally filtered by market type and consumption state
+         * @summary Find the caller\'s acquisitions, optionally filtered by ledger, market type and consumption state
+         * @param {string} [ledgerId] Only return acquisitions held in this ledger
          * @param {number} [marketTypeId] Only return acquisitions of this market type
          * @param {boolean} [includeConsumed] Include fully consumed acquisitions (no remaining stock)
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async findAllAcquisitions(marketTypeId?: number, includeConsumed?: boolean, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<AcquisitionResponse>>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.findAllAcquisitions(marketTypeId, includeConsumed, options);
+        async findAllAcquisitions(ledgerId?: string, marketTypeId?: number, includeConsumed?: boolean, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<AcquisitionResponse>>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.findAllAcquisitions(ledgerId, marketTypeId, includeConsumed, options);
             const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
             const localVarOperationServerBasePath = operationServerMap['AcquisitionApi.findAllAcquisitions']?.[localVarOperationServerIndex]?.url;
             return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
@@ -775,14 +765,15 @@ export const AcquisitionApiFactory = function (configuration?: Configuration, ba
     return {
         /**
          * 
-         * @summary Find acquisitions, optionally filtered by market type and consumption state
+         * @summary Find the caller\'s acquisitions, optionally filtered by ledger, market type and consumption state
+         * @param {string} [ledgerId] Only return acquisitions held in this ledger
          * @param {number} [marketTypeId] Only return acquisitions of this market type
          * @param {boolean} [includeConsumed] Include fully consumed acquisitions (no remaining stock)
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        findAllAcquisitions(marketTypeId?: number, includeConsumed?: boolean, options?: RawAxiosRequestConfig): AxiosPromise<Array<AcquisitionResponse>> {
-            return localVarFp.findAllAcquisitions(marketTypeId, includeConsumed, options).then((request) => request(axios, basePath));
+        findAllAcquisitions(ledgerId?: string, marketTypeId?: number, includeConsumed?: boolean, options?: RawAxiosRequestConfig): AxiosPromise<Array<AcquisitionResponse>> {
+            return localVarFp.findAllAcquisitions(ledgerId, marketTypeId, includeConsumed, options).then((request) => request(axios, basePath));
         },
     };
 };
@@ -793,14 +784,15 @@ export const AcquisitionApiFactory = function (configuration?: Configuration, ba
 export class AcquisitionApi extends BaseAPI {
     /**
      * 
-     * @summary Find acquisitions, optionally filtered by market type and consumption state
+     * @summary Find the caller\'s acquisitions, optionally filtered by ledger, market type and consumption state
+     * @param {string} [ledgerId] Only return acquisitions held in this ledger
      * @param {number} [marketTypeId] Only return acquisitions of this market type
      * @param {boolean} [includeConsumed] Include fully consumed acquisitions (no remaining stock)
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      */
-    public findAllAcquisitions(marketTypeId?: number, includeConsumed?: boolean, options?: RawAxiosRequestConfig) {
-        return AcquisitionApiFp(this.configuration).findAllAcquisitions(marketTypeId, includeConsumed, options).then((request) => request(this.axios, this.basePath));
+    public findAllAcquisitions(ledgerId?: string, marketTypeId?: number, includeConsumed?: boolean, options?: RawAxiosRequestConfig) {
+        return AcquisitionApiFp(this.configuration).findAllAcquisitions(ledgerId, marketTypeId, includeConsumed, options).then((request) => request(this.axios, this.basePath));
     }
 }
 

src/ledger/LedgerLabel.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 
-import {isCombined, Ledger, systemLedger} from "@/ledger/ledger.ts";
-import {FolderOpenIcon} from '@heroicons/vue/24/outline';
+import {isCombined, isMain, Ledger, systemLedger} from "@/ledger/ledger.ts";
+import {DocumentIcon, FolderOpenIcon} from '@heroicons/vue/24/outline';
 import {RouterLink} from "vue-router";
 import {routeNames} from "@/routes";
 
@@ -15,7 +15,8 @@ const props = defineProps<Props>();
 
 <template>
   <div class="flex">
-    <FolderOpenIcon v-if="isCombined(ledger)" class="w-4 me-1" />
+    <DocumentIcon v-if="isMain(ledger)" class="w-4 me-1" />
+    <FolderOpenIcon v-else-if="isCombined(ledger)" class="w-4 me-1" />
     <div v-else class="w-4 me-1"/>
     <RouterLink v-if="link" :to="{name: routeNames.viewLedger, params: {ledgerId: ledger.ledgerId}}">{{ ledger.name }}</RouterLink>
     <span v-else :class="{'system-ledger': ledger === systemLedger}">{{ ledger.name }}</span>

src/market/acquisition/AcquisitionResultTable.vue

@@ -7,6 +7,7 @@ import {computed, ref} from 'vue';
 import {AcquiredType} from './AcquiredType';
 import AcquisitionQuartilesTooltip from './AcquisitionQuartilesTooltip.vue';
 import {formatEveDate, formatIsk, percentFormater} from "@/formaters.ts";
+import {Ledger, LedgerLabel, useLedgersStore} from "@/ledger";
 
 type Result = {
     id: string;
@@ -20,6 +21,8 @@ type Result = {
     precentProfit: number;
     iskProfit: number;
     date: Date;
+    ledger?: Ledger;
+    ledgerName: string;
     acquisitions: AcquiredType[];
 }
 
@@ -46,15 +49,22 @@ const props = withDefaults(defineProps<Props>(), {
 defineEmits<Emits>();
 
 const columnsToIgnore = computed(() => {
-    const ic = typeof props.ignoredColums === 'string' ? [props.ignoredColums] : props.ignoredColums;
+    const ignoredColums = typeof props.ignoredColums === 'string' ? [props.ignoredColums] : [...props.ignoredColums];
 
-    if (props.infoOnly && !ic.includes('buttons')) {
-        return [...ic, 'buttons'];
+    if (props.infoOnly && !ignoredColums.includes('buttons')) {
+        ignoredColums.push('buttons');
     }
-    return ic;
+    if (!props.showAll && !ignoredColums.includes('ledger')) {
+        ignoredColums.push('ledger');
+    }
+    if (ignoredColums.includes('ledger')) {
+      ignoredColums.push('ledgerName');
+    }
+    return ignoredColums;
 });
 
 const marketTaxStore = useMarketTaxStore();
+const ledgersStore = useLedgersStore();
 
 const threshold = useStorage('market-acquisition-threshold', 10);
 const filter = ref("");
@@ -77,6 +87,8 @@ const { sortedArray, headerProps, showColumn } = useSort<Result>(computed(() =>
                 precentProfit,
                 iskProfit: r.price * precentProfit * r.remaining,
                 date: r.date,
+                ledger: ledgersStore.findById(r.ledgerId),
+                ledgerName: ledgersStore.findById(r.ledgerId)?.name ?? '',
                 acquisitions: [r]
             };
         });
@@ -109,6 +121,7 @@ const { sortedArray, headerProps, showColumn } = useSort<Result>(computed(() =>
             precentProfit,
             iskProfit: price * precentProfit * totalRemaining,
             date: first.date,
+            ledgerName: '',
             acquisitions: group
         });
     });
@@ -176,6 +189,7 @@ const total = computed(() => {
                     <SortableHeader v-bind="headerProps" sortKey="name">Item</SortableHeader>
                     <SortableHeader v-bind="headerProps" sortKey="buy">Buy</SortableHeader>
                     <SortableHeader v-bind="headerProps" sortKey="sell">Sell</SortableHeader>
+                    <SortableHeader v-bind="headerProps" sortKey="ledgerName">Ledger</SortableHeader>
                     <SortableHeader v-bind="headerProps" sortKey="date">Bought at</SortableHeader>
                     <SortableHeader v-bind="headerProps" sortKey="price">Bought Price</SortableHeader>
                     <SortableHeader v-bind="headerProps" sortKey="remaining">Remaining Amount</SortableHeader>
@@ -194,6 +208,9 @@ const total = computed(() => {
                     </td>
                     <td v-if="showColumn('buy')" class="text-right">{{ formatIsk(r.data.buy) }}</td>
                     <td v-if="showColumn('sell')" class="text-right">{{ formatIsk(r.data.sell) }}</td>
+                    <td v-if="showColumn('ledger')">
+                        <LedgerLabel v-if="r.data.ledger" :ledger="r.data.ledger" link />
+                    </td>
                     <td v-if="showColumn('date')" class="text-right">{{ formatEveDate(r.data.date) }}</td>
                     <td v-if="showColumn('price')" class="text-right">{{ formatIsk(r.data.price) }}</td>
                     <td v-if="showColumn('remaining')" class="text-right">{{ r.data.remaining }}/{{ r.data.quantity }}</td>
@@ -214,9 +231,12 @@ const total = computed(() => {
                     <td v-if="showColumn('sell')">
                         <template v-if="!showColumn('name') && !showColumn('buy')">Total</template>
                     </td>
-                    <td v-if="showColumn('date')">
+                    <td v-if="showColumn('ledger')">
                         <template v-if="!showColumn('name') && !showColumn('buy') && !showColumn('sell')">Total</template>
                     </td>
+                    <td v-if="showColumn('date')">
+                        <template v-if="!showColumn('name') && !showColumn('buy') && !showColumn('sell') && !showColumn('ledger')">Total</template>
+                    </td>
                     <td v-if="showColumn('price')"  class="text-right">
                         <template v-if="total.sameItem">
                             {{ formatIsk(total.price) }}

src/market/acquisition/AcquisitionsPanel.vue

@@ -0,0 +1,51 @@
+<script setup lang="ts">
+import {getMarketTypes, MarketTypePrice, useApraisalStore} from "@/market";
+import {ref, watch} from 'vue';
+import {AcquiredType} from './AcquiredType';
+import {RawAcquiredType} from './acquisition';
+import AcquisitionResultTable from './AcquisitionResultTable.vue';
+import BuyModal from './BuyModal.vue';
+import SellModal from './SellModal.vue';
+
+interface Props {
+    items: RawAcquiredType[];
+    ignoredColums?: string[] | string;
+}
+
+const props = defineProps<Props>();
+
+const buyModal = ref<typeof BuyModal>();
+const sellModal = ref<typeof SellModal>();
+
+const apraisalStore = useApraisalStore();
+const enriched = ref<AcquiredType[]>([]);
+
+watch(() => props.items, async itms => {
+    if (itms.length === 0) {
+        enriched.value = [];
+        return;
+    }
+
+    const types = await getMarketTypes([...new Set(itms.map(i => i.type))]);
+    const prices = await apraisalStore.getPrices(types);
+
+    enriched.value = itms.map(i => {
+        const price = prices.find(p => p.type.id === i.type) as MarketTypePrice;
+
+        return {
+            ...i,
+            type: price.type,
+            buy: price.buy,
+            sell: price.sell
+        };
+    });
+}, {immediate: true});
+</script>
+
+<template>
+    <template v-if="enriched.length > 0">
+        <AcquisitionResultTable :items="enriched" :ignoredColums="ignoredColums" @buy="(types, price, buy, sell) => buyModal?.open(types[0].type, { 'Price': price, 'Buy': buy, 'Sell': sell })" @sell="types => sellModal?.open(types)" />
+        <BuyModal ref="buyModal" />
+        <SellModal ref="sellModal" />
+    </template>
+</template>

src/market/acquisition/acquisition.ts

@@ -7,6 +7,7 @@ export type AcquiredTypeSource = 'bo' | 'so' | 'prod' | 'misc';
 
 export type RawAcquiredType = {
     id: string;
+    ledgerId: string;
     type: number;
     quantity: number;
     remaining: number;
@@ -15,8 +16,9 @@ export type RawAcquiredType = {
     source: ActivitySourceResponse;
 }
 
-const toAcquiredType = (a: AcquisitionResponse): RawAcquiredType => ({
+export const toAcquiredType = (a: AcquisitionResponse): RawAcquiredType => ({
     id: a.acquisitionId,
+    ledgerId: a.ledgerId,
     type: a.marketTypeId,
     quantity: a.quantity,
     remaining: a.remaining,

src/market/acquisition/index.ts

@@ -2,6 +2,7 @@ export * from './AcquiredType';
 export * from './acquisition';
 
 export { default as AcquisitionResultTable } from './AcquisitionResultTable.vue';
+export { default as AcquisitionsPanel } from './AcquisitionsPanel.vue';
 export { default as BuyModal } from './BuyModal.vue';
 export { default as SellModal } from './SellModal.vue';
 

src/pages/ledger/ViewLedger.vue

@@ -3,7 +3,7 @@ import {RouterLink, RouterView} from 'vue-router';
 import {useLedgerParam} from "@/ledger";
 import {routeNames} from "@/routes.ts";
 
-const {ledgerId, ledger} = useLedgerParam();
+const {ledger} = useLedgerParam();
 
 </script>
 
@@ -16,6 +16,9 @@ const {ledgerId, ledger} = useLedgerParam();
       <RouterLink :to="{name: routeNames.listLedgerTransactions}" class="tab">
         <span>Transactions</span>
       </RouterLink>
+      <RouterLink :to="{name: routeNames.listLedgerAcquisitions}" class="tab">
+        <span>Acquisitions</span>
+      </RouterLink>
     </div>
     <RouterView />
   </div>

src/pages/ledger/ViewLedgerAcquisitions.vue

@@ -0,0 +1,24 @@
+<script setup lang="ts">
+import {AcquisitionsPanel, toAcquiredType} from '@/market/acquisition';
+import {useLedgerParam} from "@/ledger";
+import {acquisitionApi} from "@/mammon";
+import {computedAsync} from "@vueuse/core";
+
+const {ledgerId} = useLedgerParam();
+
+const items = computedAsync(async () => {
+    if (!ledgerId.value) {
+        return [];
+    }
+
+    const {data} = await acquisitionApi.findAllAcquisitions(ledgerId.value);
+
+    return data.map(toAcquiredType).filter(a => a.remaining > 0);
+}, []);
+</script>
+
+<template>
+    <div class="mt-4">
+        <AcquisitionsPanel :items="items" :ignoredColums="['date', 'ledger']" />
+    </div>
+</template>

src/pages/market/Acquisitions.vue

@@ -1,42 +1,15 @@
 <script setup lang="ts">
-import {getMarketTypes, MarketTypePrice, useApraisalStore} from "@/market";
-import {AcquiredType, AcquisitionResultTable, BuyModal, SellModal, useAcquiredTypesStore} from '@/market/acquisition';
-import {ref, watch} from 'vue';
+import {AcquisitionsPanel, useAcquiredTypesStore} from '@/market/acquisition';
 import {ArrowPathIcon} from '@heroicons/vue/24/outline';
 import {useAutoRefresh} from '@/composables';
 
-const buyModal = ref<typeof BuyModal>();
-const sellModal = ref<typeof SellModal>();
-
-const apraisalStore = useApraisalStore();
 const acquiredTypesStore = useAcquiredTypesStore();
-const items = ref<AcquiredType[]>([]);
 
 const refresh = async () => {
   await acquiredTypesStore.refresh();
 }
 
 const {active: autoRefresh, toggle: toggleAutoRefresh} = useAutoRefresh(refresh, 5 * 60 * 1000);
-
-watch(() => acquiredTypesStore.acquiredTypes, async itms => {
-    if (itms.length === 0) {
-        return;
-    }
-
-    const prices = await apraisalStore.getPrices(await getMarketTypes([...new Set(itms.map(i => i.type))]));
-
-    items.value = itms.map(i => {
-        const price = prices.find(p => p.type.id === i.type) as MarketTypePrice;
-        
-        return {
-            ...i,
-            type: price.type,
-            buy: price.buy,
-            sell: price.sell
-        };
-    });
-}, { immediate: true })
-
 </script>
 
 <template>
@@ -49,10 +22,6 @@ watch(() => acquiredTypesStore.acquiredTypes, async itms => {
                 </button>
             </div>
         </div>
-        <template v-if="items.length > 0">
-            <AcquisitionResultTable :items="items" @buy="(types, price, buy, sell) => buyModal?.open(types[0].type, { 'Price': price, 'Buy': buy, 'Sell': sell })" @sell="types => sellModal?.open(types)" ignoredColums="date" />
-            <BuyModal ref="buyModal" />
-            <SellModal ref="sellModal" />
-        </template>
+        <AcquisitionsPanel :items="acquiredTypesStore.acquiredTypes" ignoredColums="date" />
     </div>
 </template>

src/pages/market/TypeInfo.vue

@@ -40,9 +40,10 @@ const result = computedAsync(async () => {
 const acquisitions = computedAsync(async () => {
     const p = price.value;
     
-    return !p ? [] : (await acquisitionApi.findAllAcquisitions(item.value?.id, true)).data
+    return !p ? [] : (await acquisitionApi.findAllAcquisitions(undefined, item.value?.id, true)).data
         .map(a => ({
           id: a.acquisitionId,
+          ledgerId: a.ledgerId,
           quantity: a.quantity,
           remaining: a.remaining,
           price: a.unitCost,

src/pages/rules/EditRuleBook.vue

@@ -4,7 +4,6 @@ import {useEventListener} from "@vueuse/core";
 import log from "loglevel";
 import {ScriptEditor, useRuleBookStore} from "@/rules";
 import {PlusIcon, TrashIcon} from "@heroicons/vue/24/outline";
-import {SliderCheckbox} from "@/components";
 import {isMain, Ledger, LedgerSelect, systemLedger, useLedgersStore} from "@/ledger";
 
 type Binding = { ref: string; ledger: Ledger };
@@ -14,7 +13,6 @@ const ledgersStore = useLedgersStore();
 
 const ledgersToUse = computed(() => [systemLedger, ...ledgersStore.ledgers.filter(isMain)]);
 
-const usedForAcquisitions = ref<boolean>(false);
 const bindings = ref<Binding[]>([]);
 const script = ref<string>('');
 
@@ -23,7 +21,6 @@ const ledgerRefs = computed<string[]>(() => bindings.value.map(b => b.ref));
 watchEffect(() => {
   const ruleBook = ruleBookStore.ruleBook;
 
-  usedForAcquisitions.value = ruleBook?.usedForAcquisitions ?? false;
   script.value = ruleBook?.script ?? '';
   bindings.value = Object.entries(ruleBook?.bindings ?? {})
       .map(([ref, id]) => ({ref, ledger: ledgersToUse.value.find(l => l.ledgerId === id) ?? systemLedger}));
@@ -39,7 +36,6 @@ const removeBinding = (index: number) => {
 };
 
 const save = () => ruleBookStore.update({
-  usedForAcquisitions: usedForAcquisitions.value,
   bindings: Object.fromEntries(
       bindings.value
           .filter(b => b.ref)
@@ -59,12 +55,6 @@ useEventListener(window, 'keydown', (event: KeyboardEvent) => {
 <template>
   <div class="flex flex-col mb-2 mt-4 h-[calc(100vh-4.5rem)]">
     <div class="flex flex-col grow min-h-0">
-      <div class="flex grow border-b-1">
-        <label class="flex items-center mb-2">
-          <SliderCheckbox class="me-2" v-model="usedForAcquisitions" />
-          Used for acquisitions
-        </label>
-      </div>
       <div class="border-b-1">
         Ledger Bindings:
         <div class="flex flex-wrap items-center mt-2">

src/routes.ts

@@ -12,6 +12,7 @@ export const routeNames = {
     viewLedger: 'view-ledger',
     viewLedgerBalance: 'view-ledger-balance',
     listLedgerTransactions: 'list-ledger-transactions',
+    listLedgerAcquisitions: 'list-ledger-acquisitions',
     editRuleBook: 'edit-rule-book',
     marketTypes: 'market-types',
     about: 'about',
@@ -27,6 +28,7 @@ export const routes: RouteRecordRaw[] = [
             {path: '', name: routeNames.viewLedger, redirect: {name: routeNames.viewLedgerBalance}},
             {path: 'balance', name: routeNames.viewLedgerBalance, component: () => import('@/pages/ledger/ViewLedgerBalance.vue')},
             {path: 'transactions', name: routeNames.listLedgerTransactions, component: () => import('@/pages/ledger/ListLedgerTransactions.vue')},
+            {path: 'acquisitions', name: routeNames.listLedgerAcquisitions, component: () => import('@/pages/ledger/ViewLedgerAcquisitions.vue')},
         ]},
     ]},