Merge pull request #56 from GideonBature/webhook-and-delivery-apis

Implement APIs to log webhook

Author: Pvsaint

fluxapay_backend/.env.example

@@ -0,0 +1,16 @@
+# Database
+DATABASE_URL="postgresql://postgres:postgres@localhost:5432/fluxapay?schema=public"
+
+# Docker Compose DB settings (optional, defaults shown)
+POSTGRES_USER=postgres
+POSTGRES_PASSWORD=postgres
+POSTGRES_DB=fluxapay
+
+# JWT
+JWT_SECRET="your-jwt-secret-here"
+
+# Email (Resend)
+RESEND_API_KEY="re_your_resend_api_key_here"
+
+# Webhook
+WEBHOOK_SECRET="your-webhook-secret-here"

fluxapay_backend/.gitignore

@@ -3,6 +3,8 @@ dist
 .env
 .DS_Store
 coverage
+/docker-compose.yml
+/docker-compose.yaml
 
 /src/generated/
 /prisma/migrations/

fluxapay_backend/prisma/schema.prisma

@@ -27,6 +27,7 @@ model Merchant {
   created_at         DateTime @default(now())
   updated_at         DateTime @updatedAt
   otps               OTP[]
+  webhookLogs        WebhookLog[]
 }
 
 model OTP {
@@ -49,4 +50,59 @@ enum MerchantStatus {
 enum OTPChannel {
   email
   phone
+}
+
+model WebhookLog {
+  id              String            @id @default(cuid())
+  merchant        Merchant          @relation(fields: [merchantId], references: [id])
+  merchantId      String
+  event_type      WebhookEventType
+  endpoint_url    String
+  request_payload Json
+  response_body   String?
+  http_status     Int?
+  status          WebhookStatus     @default(pending)
+  payment_id      String?
+  retry_count     Int               @default(0)
+  max_retries     Int               @default(3)
+  next_retry_at   DateTime?
+  created_at      DateTime          @default(now())
+  updated_at      DateTime          @updatedAt
+  retryAttempts   WebhookRetryAttempt[]
+
+  @@index([merchantId])
+  @@index([event_type])
+  @@index([status])
+  @@index([payment_id])
+}
+
+model WebhookRetryAttempt {
+  id              String      @id @default(cuid())
+  webhookLog      WebhookLog  @relation(fields: [webhookLogId], references: [id])
+  webhookLogId    String
+  attempt_number  Int
+  http_status     Int?
+  response_body   String?
+  error_message   String?
+  created_at      DateTime    @default(now())
+
+  @@index([webhookLogId])
+}
+
+enum WebhookEventType {
+  payment_completed
+  payment_failed
+  payment_pending
+  refund_completed
+  refund_failed
+  subscription_created
+  subscription_cancelled
+  subscription_renewed
+}
+
+enum WebhookStatus {
+  pending
+  delivered
+  failed
+  retrying
 }

fluxapay_backend/src/app.ts

@@ -4,6 +4,7 @@ import swaggerUi from "swagger-ui-express";
 import { specs } from "./docs/swagger";
 import { PrismaClient } from "./generated/client/client";
 import merchantRoutes from "./routes/merchant.route";
+import webhookRoutes from "./routes/webhook.route";
 
 const app = express();
 const prisma = new PrismaClient();
@@ -15,6 +16,7 @@ app.use(express.json());
 app.use("/api-docs", swaggerUi.serve, swaggerUi.setup(specs));
 
 app.use("/api/merchants", merchantRoutes);
+app.use("/api/webhooks", webhookRoutes);
 // Basic health check
 app.get("/health", (req, res) => {
   res.json({ status: "ok", timestamp: new Date() });

fluxapay_backend/src/controllers/webhook.controller.ts

@@ -0,0 +1,98 @@
+import { Request, Response } from "express";
+import z from "zod";
+import * as webhookSchema from "../schemas/webhook.schema";
+import {
+  getWebhookLogsService,
+  getWebhookLogDetailsService,
+  retryWebhookService,
+  sendTestWebhookService,
+} from "../services/webhook.service";
+import { AuthRequest } from "../types/express";
+import { validateUserId } from "../helpers/request.helper";
+
+type GetWebhookLogsQuery = z.infer<typeof webhookSchema.getWebhookLogsSchema>;
+type SendTestWebhookBody = z.infer<typeof webhookSchema.sendTestWebhookSchema>;
+
+export async function getWebhookLogs(req: AuthRequest, res: Response) {
+  try {
+    const merchantId = await validateUserId(req);
+    const query = req.query as unknown as GetWebhookLogsQuery;
+
+    const result = await getWebhookLogsService({
+      merchantId,
+      event_type: query.event_type as any,
+      status: query.status as any,
+      date_from: query.date_from,
+      date_to: query.date_to,
+      search: query.search,
+      page: Number(query.page) || 1,
+      limit: Number(query.limit) || 10,
+    });
+
+    res.status(200).json(result);
+  } catch (err: any) {
+    console.error(err);
+    res.status(err.status || 500).json({ message: err.message || "Server error" });
+  }
+}
+
+export async function getWebhookLogDetails(req: AuthRequest, res: Response) {
+  try {
+    const merchantId = await validateUserId(req);
+    const { log_id } = req.params;
+
+    if (!log_id || Array.isArray(log_id)) {
+      return res.status(400).json({ message: "Log ID is required" });
+    }
+
+    const result = await getWebhookLogDetailsService({
+      merchantId,
+      log_id,
+    });
+
+    res.status(200).json(result);
+  } catch (err: any) {
+    console.error(err);
+    res.status(err.status || 500).json({ message: err.message || "Server error" });
+  }
+}
+
+export async function retryWebhook(req: AuthRequest, res: Response) {
+  try {
+    const merchantId = await validateUserId(req);
+    const { log_id } = req.params;
+
+    if (!log_id || Array.isArray(log_id)) {
+      return res.status(400).json({ message: "Log ID is required" });
+    }
+
+    const result = await retryWebhookService({
+      merchantId,
+      log_id,
+    });
+
+    res.status(200).json(result);
+  } catch (err: any) {
+    console.error(err);
+    res.status(err.status || 500).json({ message: err.message || "Server error" });
+  }
+}
+
+export async function sendTestWebhook(req: AuthRequest, res: Response) {
+  try {
+    const merchantId = await validateUserId(req);
+    const body = req.body as SendTestWebhookBody;
+
+    const result = await sendTestWebhookService({
+      merchantId,
+      event_type: body.event_type as any,
+      endpoint_url: body.endpoint_url,
+      payload_override: body.payload_override,
+    });
+
+    res.status(200).json(result);
+  } catch (err: any) {
+    console.error(err);
+    res.status(err.status || 500).json({ message: err.message || "Server error" });
+  }
+}

fluxapay_backend/src/generated/client/browser.ts

@@ -17,4 +17,23 @@ import * as Prisma from './internal/prismaNamespaceBrowser'
 export { Prisma }
 export * as $Enums from './enums'
 export * from './enums';
-
+/**
+ * Model Merchant
+ * 
+ */
+export type Merchant = Prisma.MerchantModel
+/**
+ * Model OTP
+ * 
+ */
+export type OTP = Prisma.OTPModel
+/**
+ * Model WebhookLog
+ * 
+ */
+export type WebhookLog = Prisma.WebhookLogModel
+/**
+ * Model WebhookRetryAttempt
+ * 
+ */
+export type WebhookRetryAttempt = Prisma.WebhookRetryAttemptModel

fluxapay_backend/src/generated/client/client.ts

@@ -27,8 +27,8 @@ export * from "./enums"
  * @example
  * ```
  * const prisma = new PrismaClient()
- * // Fetch zero or more Users
- * const users = await prisma.user.findMany()
+ * // Fetch zero or more Merchants
+ * const merchants = await prisma.merchant.findMany()
  * ```
  * 
  * Read more in our [docs](https://www.prisma.io/docs/reference/tools-and-interfaces/prisma-client).
@@ -39,7 +39,26 @@ export { Prisma }
 
 
 // file annotations for bundling tools to include these files
-path.join(__dirname, "libquery_engine-debian-openssl-3.0.x.so.node")
-path.join(process.cwd(), "src/generated/client/libquery_engine-debian-openssl-3.0.x.so.node")
-
+path.join(__dirname, "libquery_engine-darwin-arm64.dylib.node")
+path.join(process.cwd(), "src/generated/client/libquery_engine-darwin-arm64.dylib.node")
 
+/**
+ * Model Merchant
+ * 
+ */
+export type Merchant = Prisma.MerchantModel
+/**
+ * Model OTP
+ * 
+ */
+export type OTP = Prisma.OTPModel
+/**
+ * Model WebhookLog
+ * 
+ */
+export type WebhookLog = Prisma.WebhookLogModel
+/**
+ * Model WebhookRetryAttempt
+ * 
+ */
+export type WebhookRetryAttempt = Prisma.WebhookRetryAttemptModel