fix scan

docs/mammon-api.yml

@@ -471,6 +471,11 @@ paths:
                 type: array
                 items:
                   $ref: "#/components/schemas/MarketPriceResponse"
+        "400":
+          description: |-
+            Returned when:
+            - the types parameter is missing
+            - a types value is not a numeric id
   /ledgers:
     get:
       tags:
@@ -832,6 +837,10 @@ components:
         marketTypeId:
           type: integer
           format: int64
+        buy:
+          type: number
+        sell:
+          type: number
         q1:
           type: number
         median:
@@ -846,12 +855,14 @@ components:
         score:
           type: number
       required:
+      - buy
       - marketTypeId
       - median
       - profit
       - q1
       - q3
       - score
+      - sell
       - totalVolume
     MarketPriceResponse:
       type: object

src/generated/mammon/api.ts

@@ -115,6 +115,8 @@ export interface MarketPriceResponse {
 }
 export interface MarketScanResponse {
     'marketTypeId': number;
+    'buy': number;
+    'sell': number;
     'q1': number;
     'median': number;
     'q3': number;

src/market/scan/scan.ts

@@ -21,10 +21,10 @@ export const calculateScore = (quartils: HistoryQuartils, profit: number, orderC
     return Math.sqrt((Math.pow(quartils.totalVolume, 1.1) * Math.pow(quartils.q1, 1.2) * Math.pow(profit, 0.5) * Math.pow(Math.max(1, orderCount), -0.7)) / days);
 }
 
-export const toScanResult = (res: MarketScanResponse, type: MarketType, price: MarketTypePrice): ScanResult => ({
+export const toScanResult = (res: MarketScanResponse, type: MarketType): ScanResult => ({
     type,
-    buy: price.buy,
-    sell: price.sell,
+    buy: res.buy,
+    sell: res.sell,
     q1: res.q1,
     median: res.median,
     q3: res.q3,

src/pages/market/Scan.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import {getMarketTypes, TaxInput, useApraisalStore, useMarketTaxStore} from "@/market";
+import {getMarketTypes, TaxInput, useMarketTaxStore} from "@/market";
 import {BuyModal} from '@/market/acquisition';
 import {ScanResult, ScanResultTable, toScanResult} from '@/market/scan';
 import {marketApi} from "@/mammon";
@@ -8,7 +8,6 @@ import {ref, watch} from 'vue';
 
 const buyModal = ref<typeof BuyModal>();
 
-const apraisalStore = useApraisalStore();
 const marketTaxStore = useMarketTaxStore();
 const days = useStorage('market-scan-days', 365);
 const items = ref<ScanResult[]>([]);
@@ -23,13 +22,11 @@ const scan = async () => {
             marketTaxStore.scc / 100
         );
         const types = await getMarketTypes(data.map(r => r.marketTypeId));
-        const prices = await apraisalStore.getPrices(types);
 
         items.value = data.flatMap(r => {
             const type = types.find(t => t.id === r.marketTypeId);
-            const price = prices.find(p => p.type.id === r.marketTypeId);
 
-            return type && price ? [toScanResult(r, type, price)] : [];
+            return type ? [toScanResult(r, type)] : [];
         });
     } finally {
         loading.value = false;