changes

apps/edr-payment-api/src/config/dmoney.config.ts

@@ -2,9 +2,17 @@ import { registerAs } from "@nestjs/config";
 
 export default registerAs("dmoney", () => ({
   baseUrl: process.env.DMONEY_BASE_URL ?? "",
-  appId: process.env.DMONEY_APP_ID ?? "",
+  webBaseUrl: process.env.DMONEY_WEB_BASE_URL ?? "",
+  fabricAppId: process.env.DMONEY_FABRIC_APP_ID ?? "",
   appSecret: process.env.DMONEY_APP_SECRET ?? "",
-  publicKey: process.env.DMONEY_PUBLIC_KEY ?? "",
-  privateKey: process.env.DMONEY_PRIVATE_KEY ?? "",
+  merchantAppId: process.env.DMONEY_MERCHANT_APP_ID ?? "",
+  merchantCode: process.env.DMONEY_MERCHANT_CODE ?? "",
   notifyUrl: process.env.DMONEY_NOTIFY_URL ?? "",
+  returnUrl: process.env.DMONEY_RETURN_URL ?? "",
+  timeoutExpress: process.env.DMONEY_TIMEOUT_EXPRESS ?? "120m",
+  language: process.env.DMONEY_LANGUAGE ?? "en",
+  currency: process.env.DMONEY_CURRENCY ?? "FDJ",
+  privateKey: process.env.DMONEY_PRIVATE_KEY ?? "",
+  publicKey: process.env.DMONEY_PUBLIC_KEY ?? "",
+  insecureTls: process.env.DMONEY_INSECURE_TLS === "true",
 }));

apps/edr-payment-api/src/modules/webhooks/handlers/dmoney-webhook.service.ts

@@ -13,22 +13,36 @@ export class DMoneyWebhookService {
     const signatureValid = this.provider.verifyWebhookSignature(
       payload as unknown as Record<string, unknown>,
     );
-    const mapped = this.provider.mapWebhookStatus(payload.status);
+    const mapped = this.provider.mapWebhookTradeStatus(payload.trade_status);
+    const providerTxnId = payload.transId ?? payload.payment_order_id;
 
     await this.processor.process({
       provider: this.provider.method,
-      externalEventId: `${payload.orderId}_${payload.status}`,
-      merchantOrderId: payload.merchantOrderId,
-      providerTxnId: payload.transactionId,
+      externalEventId: `${payload.payment_order_id}_${payload.trade_status}`,
+      merchantOrderId: payload.merch_order_id,
+      providerTxnId,
       signatureValid,
-      rawStatus: payload.status,
+      rawStatus: payload.trade_status,
       payload: payload as unknown as Record<string, unknown>,
       result: {
         status: mapped,
-        providerTxnId: payload.transactionId,
-        paidAt: payload.paidAt ? new Date(payload.paidAt) : undefined,
-        failureCode: payload.status,
+        providerTxnId,
+        paidAt: this.parseTransEndTime(payload.trans_end_time),
+        failureCode: payload.trade_status,
       },
     });
   }
+
+  /** D-Money sends trans_end_time either as epoch ms/s or "YYYY-MM-DD HH:mm:ss". */
+  private parseTransEndTime(raw: string | undefined): Date | undefined {
+    if (!raw) return undefined;
+    if (/^\d+$/.test(raw)) {
+      const n = parseInt(raw, 10);
+      if (Number.isNaN(n)) return undefined;
+      // 13-digit value is milliseconds, otherwise seconds.
+      return new Date(raw.length >= 13 ? n : n * 1000);
+    }
+    const parsed = new Date(raw.replace(" ", "T"));
+    return Number.isNaN(parsed.getTime()) ? undefined : parsed;
+  }
 }

apps/edr-payment-api/src/modules/webhooks/webhooks.controller.ts

@@ -136,7 +136,7 @@ export class WebhooksController {
     } catch (err) {
       this.logger.error(`D-Money webhook handler threw: ${this.message(err)}`);
     }
-    return { success: true };
+    return { code: "0", msg: "Success", result: "SUCCESS" };
   }
 
   private message(err: unknown): string {