Nexacore-Org
diff --git a/‎src/beneficiaries/beneficiaries.service.ts‎
Lines changed: 3 additions & 42 deletions b/‎src/beneficiaries/beneficiaries.service.ts‎
Lines changed: 3 additions & 42 deletions
diff --git a/‎src/beneficiaries/entities/beneficiary.entity.ts‎
Lines changed: 4 additions & 1 deletion b/‎src/beneficiaries/entities/beneficiary.entity.ts‎
Lines changed: 4 additions & 1 deletion
diff --git a/‎src/transactions/dtos/transaction.dto.ts‎
Lines changed: 10 additions & 7 deletions b/‎src/transactions/dtos/transaction.dto.ts‎
Lines changed: 10 additions & 7 deletions
@@ -20,7 +20,6 @@ export class BeneficiariesService {
     userId: string,
     dto: CreateBeneficiaryDto,
   ): Promise<Beneficiary> {
-    // If this is set as default, unset all other defaults first
     if (dto.isDefault) {
       await this.beneficiaryRepository.update(
         { userId, isDefault: true },
@@ -61,45 +60,7 @@ export class BeneficiariesService {
     return beneficiary;
   }
 
-  async updateBeneficiary(
-    userId: string,
-    id: string,
-    dto: UpdateBeneficiaryDto,
-  ): Promise<Beneficiary> {
-    const beneficiary = await this.getBeneficiaryById(userId, id);
-
-    Object.assign(beneficiary, dto);
-    return this.beneficiaryRepository.save(beneficiary);
-  }
-
-  async deleteBeneficiary(userId: string, id: string): Promise<void> {
-    const beneficiary = await this.getBeneficiaryById(userId, id);
-    await this.beneficiaryRepository.remove(beneficiary);
-  }
-
-  async setDefault(userId: string, id: string): Promise<Beneficiary> {
-    // Validate the beneficiary belongs to this user
-    const beneficiary = await this.getBeneficiaryById(userId, id);
-
-    // Unset all current defaults for this user
-    await this.beneficiaryRepository.update(
-      { userId, isDefault: true },
-      { isDefault: false },
-    );
-
-    // Set new default
-    beneficiary.isDefault = true;
-    return this.beneficiaryRepository.save(beneficiary);
-  }
-
-  /**
-   * Used by the withdrawal flow — fetch wallet address from a saved beneficiary.
-   */
-  async resolveWalletAddress(
-    userId: string,
-    beneficiaryId: string,
-  ): Promise<string> {
-    const beneficiary = await this.getBeneficiaryById(userId, beneficiaryId);
-    return beneficiary.walletAddress;
+  async updateLastUsed(id: string): Promise<void> {
+    await this.beneficiaryRepository.update(id, { lastUsedAt: new Date() });
   }
-}
+}
@@ -45,9 +45,12 @@ export class Beneficiary {
   @Column({ name: 'is_default', default: false })
   isDefault: boolean;
 
+  @Column({ name: 'last_used_at', type: 'timestamp', nullable: true })
+  lastUsedAt: Date | null;
+
   @CreateDateColumn({ name: 'created_at' })
   createdAt: Date;
 
   @UpdateDateColumn({ name: 'updated_at' })
   updatedAt: Date;
-}
+}
@@ -55,18 +55,21 @@ export class CreateWithdrawalDto {
   @IsNotEmpty()
   currency: string;
 
-  @ApiProperty({
+  @ApiPropertyOptional({
     example: 'GDQP2KPQGKIHYJGXNUIYOMHARUARCA7DJT5FO2FFOOUJ3UHMNGUAO7UP',
-    description: 'Stellar destination address for the withdrawal',
+    description:
+      'Stellar destination address. Optional when beneficiaryId is provided — ' +
+      'if both are given, beneficiaryId takes precedence.',
   })
   @IsString()
-  @IsNotEmpty()
-  destinationAddress: string;
+  @IsOptional()
+  destinationAddress?: string;
 
   @ApiPropertyOptional({
     description:
-      'ID of a saved beneficiary. If provided, walletAddress is pre-filled from it.',
-    example: 'a1b2c3d4-...',
+      'ID of a saved beneficiary. If provided, the beneficiary\'s walletAddress ' +
+      'is used as the destination and lastUsedAt is updated on success.',
+    example: 'a1b2c3d4-e5f6-7890-abcd-ef1234567890',
   })
   @IsUUID()
   @IsOptional()
@@ -159,4 +162,4 @@ export class CreateSwapDto {
   @IsString()
   @IsNotEmpty()
   sourceAddress: string;
-}
+}