Volk Überarbeittung und Englisch Varaiblen ersetzt

ApiCore-Backend/prisma/schema.prisma

@@ -65,15 +65,15 @@ model RolePermission {
 }
 
 model User {
-  id            String     @id @default(cuid())
-  email         String     @unique
+  id            String    @id @default(cuid())
+  email         String    @unique
   passwordHash  String
   name          String
   roleId        String
-  role          Role       @relation(fields: [roleId], references: [id])
-  isActive      Boolean    @default(true)
-  createdAt     DateTime   @default(now())
-  updatedAt     DateTime   @updatedAt
+  role          Role      @relation(fields: [roleId], references: [id])
+  isActive      Boolean   @default(true)
+  createdAt     DateTime  @default(now())
+  updatedAt     DateTime  @updatedAt
   deactivatedAt DateTime?
 
   // TOTP-Secret AES-256-GCM-verschluesselt gespeichert (siehe
@@ -209,24 +209,33 @@ enum ColonyStatus {
   MERGED
 }
 
+// Fuenfstufige Zustandsskala, geteilt von Brut-, Futter- und Gesundheitsstatus.
+enum ColonyCondition {
+  EXCELLENT
+  GOOD
+  AVERAGE
+  WEAK
+  CRITICAL
+}
+
 model Colony {
-  id             String       @id @default(cuid())
-  code           String       @unique
+  id             String           @id @default(cuid())
+  code           String           @unique
   apiaryId       String
-  apiary         Apiary       @relation(fields: [apiaryId], references: [id])
+  apiary         Apiary           @relation(fields: [apiaryId], references: [id])
   hiveType       String?
   originText     String?
   colonyType     ColonyType
-  status         ColonyStatus @default(ACTIVE)
+  status         ColonyStatus     @default(ACTIVE)
   strength       Int?
-  broodStatus    String?
-  feedStatus     String?
-  healthStatus   String?
+  broodStatus    ColonyCondition?
+  feedStatus     ColonyCondition?
+  healthStatus   ColonyCondition?
   notes          String?
-  currentQueenId String?      @unique
-  currentQueen   Queen?       @relation("ColonyCurrentQueen", fields: [currentQueenId], references: [id])
-  createdAt      DateTime     @default(now())
-  updatedAt      DateTime     @updatedAt
+  currentQueenId String?          @unique
+  currentQueen   Queen?           @relation("ColonyCurrentQueen", fields: [currentQueenId], references: [id])
+  createdAt      DateTime         @default(now())
+  updatedAt      DateTime         @updatedAt
   deactivatedAt  DateTime?
 
   apiaryHistory      ColonyApiaryHistory[]

ApiCore-Backend/src/colonies/dto/create-colony.dto.ts

@@ -1,6 +1,6 @@
 import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
-import { IsEnum, IsInt, IsOptional, IsString } from 'class-validator';
-import { ColonyType } from '../../../generated/prisma';
+import { IsEnum, IsInt, IsOptional, IsString, Max, Min } from 'class-validator';
+import { ColonyCondition, ColonyType } from '../../../generated/prisma';
 
 export class CreateColonyDto {
   @ApiProperty()
@@ -25,25 +25,27 @@ export class CreateColonyDto {
   @IsString()
   originText?: string;
 
-  @ApiPropertyOptional()
+  @ApiPropertyOptional({ minimum: 1, maximum: 10 })
   @IsOptional()
   @IsInt()
+  @Min(1)
+  @Max(10)
   strength?: number;
 
-  @ApiPropertyOptional()
+  @ApiPropertyOptional({ enum: ColonyCondition })
   @IsOptional()
-  @IsString()
-  broodStatus?: string;
+  @IsEnum(ColonyCondition)
+  broodStatus?: ColonyCondition;
 
-  @ApiPropertyOptional()
+  @ApiPropertyOptional({ enum: ColonyCondition })
   @IsOptional()
-  @IsString()
-  feedStatus?: string;
+  @IsEnum(ColonyCondition)
+  feedStatus?: ColonyCondition;
 
-  @ApiPropertyOptional()
+  @ApiPropertyOptional({ enum: ColonyCondition })
   @IsOptional()
-  @IsString()
-  healthStatus?: string;
+  @IsEnum(ColonyCondition)
+  healthStatus?: ColonyCondition;
 
   @ApiPropertyOptional()
   @IsOptional()

ApiCore-Backend/test/jest-e2e.json

@@ -7,5 +7,6 @@
   "maxWorkers": 4,
   "transform": {
     "^.+\\.(t|j)s$": "ts-jest"
-  }
+  },
+  "transformIgnorePatterns": ["node_modules/(?!(otplib|@otplib|@scure|@noble)/)"]
 }