Merge pull request #31 from HamzaSha1/feat/neoleap-integration

Feat/neoleap integration

src/card/controllers/cards.controller.ts

@@ -1,12 +1,14 @@
-import { Controller, Get, Post, UseGuards } from '@nestjs/common';
+import { Body, Controller, Get, HttpCode, HttpStatus, Post, UseGuards } from '@nestjs/common';
-import { ApiBearerAuth, ApiTags } from '@nestjs/swagger';
+import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
+import { Roles } from '~/auth/enums';
 import { IJwtPayload } from '~/auth/interfaces';
-import { AuthenticatedUser } from '~/common/decorators';
+import { AllowedRoles, AuthenticatedUser } from '~/common/decorators';
-import { AccessTokenGuard } from '~/common/guards';
+import { AccessTokenGuard, RolesGuard } from '~/common/guards';
 import { CardEmbossingDetailsResponseDto } from '~/common/modules/neoleap/dtos/response';
 import { ApiDataResponse } from '~/core/decorators';
 import { ResponseFactory } from '~/core/utils';
-import { CardResponseDto } from '../dtos/responses';
+import { FundIbanRequestDto } from '../dtos/requests';
+import { AccountIbanResponseDto, CardResponseDto } from '../dtos/responses';
 import { CardService } from '../services';
 
 @Controller('cards')
@@ -36,4 +38,22 @@ export class CardsController {
     const res = await this.cardService.getEmbossingInformation(sub);
     return ResponseFactory.data(res);
   }
+
+  @Get('iban')
+  @UseGuards(RolesGuard)
+  @AllowedRoles(Roles.GUARDIAN)
+  @ApiDataResponse(AccountIbanResponseDto)
+  async getCardIban(@AuthenticatedUser() { sub }: IJwtPayload) {
+    const iban = await this.cardService.getIbanInformation(sub);
+    return ResponseFactory.data(new AccountIbanResponseDto(iban));
+  }
+
+  @Post('mock/fund-iban')
+  @ApiOperation({ summary: 'Mock endpoint to fund the IBAN - For testing purposes only' })
+  @UseGuards(RolesGuard)
+  @AllowedRoles(Roles.GUARDIAN)
+  @HttpCode(HttpStatus.NO_CONTENT)
+  fundIban(@Body() { amount, iban }: FundIbanRequestDto) {
+    return this.cardService.fundIban(iban, amount);
+  }
 }

src/card/dtos/requests/fund-iban.request.dto.ts

@@ -0,0 +1,9 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { IsString } from 'class-validator';
+import { TransferToJuniorRequestDto } from '~/junior/dtos/request';
+
+export class FundIbanRequestDto extends TransferToJuniorRequestDto {
+  @ApiProperty({ example: 'DE89370400440532013000' })
+  @IsString()
+  iban!: string;
+}

src/card/dtos/requests/index.ts

@@ -0,0 +1 @@
+export * from './fund-iban.request.dto';

src/card/dtos/responses/account-iban.response.dto.ts

@@ -0,0 +1,10 @@
+import { ApiProperty } from '@nestjs/swagger';
+
+export class AccountIbanResponseDto {
+  @ApiProperty({ example: 'DE89370400440532013000' })
+  iban!: string;
+
+  constructor(iban: string) {
+    this.iban = iban;
+  }
+}

src/card/dtos/responses/index.ts

@@ -1 +1,2 @@
+export * from './account-iban.response.dto';
 export * from './card.response.dto';

src/card/repositories/account.repository.ts

@@ -27,6 +27,13 @@ export class AccountRepository {
     });
   }
 
+  getAccountByIban(iban: string): Promise<Account | null> {
+    return this.accountRepository.findOne({
+      where: { iban },
+      relations: ['cards'],
+    });
+  }
+
   getAccountByAccountNumber(accountNumber: string): Promise<Account | null> {
     return this.accountRepository.findOne({
       where: { accountNumber },
@@ -34,6 +41,13 @@ export class AccountRepository {
     });
   }
 
+  getAccountByCustomerId(customerId: string): Promise<Account | null> {
+    return this.accountRepository.findOne({
+      where: { cards: { customerId } },
+      relations: ['cards'],
+    });
+  }
+
   topUpAccountBalance(accountReference: string, amount: number) {
     return this.accountRepository.increment({ accountReference }, 'balance', amount);
   }

src/card/repositories/card.repository.ts

@@ -60,4 +60,10 @@ export class CardRepository {
       statusDescription: statusDescription,
     });
   }
+
+  updateCardLimit(cardId: string, newLimit: number) {
+    return this.cardRepository.update(cardId, {
+      limit: newLimit,
+    });
+  }
 }

src/card/repositories/transaction.repository.ts

@@ -1,5 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
+import { Decimal } from 'decimal.js';
 import moment from 'moment';
 import { Repository } from 'typeorm';
 import {
@@ -57,9 +58,43 @@ export class TransactionRepository {
     );
   }
 
+  createInternalChildTransaction(card: Card, amount: number): Promise<Transaction> {
+    return this.transactionRepository.save(
+      this.transactionRepository.create({
+        transactionId: `CHILD-${card.id}-${Date.now()}`,
+        transactionAmount: amount,
+        transactionCurrency: '682',
+        billingAmount: 0,
+        settlementAmount: 0,
+        transactionDate: new Date(),
+        fees: 0,
+        cardId: card.id,
+        cardReference: card.cardReference,
+        cardMaskedNumber: card.firstSixDigits + '******' + card.lastFourDigits,
+        accountId: card.account!.id,
+        transactionType: TransactionType.INTERNAL,
+        accountReference: card.account!.accountReference,
+        transactionScope: TransactionScope.CARD,
+        vatOnFees: 0,
+      }),
+    );
+  }
+
   findTransactionByReference(transactionId: string, accountReference: string): Promise<Transaction | null> {
     return this.transactionRepository.findOne({
       where: { transactionId, accountReference },
     });
   }
+
+  findInternalTransactionTotal(accountId: string): Promise<number> {
+    return this.transactionRepository
+      .find({
+        where: { accountId, transactionType: TransactionType.INTERNAL },
+      })
+      .then((transactions) => {
+        return transactions
+          .reduce((total, tx) => new Decimal(total).plus(tx.transactionAmount), new Decimal(0))
+          .toNumber();
+      });
+  }
 }

src/card/services/account.service.ts

@@ -27,10 +27,26 @@ export class AccountService {
     return account;
   }
 
-  async creditAccountBalance(accountReference: string, amount: number) {
+  async getAccountByIban(iban: string): Promise<Account> {
+    const account = await this.accountRepository.getAccountByIban(iban);
+    if (!account) {
+      throw new UnprocessableEntityException('ACCOUNT.NOT_FOUND');
+    }
+    return account;
+  }
+
+  creditAccountBalance(accountReference: string, amount: number) {
     return this.accountRepository.topUpAccountBalance(accountReference, amount);
   }
 
+  async getAccountByCustomerId(customerId: string): Promise<Account> {
+    const account = await this.accountRepository.getAccountByCustomerId(customerId);
+    if (!account) {
+      throw new UnprocessableEntityException('ACCOUNT.NOT_FOUND');
+    }
+    return account;
+  }
+
   async decreaseAccountBalance(accountReference: string, amount: number) {
     const account = await this.getAccountByReferenceNumber(accountReference);
     /**
@@ -44,4 +60,10 @@ export class AccountService {
 
     return this.accountRepository.decreaseAccountBalance(accountReference, amount);
   }
+
+  //THIS IS A MOCK FUNCTION FOR TESTING PURPOSES ONLY
+  async fundIban(iban: string, amount: number) {
+    const account = await this.getAccountByIban(iban);
+    return this.accountRepository.topUpAccountBalance(account.accountReference, amount);
+  }
 }

src/card/services/card.service.ts

@@ -1,4 +1,5 @@
 import { BadRequestException, forwardRef, Inject, Injectable } from '@nestjs/common';
+import Decimal from 'decimal.js';
 import { Transactional } from 'typeorm-transactional';
 import { AccountCardStatusChangedWebhookRequest } from '~/common/modules/neoleap/dtos/requests';
 import { NeoLeapService } from '~/common/modules/neoleap/services';
@@ -10,12 +11,14 @@ import { CardColors } from '../enums';
 import { CardStatusMapper } from '../mappers/card-status.mapper';
 import { CardRepository } from '../repositories';
 import { AccountService } from './account.service';
+import { TransactionService } from './transaction.service';
 
 @Injectable()
 export class CardService {
   constructor(
     private readonly cardRepository: CardRepository,
     private readonly accountService: AccountService,
+    @Inject(forwardRef(() => TransactionService)) private readonly transactionService: TransactionService,
     @Inject(forwardRef(() => NeoLeapService)) private readonly neoleapService: NeoLeapService,
     @Inject(forwardRef(() => CustomerService)) private readonly customerService: CustomerService,
   ) {}
@@ -99,4 +102,40 @@ export class CardService {
 
     return this.neoleapService.getEmbossingInformation(card);
   }
+
+  async updateCardLimit(cardId: string, newLimit: number) {
+    const { affected } = await this.cardRepository.updateCardLimit(cardId, newLimit);
+
+    if (affected === 0) {
+      throw new BadRequestException('CARD.NOT_FOUND');
+    }
+  }
+
+  async getIbanInformation(customerId: string) {
+    const account = await this.accountService.getAccountByCustomerId(customerId);
+    return account.iban;
+  }
+
+  @Transactional()
+  async transferToChild(juniorId: string, amount: number) {
+    const card = await this.getCardByCustomerId(juniorId);
+    const availableSpendingLimit = await this.transactionService.calculateAvailableSpendingLimitForParent(card.account);
+
+    if (amount > availableSpendingLimit) {
+      throw new BadRequestException('CARD.INSUFFICIENT_BALANCE');
+    }
+
+    const finalAmount = Decimal(amount).plus(card.limit);
+    await Promise.all([
+      this.neoleapService.updateCardControl(card.cardReference, finalAmount.toNumber()),
+      this.updateCardLimit(card.id, finalAmount.toNumber()),
+      this.transactionService.createInternalChildTransaction(card.id, amount),
+    ]);
+
+    return finalAmount.toNumber();
+  }
+
+  fundIban(iban: string, amount: number) {
+    return this.accountService.fundIban(iban, amount);
+  }
 }

src/card/services/transaction.service.ts

@@ -1,10 +1,11 @@
-import { Injectable, UnprocessableEntityException } from '@nestjs/common';
+import { forwardRef, Inject, Injectable, UnprocessableEntityException } from '@nestjs/common';
 import Decimal from 'decimal.js';
 import { Transactional } from 'typeorm-transactional';
 import {
   AccountTransactionWebhookRequest,
   CardTransactionWebhookRequest,
 } from '~/common/modules/neoleap/dtos/requests';
+import { Account } from '../entities/account.entity';
 import { Transaction } from '../entities/transaction.entity';
 import { TransactionRepository } from '../repositories/transaction.repository';
 import { AccountService } from './account.service';
@@ -15,7 +16,7 @@ export class TransactionService {
   constructor(
     private readonly transactionRepository: TransactionRepository,
     private readonly accountService: AccountService,
-    private readonly cardService: CardService,
+    @Inject(forwardRef(() => CardService)) private readonly cardService: CardService,
   ) {}
 
   @Transactional()
@@ -51,6 +52,17 @@ export class TransactionService {
     return transaction;
   }
 
+  async createInternalChildTransaction(cardId: string, amount: number) {
+    const card = await this.cardService.getCardById(cardId);
+    const transaction = await this.transactionRepository.createInternalChildTransaction(card, amount);
+    return transaction;
+  }
+
+  async calculateAvailableSpendingLimitForParent(account: Account): Promise<number> {
+    const internalTransactionSum = await this.transactionRepository.findInternalTransactionTotal(account.id);
+    return new Decimal(account.balance).minus(internalTransactionSum).toNumber();
+  }
+
   private async findExistingTransaction(transactionId: string, accountReference: string): Promise<Transaction | null> {
     const existingTransaction = await this.transactionRepository.findTransactionByReference(
       transactionId,

src/common/modules/neoleap/__mocks__/create-application.mock.ts

@@ -1,758 +1,198 @@
-function getRandomWithDigits(digits: number): string {
+import { randomInt, randomUUID } from 'crypto';
-  const min = Math.pow(10, digits - 1); // e.g. 1000 for 4 digits
-  const max = Math.pow(10, digits) - 1; // e.g. 9999 for 4 digits
 
-  const result = Math.floor(Math.random() * (max - min + 1)) + min;
+/** Generate a string of `n` random digits (first digit never 0). */
-  return result.toString();
+function randomDigits(n: number): string {
+  if (n <= 0) return '0';
+  let s = String(randomInt(1, 10)); // first digit 1–9
+  for (let i = 1; i < n; i++) s += String(randomInt(0, 10));
+  return s;
 }
 
-export const CREATE_APPLICATION_MOCK = {
+/** Build a fresh mock object every time it's called */
-  ResponseHeader: {
+export function buildCreateApplicationMock() {
-    Version: '1.0.0',
+  const now = new Date().toISOString();
-    MsgUid: 'adaa1893-9f95-48a8-b7a1-0422bcf629b5',
-    Source: 'ZOD',
-    ServiceId: 'CreateNewApplication',
-    ReqDateTime: '2025-06-03T07:32:16.304Z',
-    RspDateTime: '2025-06-03T08:21:15.662',
-    ResponseCode: '000',
-    ResponseType: 'Success',
-    ProcessingTime: 1665,
-    EncryptionKey: null,
-    ResponseDescription: 'Operation Successful',
-    LocalizedResponseDescription: null,
-    CustomerSpecificResponseDescriptionList: null,
-    HeaderUserDataList: null,
-  },
 
-  CreateNewApplicationResponseDetails: {
+  return {
-    InstitutionCode: '1100',
+    ResponseHeader: {
-    ApplicationTypeDetails: {
+      Version: '1.0.0',
-      TypeCode: '01',
+      MsgUid: randomUUID(),
-      Description: 'Normal Primary',
+      Source: 'ZOD',
-      Additional: false,
+      ServiceId: 'CreateNewApplication',
-      Corporate: false,
+      ReqDateTime: now,
-      UserData: null,
+      RspDateTime: now,
+      ResponseCode: '000',
+      ResponseType: 'Success',
+      ProcessingTime: 1665,
+      EncryptionKey: null,
+      ResponseDescription: 'Operation Successful',
+      LocalizedResponseDescription: null,
+      CustomerSpecificResponseDescriptionList: null,
+      HeaderUserDataList: null,
     },
-    ApplicationDetails: {
+
-      cif: null,
+    CreateNewApplicationResponseDetails: {
-      ApplicationNumber: '3300000000073',
+      InstitutionCode: '1100',
-      ExternalApplicationNumber: '3',
+      ApplicationTypeDetails: {
-      ApplicationStatus: '04',
+        TypeCode: '01',
-      Organization: 0,
+        Description: 'Normal Primary',
-      Product: '1101',
+        Additional: false,
-      ApplicatonDate: '2025-05-29',
+        Corporate: false,
-      ApplicationSource: 'O',
+        UserData: null,
-      SalesSource: null,
-      DeliveryMethod: 'V',
-      ProgramCode: null,
-      Campaign: null,
-      Plastic: null,
-      Design: null,
-      ProcessStage: '99',
-      ProcessStageStatus: 'S',
-      Score: null,
-      ExternalScore: null,
-      RequestedLimit: 0,
-      SuggestedLimit: null,
-      AssignedLimit: 0,
-      AllowedLimitList: null,
-      EligibilityCheckResult: '00',
-      EligibilityCheckDescription: null,
-      Title: 'Mr.',
-      FirstName: 'Abdalhamid',
-      SecondName: null,
-      ThirdName: null,
-      LastName: ' Ahmad',
-      FullName: 'Abdalhamid Ahmad',
-      EmbossName: 'ABDALHAMID AHMAD',
-      PlaceOfBirth: null,
-      DateOfBirth: '1999-01-07',
-      LocalizedDateOfBirth: '1999-01-07',
-      Age: 26,
-      Gender: 'M',
-      Married: 'U',
-      Nationality: '682',
-      IdType: '01',
-      IdNumber: '1089055972',
-      IdExpiryDate: '2031-09-17',
-      EducationLevel: null,
-      ProfessionCode: 0,
-      NumberOfDependents: 0,
-      EmployerName: 'N/A',
-      EmploymentYears: 0,
-      EmploymentMonths: 0,
-      EmployerPhoneArea: null,
-      EmployerPhoneNumber: null,
-      EmployerPhoneExtension: null,
-      EmployerMobile: null,
-      EmployerFaxArea: null,
-      EmployerFax: null,
-      EmployerCity: null,
-      EmployerAddress: null,
-      EmploymentActivity: null,
-      EmploymentStatus: null,
-      CIF: null,
-      BankAccountNumber: ' ',
-      Currency: {
-        CurrCode: '682',
-        AlphaCode: 'SAR',
       },
-      RequestedCurrencyList: null,
+      ApplicationDetails: {
-      CreditAccountNumber: '6000000000000000',
+        cif: null,
-      AccountType: '30',
+        ApplicationNumber: '3300000000073',
-      OpenDate: null,
+        ExternalApplicationNumber: '3',
-      Income: 0,
+        ApplicationStatus: '04',
-      AdditionalIncome: 0,
+        Organization: 0,
-      TotalIncome: 0,
+        Product: '1101',
-      CurrentBalance: 0,
+        ApplicatonDate: '2025-05-29',
-      AverageBalance: 0,
+        ApplicationSource: 'O',
-      AssetsBalance: 0,
+        SalesSource: null,
-      InsuranceBalance: 0,
+        DeliveryMethod: 'V',
-      DepositAmount: 0,
+        ProgramCode: null,
-      GuarenteeAccountNumber: null,
+        Campaign: null,
-      GuarenteeAmount: 0,
+        Plastic: null,
-      InstalmentAmount: 0,
+        Design: null,
-      AutoDebit: 'N',
+        ProcessStage: '99',
-      PaymentMethod: '2',
+        ProcessStageStatus: 'S',
-      BillingCycle: 'C1',
+        Score: null,
-      OldIssueDate: null,
+        ExternalScore: null,
-      OtherPaymentsDate: null,
+        RequestedLimit: 0,
-      MaximumDelinquency: null,
+        SuggestedLimit: null,
-      CreditBureauDecision: null,
+        AssignedLimit: 0,
-      CreditBureauUserData: null,
+        AllowedLimitList: null,
-      ECommerce: 'N',
+        EligibilityCheckResult: '00',
-      NumberOfCards: 0,
+        EligibilityCheckDescription: null,
-      OtherBank: null,
-      OtherBankDescription: null,
-      InsuranceProduct: null,
-      SocialCode: '000',
-      JobGrade: 0,
-      Flags: [
-        {
-          Position: 1,
-          Value: '0',
-        },
-        {
-          Position: 2,
-          Value: '0',
-        },
-        {
-          Position: 3,
-          Value: '0',
-        },
-        {
-          Position: 4,
-          Value: '0',
-        },
-        {
-          Position: 5,
-          Value: '0',
-        },
-        {
-          Position: 6,
-          Value: '0',
-        },
-        {
-          Position: 7,
-          Value: '0',
-        },
-        {
-          Position: 8,
-          Value: '0',
-        },
-        {
-          Position: 9,
-          Value: '0',
-        },
-        {
-          Position: 10,
-          Value: '0',
-        },
-        {
-          Position: 11,
-          Value: '0',
-        },
-        {
-          Position: 12,
-          Value: '0',
-        },
-        {
-          Position: 13,
-          Value: '0',
-        },
-        {
-          Position: 14,
-          Value: '0',
-        },
-        {
-          Position: 15,
-          Value: '0',
-        },
-        {
-          Position: 16,
-          Value: '0',
-        },
-        {
-          Position: 17,
-          Value: '0',
-        },
-        {
-          Position: 18,
-          Value: '0',
-        },
-        {
-          Position: 19,
-          Value: '0',
-        },
-        {
-          Position: 20,
-          Value: '0',
-        },
-        {
-          Position: 21,
-          Value: '0',
-        },
-        {
-          Position: 22,
-          Value: '0',
-        },
-        {
-          Position: 23,
-          Value: '0',
-        },
-        {
-          Position: 24,
-          Value: '0',
-        },
-        {
-          Position: 25,
-          Value: '0',
-        },
-        {
-          Position: 26,
-          Value: '0',
-        },
-        {
-          Position: 27,
-          Value: '0',
-        },
-        {
-          Position: 28,
-          Value: '0',
-        },
-        {
-          Position: 29,
-          Value: '0',
-        },
-        {
-          Position: 30,
-          Value: '0',
-        },
-        {
-          Position: 31,
-          Value: '0',
-        },
-        {
-          Position: 32,
-          Value: '0',
-        },
-        {
-          Position: 33,
-          Value: '0',
-        },
-        {
-          Position: 34,
-          Value: '0',
-        },
-        {
-          Position: 35,
-          Value: '0',
-        },
-        {
-          Position: 36,
-          Value: '0',
-        },
-        {
-          Position: 37,
-          Value: '0',
-        },
-        {
-          Position: 38,
-          Value: '0',
-        },
-        {
-          Position: 39,
-          Value: '0',
-        },
-        {
-          Position: 40,
-          Value: '0',
-        },
-        {
-          Position: 41,
-          Value: '0',
-        },
-        {
-          Position: 42,
-          Value: '0',
-        },
-        {
-          Position: 43,
-          Value: '0',
-        },
-        {
-          Position: 44,
-          Value: '0',
-        },
-        {
-          Position: 45,
-          Value: '0',
-        },
-        {
-          Position: 46,
-          Value: '0',
-        },
-        {
-          Position: 47,
-          Value: '0',
-        },
-        {
-          Position: 48,
-          Value: '0',
-        },
-        {
-          Position: 49,
-          Value: '0',
-        },
-        {
-          Position: 50,
-          Value: '0',
-        },
-        {
-          Position: 51,
-          Value: '0',
-        },
-        {
-          Position: 52,
-          Value: '0',
-        },
-        {
-          Position: 53,
-          Value: '0',
-        },
-        {
-          Position: 54,
-          Value: '0',
-        },
-        {
-          Position: 55,
-          Value: '0',
-        },
-        {
-          Position: 56,
-          Value: '0',
-        },
-        {
-          Position: 57,
-          Value: '0',
-        },
-        {
-          Position: 58,
-          Value: '0',
-        },
-        {
-          Position: 59,
-          Value: '0',
-        },
-        {
-          Position: 60,
-          Value: '0',
-        },
-        {
-          Position: 61,
-          Value: '0',
-        },
-        {
-          Position: 62,
-          Value: '0',
-        },
-        {
-          Position: 63,
-          Value: '0',
-        },
-        {
-          Position: 64,
-          Value: '0',
-        },
-      ],
-      CheckFlags: [
-        {
-          Position: 1,
-          Value: '0',
-        },
-        {
-          Position: 2,
-          Value: '0',
-        },
-        {
-          Position: 3,
-          Value: '0',
-        },
-        {
-          Position: 4,
-          Value: '0',
-        },
-        {
-          Position: 5,
-          Value: '0',
-        },
-        {
-          Position: 6,
-          Value: '0',
-        },
-        {
-          Position: 7,
-          Value: '0',
-        },
-        {
-          Position: 8,
-          Value: '0',
-        },
-        {
-          Position: 9,
-          Value: '0',
-        },
-        {
-          Position: 10,
-          Value: '0',
-        },
-        {
-          Position: 11,
-          Value: '0',
-        },
-        {
-          Position: 12,
-          Value: '0',
-        },
-        {
-          Position: 13,
-          Value: '0',
-        },
-        {
-          Position: 14,
-          Value: '0',
-        },
-        {
-          Position: 15,
-          Value: '0',
-        },
-        {
-          Position: 16,
-          Value: '0',
-        },
-        {
-          Position: 17,
-          Value: '0',
-        },
-        {
-          Position: 18,
-          Value: '0',
-        },
-        {
-          Position: 19,
-          Value: '0',
-        },
-        {
-          Position: 20,
-          Value: '0',
-        },
-        {
-          Position: 21,
-          Value: '0',
-        },
-        {
-          Position: 22,
-          Value: '0',
-        },
-        {
-          Position: 23,
-          Value: '0',
-        },
-        {
-          Position: 24,
-          Value: '0',
-        },
-        {
-          Position: 25,
-          Value: '0',
-        },
-        {
-          Position: 26,
-          Value: '0',
-        },
-        {
-          Position: 27,
-          Value: '0',
-        },
-        {
-          Position: 28,
-          Value: '0',
-        },
-        {
-          Position: 29,
-          Value: '0',
-        },
-        {
-          Position: 30,
-          Value: '0',
-        },
-        {
-          Position: 31,
-          Value: '0',
-        },
-        {
-          Position: 32,
-          Value: '0',
-        },
-        {
-          Position: 33,
-          Value: '0',
-        },
-        {
-          Position: 34,
-          Value: '0',
-        },
-        {
-          Position: 35,
-          Value: '0',
-        },
-        {
-          Position: 36,
-          Value: '0',
-        },
-        {
-          Position: 37,
-          Value: '0',
-        },
-        {
-          Position: 38,
-          Value: '0',
-        },
-        {
-          Position: 39,
-          Value: '0',
-        },
-        {
-          Position: 40,
-          Value: '0',
-        },
-        {
-          Position: 41,
-          Value: '0',
-        },
-        {
-          Position: 42,
-          Value: '0',
-        },
-        {
-          Position: 43,
-          Value: '0',
-        },
-        {
-          Position: 44,
-          Value: '0',
-        },
-        {
-          Position: 45,
-          Value: '0',
-        },
-        {
-          Position: 46,
-          Value: '0',
-        },
-        {
-          Position: 47,
-          Value: '0',
-        },
-        {
-          Position: 48,
-          Value: '0',
-        },
-        {
-          Position: 49,
-          Value: '0',
-        },
-        {
-          Position: 50,
-          Value: '0',
-        },
-        {
-          Position: 51,
-          Value: '0',
-        },
-        {
-          Position: 52,
-          Value: '0',
-        },
-        {
-          Position: 53,
-          Value: '0',
-        },
-        {
-          Position: 54,
-          Value: '0',
-        },
-        {
-          Position: 55,
-          Value: '0',
-        },
-        {
-          Position: 56,
-          Value: '0',
-        },
-        {
-          Position: 57,
-          Value: '0',
-        },
-        {
-          Position: 58,
-          Value: '0',
-        },
-        {
-          Position: 59,
-          Value: '0',
-        },
-        {
-          Position: 60,
-          Value: '0',
-        },
-        {
-          Position: 61,
-          Value: '0',
-        },
-        {
-          Position: 62,
-          Value: '0',
-        },
-        {
-          Position: 63,
-          Value: '0',
-        },
-        {
-          Position: 64,
-          Value: '0',
-        },
-      ],
-      Maker: null,
-      Checker: null,
-      ReferredTo: null,
-      ReferralReason: null,
-      UserData1: null,
-      UserData2: null,
-      UserData3: null,
-      UserData4: null,
-      UserData5: null,
-      AdditionalFields: [],
-    },
-    ApplicationStatusDetails: {
-      StatusCode: '04',
-      Description: 'Approved',
-      Canceled: false,
-    },
-    CorporateDetails: null,
-    CustomerDetails: {
-      Id: 115158,
-      CustomerCode: '100000024619',
-      IdNumber: ' ',
-      TypeId: 0,
-      PreferredLanguage: 'EN',
-      ExternalCustomerCode: null,
-      Title: ' ',
-      FirstName: ' ',
-      LastName: ' ',
-      DateOfBirth: null,
-      UserData1: '2031-09-17',
-      UserData2: '01',
-      UserData3: null,
-      UserData4: '682',
-      CustomerSegment: null,
-      Gender: 'U',
-      Married: 'U',
-    },
-    AccountDetailsList: [
-      {
-        Id: getRandomWithDigits(5),
-        InstitutionCode: '1100',
-        AccountNumber: getRandomWithDigits(16),
-        Currency: {
-          CurrCode: '682',
-          AlphaCode: 'SAR',
-        },
-        AccountTypeCode: '30',
-        ClassId: '2',
-        AccountStatus: '00',
-        VipFlag: '0',
-        BlockedAmount: 0,
-        EquivalentBlockedAmount: null,
-        UnclearCredit: 0,
-        EquivalentUnclearCredit: null,
-        AvailableBalance: 0,
-        EquivalentAvailableBalance: null,
-        AvailableBalanceToSpend: 0,
-        CreditLimit: 0,
-        RemainingCashLimit: null,
-        UserData1: 'D36407C9AE4C28D2185',
-        UserData2: null,
-        UserData3: 'D36407C9AE4C28D2185',
-        UserData4: null,
-        UserData5: 'SA2380900000752991120011',
-      },
-    ],
-    CardDetailsList: [
-      {
-        pvv: null,
-        ResponseCardIdentifier: {
-          Id: getRandomWithDigits(5),
-          Pan: 'DDDDDDDDDDDDDDDDDDD',
-          MaskedPan: '999999_9999',
-          VPan: getRandomWithDigits(16),
-          Seqno: 0,
-        },
-        ExpiryDate: '2031-09-30',
-        EffectiveDate: '2025-06-02',
-        CardStatus: '30',
-        OldPlasticExpiryDate: null,
-        OldPlasticCardStatus: null,
-        EmbossingName: 'ABDALHAMID AHMAD',
         Title: 'Mr.',
         FirstName: 'Abdalhamid',
+        SecondName: null,
+        ThirdName: null,
         LastName: ' Ahmad',
-        Additional: false,
+        FullName: 'Abdalhamid Ahmad',
-        BatchNumber: 8849,
+        EmbossName: 'ABDALHAMID AHMAD',
-        ServiceCode: '226',
+        PlaceOfBirth: null,
-        Kinship: null,
         DateOfBirth: '1999-01-07',
-        LastActivity: null,
+        LocalizedDateOfBirth: '1999-01-07',
-        LastStatusChangeDate: '2025-06-03',
+        Age: 26,
-        ActivationDate: null,
+        Gender: 'M',
-        DateLastIssued: null,
+        Married: 'U',
-        PVV: null,
+        Nationality: '682',
-        UserData: '4',
+        IdType: '01',
-        UserData1: '3',
+        IdNumber: '1089055972',
-        UserData2: null,
+        IdExpiryDate: '2031-09-17',
-        UserData3: null,
+        EducationLevel: null,
-        UserData4: null,
+        ProfessionCode: 0,
-        UserData5: null,
+        NumberOfDependents: 0,
-        Memo: null,
+        EmployerName: 'N/A',
-        CardAuthorizationParameters: null,
+        EmploymentYears: 0,
-        L10NTitle: null,
+        EmploymentMonths: 0,
-        L10NFirstName: null,
+        CIF: null,
-        L10NLastName: null,
+        BankAccountNumber: ' ',
-        PinStatus: '40',
+        Currency: { CurrCode: '682', AlphaCode: 'SAR' },
-        OldPinStatus: '0',
+        CreditAccountNumber: '6000000000000000',
-        CustomerIdNumber: '1089055972',
+        AccountType: '30',
-        Language: 0,
+        Income: 0,
+        AdditionalIncome: 0,
+        TotalIncome: 0,
+        CurrentBalance: 0,
+        AverageBalance: 0,
+        AssetsBalance: 0,
+        InsuranceBalance: 0,
+        DepositAmount: 0,
+        GuarenteeAccountNumber: null,
+        GuarenteeAmount: 0,
+        InstalmentAmount: 0,
+        AutoDebit: 'N',
+        PaymentMethod: '2',
+        BillingCycle: 'C1',
+        MaximumDelinquency: null,
+        CreditBureauDecision: null,
+        ECommerce: 'N',
+        NumberOfCards: 0,
+        SocialCode: '000',
+        JobGrade: 0,
+        Flags: Array.from({ length: 64 }, (_, i) => ({
+          Position: i + 1,
+          Value: '0',
+        })),
+        CheckFlags: Array.from({ length: 64 }, (_, i) => ({
+          Position: i + 1,
+          Value: '0',
+        })),
       },
-    ],
+
-  },
+      ApplicationStatusDetails: {
-};
+        StatusCode: '04',
+        Description: 'Approved',
+        Canceled: false,
+      },
+
+      CustomerDetails: {
+        Id: 115158,
+        CustomerCode: '100000024619',
+        IdNumber: ' ',
+        TypeId: 0,
+        PreferredLanguage: 'EN',
+        ExternalCustomerCode: null,
+        Title: ' ',
+        FirstName: ' ',
+        LastName: ' ',
+        DateOfBirth: null,
+        UserData1: '2031-09-17',
+        UserData2: '01',
+        UserData3: null,
+        UserData4: '682',
+        CustomerSegment: null,
+        Gender: 'U',
+        Married: 'U',
+      },
+
+      AccountDetailsList: [
+        {
+          Id: randomDigits(5),
+          InstitutionCode: '1100',
+          AccountNumber: randomDigits(16),
+          Currency: { CurrCode: '682', AlphaCode: 'SAR' },
+          AccountTypeCode: '30',
+          ClassId: '2',
+          AccountStatus: '00',
+          VipFlag: '0',
+          BlockedAmount: 0,
+          AvailableBalance: 0,
+          UserData1: 'D36407C9AE4C28D2185',
+          UserData3: 'D36407C9AE4C28D2185',
+          UserData5: `SA${randomDigits(22)}`,
+        },
+      ],
+
+      CardDetailsList: [
+        {
+          pvv: null,
+          ResponseCardIdentifier: {
+            Id: randomDigits(5),
+            Pan: 'DDDDDDDDDDDDDDDDDDD',
+            MaskedPan: '999999_9999',
+            VPan: randomDigits(16),
+            Seqno: 0,
+          },
+          ExpiryDate: '2031-09-30',
+          EffectiveDate: '2025-06-02',
+          CardStatus: '30',
+          EmbossingName: 'ABDALHAMID AHMAD',
+          Title: 'Mr.',
+          FirstName: 'Abdalhamid',
+          LastName: ' Ahmad',
+          BatchNumber: 8849,
+          ServiceCode: '226',
+          DateOfBirth: '1999-01-07',
+          LastStatusChangeDate: '2025-06-03',
+          PinStatus: '40',
+          OldPinStatus: '0',
+          CustomerIdNumber: '1089055972',
+          Language: 0,
+        },
+      ],
+    },
+  };
+}

src/common/modules/neoleap/services/neoleap.service.ts

@@ -10,8 +10,8 @@ import { InitiateKycRequestDto } from '~/customer/dtos/request';
 import { Customer } from '~/customer/entities';
 import { Gender } from '~/customer/enums';
 import {
+  buildCreateApplicationMock,
   CARD_EMBOSSING_DETAILS_MOCK,
-  CREATE_APPLICATION_MOCK,
   INITIATE_KYC_MOCK,
   INQUIRE_APPLICATION_MOCK,
 } from '../__mocks__/';
@@ -95,7 +95,7 @@ export class NeoLeapService {
     const responseKey = 'CreateNewApplicationResponseDetails';
 
     if (!this.useGateway) {
-      return plainToInstance(CreateApplicationResponse, CREATE_APPLICATION_MOCK[responseKey], {
+      return plainToInstance(CreateApplicationResponse, buildCreateApplicationMock()[responseKey], {
         excludeExtraneousValues: true,
       });
     }
@@ -169,7 +169,7 @@ export class NeoLeapService {
     const responseKey = 'CreateNewApplicationResponseDetails';
 
     if (!this.useGateway) {
-      return plainToInstance(CreateApplicationResponse, CREATE_APPLICATION_MOCK[responseKey], {
+      return plainToInstance(CreateApplicationResponse, buildCreateApplicationMock()[responseKey], {
         excludeExtraneousValues: true,
       });
     }

src/core/utils/index.ts

@@ -1,3 +1,4 @@
-export * from './response.factory.util';
-export * from './i18n-context-wrapper.util';
 export * from './class-validator-formatter.util';
+export * from './i18n-context-wrapper.util';
+export * from './patch.util';
+export * from './response.factory.util';

src/core/utils/patch.util.ts

@@ -0,0 +1,3 @@
+export const setIf = <T, K extends keyof T>(obj: T, key: K, val: T[K] | undefined) => {
+  if (typeof val !== 'undefined') obj[key] = val as T[K];
+};

src/customer/entities/customer.entity.ts

@@ -15,7 +15,7 @@ import { CountryIso } from '~/common/enums';
 import { Guardian } from '~/guardian/entities/guradian.entity';
 import { Junior } from '~/junior/entities';
 import { User } from '~/user/entities';
-import { CustomerStatus, KycStatus } from '../enums';
+import { CustomerStatus, Gender, KycStatus } from '../enums';
 
 @Entity('customers')
 export class Customer extends BaseEntity {
@@ -62,7 +62,7 @@ export class Customer extends BaseEntity {
   isPep!: boolean;
 
   @Column('varchar', { length: 255, nullable: true, name: 'gender' })
-  gender!: string;
+  gender!: Gender;
 
   @Column('boolean', { default: false, name: 'is_junior' })
   isJunior!: boolean;

src/i18n/ar/app.json

@@ -67,7 +67,8 @@
     "NOT_FOUND": "لم يتم العثور على الطفل.",
     "CIVIL_ID_REQUIRED": "مطلوب بطاقة الهوية المدنية.",
     "CIVIL_ID_NOT_CREATED_BY_GUARDIAN": "تم تحميل بطاقة الهوية المدنية من قبل شخص آخر غير ولي الأمر.",
-    "CIVIL_ID_ALREADY_EXISTS": "بطاقة الهوية المدنية مستخدمة بالفعل من قبل طفل آخر."
+    "CIVIL_ID_ALREADY_EXISTS": "بطاقة الهوية المدنية مستخدمة بالفعل من قبل طفل آخر.",
+    "CANNOT_UPDATE_REGISTERED_USER": "الطفل قد سجل بالفعل. لا يُسمح بتحديث البيانات."
   },
 
   "MONEY_REQUEST": {
@@ -102,5 +103,8 @@
   },
   "OTP": {
     "INVALID_OTP": "رمز التحقق الذي أدخلته غير صالح. يرجى المحاولة مرة أخرى."
+  }, 
+   "CARD": {
+    "INSUFFICIENT_BALANCE": "البطاقة لا تحتوي على رصيد كافٍ لإكمال هذا التحويل."
   }
 }

src/i18n/en/app.json

@@ -66,7 +66,8 @@
     "NOT_FOUND": "The junior was not found.",
     "CIVIL_ID_REQUIRED": "Civil ID is required.",
     "CIVIL_ID_NOT_CREATED_BY_GUARDIAN": "The civil ID document was not uploaded by the guardian.",
-    "CIVIL_ID_ALREADY_EXISTS": "The civil ID is already used by another junior."
+    "CIVIL_ID_ALREADY_EXISTS": "The civil ID is already used by another junior.",
+    "CANNOT_UPDATE_REGISTERED_USER": "The junior has already registered. Updating details is not allowed."
   },
 
   "MONEY_REQUEST": {
@@ -101,5 +102,8 @@
   },
   "OTP": {
     "INVALID_OTP": "The OTP you entered is invalid. Please try again."
+  },
+  "CARD": {
+    "INSUFFICIENT_BALANCE": "The card does not have sufficient balance to complete this transfer."
   }
 }

src/junior/controllers/junior.controller.ts

@@ -1,4 +1,4 @@
-import { Body, Controller, Get, Param, Post, Query, UseGuards } from '@nestjs/common';
+import { Body, Controller, Get, Param, Patch, Post, Query, UseGuards } from '@nestjs/common';
 import { ApiBearerAuth, ApiTags } from '@nestjs/swagger';
 import { Roles } from '~/auth/enums';
 import { IJwtPayload } from '~/auth/interfaces';
@@ -8,8 +8,18 @@ import { ApiDataPageResponse, ApiDataResponse, ApiLangRequestHeader } from '~/co
 import { PageOptionsRequestDto } from '~/core/dtos';
 import { CustomParseUUIDPipe } from '~/core/pipes';
 import { ResponseFactory } from '~/core/utils';
-import { CreateJuniorRequestDto, SetThemeRequestDto } from '../dtos/request';
+import {
-import { JuniorResponseDto, QrCodeValidationResponseDto, ThemeResponseDto } from '../dtos/response';
+  CreateJuniorRequestDto,
+  SetThemeRequestDto,
+  TransferToJuniorRequestDto,
+  UpdateJuniorRequestDto,
+} from '../dtos/request';
+import {
+  JuniorResponseDto,
+  QrCodeValidationResponseDto,
+  ThemeResponseDto,
+  TransferToJuniorResponseDto,
+} from '../dtos/response';
 import { JuniorService } from '../services';
 
 @Controller('juniors')
@@ -59,6 +69,20 @@ export class JuniorController {
     return ResponseFactory.data(new JuniorResponseDto(junior));
   }
 
+  @Patch(':juniorId')
+  @UseGuards(RolesGuard)
+  @AllowedRoles(Roles.GUARDIAN)
+  @ApiDataResponse(JuniorResponseDto)
+  async updateJunior(
+    @AuthenticatedUser() user: IJwtPayload,
+    @Param('juniorId', CustomParseUUIDPipe) juniorId: string,
+    @Body() body: UpdateJuniorRequestDto,
+  ) {
+    const junior = await this.juniorService.updateJunior(juniorId, body, user.sub);
+
+    return ResponseFactory.data(new JuniorResponseDto(junior));
+  }
+
   @Post('set-theme')
   @UseGuards(RolesGuard)
   @AllowedRoles(Roles.JUNIOR)
@@ -86,4 +110,18 @@ export class JuniorController {
 
     return ResponseFactory.data(new QrCodeValidationResponseDto(junior));
   }
+
+  @Post(':juniorId/transfer')
+  @UseGuards(RolesGuard)
+  @AllowedRoles(Roles.GUARDIAN)
+  @ApiDataResponse(TransferToJuniorResponseDto)
+  async transferToJunior(
+    @AuthenticatedUser() user: IJwtPayload,
+    @Param('juniorId', CustomParseUUIDPipe) juniorId: string,
+    @Body() body: TransferToJuniorRequestDto,
+  ) {
+    const newAmount = await this.juniorService.transferToJunior(juniorId, body, user.sub);
+
+    return ResponseFactory.data(new TransferToJuniorResponseDto(newAmount));
+  }
 }

src/junior/dtos/request/index.ts

@@ -1,2 +1,4 @@
 export * from './create-junior.request.dto';
 export * from './set-theme.request.dto';
+export * from './transfer-to-junior.request.dto';
+export * from './update-junior.request.dto';

src/junior/dtos/request/transfer-to-junior.request.dto.ts

@@ -0,0 +1,12 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { IsNumber } from 'class-validator';
+import { i18nValidationMessage as i18n } from 'nestjs-i18n';
+
+export class TransferToJuniorRequestDto {
+  @ApiProperty({ example: 300.42 })
+  @IsNumber(
+    { maxDecimalPlaces: 3 },
+    { message: i18n('validation.IsNumber', { path: 'general', property: 'transferToJunior.amount' }) },
+  )
+  amount!: number;
+}

src/junior/dtos/request/update-junior.request.dto.ts

@@ -0,0 +1,5 @@
+import { OmitType, PartialType } from '@nestjs/swagger';
+import { CreateJuniorRequestDto } from './create-junior.request.dto';
+
+const omitted = OmitType(CreateJuniorRequestDto, ['cardColor', 'cardPin']);
+export class UpdateJuniorRequestDto extends PartialType(omitted) {}

src/junior/dtos/response/index.ts

@@ -2,3 +2,4 @@ export * from './junior.response.dto';
 export * from './qr-code-validation-details.response.dto';
 export * from './qr-code-validation.response.dto';
 export * from './theme.response.dto';
+export * from './transfer-to-junior.response.dto';

src/junior/dtos/response/junior.response.dto.ts

@@ -1,7 +1,8 @@
 import { ApiProperty } from '@nestjs/swagger';
+import { Gender } from '~/customer/enums';
 import { DocumentMetaResponseDto } from '~/document/dtos/response';
 import { Junior } from '~/junior/entities';
-import { Relationship } from '~/junior/enums';
+import { GuardianRelationship, Relationship } from '~/junior/enums';
 
 export class JuniorResponseDto {
   @ApiProperty({ example: 'id' })
@@ -16,9 +17,18 @@ export class JuniorResponseDto {
   @ApiProperty({ example: 'test@junior.com' })
   email!: string;
 
+  @ApiProperty({ example: Gender.MALE })
+  gender!: Gender;
+
+  @ApiProperty({ example: '2000-01-01' })
+  dateOfBirth!: Date;
+
   @ApiProperty({ enum: Relationship })
   relationship!: Relationship;
 
+  @ApiProperty({ enum: GuardianRelationship })
+  guardianRelationship!: GuardianRelationship;
+
   @ApiProperty({ type: DocumentMetaResponseDto })
   profilePicture!: DocumentMetaResponseDto | null;
 
@@ -27,7 +37,10 @@ export class JuniorResponseDto {
     this.firstName = junior.customer.firstName;
     this.lastName = junior.customer.lastName;
     this.email = junior.customer.user.email;
+    this.gender = junior.customer.gender;
+    this.dateOfBirth = junior.customer.dateOfBirth;
     this.relationship = junior.relationship;
+    this.guardianRelationship = GuardianRelationship[junior.relationship];
     this.profilePicture = junior.customer.user.profilePicture
       ? new DocumentMetaResponseDto(junior.customer.user.profilePicture)
       : null;

src/junior/dtos/response/transfer-to-junior.response.dto.ts

@@ -0,0 +1,10 @@
+import { ApiProperty } from '@nestjs/swagger';
+
+export class TransferToJuniorResponseDto {
+  @ApiProperty({ example: 300.42 })
+  newAmount!: number;
+
+  constructor(newAmount: number) {
+    this.newAmount = newAmount;
+  }
+}

src/junior/services/junior.service.ts

@@ -4,12 +4,18 @@ import { Roles } from '~/auth/enums';
 import { CardService } from '~/card/services';
 import { NeoLeapService } from '~/common/modules/neoleap/services';
 import { PageOptionsRequestDto } from '~/core/dtos';
+import { setIf } from '~/core/utils';
 import { CustomerService } from '~/customer/services';
 import { DocumentService, OciService } from '~/document/services';
 import { UserType } from '~/user/enums';
 import { UserService } from '~/user/services';
 import { UserTokenService } from '~/user/services/user-token.service';
-import { CreateJuniorRequestDto, SetThemeRequestDto } from '../dtos/request';
+import {
+  CreateJuniorRequestDto,
+  SetThemeRequestDto,
+  TransferToJuniorRequestDto,
+  UpdateJuniorRequestDto,
+} from '../dtos/request';
 import { Junior } from '../entities';
 import { JuniorRepository } from '../repositories';
 import { QrcodeService } from './qrcode.service';
@@ -85,6 +91,39 @@ export class JuniorService {
     return junior;
   }
 
+  async updateJunior(juniorId: string, body: UpdateJuniorRequestDto, guardianId: string) {
+    this.logger.log(`Updating junior ${juniorId}`);
+    const junior = await this.findJuniorById(juniorId, false, guardianId);
+    const customer = junior.customer;
+    const user = customer.user;
+
+    if (user.password) {
+      this.logger.error(`Cannot update junior ${juniorId} with registered user`);
+      throw new BadRequestException('JUNIOR.CANNOT_UPDATE_REGISTERED_USER');
+    }
+
+    if (body.email) {
+      const existingUser = await this.userService.findUser({ email: body.email });
+      if (existingUser && existingUser.id !== junior.customer.user.id) {
+        this.logger.error(`User with email ${body.email} already exists`);
+        throw new BadRequestException('USER.ALREADY_EXISTS');
+      }
+      junior.customer.user.email = body.email;
+    }
+    setIf(user, 'profilePictureId', body.profilePictureId);
+    setIf(user, 'firstName', body.firstName);
+    setIf(user, 'lastName', body.lastName);
+
+    setIf(customer, 'firstName', body.firstName);
+    setIf(customer, 'lastName', body.lastName);
+    setIf(customer, 'dateOfBirth', body.dateOfBirth as unknown as Date);
+
+    setIf(junior, 'relationship', body.relationship);
+    await Promise.all([junior.save(), customer.save(), user.save()]);
+    this.logger.log(`Junior ${juniorId} updated successfully`);
+    return junior;
+  }
+
   @Transactional()
   async setTheme(body: SetThemeRequestDto, juniorId: string) {
     this.logger.log(`Setting theme for junior ${juniorId}`);
@@ -133,6 +172,17 @@ export class JuniorService {
     return !!junior;
   }
 
+  async transferToJunior(juniorId: string, body: TransferToJuniorRequestDto, guardianId: string) {
+    const doesBelong = await this.doesJuniorBelongToGuardian(guardianId, juniorId);
+
+    if (!doesBelong) {
+      this.logger.error(`Junior ${juniorId} does not belong to guardian ${guardianId}`);
+      throw new BadRequestException('JUNIOR.NOT_BELONG_TO_GUARDIAN');
+    }
+
+    return this.cardService.transferToChild(juniorId, body.amount);
+  }
+
   private async prepareJuniorImages(juniors: Junior[]) {
     this.logger.log(`Preparing junior images`);
     await Promise.all(