fix architecture and write new tests

apps/api/src/modules/payments/payment.service.ts

@@ -2,6 +2,7 @@ import { ConflictError, ValidationError } from '../../http/errors'
 import * as amanpay from '../../services/amanpayService'
 import * as paypal from '../../services/paypalService'
 import * as repo from './payment.repo'
+import { getWebhookEventId, processWebhookOnce } from '../../security/webhookIdempotency'
 
 export function listByCompany(companyId: string) {
   return repo.findByCompany(companyId)
@@ -11,12 +12,12 @@ export function listByReservation(reservationId: string, companyId: string) {
   return repo.findByReservation(reservationId, companyId)
 }
 
-export async function handleAmanpayWebhook(event: any) {
+async function applyAmanpayWebhook(event: any) {
   const transactionId = event.transaction_id ?? event.id
   const status        = event.status?.toUpperCase()
   if (status === 'PAID' || status === 'SUCCEEDED') {
     const payment = await repo.findByAmanpay(transactionId)
-    if (payment) {
+    if (payment && payment.status !== 'SUCCEEDED') {
       await repo.markPaymentSucceeded(payment.id)
       await repo.incrementReservationPaid(payment.reservationId, payment.amount)
     }
@@ -25,12 +26,12 @@ export async function handleAmanpayWebhook(event: any) {
   }
 }
 
-export async function handlePaypalWebhook(event: any) {
+async function applyPaypalWebhook(event: any) {
   const eventType = event.event_type as string
   if (eventType === 'PAYMENT.CAPTURE.COMPLETED') {
     const captureId = event.resource?.id as string
     const payment   = await repo.findByPaypal(captureId)
-    if (payment) {
+    if (payment && payment.status !== 'SUCCEEDED') {
       await repo.markPaymentSucceeded(payment.id)
       await repo.incrementReservationPaid(payment.reservationId, payment.amount)
     }
@@ -39,6 +40,26 @@ export async function handlePaypalWebhook(event: any) {
   }
 }
 
+export async function handleAmanpayWebhook(event: any, rawBody: string | Buffer = JSON.stringify(event)) {
+  return processWebhookOnce({
+    provider: 'amanpay:payments',
+    providerEventId: getWebhookEventId('amanpay', event),
+    eventType: String(event.status ?? 'unknown'),
+    rawBody,
+    handle: () => applyAmanpayWebhook(event),
+  })
+}
+
+export async function handlePaypalWebhook(event: any, rawBody: string | Buffer = JSON.stringify(event)) {
+  return processWebhookOnce({
+    provider: 'paypal:payments',
+    providerEventId: getWebhookEventId('paypal', event),
+    eventType: String(event.event_type ?? 'unknown'),
+    rawBody,
+    handle: () => applyPaypalWebhook(event),
+  })
+}
+
 export async function initCharge(reservationId: string, companyId: string, body: {
   provider: 'AMANPAY' | 'PAYPAL'; type: 'CHARGE' | 'DEPOSIT'
   currency: 'MAD'; successUrl: string; failureUrl: string