fix: arreglar paginas de productos viejos

This commit is contained in:
Cat /dev/Nulo 2024-12-17 00:21:49 -03:00
parent 6864f55b70
commit 40f8ba0caa
2 changed files with 80 additions and 24 deletions

View file

@ -1,19 +1,14 @@
import { db } from '$lib/server/db'; import { db } from '$lib/server/db';
import type { PageServerLoad } from './$types'; import type { PageServerLoad } from './$types';
import { banderas, datasets, precios, sucursales } from '$lib/server/db/schema'; import { banderas, datasets, precios, sucursales } from '$lib/server/db/schema';
import { and, eq, sql } from 'drizzle-orm'; import { and, eq, sql, SQL } from 'drizzle-orm';
import { error } from '@sveltejs/kit'; import { error } from '@sveltejs/kit';
import * as Sentry from '@sentry/sveltekit'; import * as Sentry from '@sentry/sveltekit';
import { formatISO, subDays } from 'date-fns'; import { formatISO, subDays } from 'date-fns';
import { z } from 'zod'; import { z } from 'zod';
export const load: PageServerLoad = async ({ params, setHeaders }) => {
const { success, data } = z.object({ id: z.coerce.bigint() }).safeParse(params); function getProduct(id: bigint, filterDatasetBy: SQL) {
if (!success) { const q = db
return error(400, `Esta URL es inválida`);
}
const id = data.id;
const aWeekAgo = subDays(new Date(), 5);
const preciosQuery = db
.select({ .select({
id_comercio: precios.id_comercio, id_comercio: precios.id_comercio,
id_bandera: precios.id_bandera, id_bandera: precios.id_bandera,
@ -35,7 +30,7 @@ export const load: PageServerLoad = async ({ params, setHeaders }) => {
.from(precios) .from(precios)
.where( .where(
and( and(
eq(precios.id_producto, BigInt(params.id)), eq(precios.id_producto, BigInt(id)),
sql`${precios.id_dataset} IN ( sql`${precios.id_dataset} IN (
@ -44,7 +39,7 @@ FROM datasets d1
JOIN ( JOIN (
SELECT id_comercio, MAX(date) as max_date SELECT id_comercio, MAX(date) as max_date
FROM datasets FROM datasets
WHERE date > ${formatISO(aWeekAgo, { representation: 'date' })} WHERE ${filterDatasetBy}
GROUP BY id_comercio GROUP BY id_comercio
) d2 ON d1.id_comercio = d2.id_comercio AND d1.date = d2.max_date ) d2 ON d1.id_comercio = d2.id_comercio AND d1.date = d2.max_date
ORDER BY d1.id_comercio) ORDER BY d1.id_comercio)
@ -68,14 +63,35 @@ ORDER BY d1.id_comercio)
eq(banderas.id_bandera, precios.id_bandera) eq(banderas.id_bandera, precios.id_bandera)
) )
); );
const preciosRes = await Sentry.startSpan( return Sentry.startSpan(
{ {
op: 'db.query', op: 'db.query',
name: preciosQuery.toSQL().sql, name: q.toSQL().sql,
data: { 'db.system': 'postgresql' } data: { 'db.system': 'postgresql' }
// eslint-disable-next-line @typescript-eslint/no-explicit-any // eslint-disable-next-line @typescript-eslint/no-explicit-any
} as any, } as any,
() => preciosQuery () =>
q.then((x) =>
x.map((p) => ({
...p,
productos_precio_lista: parseFloat(p.productos_precio_lista ?? '0'),
sucursales_latitud: parseFloat(p.sucursales_latitud ?? '0'),
sucursales_longitud: parseFloat(p.sucursales_longitud ?? '0')
}))
)
);
}
export const load: PageServerLoad = async ({ params, setHeaders }) => {
const { success, data } = z.object({ id: z.coerce.bigint() }).safeParse(params);
if (!success) {
return error(400, `Esta URL es inválida`);
}
const id = data.id;
const aWeekAgo = subDays(new Date(), 5);
const preciosRes = await getProduct(
id,
sql`date > ${formatISO(aWeekAgo, { representation: 'date' })}`
); );
setHeaders({ setHeaders({
@ -83,16 +99,22 @@ ORDER BY d1.id_comercio)
}); });
if (preciosRes.length == 0) { if (preciosRes.length == 0) {
return error(404, `Producto ${params.id} no encontrado`); const preciosOldRes = await getProduct(id, sql`TRUE`);
if (preciosOldRes.length == 0) {
return error(404, `Producto ${params.id} no encontrado`);
}
return {
precios: preciosOldRes,
id_producto: id,
old: true
};
} }
return { return {
precios: preciosRes.map((p) => ({ precios: preciosRes,
...p, id_producto: id,
productos_precio_lista: parseFloat(p.productos_precio_lista ?? '0'), old: false
sucursales_latitud: parseFloat(p.sucursales_latitud ?? '0'),
sucursales_longitud: parseFloat(p.sucursales_longitud ?? '0')
})),
id_producto: id
}; };
}; };

View file

@ -23,6 +23,9 @@
import type { GeoJSON as GeoJSONType } from 'geojson'; import type { GeoJSON as GeoJSONType } from 'geojson';
import type { DataDrivenPropertyValueSpecification } from 'maplibre-gl'; import type { DataDrivenPropertyValueSpecification } from 'maplibre-gl';
import Button from '$lib/components/ui/button/button.svelte'; import Button from '$lib/components/ui/button/button.svelte';
import { TriangleAlert } from 'lucide-svelte';
import * as Dialog from '$lib/components/ui/dialog';
import { differenceInDays } from 'date-fns';
export let data: PageData; export let data: PageData;
@ -61,8 +64,19 @@
})) }))
}; };
} }
$: geoJSON = generateGeoJSON(data.precios); $: geoJSON = generateGeoJSON(data.precios);
$: newest = new Date(
data.precios.sort((a, b) => {
const dateA = b.dataset_date ? new Date(b.dataset_date) : new Date(0);
const dateB = a.dataset_date ? new Date(a.dataset_date) : new Date(0);
return dateA.getTime() - dateB.getTime();
})[0].dataset_date ?? new Date(0)
);
const relativeTimeFormatter = new Intl.RelativeTimeFormat('es-AR', {
style: 'long',
numeric: 'auto'
});
function hoverStateFilter( function hoverStateFilter(
offValue: number, offValue: number,
@ -86,12 +100,32 @@
> >
<ArrowLeft class="size-8 flex-shrink-0" /> <ArrowLeft class="size-8 flex-shrink-0" />
</button> </button>
<div class="flex flex-wrap items-center gap-x-2 overflow-hidden p-1"> <div class="flex flex-wrap items-center gap-x-2 gap-y-1 overflow-hidden p-1">
<h1 class="overflow-hidden text-ellipsis whitespace-nowrap pb-1 text-2xl font-bold"> <h1 class="overflow-hidden text-ellipsis whitespace-nowrap pb-1 text-2xl font-bold">
{data.precios[0].productos_descripcion} {data.precios[0].productos_descripcion}
</h1> </h1>
<Badge>{data.precios.length} precios</Badge> <Badge>{data.precios.length} precios</Badge>
<Badge variant="outline">EAN {data.id_producto}</Badge> <Badge variant="outline">EAN {data.id_producto}</Badge>
{#if data.old}
<Dialog.Root>
<Dialog.Trigger>
<Badge variant="destructive" class="flex items-center gap-1">
<TriangleAlert class="size-4" />
Precios antiguos
</Badge>
</Dialog.Trigger>
<Dialog.Content>
<Dialog.Title>Precios antiguos</Dialog.Title>
<Dialog.Description>
Los datos de esta pagina son de hace al menos {relativeTimeFormatter.format(
-differenceInDays(new Date(), new Date(newest)),
'days'
)}. Es muy probable que este producto especifico este descontinuado. Revisa las fechas
de cada precio para confirmar.
</Dialog.Description>
</Dialog.Content>
</Dialog.Root>
{/if}
</div> </div>
</div> </div>
<MapLibre <MapLibre