Datenschutz vollmacht fixed, two time counter added

backend/src/controllers/contract.controller.ts

@@ -244,6 +244,79 @@ export async function getCockpit(req: AuthRequest, res: Response): Promise<void>
   }
 }
 
+// ==================== FOLGEZÄHLER ====================
+
+export async function addSuccessorMeter(req: AuthRequest, res: Response): Promise<void> {
+  try {
+    const contractId = parseInt(req.params.id);
+    const { meterId, installedAt, finalReadingPrevious } = req.body;
+
+    const contract = await prisma.contract.findUnique({
+      where: { id: contractId },
+      include: { energyDetails: { include: { contractMeters: { orderBy: { position: 'asc' } } } } },
+    });
+
+    if (!contract?.energyDetails) {
+      res.status(404).json({ success: false, error: 'Energievertrag nicht gefunden' } as ApiResponse);
+      return;
+    }
+
+    const ecdId = contract.energyDetails.id;
+    const existingMeters = contract.energyDetails.contractMeters;
+    const nextPosition = existingMeters.length > 0
+      ? Math.max(...existingMeters.map(m => m.position)) + 1
+      : 0;
+
+    // Vorherigen Zähler als gewechselt markieren
+    if (existingMeters.length > 0 && finalReadingPrevious !== undefined) {
+      const prevMeter = existingMeters[existingMeters.length - 1];
+      await prisma.contractMeter.update({
+        where: { id: prevMeter.id },
+        data: {
+          removedAt: installedAt ? new Date(installedAt) : new Date(),
+          finalReading: parseFloat(finalReadingPrevious),
+        },
+      });
+    }
+
+    const contractMeter = await prisma.contractMeter.create({
+      data: {
+        energyContractDetailsId: ecdId,
+        meterId: parseInt(meterId),
+        position: nextPosition,
+        installedAt: installedAt ? new Date(installedAt) : new Date(),
+      },
+      include: { meter: { include: { readings: true } } },
+    });
+
+    // Aktuellen Zähler am Vertrag aktualisieren
+    await prisma.energyContractDetails.update({
+      where: { id: ecdId },
+      data: { meterId: parseInt(meterId) },
+    });
+
+    res.json({ success: true, data: contractMeter } as ApiResponse);
+  } catch (error) {
+    res.status(400).json({
+      success: false,
+      error: error instanceof Error ? error.message : 'Fehler beim Hinzufügen des Folgezählers',
+    } as ApiResponse);
+  }
+}
+
+export async function removeContractMeter(req: AuthRequest, res: Response): Promise<void> {
+  try {
+    const contractMeterId = parseInt(req.params.contractMeterId);
+    await prisma.contractMeter.delete({ where: { id: contractMeterId } });
+    res.json({ success: true, data: null } as ApiResponse);
+  } catch (error) {
+    res.status(400).json({
+      success: false,
+      error: error instanceof Error ? error.message : 'Fehler beim Entfernen',
+    } as ApiResponse);
+  }
+}
+
 // ==================== SNOOZE (VERTRAG ZURÜCKSTELLEN) ====================
 
 export async function snoozeContract(req: Request, res: Response): Promise<void> {

backend/src/controllers/customer.controller.ts

@@ -293,7 +293,14 @@ export async function getMeterReadings(req: Request, res: Response): Promise<voi
 
 export async function addMeterReading(req: Request, res: Response): Promise<void> {
   try {
-    const reading = await customerService.addMeterReading(parseInt(req.params.meterId), req.body);
+    const { readingDate, value, valueNt, unit, notes } = req.body;
+    const reading = await customerService.addMeterReading(parseInt(req.params.meterId), {
+      readingDate: new Date(readingDate),
+      value: parseFloat(value),
+      valueNt: valueNt !== undefined && valueNt !== null && valueNt !== '' ? parseFloat(valueNt) : undefined,
+      unit,
+      notes,
+    });
     res.status(201).json({ success: true, data: reading } as ApiResponse);
   } catch (error) {
     res.status(400).json({
@@ -305,10 +312,18 @@ export async function addMeterReading(req: Request, res: Response): Promise<void
 
 export async function updateMeterReading(req: Request, res: Response): Promise<void> {
   try {
+    const { readingDate, value, valueNt, unit, notes } = req.body;
+    const updateData: Record<string, unknown> = {};
+    if (readingDate !== undefined) updateData.readingDate = new Date(readingDate);
+    if (value !== undefined) updateData.value = parseFloat(value);
+    if (valueNt !== undefined) updateData.valueNt = valueNt !== null && valueNt !== '' ? parseFloat(valueNt) : null;
+    if (unit !== undefined) updateData.unit = unit;
+    if (notes !== undefined) updateData.notes = notes;
+
     const reading = await customerService.updateMeterReading(
       parseInt(req.params.meterId),
       parseInt(req.params.readingId),
-      req.body
+      updateData as any
     );
     res.json({ success: true, data: reading } as ApiResponse);
   } catch (error) {
@@ -358,15 +373,20 @@ export async function reportMeterReading(req: AuthRequest, res: Response): Promi
       return;
     }
 
-    const reading = await prisma.meterReading.create({
-      data: {
-        meterId,
-        value: parseFloat(value),
-        readingDate: readingDate ? new Date(readingDate) : new Date(),
-        notes,
-        reportedBy: user.email,
-        status: 'REPORTED',
-      },
+    const parsedDate = readingDate ? new Date(readingDate) : new Date();
+    const parsedValue = parseFloat(value);
+
+    // Validierung über den Service (monoton steigend)
+    const reading = await customerService.addMeterReading(meterId, {
+      readingDate: parsedDate,
+      value: parsedValue,
+      notes,
+    });
+
+    // Status auf REPORTED setzen
+    await prisma.meterReading.update({
+      where: { id: reading.id },
+      data: { reportedBy: user.email, status: 'REPORTED' },
     });
 
     res.status(201).json({ success: true, data: reading } as ApiResponse);