style tweaks to both form and existing inventory, added createdAt and modified purchasePrice (for % of market)
This commit is contained in:
Zach Harding
@@ -1,58 +1,84 @@
|
||||
import type { APIRoute } from 'astro';
|
||||
import { db } from '../../db/index';
|
||||
import { inventory } from '../../db/schema';
|
||||
import { inventory, skus, cards } from '../../db/schema';
|
||||
import { client } from '../../db/typesense';
|
||||
import { eq } from 'drizzle-orm';
|
||||
import { eq, and } from 'drizzle-orm';
|
||||
|
||||
|
||||
const GainLoss = (purchasePrice:any, marketPrice:any) => {
|
||||
const GainLoss = (purchasePrice: any, marketPrice: any) => {
|
||||
if (!purchasePrice || !marketPrice) return '<div class="fs-5 fw-semibold">N/A</div>';
|
||||
const pp = Number(purchasePrice);
|
||||
const mp = Number(marketPrice);
|
||||
if (pp === mp) return '<div class="fs-5 fw-semibold text-warning">-</div>';
|
||||
if (pp > mp) return `<div class="fs-5 fw-semibold text-critical">-$${pp-mp}</div>`;
|
||||
return `<div class="fs-5 fw-semibold text-success">+$${mp-pp}</div>`;
|
||||
if (pp > mp) return `<div class="fs-5 fw-semibold text-critical">-$${(pp - mp).toFixed(2)}</div>`;
|
||||
return `<div class="fs-6 fw-semibold text-success">+$${(mp - pp).toFixed(2)}</div>`;
|
||||
}
|
||||
|
||||
const getInventory = async (userId: string, cardId: number) => {
|
||||
|
||||
const getInventory = async (userId:string, cardId:number) => {
|
||||
|
||||
const inventories = await db.query.inventory.findMany({
|
||||
where: { userId:userId, cardId:cardId, },
|
||||
with: { card: true, sku: true, }
|
||||
});
|
||||
const inventories = await db
|
||||
.select({
|
||||
inventoryId: inventory.inventoryId,
|
||||
cardId: inventory.cardId,
|
||||
condition: inventory.condition,
|
||||
quantity: inventory.quantity,
|
||||
purchasePrice: inventory.purchasePrice,
|
||||
note: inventory.note,
|
||||
marketPrice: skus.marketPrice,
|
||||
createdAt: inventory.createdAt,
|
||||
})
|
||||
.from(inventory)
|
||||
.leftJoin(
|
||||
cards,
|
||||
eq(inventory.cardId, cards.cardId)
|
||||
)
|
||||
.leftJoin(
|
||||
skus,
|
||||
and(
|
||||
eq(cards.productId, skus.productId),
|
||||
eq(inventory.condition, skus.condition)
|
||||
)
|
||||
)
|
||||
.where(and(
|
||||
eq(inventory.userId, userId),
|
||||
eq(inventory.cardId, cardId)
|
||||
));
|
||||
|
||||
const invHtml = inventories.map(inv => {
|
||||
const marketPrice = inv.marketPrice ? Number(inv.marketPrice).toFixed(2) : null;
|
||||
const marketPriceDisplay = marketPrice ? `$${marketPrice}` : '—';
|
||||
const purchasePriceDisplay = inv.purchasePrice ? `$${Number(inv.purchasePrice).toFixed(2)}` : '—';
|
||||
|
||||
return `
|
||||
<article class="border rounded-4 p-2 bg-body-tertiary inventory-entry-card"
|
||||
<article class="alert alert-dark rounded-4 inventory-entry-card"
|
||||
data-inventory-id="${inv.inventoryId}"
|
||||
data-card-id="${inv.cardId}"
|
||||
data-purchase-price="${inv.purchasePrice}"
|
||||
data-note="${(inv.note || '').replace(/"/g, '"')}">
|
||||
<div class="d-flex flex-column gap-2">
|
||||
<div class="d-flex flex-column">
|
||||
<!-- Top row -->
|
||||
<div class="d-flex justify-content-between align-items-start gap-3">
|
||||
<div class="d-flex justify-content-between gap-3">
|
||||
<div class="min-w-0 flex-grow-1">
|
||||
<div class="fw-semibold fs-5 text-body mb-1">${inv.condition}</div>
|
||||
<div class="fw-semibold fs-6 text-body mb-1">${inv.condition}</div>
|
||||
</div>
|
||||
<div class="fs-7 text-secondary">Added: ${inv.createdAt ? new Date(inv.createdAt).toLocaleDateString() : '—'}</div>
|
||||
</div>
|
||||
<!-- Middle row -->
|
||||
<div class="row g-2">
|
||||
<div class="col-4">
|
||||
<div class="small text-secondary">Purchase price</div>
|
||||
<div class="fs-5 fw-semibold">$${inv.purchasePrice}</div>
|
||||
<div class="fs-6 fw-semibold">${purchasePriceDisplay}</div>
|
||||
</div>
|
||||
<div class="col-4">
|
||||
<div class="small text-secondary">Market price</div>
|
||||
<div class="fs-5 text-success">$${inv.sku?.marketPrice}</div>
|
||||
<div class="fs-6 text-success">${marketPriceDisplay}</div>
|
||||
</div>
|
||||
<div class="col-4">
|
||||
<div class="small text-secondary">Gain / loss</div>
|
||||
${GainLoss(inv.purchasePrice, inv.sku?.marketPrice)}
|
||||
${GainLoss(inv.purchasePrice, marketPrice)}
|
||||
</div>
|
||||
</div>
|
||||
<!-- Bottom row -->
|
||||
<div class="d-flex justify-content-between align-items-center gap-3 flex-wrap">
|
||||
<div class="d-flex justify-content-between align-items-center gap-3 flex-wrap mt-2">
|
||||
<div class="d-flex align-items-center gap-2">
|
||||
<span class="small text-secondary">Qty</span>
|
||||
<div class="btn-group" role="group" aria-label="Quantity controls">
|
||||
@@ -63,7 +89,7 @@ const getInventory = async (userId:string, cardId:number) => {
|
||||
</div>
|
||||
<div class="d-flex align-items-center gap-2 flex-wrap">
|
||||
<button type="button" class="btn btn-sm btn-outline-secondary" data-inv-action="update">Edit</button>
|
||||
<button type="button" class="btn btn-sm btn-outline-danger" data-inv-action="remove">Remove</button>
|
||||
<button type="button" class="btn btn-sm btn-outline-danger" data-inv-action="remove" onclick="if(!confirm('Are you sure you want to remove this card from your inventory?')) event.stopImmediatePropagation();">Remove</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -77,12 +103,10 @@ const getInventory = async (userId:string, cardId:number) => {
|
||||
headers: { 'Content-Type': 'text/html' },
|
||||
}
|
||||
);
|
||||
|
||||
}
|
||||
|
||||
|
||||
const addToInventory = async (userId:string, cardId:number, condition:string, purchasePrice:number, quantity:number, note:string, catalogName:string) => {
|
||||
// First add to database
|
||||
const addToInventory = async (userId: string, cardId: number, condition: string, purchasePrice: number, quantity: number, note: string, catalogName: string) => {
|
||||
const inv = await db.insert(inventory).values({
|
||||
userId: userId,
|
||||
cardId: cardId,
|
||||
@@ -92,7 +116,6 @@ const addToInventory = async (userId:string, cardId:number, condition:string, pu
|
||||
quantity: quantity,
|
||||
note: note,
|
||||
}).returning();
|
||||
// And then add to Typesense
|
||||
await client.collections('inventories').documents().import(inv.map(i => ({
|
||||
id: i.inventoryId,
|
||||
userId: i.userId,
|
||||
@@ -101,23 +124,20 @@ const addToInventory = async (userId:string, cardId:number, condition:string, pu
|
||||
})));
|
||||
}
|
||||
|
||||
const removeFromInventory = async (inventoryId:string) => {
|
||||
await db.delete(inventory).where(eq( inventory.inventoryId, inventoryId ));
|
||||
const removeFromInventory = async (inventoryId: string) => {
|
||||
await db.delete(inventory).where(eq(inventory.inventoryId, inventoryId));
|
||||
await client.collections('inventories').documents(inventoryId).delete();
|
||||
}
|
||||
|
||||
const updateInventory = async (inventoryId:string, quantity:number, purchasePrice:number, note:string) => {
|
||||
// Update in database
|
||||
const updateInventory = async (inventoryId: string, quantity: number, purchasePrice: number, note: string) => {
|
||||
await db.update(inventory).set({
|
||||
quantity: quantity,
|
||||
purchasePrice: purchasePrice,
|
||||
note: note,
|
||||
}).where(eq( inventory.inventoryId, inventoryId ));
|
||||
// There is no need to update Typesense for these fields as they are not indexed
|
||||
}).where(eq(inventory.inventoryId, inventoryId));
|
||||
}
|
||||
|
||||
export const POST: APIRoute = async ({ request, locals }) => {
|
||||
// Access form data from the request body
|
||||
const formData = await request.formData();
|
||||
const action = formData.get('action');
|
||||
const cardId = Number(formData.get('cardId')) || 0;
|
||||
@@ -132,7 +152,6 @@ export const POST: APIRoute = async ({ request, locals }) => {
|
||||
const note = formData.get('note')?.toString() || '';
|
||||
const catalogName = formData.get('catalogName')?.toString() || 'Default';
|
||||
await addToInventory(userId!, cardId, condition, purchasePrice, quantity, note, catalogName);
|
||||
//return await getInventory(cardId);
|
||||
break;
|
||||
|
||||
case 'remove':
|
||||
@@ -149,12 +168,8 @@ export const POST: APIRoute = async ({ request, locals }) => {
|
||||
break;
|
||||
|
||||
default:
|
||||
// No action = list inventory for this card
|
||||
return getInventory(userId!, cardId);
|
||||
}
|
||||
|
||||
// Always return current inventory after a mutation
|
||||
return getInventory(userId!, cardId);
|
||||
|
||||
|
||||
};
|
||||
Reference in New Issue
Block a user