stocklist v.3.0 done (#1092)

* stocklist v.3.0 done

* fixed errors

* fixed more errors

* migration squash

Author: efollin

src/database/prisma/migrations/20260216154843_stocklist_rehaul/migration.sql

@@ -0,0 +1,15 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `quantityIn` on the `drinkitembatch` table. All the data in the column will be lost.
+  - You are about to drop the column `quantityOut` on the `drinkitembatch` table. All the data in the column will be lost.
+  - Added the required column `quantity_delta` to the `drinkitembatch` table without a default value. This is not possible if the table is not empty.
+
+*/
+-- AlterTable
+ALTER TABLE "drinkitem" ADD COLUMN     "quantity_available" INTEGER DEFAULT 0;
+
+-- AlterTable
+ALTER TABLE "drinkitembatch" DROP COLUMN "quantityIn",
+DROP COLUMN "quantityOut",
+ADD COLUMN     "quantity_delta" INTEGER NOT NULL;

src/database/prisma/schema.prisma

@@ -469,20 +469,20 @@ model DrinkItem {
   systembolagetID   Int               @map("systembolaget_id")
   bottleEmptyWeight Int?              @map("bottle_empty_weight")
   bottleFullWeight  Int?              @map("bottle_full_weight")
+  quantityAvailable Int?              @default(0) @map("quantity_available")
   stockLists        DrinkItemBatch[]
 
   @@map("drinkitem")
 }
 
 model DrinkItemBatch {
-  id          String    @id() @default(dbgenerated("gen_random_uuid()")) @db.Uuid()
-  drinkItemId String    @map("drink_item_id") @db.Uuid()
-  item        DrinkItem @relation(fields: [drinkItemId], references: [id])
-  quantityIn  Int?
-  quantityOut Int?
-  user        String
-  date        DateTime
-  nrBottles   Int?
+  id            String    @id() @default(dbgenerated("gen_random_uuid()")) @db.Uuid()
+  drinkItemId   String    @map("drink_item_id") @db.Uuid()
+  item          DrinkItem @relation(fields: [drinkItemId], references: [id])
+  quantityDelta Int       @map("quantity_delta")
+  user          String
+  date          DateTime
+  nrBottles     Int?
 
   @@map("drinkitembatch")
 }

src/database/schema.zmodel

@@ -552,6 +552,7 @@ model DrinkItem {
   systembolagetID   Int               @map("systembolaget_id")
   bottleEmptyWeight Int?              @map("bottle_empty_weight")
   bottleFullWeight  Int?              @map("bottle_full_weight")
+  quantityAvailable Int?              @map("quantity_available") @default(0)
 
   stockLists        DrinkItemBatch[]
 
@@ -563,14 +564,13 @@ model DrinkItem {
 }
 
 model DrinkItemBatch {
-  id          String    @id @default(dbgenerated("gen_random_uuid()")) @db.Uuid
-  drinkItemId String    @map("drink_item_id") @db.Uuid
-  item        DrinkItem @relation(fields: [drinkItemId], references: [id])
-  quantityIn  Int?
-  quantityOut Int?
-  user        String
-  date        DateTime
-  nrBottles   Int?
+  id            String    @id @default(dbgenerated("gen_random_uuid()")) @db.Uuid
+  drinkItemId   String    @map("drink_item_id") @db.Uuid
+  item          DrinkItem @relation(fields: [drinkItemId], references: [id])
+  quantityDelta Int       @map("quantity_delta")
+  user          String
+  date          DateTime
+  nrBottles     Int?
 
   @@allow("read", true)
   @@allow("create", has(auth().policies, "drinkitembatch:create"))

src/database/seed/.snaplet/dataModel.json

@@ -4040,6 +4040,20 @@
           "isId": false,
           "maxLength": null
         },
+        {
+          "id": "public.drinkitem.quantity_available",
+          "name": "quantity_available",
+          "columnName": "quantity_available",
+          "type": "int4",
+          "isRequired": false,
+          "kind": "scalar",
+          "isList": false,
+          "isGenerated": false,
+          "sequence": false,
+          "hasDefaultValue": true,
+          "isId": false,
+          "maxLength": null
+        },
         {
           "name": "drinkitembatch",
           "type": "drinkitembatch",
@@ -4098,34 +4112,6 @@
           "isId": false,
           "maxLength": null
         },
-        {
-          "id": "public.drinkitembatch.quantityIn",
-          "name": "quantityIn",
-          "columnName": "quantityIn",
-          "type": "int4",
-          "isRequired": false,
-          "kind": "scalar",
-          "isList": false,
-          "isGenerated": false,
-          "sequence": false,
-          "hasDefaultValue": false,
-          "isId": false,
-          "maxLength": null
-        },
-        {
-          "id": "public.drinkitembatch.quantityOut",
-          "name": "quantityOut",
-          "columnName": "quantityOut",
-          "type": "int4",
-          "isRequired": false,
-          "kind": "scalar",
-          "isList": false,
-          "isGenerated": false,
-          "sequence": false,
-          "hasDefaultValue": false,
-          "isId": false,
-          "maxLength": null
-        },
         {
           "id": "public.drinkitembatch.user",
           "name": "user",
@@ -4168,6 +4154,20 @@
           "isId": false,
           "maxLength": null
         },
+        {
+          "id": "public.drinkitembatch.quantity_delta",
+          "name": "quantity_delta",
+          "columnName": "quantity_delta",
+          "type": "int4",
+          "isRequired": true,
+          "kind": "scalar",
+          "isList": false,
+          "isGenerated": false,
+          "sequence": false,
+          "hasDefaultValue": false,
+          "isId": false,
+          "maxLength": null
+        },
         {
           "name": "drinkitem",
           "type": "drinkitem",

src/lib/utils/getTotalInventoryValue.ts

@@ -0,0 +1,62 @@
+import type { ExtendedPrisma } from "$lib/server/extendedPrisma";
+import type { DrinkGroup, DrinkQuantityType } from "@prisma/client";
+
+type StockRow = {
+  quantityType: DrinkQuantityType;
+  name: string;
+  price: number;
+  group: DrinkGroup;
+  systembolagetId: number;
+  bottleEmptyWeight: number | null;
+  bottleFullWeight: number | null;
+};
+
+export async function inventoryValue(prisma: ExtendedPrisma) {
+  const items = await prisma.drinkItem.findMany({
+    where: {
+      quantityAvailable: { gt: 0 },
+    },
+  });
+
+  let value = 0;
+
+  for (const item of items) {
+    if (item.quantityType === "COUNTS") {
+      value += (item.price / 100) * item.quantityAvailable!;
+    } else {
+      const bottleWeight = item.bottleEmptyWeight!;
+      const liquidWeight = item.quantityAvailable! - bottleWeight;
+      const bottlePrice = item.price / 100;
+      const fullBottleLiquidWeight = item.bottleFullWeight! - bottleWeight;
+      value += (liquidWeight / fullBottleLiquidWeight) * bottlePrice;
+    }
+  }
+  return value;
+}
+
+export async function readCSV(prisma: ExtendedPrisma, file: File) {
+  const text = await file.text();
+
+  const lines = text.split(/\r?\n/).filter((l) => l.trim() !== "");
+
+  const cell = (arr: string[], i: number) => (arr[i] ?? "").trim();
+
+  const toNumberOrNull = (v: string): number | null =>
+    v === "" ? null : Number(v);
+
+  const rows: StockRow[] = lines.slice(1).map((line) => {
+    const values = line.split(",");
+
+    return {
+      quantityType: cell(values, 0) as DrinkQuantityType,
+      name: cell(values, 1),
+      price: Number(cell(values, 2)),
+      group: cell(values, 3) as DrinkGroup,
+      systembolagetId: Number(cell(values, 4)),
+      bottleEmptyWeight: toNumberOrNull(cell(values, 5)),
+      bottleFullWeight: toNumberOrNull(cell(values, 6)),
+    };
+  });
+
+  return rows;
+}

src/lib/utils/stocklistUtils.ts

@@ -1,10 +1,47 @@
-import type { PageServerLoad } from "./$types";
-import { getTotalInventoryValue } from "$lib/utils/getTotalInventoryValue";
+import { inventoryValue, readCSV } from "$lib/utils/stocklistUtils";
+import { fail } from "sveltekit-superforms";
+import type { Actions, PageServerLoad } from "./$types";
 
 export const load: PageServerLoad = async ({ locals }) => {
   const { prisma } = locals;
+  const drinkItems = await prisma.drinkItem.findMany({
+    where: {
+      quantityAvailable: { gt: 0 },
+    },
+  });
+  const currentInventoryValue = await inventoryValue(prisma);
 
-  const { totalInventoryValue, grouped } = await getTotalInventoryValue(prisma);
+  return { currentInventoryValue, drinkItems };
+};
+
+export const actions: Actions = {
+  readFile: async ({ request, locals }) => {
+    const prisma = locals.prisma;
+    const form = await request.formData();
+    const file = form.get("upload");
+
+    if (!(file instanceof File)) {
+      return fail(400, { message: "No file uploaded" });
+    }
+
+    const items = await readCSV(prisma, file);
 
-  return { totalInventoryValue, grouped };
+    for (const item of items) {
+      await prisma.drinkItem.create({
+        data: {
+          name: item.name,
+          price: item.price * 100,
+          group: item.group,
+          systembolagetID: item.systembolagetId,
+          quantityType: item.quantityType,
+          bottleEmptyWeight: item.bottleEmptyWeight,
+          bottleFullWeight: item.bottleFullWeight,
+        },
+      });
+    }
+    return {
+      success: true,
+      message: `Produkter skapade`,
+    };
+  },
 };