feat: hive setup data model and API (Beute L1)
Each colony can now hold its hive setup (Ist-Zustand) as validated JSON with an append-only change log: - catalog: hive systems and part types with dimensions, placement rules and state fields; Liebig-Zander 10 seeded with fixed ids (owner's equipment incl. Bausperre, Futterzarge, Nassenheider) - pure domain module (operations, validator, derived facts) with shared JSON fixtures the frontend runs too - API: catalog (hive-systems:manage), setup create/change/history/ state at a day (colonies:read/update), 409 HIVE_CONFLICT with the current state, idempotent writes, HiveChanged event - inspections can carry hive ops saved in the same transaction - backup export/import of the new tables (backup wins per colony) - docs: ARCHITECTURE section 13, Annahmen 95-100 Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>
This commit is contained in:
Nick SzaunigandClaude Opus 5.5 committed
1 parent
8982d0796a
commit
b48fb157c8
141 files changed
+15211
-17
No files matched your search
@@ -0,0 +1,109 @@
|
||||
-- Beute in 3D: hive systems, part types, per-colony setup and its change
|
||||
-- history (spec 2026-10-15, section 5.1).
|
||||
|
||||
-- CreateEnum
|
||||
CREATE TYPE "HivePartKind" AS ENUM ('FLOOR', 'BOX', 'DIVIDER_BOARD', 'QUEEN_EXCLUDER', 'FEEDER', 'COVER_SHEET', 'PROPOLIS_SCREEN', 'INNER_LID', 'INSULATION', 'ROOF', 'FLOOR_INSERT', 'EVAPORATOR');
|
||||
|
||||
-- CreateEnum
|
||||
CREATE TYPE "HiveBoxDepth" AS ENUM ('FULL', 'SHALLOW');
|
||||
|
||||
-- CreateEnum
|
||||
CREATE TYPE "HiveChangeSource" AS ENUM ('INIT', 'CARD', 'EDITOR', 'INSPECTION', 'AI_SUGGESTION');
|
||||
|
||||
-- CreateTable
|
||||
CREATE TABLE "HiveSystem" (
|
||||
"id" TEXT NOT NULL,
|
||||
"name" TEXT NOT NULL,
|
||||
"frameWidthMm" INTEGER NOT NULL,
|
||||
"frameHeightMm" INTEGER NOT NULL,
|
||||
"footprintLMm" INTEGER NOT NULL,
|
||||
"footprintWMm" INTEGER NOT NULL,
|
||||
"template" JSONB NOT NULL,
|
||||
"active" BOOLEAN NOT NULL DEFAULT true,
|
||||
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||
"updatedAt" TIMESTAMP(3) NOT NULL,
|
||||
|
||||
CONSTRAINT "HiveSystem_pkey" PRIMARY KEY ("id")
|
||||
);
|
||||
|
||||
-- CreateTable
|
||||
CREATE TABLE "HivePartType" (
|
||||
"id" TEXT NOT NULL,
|
||||
"systemId" TEXT NOT NULL,
|
||||
"kind" "HivePartKind" NOT NULL,
|
||||
"name" TEXT NOT NULL,
|
||||
"articleRef" TEXT,
|
||||
"lengthMm" INTEGER NOT NULL,
|
||||
"widthMm" INTEGER NOT NULL,
|
||||
"heightMm" INTEGER NOT NULL,
|
||||
"boxDepth" "HiveBoxDepth",
|
||||
"frameSlots" INTEGER,
|
||||
"stateSchema" JSONB NOT NULL,
|
||||
"active" BOOLEAN NOT NULL DEFAULT true,
|
||||
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||
"updatedAt" TIMESTAMP(3) NOT NULL,
|
||||
|
||||
CONSTRAINT "HivePartType_pkey" PRIMARY KEY ("id")
|
||||
);
|
||||
|
||||
-- CreateTable
|
||||
CREATE TABLE "HiveSetup" (
|
||||
"colonyId" TEXT NOT NULL,
|
||||
"systemId" TEXT NOT NULL,
|
||||
"version" INTEGER NOT NULL DEFAULT 1,
|
||||
"state" JSONB NOT NULL,
|
||||
"updatedAt" TIMESTAMP(3) NOT NULL,
|
||||
|
||||
CONSTRAINT "HiveSetup_pkey" PRIMARY KEY ("colonyId")
|
||||
);
|
||||
|
||||
-- CreateTable
|
||||
CREATE TABLE "HiveChange" (
|
||||
"id" TEXT NOT NULL,
|
||||
"colonyId" TEXT NOT NULL,
|
||||
"version" INTEGER NOT NULL,
|
||||
"occurredOn" TIMESTAMP(3) NOT NULL,
|
||||
"source" "HiveChangeSource" NOT NULL,
|
||||
"inspectionId" TEXT,
|
||||
"userId" TEXT NOT NULL,
|
||||
"ops" JSONB NOT NULL,
|
||||
"stateAfter" JSONB NOT NULL,
|
||||
"note" TEXT,
|
||||
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||
|
||||
CONSTRAINT "HiveChange_pkey" PRIMARY KEY ("id")
|
||||
);
|
||||
|
||||
-- CreateIndex
|
||||
CREATE UNIQUE INDEX "HiveSystem_name_key" ON "HiveSystem"("name");
|
||||
|
||||
-- CreateIndex
|
||||
CREATE UNIQUE INDEX "HivePartType_systemId_name_key" ON "HivePartType"("systemId", "name");
|
||||
|
||||
-- CreateIndex
|
||||
CREATE UNIQUE INDEX "HiveChange_inspectionId_key" ON "HiveChange"("inspectionId");
|
||||
|
||||
-- CreateIndex
|
||||
CREATE INDEX "HiveChange_colonyId_occurredOn_idx" ON "HiveChange"("colonyId", "occurredOn");
|
||||
|
||||
-- CreateIndex
|
||||
CREATE UNIQUE INDEX "HiveChange_colonyId_version_key" ON "HiveChange"("colonyId", "version");
|
||||
|
||||
-- AddForeignKey
|
||||
ALTER TABLE "HivePartType" ADD CONSTRAINT "HivePartType_systemId_fkey" FOREIGN KEY ("systemId") REFERENCES "HiveSystem"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
|
||||
|
||||
-- AddForeignKey
|
||||
ALTER TABLE "HiveSetup" ADD CONSTRAINT "HiveSetup_colonyId_fkey" FOREIGN KEY ("colonyId") REFERENCES "Colony"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
|
||||
|
||||
-- AddForeignKey
|
||||
ALTER TABLE "HiveSetup" ADD CONSTRAINT "HiveSetup_systemId_fkey" FOREIGN KEY ("systemId") REFERENCES "HiveSystem"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
|
||||
|
||||
-- AddForeignKey
|
||||
ALTER TABLE "HiveChange" ADD CONSTRAINT "HiveChange_colonyId_fkey" FOREIGN KEY ("colonyId") REFERENCES "HiveSetup"("colonyId") ON DELETE RESTRICT ON UPDATE CASCADE;
|
||||
|
||||
-- AddForeignKey
|
||||
ALTER TABLE "HiveChange" ADD CONSTRAINT "HiveChange_inspectionId_fkey" FOREIGN KEY ("inspectionId") REFERENCES "Inspection"("id") ON DELETE SET NULL ON UPDATE CASCADE;
|
||||
|
||||
-- AddForeignKey
|
||||
ALTER TABLE "HiveChange" ADD CONSTRAINT "HiveChange_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
|
||||
|
||||
+36
@@ -0,0 +1,36 @@
|
||||
-- Beute in 3D: start catalog for the Liebig-Zander equipment (spec 2026-10-15,
|
||||
-- sections 4.3 and 4.4) under fixed ids, so the system template has stable
|
||||
-- references and a restore into a fresh install creates no duplicate names.
|
||||
-- Dimensions are catalog data and editable in the settings.
|
||||
|
||||
-- Hive system
|
||||
INSERT INTO "HiveSystem" ("id", "name", "frameWidthMm", "frameHeightMm", "footprintLMm", "footprintWMm", "template", "active", "updatedAt")
|
||||
VALUES (
|
||||
'hive-system-zander-liebig-10',
|
||||
'Zander nach Dr. Liebig, 10 Rähmchen',
|
||||
477,
|
||||
220,
|
||||
525,
|
||||
430,
|
||||
'{"schemaVersion":1,"stack":[{"partTypeId":"hive-part-zl10-floor","state":{}},{"partTypeId":"hive-part-zl10-box-10","state":{},"frames":[{"slot":1,"type":"FOUNDATION"},{"slot":2,"type":"FOUNDATION"},{"slot":3,"type":"FOUNDATION"},{"slot":4,"type":"FOUNDATION"},{"slot":5,"type":"FOUNDATION"},{"slot":6,"type":"FOUNDATION"},{"slot":7,"type":"FOUNDATION"},{"slot":8,"type":"FOUNDATION"},{"slot":9,"type":"FOUNDATION"},{"slot":10,"type":"FOUNDATION"}]},{"partTypeId":"hive-part-zl10-cover-abdeckfix","state":{}},{"partTypeId":"hive-part-zl10-inner-lid","state":{}},{"partTypeId":"hive-part-zl10-insulation","state":{}},{"partTypeId":"hive-part-zl10-roof","state":{}}]}'::jsonb,
|
||||
true,
|
||||
CURRENT_TIMESTAMP
|
||||
);
|
||||
|
||||
-- Part types
|
||||
INSERT INTO "HivePartType" ("id", "systemId", "kind", "name", "lengthMm", "widthMm", "heightMm", "boxDepth", "frameSlots", "stateSchema", "active", "updatedAt")
|
||||
VALUES
|
||||
('hive-part-zl10-floor', 'hive-system-zander-liebig-10', 'FLOOR', 'Liebig Wanderboden', 525, 430, 120, NULL, NULL, '[{"key":"entrance","label":"Flugloch","kind":"choice","options":["OPEN","NARROW","CLOSED"],"optionLabels":["offen","eng","zu"]},{"key":"varroaTray","label":"Varroa-Schublade","kind":"choice","options":["IN","OUT"],"optionLabels":["drin","draußen"]}]'::jsonb, true, CURRENT_TIMESTAMP),
|
||||
('hive-part-zl10-floor-insert', 'hive-system-zander-liebig-10', 'FLOOR_INSERT', 'Liebig Bausperre', 475, 375, 5, NULL, NULL, '[]'::jsonb, true, CURRENT_TIMESTAMP),
|
||||
('hive-part-zl10-box-10', 'hive-system-zander-liebig-10', 'BOX', 'Liebig Zander Ganzzarge, 10 Rähmchen', 525, 430, 230, 'FULL', 10, '[]'::jsonb, true, CURRENT_TIMESTAMP),
|
||||
('hive-part-zl10-box-empty', 'hive-system-zander-liebig-10', 'BOX', 'Leerzarge (Liebig Zander Ganzzarge ohne Rähmchen)', 525, 430, 230, 'FULL', 0, '[]'::jsonb, true, CURRENT_TIMESTAMP),
|
||||
('hive-part-zl10-divider-board', 'hive-system-zander-liebig-10', 'DIVIDER_BOARD', 'Liebig Zwischenboden', 525, 430, 50, NULL, NULL, '[{"key":"bungHoles","label":"Spundlöcher","kind":"choice","options":["OPEN","CLOSED","BEE_ESCAPE"],"optionLabels":["offen","zu","Bienenflucht"]}]'::jsonb, true, CURRENT_TIMESTAMP),
|
||||
('hive-part-zl10-queen-excluder', 'hive-system-zander-liebig-10', 'QUEEN_EXCLUDER', 'Niro-Absperrgitter Zander Liebig', 478, 376, 2, NULL, NULL, '[]'::jsonb, true, CURRENT_TIMESTAMP),
|
||||
('hive-part-zl10-feeder', 'hive-system-zander-liebig-10', 'FEEDER', 'Liebig Zweikammer-Futterzarge', 520, 420, 70, NULL, NULL, '[{"key":"syrupLiters","label":"Flüssigfutter","kind":"level","unit":"l","max":3,"step":0.5,"feedType":"SUGAR_WATER"},{"key":"fondantKg","label":"Futterteig","kind":"level","unit":"kg","max":2.5,"step":0.5,"feedType":"FEED_PASTE"}]'::jsonb, true, CURRENT_TIMESTAMP),
|
||||
('hive-part-zl10-cover-abdeckfix', 'hive-system-zander-liebig-10', 'COVER_SHEET', 'Abdeck-Fix (Folie, klar, 0,4 mm)', 478, 378, 1, NULL, NULL, '[]'::jsonb, true, CURRENT_TIMESTAMP),
|
||||
('hive-part-zl10-cover-lotus', 'hive-system-zander-liebig-10', 'COVER_SHEET', 'Imgut Lotus-Abdeckung (0,5 mm)', 478, 378, 1, NULL, NULL, '[]'::jsonb, true, CURRENT_TIMESTAMP),
|
||||
('hive-part-zl10-propolis-screen', 'hive-system-zander-liebig-10', 'PROPOLIS_SCREEN', 'Imgut Propolisgitter', 478, 378, 3, NULL, NULL, '[]'::jsonb, true, CURRENT_TIMESTAMP),
|
||||
('hive-part-zl10-inner-lid', 'hive-system-zander-liebig-10', 'INNER_LID', 'Liebig Holzdeckel', 525, 430, 35, NULL, NULL, '[{"key":"feedHole","label":"Futterloch","kind":"choice","options":["OPEN","CLOSED"],"optionLabels":["offen","zu"]}]'::jsonb, true, CURRENT_TIMESTAMP),
|
||||
('hive-part-zl10-insulation', 'hive-system-zander-liebig-10', 'INSULATION', 'Styropor-Einlage (selbst gebaut)', 465, 365, 20, NULL, NULL, '[]'::jsonb, true, CURRENT_TIMESTAMP),
|
||||
('hive-part-zl10-roof', 'hive-system-zander-liebig-10', 'ROOF', 'Edelstahldeckel konisch Liebig', 525, 430, 60, NULL, NULL, '[]'::jsonb, true, CURRENT_TIMESTAMP),
|
||||
('hive-part-zl10-evaporator', 'hive-system-zander-liebig-10', 'EVAPORATOR', 'Nassenheider Verdunster Professional', 200, 140, 120, NULL, NULL, '[{"key":"acidMl","label":"Ameisensäure","kind":"level","unit":"ml","max":290,"step":10}]'::jsonb, true, CURRENT_TIMESTAMP);
|
||||
@@ -104,6 +104,7 @@ model User {
|
||||
refreshTokens RefreshToken[]
|
||||
|
||||
inspections Inspection[]
|
||||
hiveChanges HiveChange[]
|
||||
varroaMeasurements VarroaMeasurement[]
|
||||
swarmControlChecks SwarmControlCheck[]
|
||||
winterChecks WinterCheck[]
|
||||
@@ -331,6 +332,7 @@ model Colony {
|
||||
harvests HarvestColony[]
|
||||
queenEvaluations QueenEvaluation[]
|
||||
suggestions Suggestion[]
|
||||
hiveSetup HiveSetup?
|
||||
|
||||
@@index([apiaryId])
|
||||
@@index([status])
|
||||
@@ -501,7 +503,8 @@ model Inspection {
|
||||
notes String?
|
||||
createdAt DateTime @default(now())
|
||||
|
||||
tasks Task[]
|
||||
tasks Task[]
|
||||
hiveChange HiveChange?
|
||||
|
||||
@@index([colonyId, date])
|
||||
}
|
||||
@@ -2182,3 +2185,101 @@ model ComplianceAcknowledgement {
|
||||
|
||||
@@index([itemKey, subjectId])
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Beute in 3D: Beutensysteme, Teile-Arten, Aufbau je Volk (Spec 2026-10-15)
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
model HiveSystem {
|
||||
id String @id @default(cuid())
|
||||
name String @unique
|
||||
frameWidthMm Int // Oberträger
|
||||
frameHeightMm Int
|
||||
footprintLMm Int
|
||||
footprintWMm Int
|
||||
template Json // Aufbau-JSON ohne Ids, Schema 5.2
|
||||
active Boolean @default(true)
|
||||
partTypes HivePartType[]
|
||||
setups HiveSetup[]
|
||||
createdAt DateTime @default(now())
|
||||
updatedAt DateTime @updatedAt
|
||||
}
|
||||
|
||||
model HivePartType {
|
||||
id String @id @default(cuid())
|
||||
systemId String
|
||||
system HiveSystem @relation(fields: [systemId], references: [id])
|
||||
kind HivePartKind
|
||||
name String
|
||||
articleRef String? // z. B. Holtermann-Art.-Nr.
|
||||
lengthMm Int
|
||||
widthMm Int
|
||||
heightMm Int
|
||||
boxDepth HiveBoxDepth?
|
||||
frameSlots Int? // nur BOX
|
||||
stateSchema Json // Abschnitt 4.2
|
||||
active Boolean @default(true)
|
||||
createdAt DateTime @default(now())
|
||||
updatedAt DateTime @updatedAt
|
||||
|
||||
@@unique([systemId, name])
|
||||
}
|
||||
|
||||
model HiveSetup {
|
||||
colonyId String @id
|
||||
colony Colony @relation(fields: [colonyId], references: [id])
|
||||
systemId String
|
||||
system HiveSystem @relation(fields: [systemId], references: [id])
|
||||
version Int @default(1)
|
||||
state Json // Abschnitt 5.2, immer vollständig
|
||||
updatedAt DateTime @updatedAt
|
||||
changes HiveChange[]
|
||||
}
|
||||
|
||||
model HiveChange {
|
||||
id String @id @default(cuid())
|
||||
colonyId String
|
||||
setup HiveSetup @relation(fields: [colonyId], references: [colonyId])
|
||||
version Int // Version nach der Änderung
|
||||
occurredOn DateTime // fachlicher Tag (Durchsicht oder Eingabe)
|
||||
source HiveChangeSource
|
||||
inspectionId String? @unique
|
||||
inspection Inspection? @relation(fields: [inspectionId], references: [id])
|
||||
userId String
|
||||
user User @relation(fields: [userId], references: [id])
|
||||
ops Json // angewandte Operationen, Abschnitt 6
|
||||
stateAfter Json
|
||||
note String?
|
||||
createdAt DateTime @default(now())
|
||||
|
||||
@@unique([colonyId, version])
|
||||
@@index([colonyId, occurredOn])
|
||||
}
|
||||
|
||||
enum HivePartKind {
|
||||
FLOOR
|
||||
BOX
|
||||
DIVIDER_BOARD
|
||||
QUEEN_EXCLUDER
|
||||
FEEDER
|
||||
COVER_SHEET
|
||||
PROPOLIS_SCREEN
|
||||
INNER_LID
|
||||
INSULATION
|
||||
ROOF
|
||||
FLOOR_INSERT
|
||||
EVAPORATOR
|
||||
}
|
||||
|
||||
enum HiveBoxDepth {
|
||||
FULL
|
||||
SHALLOW
|
||||
}
|
||||
|
||||
enum HiveChangeSource {
|
||||
INIT
|
||||
CARD
|
||||
EDITOR
|
||||
INSPECTION
|
||||
AI_SUGGESTION
|
||||
}
|
||||
Reference in new issue
Block a user