boki/stock-bot
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

getting close to having exchanges done

Browse source
This commit is contained in:
Boki 2025-06-18 09:12:51 -04:00
parent 6a34d1140f
commit 4f4f615a62
3 changed files with 68 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

53
apps/web-api/src/routes/exchange.routes.ts
View file

@ -9,12 +9,13 @@ import { getMongoDBClient } from '@stock-bot/mongodb-client';
const logger = getLogger('exchange-routes');
export const exchangeRoutes = new Hono();
// Get all exchanges with provider mapping counts
// Get all exchanges with provider mapping counts and mappings
exchangeRoutes.get('/', async c => {
try {
const postgresClient = getPostgreSQLClient();
const query = `
// First get all exchanges with counts
const exchangesQuery = `
SELECT
e.id,
e.code,
@ -34,12 +35,49 @@ exchangeRoutes.get('/', async c => {
ORDER BY e.code
`;
const result = await postgresClient.query(query);
const exchangesResult = await postgresClient.query(exchangesQuery);
// Then get all provider mappings
const mappingsQuery = `
SELECT
pem.*,
e.code as master_exchange_code,
e.name as master_exchange_name
FROM provider_exchange_mappings pem
JOIN exchanges e ON pem.master_exchange_id = e.id
ORDER BY pem.master_exchange_id, pem.provider, pem.provider_exchange_code
`;
const mappingsResult = await postgresClient.query(mappingsQuery);
// Group mappings by exchange ID
const mappingsByExchange = mappingsResult.rows.reduce((acc, mapping) => {
const exchangeId = mapping.master_exchange_id;
if (!acc[exchangeId]) {
acc[exchangeId] = [];
}
acc[exchangeId].push(mapping);
return acc;
}, {} as Record<string, any[]>);
// Attach mappings to exchanges
const exchangesWithMappings = exchangesResult.rows.map(exchange => {
const mappings = mappingsByExchange[exchange.id] || [];
logger.info('Exchange mapping debug', {
exchangeId: exchange.id,
exchangeCode: exchange.code,
mappingsCount: mappings.length,
availableExchangeIds: Object.keys(mappingsByExchange)
});
return {
...exchange,
provider_mappings: mappings
};
});
return c.json({
success: true,
data: result.rows,
total: result.rows.length,
data: exchangesWithMappings,
total: exchangesWithMappings.length,
});
} catch (error) {
logger.error('Failed to get exchanges', { error });
@ -343,6 +381,9 @@ exchangeRoutes.post('/provider-mappings', async c => {
);
}
// Validate and clean currency field (must be 3 characters or null)
const cleanCurrency = currency && currency.length <= 3 ? currency : null;
const query = `
INSERT INTO provider_exchange_mappings
(provider, provider_exchange_code, provider_exchange_name, master_exchange_id,
@ -357,7 +398,7 @@ exchangeRoutes.post('/provider-mappings', async c => {
provider_exchange_name,
master_exchange_id,
country_code,
currency,
cleanCurrency,
confidence,
active,
verified,

75
apps/web-app/src/features/exchanges/components/ExchangesTable.tsx
View file

@ -24,7 +24,6 @@ export function ExchangesTable() {
exchangeId: string;
exchangeName: string;
} | null>(null);
const [expandedRowData, setExpandedRowData] = useState<Record<string, ProviderMapping[]>>({});
const handleCellEdit = useCallback(
async (id: string, field: string, value: string) => {
@ -62,20 +61,7 @@ export function ExchangesTable() {
async (mappingId: string, currentStatus: boolean) => {
const success = await updateProviderMapping(mappingId, { active: !currentStatus });
if (success) {
// Update the local expanded row data immediately
setExpandedRowData(prev => {
const updated = { ...prev };
Object.keys(updated).forEach(exchangeId => {
updated[exchangeId] = updated[exchangeId].map(mapping =>
mapping.id === mappingId
? { ...mapping, active: !currentStatus }
: mapping
);
});
return updated;
});
// Also refresh the main table data
// Refresh the main table data to get updated counts and mappings
refetch();
}
},
@ -84,18 +70,10 @@ export function ExchangesTable() {
const handleRowExpand = useCallback(
async (row: any) => {
const exchangeId = row.original.id;
if (!expandedRowData[exchangeId]) {
const details = await fetchExchangeDetails(exchangeId);
if (details) {
setExpandedRowData(prev => ({
...prev,
[exchangeId]: details.provider_mappings
}));
}
}
// Row expansion is now handled automatically by TanStack Table
// No need to fetch data since all mappings are already loaded
},
[fetchExchangeDetails]
[]
);
const columns = useMemo<ColumnDef<Exchange>[]>(() => {
@ -258,27 +236,18 @@ export function ExchangesTable() {
const activeMappings = parseInt(row.original.active_mapping_count) || 0;
const verifiedMappings = parseInt(row.original.verified_mapping_count) || 0;
// Parse provider mappings from the expanded data or from a summary field
const exchangeId = row.original.id;
const mappings = expandedRowData[exchangeId] || [];
// Get provider mappings directly from the exchange data
const mappings = row.original.provider_mappings || [];
const handleLoadMappings = async () => {
if (mappings.length === 0 && totalMappings > 0) {
const details = await fetchExchangeDetails(exchangeId);
if (details) {
setExpandedRowData(prev => ({
...prev,
[exchangeId]: details.provider_mappings
}));
}
}
};
// Sort mappings to show active ones first
const sortedMappings = [...mappings].sort((a, b) => {
if (a.active && !b.active) return -1;
if (!a.active && b.active) return 1;
return 0;
});
return (
<div
className="flex flex-col gap-1 cursor-pointer"
onMouseEnter={handleLoadMappings}
>
<div className="flex flex-col gap-1">
<div className="text-sm">
<span className="text-text-primary font-medium">{totalMappings}</span>
<span className="text-text-muted"> total</span>
@ -290,18 +259,16 @@ export function ExchangesTable() {
</div>
{mappings.length > 0 ? (
<div className="flex flex-wrap gap-1 text-xs">
{mappings.slice(0, 3).map((mapping, index) => (
<span key={index} className={`${mapping.active ? 'text-text-primary' : 'text-text-muted'}`}>
<span className="font-bold text-primary-400">{mapping.provider.toLowerCase()}</span>
<span className="text-text-secondary">({mapping.provider_exchange_code})</span>
{sortedMappings.slice(0, 3).map((mapping, index) => (
<span key={index} className={mapping.active ? 'text-green-500' : 'text-text-muted'}>
<span className={mapping.active ? 'font-bold text-green-500' : 'font-bold text-text-muted'}>{mapping.provider.toLowerCase()}</span>
<span className={mapping.active ? 'text-green-500' : 'text-text-muted'}>({mapping.provider_exchange_code})</span>
</span>
))}
{mappings.length > 3 && (
<span className="text-text-muted">+{mappings.length - 3} more</span>
{sortedMappings.length > 3 && (
<span className="text-text-muted">+{sortedMappings.length - 3} more</span>
)}
</div>
) : totalMappings > 0 ? (
<div className="text-xs text-text-muted">Hover to load mappings...</div>
) : (
<div className="text-xs text-text-muted">No mappings</div>
)}
@ -350,13 +317,11 @@ export function ExchangesTable() {
}, [
editingCell,
editValue,
expandedRowData,
handleCellEdit,
handleToggleActive,
handleAddProviderMapping,
handleDeleteExchange,
handleRowExpand,
fetchExchangeDetails,
]);
if (error) {
@ -373,7 +338,7 @@ export function ExchangesTable() {
const renderSubComponent = ({ row }: { row: any }) => {
const exchange = row.original as Exchange;
const mappings = expandedRowData[exchange.id] || [];
const mappings = exchange.provider_mappings || [];
if (mappings.length === 0) {
return (

1
apps/web-app/src/features/exchanges/types/index.ts
View file

@ -30,6 +30,7 @@ export interface Exchange {
active_mapping_count: string;
verified_mapping_count: string;
providers: string | null;
provider_mappings: ProviderMapping[];
}
export interface ExchangeDetails {