Merge pull request #1426 from KeNgKawthar/No-API-client

No api client

Author: mftee

backend/src/payments/payments.controller.ts

@@ -1,6 +1,7 @@
 import {
   Body,
   Controller,
+  Get,
   Param,
   ParseUUIDPipe,
   Post,
@@ -10,6 +11,7 @@ import {
   ApiBearerAuth,
   ApiConflictResponse,
   ApiForbiddenResponse,
+  ApiOkResponse,
   ApiOperation,
   ApiTags,
   ApiUnprocessableEntityResponse,
@@ -20,18 +22,36 @@ import { RolesGuard } from '../auth/guards/roles.guard';
 import { UserRole } from '../common/enums/role.enum';
 import { User } from '../users/entities/user.entity';
 import { PaymentsService } from './payments.service';
+import { Payment } from './entities/payment.entity';
 import { SubmitPaymentDto } from './dto/submit-payment.dto';
 import { TestSignAndSubmitPaymentDto } from './dto/test-sign-and-submit-payment.dto';
 
 @ApiTags('payments')
 @ApiBearerAuth()
 @Controller('shipments/:shipmentId/payment')
-@UseGuards(RolesGuard)
-@Roles(UserRole.SHIPPER, UserRole.ADMIN)
 export class PaymentsController {
   constructor(private readonly paymentsService: PaymentsService) {}
 
+  @Get()
+  @ApiOperation({
+    summary: 'Get payment/escrow status for a shipment',
+    description:
+      'Returns the escrow payment record if one exists for this shipment. Accessible to the shipper, carrier, and admin.',
+  })
+  @ApiOkResponse({ description: 'Payment record found', type: Payment })
+  @ApiOperation({ summary: 'Get escrow status for a shipment' })
+  @UseGuards(RolesGuard)
+  @Roles(UserRole.SHIPPER, UserRole.CARRIER, UserRole.ADMIN)
+  getStatus(
+    @Param('shipmentId', ParseUUIDPipe) shipmentId: string,
+    @CurrentUser() user: User,
+  ) {
+    return this.paymentsService.findByShipmentIdForUser(shipmentId, user);
+  }
+
   @Post()
+  @UseGuards(RolesGuard)
+  @Roles(UserRole.SHIPPER, UserRole.ADMIN)
   @ApiOperation({
     summary:
       'Build an unsigned funding transaction for an accepted shipment (shipper only)',

backend/src/payments/payments.service.ts

@@ -41,6 +41,10 @@ export interface SubmitFundingResult {
   stellarTxHash: string | null;
 }
 
+export interface PaymentResponse {
+  payment: Payment | null;
+}
+
 // A payment beyond this point is either funded or otherwise terminal for
 // this issue's purposes — funding it again (or funding a still-in-flight
 // one) is always a 4xx, never a fresh chain call.
@@ -65,6 +69,26 @@ export class PaymentsService {
     private readonly config: ConfigService,
   ) {}
 
+  async findByShipmentIdForUser(
+    shipmentId: string,
+    user: User,
+  ): Promise<PaymentResponse> {
+    const shipment = await this.getShipment(shipmentId);
+
+    const isShipper = shipment.shipperId === user.id;
+    const isCarrier = shipment.carrierId === user.id;
+    const isAdmin = user.role === 'admin';
+
+    if (!isShipper && !isCarrier && !isAdmin) {
+      throw new ForbiddenException(
+        'You do not have access to this shipment payment',
+      );
+    }
+
+    const payment = await this.findByShipmentId(shipmentId);
+    return { payment };
+  }
+
   async getOrCreatePayment(
     shipmentId: string,
     amount: number,

frontend/app/(dashboard)/shipments/[id]/page.tsx

@@ -4,7 +4,9 @@ import { useCallback, useEffect, useState } from 'react';
 import { useParams, useRouter } from 'next/navigation';
 import { toast } from 'sonner';
 import { Shipment, ShipmentStatus, ShipmentStatusHistory } from '../../../../types/shipment.types';
+import { Payment, PaymentStatus } from '../../../../types/payment.types';
 import { shipmentApi } from '../../../../lib/api/shipment.api';
+import { paymentApi } from '../../../../lib/api/payments.api';
 import { useAuthStore } from '../../../../stores/auth.store';
 import { StatusBadge } from '../../../../components/shipment/status-badge';
 import { StatusTimeline } from '../../../../components/shipment/status-timeline';
@@ -18,7 +20,9 @@ export default function ShipmentDetailPage() {
 
   const [shipment, setShipment] = useState<Shipment | null>(null);
   const [history, setHistory] = useState<ShipmentStatusHistory[]>([]);
+  const [payment, setPayment] = useState<Payment | null>(null);
   const [loading, setLoading] = useState(true);
+  const [paymentLoading, setPaymentLoading] = useState(false);
   const [actionLoading, setActionLoading] = useState(false);
 
   const reload = useCallback(async () => {

frontend/lib/api/payments.api.ts

@@ -0,0 +1,10 @@
+import { apiClient } from './client';
+import { Payment, PaymentStatus } from '../../types/payment.types';
+
+export const paymentApi = {
+  getByShipmentId(shipmentId: string): Promise<Payment | null> {
+    return apiClient<{ payment: Payment | null }>(
+      `/shipments/${shipmentId}/payment`,
+    ).then((data) => data.payment);
+  },
+};

frontend/types/payment.types.ts

@@ -0,0 +1,27 @@
+export enum PaymentStatus {
+  PENDING = 'pending',
+  FUNDING = 'funding',
+  FUNDED = 'funded',
+  RELEASED = 'released',
+  REFUNDED = 'refunded',
+  DISPUTED = 'disputed',
+  CANCELLED = 'cancelled',
+}
+
+export interface Payment {
+  id: string;
+  shipmentId: string;
+  onChainShipmentId: number;
+  status: PaymentStatus;
+  amount: number;
+  assetCode: string;
+  tokenContractAddress: string | null;
+  shipperWalletAddress: string | null;
+  carrierWalletAddress: string | null;
+  fundedAt: string | null;
+  settledAt: string | null;
+  stellarTxHash: string | null;
+  failureReason: string | null;
+  createdAt: string;
+  updatedAt: string;
+}