feat: RBAC Phase 2c - Ernte & Lager auf @RequirePermission umgestellt

Harvests, Extractions, HoneyBatches, Storage, Products, Bottling,
Equipment: @Roles(...) durch @RequirePermission(...) ersetzt,
ungeschuetzte GET-Routen mit :read-Rechten geschlossen. HoneyBatches
behaelt die feine Unterscheidung relocate (auch STAFF) vs.
create/measurements (nur BEEKEEPER+); Storage bekommt konsequent
keine STAFF-Schreibrechte (deckt sich mit dem bisherigen @Roles-Stand).

Verifiziert: tsc, lint, volle e2e-Suite 158/159 gruen (1 getrackter Skip).

Co-Authored-By: Claude Sonnet 5 <[email protected]>
This commit is contained in:
Nick SzaunigandClaude Sonnet 5 committed 2026-08-26 07:05:32 +02:00
1 parent cdbdaedb8f
commit c510304813
7 files changed
+43 -30

No files matched your search

@@ -8,8 +8,7 @@ import {
Query, Query,
} from '@nestjs/common'; } from '@nestjs/common';
import { ApiBearerAuth, ApiTags } from '@nestjs/swagger'; import { ApiBearerAuth, ApiTags } from '@nestjs/swagger';
import { LegacyRole as Role } from '../../generated/prisma'; import { RequirePermission } from '../auth/decorators/require-permission.decorator';
import { Roles } from '../auth/decorators/roles.decorator';
import { CurrentUser } from '../auth/decorators/current-user.decorator'; import { CurrentUser } from '../auth/decorators/current-user.decorator';
import type { AuthenticatedUser } from '../auth/types/authenticated-user'; import type { AuthenticatedUser } from '../auth/types/authenticated-user';
import { CreateBottlingBatchDto } from './dto/create-bottling-batch.dto'; import { CreateBottlingBatchDto } from './dto/create-bottling-batch.dto';
@@ -22,17 +21,19 @@ import { BottlingService } from './bottling.service';
export class BottlingController { export class BottlingController {
constructor(private readonly bottlingService: BottlingService) {} constructor(private readonly bottlingService: BottlingService) {}
@RequirePermission('bottling:read')
@Get() @Get()
findAll(@Query('honeyBatchId') honeyBatchId?: string) { findAll(@Query('honeyBatchId') honeyBatchId?: string) {
return this.bottlingService.findAll({ honeyBatchId }); return this.bottlingService.findAll({ honeyBatchId });
} }
@RequirePermission('bottling:read')
@Get(':id') @Get(':id')
findOne(@Param('id') id: string) { findOne(@Param('id') id: string) {
return this.bottlingService.findById(id); return this.bottlingService.findById(id);
} }
@Roles(Role.ADMIN, Role.BEEKEEPER) @RequirePermission('bottling:create')
@Post() @Post()
create( create(
@Body() dto: CreateBottlingBatchDto, @Body() dto: CreateBottlingBatchDto,
@@ -41,7 +42,7 @@ export class BottlingController {
return this.bottlingService.create(dto, actor.id); return this.bottlingService.create(dto, actor.id);
} }
@Roles(Role.ADMIN, Role.BEEKEEPER) @RequirePermission('bottling:update')
@Patch(':id') @Patch(':id')
update( update(
@Param('id') id: string, @Param('id') id: string,
@@ -8,8 +8,8 @@ import {
Query, Query,
} from '@nestjs/common'; } from '@nestjs/common';
import { ApiBearerAuth, ApiTags } from '@nestjs/swagger'; import { ApiBearerAuth, ApiTags } from '@nestjs/swagger';
import { EquipmentCondition, LegacyRole as Role } from '../../generated/prisma'; import { EquipmentCondition } from '../../generated/prisma';
import { Roles } from '../auth/decorators/roles.decorator'; import { RequirePermission } from '../auth/decorators/require-permission.decorator';
import { CurrentUser } from '../auth/decorators/current-user.decorator'; import { CurrentUser } from '../auth/decorators/current-user.decorator';
import type { AuthenticatedUser } from '../auth/types/authenticated-user'; import type { AuthenticatedUser } from '../auth/types/authenticated-user';
import { CreateEquipmentDto } from './dto/create-equipment.dto'; import { CreateEquipmentDto } from './dto/create-equipment.dto';
@@ -22,17 +22,19 @@ import { EquipmentService } from './equipment.service';
export class EquipmentController { export class EquipmentController {
constructor(private readonly equipmentService: EquipmentService) {} constructor(private readonly equipmentService: EquipmentService) {}
@RequirePermission('equipment:read')
@Get() @Get()
findAll(@Query('condition') condition?: EquipmentCondition) { findAll(@Query('condition') condition?: EquipmentCondition) {
return this.equipmentService.findAll({ condition }); return this.equipmentService.findAll({ condition });
} }
@RequirePermission('equipment:read')
@Get(':id') @Get(':id')
findOne(@Param('id') id: string) { findOne(@Param('id') id: string) {
return this.equipmentService.findById(id); return this.equipmentService.findById(id);
} }
@Roles(Role.ADMIN, Role.BEEKEEPER) @RequirePermission('equipment:create')
@Post() @Post()
create( create(
@Body() dto: CreateEquipmentDto, @Body() dto: CreateEquipmentDto,
@@ -41,7 +43,7 @@ export class EquipmentController {
return this.equipmentService.create(dto, actor.id); return this.equipmentService.create(dto, actor.id);
} }
@Roles(Role.ADMIN, Role.BEEKEEPER) @RequirePermission('equipment:update')
@Patch(':id') @Patch(':id')
update( update(
@Param('id') id: string, @Param('id') id: string,
@@ -1,7 +1,6 @@
import { Body, Controller, Get, Param, Patch, Post } from '@nestjs/common'; import { Body, Controller, Get, Param, Patch, Post } from '@nestjs/common';
import { ApiBearerAuth, ApiTags } from '@nestjs/swagger'; import { ApiBearerAuth, ApiTags } from '@nestjs/swagger';
import { LegacyRole as Role } from '../../generated/prisma'; import { RequirePermission } from '../auth/decorators/require-permission.decorator';
import { Roles } from '../auth/decorators/roles.decorator';
import { CurrentUser } from '../auth/decorators/current-user.decorator'; import { CurrentUser } from '../auth/decorators/current-user.decorator';
import type { AuthenticatedUser } from '../auth/types/authenticated-user'; import type { AuthenticatedUser } from '../auth/types/authenticated-user';
import { CreateExtractionDto } from './dto/create-extraction.dto'; import { CreateExtractionDto } from './dto/create-extraction.dto';
@@ -14,17 +13,19 @@ import { ExtractionsService } from './extractions.service';
export class ExtractionsController { export class ExtractionsController {
constructor(private readonly extractionsService: ExtractionsService) {} constructor(private readonly extractionsService: ExtractionsService) {}
@RequirePermission('extractions:read')
@Get() @Get()
findAll() { findAll() {
return this.extractionsService.findAll(); return this.extractionsService.findAll();
} }
@RequirePermission('extractions:read')
@Get(':id') @Get(':id')
findOne(@Param('id') id: string) { findOne(@Param('id') id: string) {
return this.extractionsService.findById(id); return this.extractionsService.findById(id);
} }
@Roles(Role.ADMIN, Role.BEEKEEPER) @RequirePermission('extractions:create')
@Post() @Post()
create( create(
@Body() dto: CreateExtractionDto, @Body() dto: CreateExtractionDto,
@@ -33,7 +34,7 @@ export class ExtractionsController {
return this.extractionsService.create(dto, actor.id); return this.extractionsService.create(dto, actor.id);
} }
@Roles(Role.ADMIN, Role.BEEKEEPER) @RequirePermission('extractions:update')
@Patch(':id') @Patch(':id')
update( update(
@Param('id') id: string, @Param('id') id: string,
@@ -1,7 +1,6 @@
import { Body, Controller, Get, Param, Patch, Post } from '@nestjs/common'; import { Body, Controller, Get, Param, Patch, Post } from '@nestjs/common';
import { ApiBearerAuth, ApiTags } from '@nestjs/swagger'; import { ApiBearerAuth, ApiTags } from '@nestjs/swagger';
import { LegacyRole as Role } from '../../generated/prisma'; import { RequirePermission } from '../auth/decorators/require-permission.decorator';
import { Roles } from '../auth/decorators/roles.decorator';
import { CurrentUser } from '../auth/decorators/current-user.decorator'; import { CurrentUser } from '../auth/decorators/current-user.decorator';
import type { AuthenticatedUser } from '../auth/types/authenticated-user'; import type { AuthenticatedUser } from '../auth/types/authenticated-user';
import { CreateHarvestDto } from './dto/create-harvest.dto'; import { CreateHarvestDto } from './dto/create-harvest.dto';
@@ -14,17 +13,19 @@ import { HarvestsService } from './harvests.service';
export class HarvestsController { export class HarvestsController {
constructor(private readonly harvestsService: HarvestsService) {} constructor(private readonly harvestsService: HarvestsService) {}
@RequirePermission('harvests:read')
@Get() @Get()
findAll() { findAll() {
return this.harvestsService.findAll(); return this.harvestsService.findAll();
} }
@RequirePermission('harvests:read')
@Get(':id') @Get(':id')
findOne(@Param('id') id: string) { findOne(@Param('id') id: string) {
return this.harvestsService.findById(id); return this.harvestsService.findById(id);
} }
@Roles(Role.ADMIN, Role.BEEKEEPER, Role.STAFF) @RequirePermission('harvests:create')
@Post() @Post()
create( create(
@Body() dto: CreateHarvestDto, @Body() dto: CreateHarvestDto,
@@ -33,7 +34,7 @@ export class HarvestsController {
return this.harvestsService.create(dto, actor.id); return this.harvestsService.create(dto, actor.id);
} }
@Roles(Role.ADMIN, Role.BEEKEEPER, Role.STAFF) @RequirePermission('harvests:update')
@Patch(':id') @Patch(':id')
update( update(
@Param('id') id: string, @Param('id') id: string,
@@ -1,7 +1,7 @@
import { Body, Controller, Get, Param, Post, Query } from '@nestjs/common'; import { Body, Controller, Get, Param, Post, Query } from '@nestjs/common';
import { ApiBearerAuth, ApiTags } from '@nestjs/swagger'; import { ApiBearerAuth, ApiTags } from '@nestjs/swagger';
import { HoneyBatchStatus, LegacyRole as Role } from '../../generated/prisma'; import { HoneyBatchStatus } from '../../generated/prisma';
import { Roles } from '../auth/decorators/roles.decorator'; import { RequirePermission } from '../auth/decorators/require-permission.decorator';
import { CurrentUser } from '../auth/decorators/current-user.decorator'; import { CurrentUser } from '../auth/decorators/current-user.decorator';
import type { AuthenticatedUser } from '../auth/types/authenticated-user'; import type { AuthenticatedUser } from '../auth/types/authenticated-user';
import { CreateHoneyBatchDto } from './dto/create-honey-batch.dto'; import { CreateHoneyBatchDto } from './dto/create-honey-batch.dto';
@@ -15,27 +15,31 @@ import { HoneyBatchesService } from './honey-batches.service';
export class HoneyBatchesController { export class HoneyBatchesController {
constructor(private readonly honeyBatchesService: HoneyBatchesService) {} constructor(private readonly honeyBatchesService: HoneyBatchesService) {}
@RequirePermission('honey-batches:read')
@Get() @Get()
findAll(@Query('status') status?: HoneyBatchStatus) { findAll(@Query('status') status?: HoneyBatchStatus) {
return this.honeyBatchesService.findAll({ status }); return this.honeyBatchesService.findAll({ status });
} }
@RequirePermission('honey-batches:read')
@Get(':id') @Get(':id')
findOne(@Param('id') id: string) { findOne(@Param('id') id: string) {
return this.honeyBatchesService.findById(id); return this.honeyBatchesService.findById(id);
} }
@RequirePermission('honey-batches:read')
@Get(':id/traceability') @Get(':id/traceability')
traceability(@Param('id') id: string) { traceability(@Param('id') id: string) {
return this.honeyBatchesService.traceability(id); return this.honeyBatchesService.traceability(id);
} }
@RequirePermission('honey-batches:read')
@Get(':id/relocations') @Get(':id/relocations')
findRelocations(@Param('id') id: string) { findRelocations(@Param('id') id: string) {
return this.honeyBatchesService.findRelocations(id); return this.honeyBatchesService.findRelocations(id);
} }
@Roles(Role.ADMIN, Role.BEEKEEPER, Role.STAFF) @RequirePermission('honey-batches:relocate')
@Post(':id/relocate') @Post(':id/relocate')
relocate( relocate(
@Param('id') id: string, @Param('id') id: string,
@@ -45,7 +49,7 @@ export class HoneyBatchesController {
return this.honeyBatchesService.relocate(id, dto, actor.id); return this.honeyBatchesService.relocate(id, dto, actor.id);
} }
@Roles(Role.ADMIN, Role.BEEKEEPER) @RequirePermission('honey-batches:create')
@Post() @Post()
create( create(
@Body() dto: CreateHoneyBatchDto, @Body() dto: CreateHoneyBatchDto,
@@ -54,7 +58,7 @@ export class HoneyBatchesController {
return this.honeyBatchesService.create(dto, actor.id); return this.honeyBatchesService.create(dto, actor.id);
} }
@Roles(Role.ADMIN, Role.BEEKEEPER) @RequirePermission('honey-batches:measure')
@Post(':id/measurements') @Post(':id/measurements')
addMeasurement( addMeasurement(
@Param('id') id: string, @Param('id') id: string,
@@ -8,8 +8,8 @@ import {
Query, Query,
} from '@nestjs/common'; } from '@nestjs/common';
import { ApiBearerAuth, ApiTags } from '@nestjs/swagger'; import { ApiBearerAuth, ApiTags } from '@nestjs/swagger';
import { ProductStatus, LegacyRole as Role } from '../../generated/prisma'; import { ProductStatus } from '../../generated/prisma';
import { Roles } from '../auth/decorators/roles.decorator'; import { RequirePermission } from '../auth/decorators/require-permission.decorator';
import { CurrentUser } from '../auth/decorators/current-user.decorator'; import { CurrentUser } from '../auth/decorators/current-user.decorator';
import type { AuthenticatedUser } from '../auth/types/authenticated-user'; import type { AuthenticatedUser } from '../auth/types/authenticated-user';
import { CreateProductDto } from './dto/create-product.dto'; import { CreateProductDto } from './dto/create-product.dto';
@@ -22,17 +22,19 @@ import { ProductsService } from './products.service';
export class ProductsController { export class ProductsController {
constructor(private readonly productsService: ProductsService) {} constructor(private readonly productsService: ProductsService) {}
@RequirePermission('products:read')
@Get() @Get()
findAll(@Query('status') status?: ProductStatus) { findAll(@Query('status') status?: ProductStatus) {
return this.productsService.findAll({ status }); return this.productsService.findAll({ status });
} }
@RequirePermission('products:read')
@Get(':id') @Get(':id')
findOne(@Param('id') id: string) { findOne(@Param('id') id: string) {
return this.productsService.findById(id); return this.productsService.findById(id);
} }
@Roles(Role.ADMIN, Role.BEEKEEPER) @RequirePermission('products:create')
@Post() @Post()
create( create(
@Body() dto: CreateProductDto, @Body() dto: CreateProductDto,
@@ -41,7 +43,7 @@ export class ProductsController {
return this.productsService.create(dto, actor.id); return this.productsService.create(dto, actor.id);
} }
@Roles(Role.ADMIN, Role.BEEKEEPER) @RequirePermission('products:update')
@Patch(':id') @Patch(':id')
update( update(
@Param('id') id: string, @Param('id') id: string,
@@ -1,7 +1,6 @@
import { Body, Controller, Get, Param, Post } from '@nestjs/common'; import { Body, Controller, Get, Param, Post } from '@nestjs/common';
import { ApiBearerAuth, ApiTags } from '@nestjs/swagger'; import { ApiBearerAuth, ApiTags } from '@nestjs/swagger';
import { LegacyRole as Role } from '../../generated/prisma'; import { RequirePermission } from '../auth/decorators/require-permission.decorator';
import { Roles } from '../auth/decorators/roles.decorator';
import { CurrentUser } from '../auth/decorators/current-user.decorator'; import { CurrentUser } from '../auth/decorators/current-user.decorator';
import type { AuthenticatedUser } from '../auth/types/authenticated-user'; import type { AuthenticatedUser } from '../auth/types/authenticated-user';
import { CreateStorageContainerDto } from './dto/create-storage-container.dto'; import { CreateStorageContainerDto } from './dto/create-storage-container.dto';
@@ -15,12 +14,13 @@ import { StorageService } from './storage.service';
export class StorageController { export class StorageController {
constructor(private readonly storageService: StorageService) {} constructor(private readonly storageService: StorageService) {}
@RequirePermission('storage:read')
@Get('storage-containers') @Get('storage-containers')
findAllContainers() { findAllContainers() {
return this.storageService.findAllContainers(); return this.storageService.findAllContainers();
} }
@Roles(Role.ADMIN, Role.BEEKEEPER) @RequirePermission('storage:create')
@Post('storage-containers') @Post('storage-containers')
createContainer( createContainer(
@Body() dto: CreateStorageContainerDto, @Body() dto: CreateStorageContainerDto,
@@ -29,17 +29,19 @@ export class StorageController {
return this.storageService.createContainer(dto, actor.id); return this.storageService.createContainer(dto, actor.id);
} }
@RequirePermission('storage:read')
@Get('stock-items') @Get('stock-items')
findAllStockItems() { findAllStockItems() {
return this.storageService.findAllStockItems(); return this.storageService.findAllStockItems();
} }
@RequirePermission('storage:read')
@Get('stock-items/:id') @Get('stock-items/:id')
findStockItem(@Param('id') id: string) { findStockItem(@Param('id') id: string) {
return this.storageService.findStockItemById(id); return this.storageService.findStockItemById(id);
} }
@Roles(Role.ADMIN, Role.BEEKEEPER) @RequirePermission('storage:create')
@Post('stock-items') @Post('stock-items')
createStockItem( createStockItem(
@Body() dto: CreateStockItemDto, @Body() dto: CreateStockItemDto,
@@ -48,7 +50,7 @@ export class StorageController {
return this.storageService.createStockItem(dto, actor.id); return this.storageService.createStockItem(dto, actor.id);
} }
@Roles(Role.ADMIN, Role.BEEKEEPER) @RequirePermission('storage:move')
@Post('stock-items/:id/movements') @Post('stock-items/:id/movements')
addMovement( addMovement(
@Param('id') id: string, @Param('id') id: string,