L12 Zeiterfassung: Datenmodell, Rechte und Events für die Zeitfreigabe
Migration zeiterfassung_freigabe (TimeEntry source/approvalStatus/pendingChange, WorkSession.manual), Rechte field:record_own_time und time:approve, PII approvedById, Events time.approval_requested/approved/rejected. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
@@ -0,0 +1,24 @@
|
|||||||
|
-- L12 Zeiterfassung: approval workflow for manual time entries and correction proposals.
|
||||||
|
-- Additive columns only (existing rows: tracked + approved = unchanged behaviour). No new table -> no RLS/TENANT_MODELS change.
|
||||||
|
|
||||||
|
-- CreateEnum
|
||||||
|
CREATE TYPE "TimeEntrySource" AS ENUM ('tracked', 'manual');
|
||||||
|
|
||||||
|
-- CreateEnum
|
||||||
|
CREATE TYPE "TimeApprovalStatus" AS ENUM ('approved', 'pending', 'rejected');
|
||||||
|
|
||||||
|
-- AlterTable
|
||||||
|
ALTER TABLE "time_entries" ADD COLUMN "approval_status" "TimeApprovalStatus" NOT NULL DEFAULT 'approved',
|
||||||
|
ADD COLUMN "approved_at" TIMESTAMP(3),
|
||||||
|
ADD COLUMN "approved_by_id" TEXT,
|
||||||
|
ADD COLUMN "note" TEXT,
|
||||||
|
ADD COLUMN "pending_change" JSONB,
|
||||||
|
ADD COLUMN "rejection_reason" TEXT,
|
||||||
|
ADD COLUMN "source" "TimeEntrySource" NOT NULL DEFAULT 'tracked';
|
||||||
|
|
||||||
|
-- AlterTable
|
||||||
|
ALTER TABLE "work_sessions" ADD COLUMN "manual" BOOLEAN NOT NULL DEFAULT false;
|
||||||
|
|
||||||
|
-- CreateIndex
|
||||||
|
CREATE INDEX "time_entries_tenant_id_approval_status_idx" ON "time_entries"("tenant_id", "approval_status");
|
||||||
|
|
||||||
@@ -894,6 +894,8 @@ model WorkSession {
|
|||||||
startedOffline Boolean @default(false) @map("started_offline")
|
startedOffline Boolean @default(false) @map("started_offline")
|
||||||
deviceInfo String? @map("device_info")
|
deviceInfo String? @map("device_info")
|
||||||
clientId String? @map("client_id")
|
clientId String? @map("client_id")
|
||||||
|
/// L12: container session for manually recorded entries (one per user + order + day, always `ended`)
|
||||||
|
manual Boolean @default(false)
|
||||||
createdAt DateTime @default(now()) @map("created_at")
|
createdAt DateTime @default(now()) @map("created_at")
|
||||||
updatedAt DateTime @updatedAt @map("updated_at")
|
updatedAt DateTime @updatedAt @map("updated_at")
|
||||||
|
|
||||||
@@ -917,6 +919,17 @@ enum TimeEntryType {
|
|||||||
interruption
|
interruption
|
||||||
}
|
}
|
||||||
|
|
||||||
|
enum TimeEntrySource {
|
||||||
|
tracked
|
||||||
|
manual
|
||||||
|
}
|
||||||
|
|
||||||
|
enum TimeApprovalStatus {
|
||||||
|
approved
|
||||||
|
pending
|
||||||
|
rejected
|
||||||
|
}
|
||||||
|
|
||||||
model TimeEntry {
|
model TimeEntry {
|
||||||
id String @id @default(cuid())
|
id String @id @default(cuid())
|
||||||
tenantId String @map("tenant_id")
|
tenantId String @map("tenant_id")
|
||||||
@@ -930,6 +943,16 @@ model TimeEntry {
|
|||||||
correctionReason String? @map("correction_reason")
|
correctionReason String? @map("correction_reason")
|
||||||
correctedById String? @map("corrected_by_id")
|
correctedById String? @map("corrected_by_id")
|
||||||
clientId String? @map("client_id")
|
clientId String? @map("client_id")
|
||||||
|
// L12 Zeiterfassung: manual entries and correction proposals need approval; only
|
||||||
|
// `approvalStatus = approved` counts for reports, totals and billing.
|
||||||
|
source TimeEntrySource @default(tracked)
|
||||||
|
approvalStatus TimeApprovalStatus @default(approved) @map("approval_status")
|
||||||
|
approvedById String? @map("approved_by_id")
|
||||||
|
approvedAt DateTime? @map("approved_at")
|
||||||
|
rejectionReason String? @map("rejection_reason")
|
||||||
|
/// proposed correction of this entry {startedAt, endedAt, type, reason, requestedAt}; old values stay valid until approval
|
||||||
|
pendingChange Json? @map("pending_change")
|
||||||
|
note String?
|
||||||
createdAt DateTime @default(now()) @map("created_at")
|
createdAt DateTime @default(now()) @map("created_at")
|
||||||
updatedAt DateTime @updatedAt @map("updated_at")
|
updatedAt DateTime @updatedAt @map("updated_at")
|
||||||
|
|
||||||
@@ -937,6 +960,7 @@ model TimeEntry {
|
|||||||
|
|
||||||
@@index([tenantId, workSessionId])
|
@@index([tenantId, workSessionId])
|
||||||
@@index([tenantId, userId, startedAt])
|
@@index([tenantId, userId, startedAt])
|
||||||
|
@@index([tenantId, approvalStatus])
|
||||||
@@unique([tenantId, clientId])
|
@@unique([tenantId, clientId])
|
||||||
@@map("time_entries")
|
@@map("time_entries")
|
||||||
}
|
}
|
||||||
|
|||||||
+5
-1
@@ -19,13 +19,17 @@ export const EVENT_TYPES = [
|
|||||||
"import.ready_for_review",
|
"import.ready_for_review",
|
||||||
"import.failed",
|
"import.failed",
|
||||||
"sync.failed",
|
"sync.failed",
|
||||||
|
// L12 Zeiterfassung
|
||||||
|
"time.approval_requested",
|
||||||
|
"time.approved",
|
||||||
|
"time.rejected",
|
||||||
] as const;
|
] as const;
|
||||||
|
|
||||||
export type EventType = (typeof EVENT_TYPES)[number];
|
export type EventType = (typeof EVENT_TYPES)[number];
|
||||||
|
|
||||||
export type DomainEvent = {
|
export type DomainEvent = {
|
||||||
type: EventType;
|
type: EventType;
|
||||||
entityType: "work_order" | "report" | "import_job" | "sync_operation";
|
entityType: "work_order" | "report" | "import_job" | "sync_operation" | "time_entry";
|
||||||
entityId: string;
|
entityId: string;
|
||||||
/** Short, human-readable facts for templates (no PII beyond what the recipient may see). */
|
/** Short, human-readable facts for templates (no PII beyond what the recipient may see). */
|
||||||
data?: Record<string, string | number | boolean | null>;
|
data?: Record<string, string | number | boolean | null>;
|
||||||
|
|||||||
@@ -33,6 +33,7 @@ export const PII_REFERENCE_FIELDS: readonly PiiReference[] = [
|
|||||||
{ model: "WorkSession", field: "userId" },
|
{ model: "WorkSession", field: "userId" },
|
||||||
{ model: "TimeEntry", field: "userId" },
|
{ model: "TimeEntry", field: "userId" },
|
||||||
{ model: "TimeEntry", field: "correctedById" },
|
{ model: "TimeEntry", field: "correctedById" },
|
||||||
|
{ model: "TimeEntry", field: "approvedById" }, // L12: approving/rejecting person
|
||||||
{ model: "ActivityNote", field: "authorId" },
|
{ model: "ActivityNote", field: "authorId" },
|
||||||
{ model: "Document", field: "uploadedById" },
|
{ model: "Document", field: "uploadedById" },
|
||||||
{ model: "Photo", field: "takenById" },
|
{ model: "Photo", field: "takenById" },
|
||||||
|
|||||||
@@ -36,6 +36,9 @@ export const PERMISSIONS = [
|
|||||||
// Einsatz (Mobile): Einsatz starten, Zeiten, Material, Fotos, Notizen
|
// Einsatz (Mobile): Einsatz starten, Zeiten, Material, Fotos, Notizen
|
||||||
"field:execute",
|
"field:execute",
|
||||||
"field:correct_time",
|
"field:correct_time",
|
||||||
|
"field:record_own_time", // L12: eigene Zeiten nachtragen / Korrektur vorschlagen (mit Freigabe)
|
||||||
|
// Zeiterfassung: Nachträge/Korrekturen freigeben (Teamleiter: eigenes Team, Backoffice: alle)
|
||||||
|
"time:approve",
|
||||||
// Berichte
|
// Berichte
|
||||||
"report:read",
|
"report:read",
|
||||||
"report:write",
|
"report:write",
|
||||||
@@ -85,6 +88,8 @@ export const ROLE_DEFS: Record<RoleKey, { name: string; permissions: readonly Pe
|
|||||||
"work_order:read_team",
|
"work_order:read_team",
|
||||||
"field:execute",
|
"field:execute",
|
||||||
"field:correct_time",
|
"field:correct_time",
|
||||||
|
"field:record_own_time",
|
||||||
|
"time:approve",
|
||||||
"report:read",
|
"report:read",
|
||||||
"report:write",
|
"report:write",
|
||||||
"report:approve_team",
|
"report:approve_team",
|
||||||
@@ -102,6 +107,7 @@ export const ROLE_DEFS: Record<RoleKey, { name: string; permissions: readonly Pe
|
|||||||
"team:read",
|
"team:read",
|
||||||
"work_order:read_team",
|
"work_order:read_team",
|
||||||
"field:execute",
|
"field:execute",
|
||||||
|
"field:record_own_time",
|
||||||
"report:read",
|
"report:read",
|
||||||
"report:write",
|
"report:write",
|
||||||
"emergency:create",
|
"emergency:create",
|
||||||
|
|||||||
Reference in New Issue
Block a user