nilsjohan/recipe-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(categories): implement category management with hierarchical structure and update product association

Browse Source
This commit is contained in:
Nils-Johan Gynther
2026-04-17 21:16:58 +02:00
parent a9e83544c5
commit cc8be88462
11 changed files with 286 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/prisma/migrations/20260417310000_add_category_tree/migration.sql
+133
View File
@@ -0,0 +1,133 @@
-- CreateTable Category
CREATE TABLE `Category` (
`id` INTEGER NOT NULL AUTO_INCREMENT,
`name` VARCHAR(191) NOT NULL,
`parentId` INTEGER NULL,
PRIMARY KEY (`id`),
UNIQUE INDEX `Category_name_parentId_key`(`name`, `parentId`),
INDEX `Category_parentId_idx`(`parentId`),
CONSTRAINT `Category_parentId_fkey` FOREIGN KEY (`parentId`) REFERENCES `Category` (`id`) ON DELETE SET NULL ON UPDATE CASCADE
);
-- Add categoryId to Product
ALTER TABLE `Product` ADD COLUMN `categoryId` INTEGER NULL;
ALTER TABLE `Product` ADD CONSTRAINT `Product_categoryId_fkey` FOREIGN KEY (`categoryId`) REFERENCES `Category` (`id`) ON DELETE SET NULL ON UPDATE CASCADE;
-- ============================================================
-- Seed: Huvudkategorier
-- ============================================================
INSERT INTO `Category` (`name`, `parentId`) VALUES ('Bröd & Kakor', NULL);
SET @brod_kakor = LAST_INSERT_ID();
INSERT INTO `Category` (`name`, `parentId`) VALUES ('Färdigmat', NULL);
SET @fardigmat = LAST_INSERT_ID();
INSERT INTO `Category` (`name`, `parentId`) VALUES ('Fryst', NULL);
SET @fryst = LAST_INSERT_ID();
INSERT INTO `Category` (`name`, `parentId`) VALUES ('Frukt & Grönt', NULL);
SET @frukt_gront = LAST_INSERT_ID();
INSERT INTO `Category` (`name`, `parentId`) VALUES ('Glass, godis & snacks', NULL);
SET @glass = LAST_INSERT_ID();
INSERT INTO `Category` (`name`, `parentId`) VALUES ('Kött, chark & fågel', NULL);
SET @kott = LAST_INSERT_ID();
INSERT INTO `Category` (`name`, `parentId`) VALUES ('Mejeri, ost & ägg', NULL);
SET @mejeri = LAST_INSERT_ID();
INSERT INTO `Category` (`name`, `parentId`) VALUES ('Skafferi', NULL);
SET @skafferi = LAST_INSERT_ID();
-- ============================================================
-- Bröd & Kakor → underkategorier
-- ============================================================
INSERT INTO `Category` (`name`, `parentId`) VALUES ('Bröd', @brod_kakor);
SET @brod = LAST_INSERT_ID();
INSERT INTO `Category` (`name`, `parentId`) VALUES ('Kex & Kakor', @brod_kakor);
SET @kex = LAST_INSERT_ID();
INSERT INTO `Category` (`name`, `parentId`) VALUES ('Matbröd', @brod);
INSERT INTO `Category` (`name`, `parentId`) VALUES ('Matkex', @kex);
-- ============================================================
-- Färdigmat → underkategorier
-- ============================================================
INSERT INTO `Category` (`name`, `parentId`) VALUES ('Såser, grytbaser & övriga smaksättare', @fardigmat);
SET @fd_saser = LAST_INSERT_ID();
INSERT INTO `Category` (`name`, `parentId`) VALUES ('Gratäng & Röror mm', @fardigmat);
SET @fd_grataeng = LAST_INSERT_ID();
INSERT INTO `Category` (`name`, `parentId`) VALUES ('Dressing & övriga smaksättare', @fd_saser);
INSERT INTO `Category` (`name`, `parentId`) VALUES ('Krämiga sallader', @fd_grataeng);
-- ============================================================
-- Fryst → underkategorier
-- ============================================================
INSERT INTO `Category` (`name`, `parentId`) VALUES ('Bageri', @fryst);
SET @fr_bageri = LAST_INSERT_ID();
INSERT INTO `Category` (`name`, `parentId`) VALUES ('Grönsaker & kryddor', @fryst);
SET @fr_gron = LAST_INSERT_ID();
INSERT INTO `Category` (`name`, `parentId`) VALUES ('Bröd & fikabröd', @fr_bageri);
INSERT INTO `Category` (`name`, `parentId`) VALUES ('Kryddor', @fr_gron);
-- ============================================================
-- Frukt & Grönt → underkategorier
-- ============================================================
INSERT INTO `Category` (`name`, `parentId`) VALUES ('Potatis & rotsaker', @frukt_gront);
SET @fg_potatis = LAST_INSERT_ID();
INSERT INTO `Category` (`name`, `parentId`) VALUES ('Kryddor & smaksättare', @frukt_gront);
SET @fg_kryddor = LAST_INSERT_ID();
INSERT INTO `Category` (`name`, `parentId`) VALUES ('Lök', @fg_potatis);
INSERT INTO `Category` (`name`, `parentId`) VALUES ('Smaksättare', @fg_kryddor);
-- ============================================================
-- Glass, godis & snacks → underkategorier
-- ============================================================
INSERT INTO `Category` (`name`, `parentId`) VALUES ('Chips, snacks & dip', @glass);
SET @gl_chips = LAST_INSERT_ID();
INSERT INTO `Category` (`name`, `parentId`) VALUES ('Chips', @gl_chips);
-- ============================================================
-- Kött, chark & fågel → underkategorier
-- ============================================================
INSERT INTO `Category` (`name`, `parentId`) VALUES ('Pålägg', @kott);
SET @ko_paalagg = LAST_INSERT_ID();
INSERT INTO `Category` (`name`, `parentId`) VALUES ('Korv', @kott);
SET @ko_korv = LAST_INSERT_ID();
INSERT INTO `Category` (`name`, `parentId`) VALUES ('Skivat pålägg', @ko_paalagg);
INSERT INTO `Category` (`name`, `parentId`) VALUES ('Ölkorv', @ko_korv);
-- ============================================================
-- Mejeri, ost & ägg → underkategorier
-- ============================================================
INSERT INTO `Category` (`name`, `parentId`) VALUES ('Ost', @mejeri);
SET @me_ost = LAST_INSERT_ID();
INSERT INTO `Category` (`name`, `parentId`) VALUES ('Mjölk', @mejeri);
SET @me_mjolk = LAST_INSERT_ID();
INSERT INTO `Category` (`name`, `parentId`) VALUES ('Filmjölk & Yoghurt', @mejeri);
SET @me_filmjolk = LAST_INSERT_ID();
INSERT INTO `Category` (`name`, `parentId`) VALUES ('Färskost', @me_ost);
INSERT INTO `Category` (`name`, `parentId`) VALUES ('Dessertost', @me_ost);
INSERT INTO `Category` (`name`, `parentId`) VALUES ('Standardmjölk', @me_mjolk);
INSERT INTO `Category` (`name`, `parentId`) VALUES ('Filmjölk', @me_filmjolk);
-- ============================================================
-- Skafferi → underkategorier
-- ============================================================
INSERT INTO `Category` (`name`, `parentId`) VALUES ('Kryddor & smaksättare', @skafferi);
SET @sk_kryddor = LAST_INSERT_ID();
INSERT INTO `Category` (`name`, `parentId`) VALUES ('Pasta, ris & matgryn', @skafferi);
SET @sk_pasta = LAST_INSERT_ID();
INSERT INTO `Category` (`name`, `parentId`) VALUES ('Oliver & delikatesser', @skafferi);
SET @sk_oliver = LAST_INSERT_ID();
INSERT INTO `Category` (`name`, `parentId`) VALUES ('Konserver & burkar', @skafferi);
SET @sk_konserver = LAST_INSERT_ID();
INSERT INTO `Category` (`name`, `parentId`) VALUES ('Asien', @skafferi);
SET @sk_asien = LAST_INSERT_ID();
INSERT INTO `Category` (`name`, `parentId`) VALUES ('Sås, dressing & majonnäs', @sk_kryddor);
INSERT INTO `Category` (`name`, `parentId`) VALUES ('Kryddor', @sk_kryddor);
INSERT INTO `Category` (`name`, `parentId`) VALUES ('Färsk pasta', @sk_pasta);
INSERT INTO `Category` (`name`, `parentId`) VALUES ('Delikatesser', @sk_oliver);
INSERT INTO `Category` (`name`, `parentId`) VALUES ('Tomatkonserver', @sk_konserver);
INSERT INTO `Category` (`name`, `parentId`) VALUES ('Såser & grytbaser', @sk_asien);
backend/prisma/schema.prisma
+14
View File
@@ -45,6 +45,20 @@ model Product {
ownerId Int?
owner User? @relation(fields: [ownerId], references: [id], onDelete: SetNull)
userProducts UserProduct[]
categoryId Int?
categoryRef Category? @relation(fields: [categoryId], references: [id], onDelete: SetNull)
}
model Category {
id Int @id @default(autoincrement())
name String
parentId Int?
parent Category? @relation("CategoryTree", fields: [parentId], references: [id], onDelete: SetNull)
children Category[] @relation("CategoryTree")
products Product[]
@@unique([name, parentId])
@@index([parentId])
}
model UserProduct {
backend/src/app.module.ts
+2
View File
@@ -13,6 +13,7 @@ import { ReceiptAliasModule } from './receipt-alias/receipt-alias.module';
import { AuthModule } from './auth/auth.module';
import { UsersModule } from './users/users.module';
import { UserProductsModule } from './user-products/user-products.module';
import { CategoriesModule } from './categories/categories.module';
import { JwtAuthGuard } from './auth/jwt-auth.guard';
@@ -31,6 +32,7 @@ import { JwtAuthGuard } from './auth/jwt-auth.guard';
AuthModule,
UsersModule,
UserProductsModule,
CategoriesModule,
],
providers: [
{
backend/src/categories/categories.controller.ts
+20
View File
@@ -0,0 +1,20 @@
import { Controller, Get } from '@nestjs/common';
import { CategoriesService } from './categories.service';
import { Public } from '../auth/decorators/public.decorator';
@Controller('api/categories')
export class CategoriesController {
constructor(private readonly categoriesService: CategoriesService) {}
@Public()
@Get()
findAll() {
return this.categoriesService.findAll();
}
@Public()
@Get('tree')
findTree() {
return this.categoriesService.findTree();
}
}
backend/src/categories/categories.module.ts
+12
View File
@@ -0,0 +1,12 @@
import { Module } from '@nestjs/common';
import { CategoriesService } from './categories.service';
import { CategoriesController } from './categories.controller';
import { PrismaModule } from '../prisma/prisma.module';
@Module({
imports: [PrismaModule],
providers: [CategoriesService],
controllers: [CategoriesController],
exports: [CategoriesService],
})
export class CategoriesModule {}
backend/src/categories/categories.service.ts
+33
View File
@@ -0,0 +1,33 @@
import { Injectable } from '@nestjs/common';
import { PrismaService } from '../prisma/prisma.service';
export type CategoryNode = {
id: number;
name: string;
parentId: number | null;
children: CategoryNode[];
};
@Injectable()
export class CategoriesService {
constructor(private readonly prisma: PrismaService) {}
async findAll() {
return this.prisma.category.findMany({ orderBy: { name: 'asc' } });
}
async findTree(): Promise<CategoryNode[]> {
const all = await this.prisma.category.findMany({ orderBy: { name: 'asc' } });
const map = new Map<number, CategoryNode>();
all.forEach((c) => map.set(c.id, { ...c, children: [] }));
const roots: CategoryNode[] = [];
map.forEach((node) => {
if (node.parentId === null) {
roots.push(node);
} else {
map.get(node.parentId)?.children.push(node);
}
});
return roots;
}
}
backend/src/products/dto/update-product.dto.ts
+5 -1
View File
@@ -1,4 +1,4 @@
import { IsNotEmpty, IsOptional, IsString, MaxLength } from 'class-validator';
import { IsNotEmpty, IsNumber, IsOptional, IsString, MaxLength } from 'class-validator';
export class UpdateProductDto {
@IsOptional()
@@ -26,4 +26,8 @@ export class UpdateProductDto {
@IsString()
@MaxLength(191)
brand?: string;
@IsOptional()
@IsNumber()
categoryId?: number | null;
}
backend/src/products/products.service.ts
+6
View File
@@ -21,6 +21,7 @@ export class ProductsService {
include: {
tags: { include: { tag: true } },
nutrition: true,
categoryRef: { include: { parent: { include: { parent: true } } } },
},
orderBy: { name: 'asc' },
});
@@ -114,6 +115,7 @@ export class ProductsService {
category?: string | null;
subcategory?: string | null;
brand?: string | null;
categoryId?: number | null;
} = {};
if (typeof data.name === 'string') {
@@ -160,6 +162,10 @@ export class ProductsService {
updateData.brand = data.brand.trim() || null;
}
if ('categoryId' in data) {
updateData.categoryId = data.categoryId ?? null;
}
return this.prisma.product.update({
where: { id },
data: updateData,