Organizations

.env.example

@@ -9,6 +9,7 @@ NEXTAUTH_SECRET=secret
 NEXTAUTH_URL=http://localhost:3000/api/auth
 MEDIA_PATH="./media"
 BOARD_GROUP="styrit"
+DIVISION_TREASURER_EMAIL="kassor.styrit@chalmers.it"
 TREASURER_POST_ID="cd6c2fc4-9fac-42e3-873c-6cfd71c3dd8d"
 GOTIFY_ROOT_URL=http://localhost:8080
 GOTIFY_TOKEN="123abc"

.gitignore

@@ -40,3 +40,5 @@ package-lock.json
 
 .idea/
 /db
+
+.direnv

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cashit",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "private": true,
   "scripts": {
     "dev": "next dev --turbopack",
@@ -9,13 +9,13 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "@chakra-ui/react": "3.26.0",
+    "@chakra-ui/react": "3.30.0",
     "@emotion/react": "^11.14.0",
     "@prisma/client": "6.6.0",
     "@react-pdf/renderer": "^4.2.1",
     "@tanstack/react-table": "^8.21.3",
     "dayjs": "^1.11.13",
-    "next": "15.3.6",
+    "next": "15.5.9",
     "next-auth": "^4.24.11",
     "next-i18n-router": "^5.5.1",
     "next-themes": "^0.4.4",
@@ -31,14 +31,15 @@
     "@types/react": "19.2.7",
     "@types/react-dom": "19.2.3",
     "eslint": "^8",
-    "eslint-config-next": "15.3.6",
+    "eslint-config-next": "15.5.9",
+    "@typescript-eslint/parser": "8.50.1",
     "prisma": "6.6.0",
     "typescript": "^5"
   },
   "pnpm": {
     "overrides": {
-      "@types/react": "19.1.0",
-      "@types/react-dom": "19.1.0"
+      "@types/react": "19.2.7",
+      "@types/react-dom": "19.2.3"
     }
   }
 }

prisma/migrations/20251017170007_organiations/migration.sql

@@ -0,0 +1,83 @@
+/*
+  Warnings:
+
+  - The values [CARD] on the enum `ExpenseType` will be removed. If these variants are still used in the database, this will fail.
+  - Added the required column `organizationId` to the `Expense` table without a default value. This is not possible if the table is not empty.
+  - Added the required column `organizationId` to the `Invoice` table without a default value. This is not possible if the table is not empty.
+  - Added the required column `organizationId` to the `NameList` table without a default value. This is not possible if the table is not empty.
+  - Added the required column `organizationId` to the `ZettleSale` table without a default value. This is not possible if the table is not empty.
+
+*/
+-- AlterEnum
+BEGIN;
+CREATE TYPE "ExpenseType_new" AS ENUM ('EXPENSE', 'INVOICE');
+ALTER TABLE "Expense" ALTER COLUMN "type" TYPE "ExpenseType_new" USING ("type"::text::"ExpenseType_new");
+ALTER TYPE "ExpenseType" RENAME TO "ExpenseType_old";
+ALTER TYPE "ExpenseType_new" RENAME TO "ExpenseType";
+DROP TYPE "ExpenseType_old";
+COMMIT;
+
+-- CreateTable (moved before AlterTable operations)
+CREATE TABLE "Organization" (
+    "id" SERIAL NOT NULL,
+    "name" TEXT NOT NULL,
+    "ownerGammaSuperGroupId" TEXT NOT NULL,
+    "primaryEmail" TEXT NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "Organization_pkey" PRIMARY KEY ("id")
+);
+
+-- Create default organization only if there are existing records
+DO $$
+BEGIN
+    IF EXISTS (SELECT 1 FROM "Expense") OR 
+       EXISTS (SELECT 1 FROM "Invoice") OR 
+       EXISTS (SELECT 1 FROM "NameList") OR 
+       EXISTS (SELECT 1 FROM "ZettleSale") THEN
+        INSERT INTO "Organization" (
+            "name",
+            "ownerGammaSuperGroupId",
+            "primaryEmail",
+            "createdAt",
+            "updatedAt"
+            )
+        VALUES (
+            'Default Organization',
+            '45432d44-0de4-4ed0-88ce-8cdf31b72f73',
+            'default@example.com',
+            CURRENT_TIMESTAMP,
+            CURRENT_TIMESTAMP
+            );
+    END IF;
+END $$;
+
+-- AlterTable for Expense
+ALTER TABLE "Expense" ADD COLUMN "organizationId" INTEGER;
+UPDATE "Expense" SET "organizationId" = (SELECT id FROM "Organization" WHERE name = 'Default Organization') WHERE "organizationId" IS NULL;
+ALTER TABLE "Expense" ALTER COLUMN "organizationId" SET NOT NULL;
+
+-- AlterTable for Invoice
+ALTER TABLE "Invoice" ADD COLUMN "organizationId" INTEGER;
+UPDATE "Invoice" SET "organizationId" = (SELECT id FROM "Organization" WHERE name = 'Default Organization') WHERE "organizationId" IS NULL;
+ALTER TABLE "Invoice" ALTER COLUMN "organizationId" SET NOT NULL;
+
+-- AlterTable for NameList
+ALTER TABLE "NameList" ADD COLUMN "organizationId" INTEGER;
+UPDATE "NameList" SET "organizationId" = (SELECT id FROM "Organization" WHERE name = 'Default Organization') WHERE "organizationId" IS NULL;
+ALTER TABLE "NameList" ALTER COLUMN "organizationId" SET NOT NULL;
+
+-- AlterTable for ZettleSale
+ALTER TABLE "ZettleSale" ADD COLUMN "organizationId" INTEGER;
+UPDATE "ZettleSale" SET "organizationId" = (SELECT id FROM "Organization" WHERE name = 'Default Organization') WHERE "organizationId" IS NULL;
+ALTER TABLE "ZettleSale" ALTER COLUMN "organizationId" SET NOT NULL;
+
+-- AddForeignKey
+ALTER TABLE "Expense" ADD CONSTRAINT "Expense_organizationId_fkey" FOREIGN KEY ("organizationId") REFERENCES "Organization"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+
+ALTER TABLE "Invoice" ADD CONSTRAINT "Invoice_organizationId_fkey" FOREIGN KEY ("organizationId") REFERENCES "Organization"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+
+ALTER TABLE "NameList" ADD CONSTRAINT "NameList_organizationId_fkey" FOREIGN KEY ("organizationId") REFERENCES "Organization"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+
+ALTER TABLE "ZettleSale" ADD CONSTRAINT "ZettleSale_organizationId_fkey" FOREIGN KEY ("organizationId") REFERENCES "Organization"("id") ON DELETE RESTRICT ON UPDATE CASCADE;

prisma/schema.prisma

@@ -14,8 +14,24 @@ enum RequestStatus {
   REJECTED
 }
 
+model Organization {
+  id                     Int      @id @default(autoincrement())
+  name                   String
+  primaryEmail           String
+  ownerGammaSuperGroupId String
+  createdAt              DateTime @default(now())
+  updatedAt              DateTime @updatedAt
+
+  expenses    Expense[]
+  invoices    Invoice[]
+  nameLists   NameList[]
+  zettleSales ZettleSale[]
+}
+
 model Expense {
-  id                Int     @id @default(autoincrement())
+  id                Int          @id @default(autoincrement())
+  organization      Organization @relation(fields: [organizationId], references: [id])
+  organizationId    Int
   gammaSuperGroupId String?
   gammaGroupId      String?
   gammaUserId       String
@@ -36,11 +52,12 @@ model Expense {
 enum ExpenseType {
   EXPENSE
   INVOICE
-  CARD
 }
 
 model Invoice {
-  id                Int     @id @default(autoincrement())
+  id                Int          @id @default(autoincrement())
+  organization      Organization @relation(fields: [organizationId], references: [id])
+  organizationId    Int
   gammaSuperGroupId String?
   gammaGroupId      String?
   gammaUserId       String
@@ -83,6 +100,8 @@ enum InvoiceItemVat {
 
 model NameList {
   id                Int                  @id @default(autoincrement())
+  organization      Organization         @relation(fields: [organizationId], references: [id])
+  organizationId    Int
   gammaSuperGroupId String?
   gammaGroupId      String?
   gammaUserId       String
@@ -142,16 +161,18 @@ model NamedMedia {
 }
 
 model ZettleSale {
-  id                Int      @id @default(autoincrement())
+  id                Int          @id @default(autoincrement())
+  organization      Organization @relation(fields: [organizationId], references: [id])
+  organizationId    Int
   gammaSuperGroupId String
   gammaGroupId      String
   gammaUserId       String
-  amount            Float    @db.DoublePrecision
+  amount            Float        @db.DoublePrecision
   description       String
   name              String
-  saleDate          DateTime @db.Date
-  createdAt         DateTime @default(now())
-  updatedAt         DateTime @updatedAt
+  saleDate          DateTime     @db.Date
+  createdAt         DateTime     @default(now())
+  updatedAt         DateTime     @updatedAt
 
   @@unique([gammaGroupId, saleDate])
 }