restucturization of recipients payment methods

frontend/pshared/lib/data/dto/payment/card.dart

@@ -0,0 +1,20 @@
+import 'package:json_annotation/json_annotation.dart';
+
+part 'card.g.dart';
+
+
+@JsonSerializable()
+class CardPaymentDataDTO {
+  final String pan;
+  final String firstName;
+  final String lastName;
+
+  const CardPaymentDataDTO({
+    required this.pan,
+    required this.firstName,
+    required this.lastName,
+  });
+
+  factory CardPaymentDataDTO.fromJson(Map<String, dynamic> json) => _$CardPaymentDataDTOFromJson(json);
+  Map<String, dynamic> toJson() => _$CardPaymentDataDTOToJson(this);
+}

frontend/pshared/lib/data/dto/payment/crypto_address.dart

@@ -0,0 +1,20 @@
+import 'package:json_annotation/json_annotation.dart';
+
+part 'crypto_address.g.dart';
+
+
+@JsonSerializable()
+class CryptoAddressPaymentDataDTO {
+  final String address;
+  final String network;
+  final String? destinationTag;
+
+  const CryptoAddressPaymentDataDTO({
+    required this.address,
+    required this.network,
+    this.destinationTag,
+  });
+
+  factory CryptoAddressPaymentDataDTO.fromJson(Map<String, dynamic> json) => _$CryptoAddressPaymentDataDTOFromJson(json);
+  Map<String, dynamic> toJson() => _$CryptoAddressPaymentDataDTOToJson(this);
+}

frontend/pshared/lib/data/dto/payment/iban.dart

@@ -0,0 +1,22 @@
+import 'package:json_annotation/json_annotation.dart';
+
+part 'iban.g.dart';
+
+
+@JsonSerializable()
+class IbanPaymentDataDTO {
+  final String iban;
+  final String accountHolder;
+  final String? bic;
+  final String? bankName;
+
+  const IbanPaymentDataDTO({
+    required this.iban,
+    required this.accountHolder,
+    this.bic,
+    this.bankName,
+  });
+
+  factory IbanPaymentDataDTO.fromJson(Map<String, dynamic> json) => _$IbanPaymentDataDTOFromJson(json);
+  Map<String, dynamic> toJson() => _$IbanPaymentDataDTOToJson(this);
+}

frontend/pshared/lib/data/dto/payment/method.dart

@@ -0,0 +1,33 @@
+import 'package:json_annotation/json_annotation.dart';
+
+import 'package:pshared/data/dto/date_time.dart';
+import 'package:pshared/data/dto/permissions/bound.dart';
+
+part 'method.g.dart';
+
+
+@JsonSerializable()
+class PaymentMethodDTO extends PermissionBoundDTO {
+  final String recipientRef;
+  final String type;
+  final Map<String, dynamic> data;
+
+  @JsonKey(defaultValue: false)
+  final bool isArchived;
+
+  const PaymentMethodDTO({
+    required super.id,
+    required super.createdAt,
+    required super.updatedAt,
+    required super.permissionRef,
+    required super.organizationRef,
+    required this.recipientRef,
+    required this.type,
+    required this.data,
+    this.isArchived = false,
+  });
+
+  factory PaymentMethodDTO.fromJson(Map<String, dynamic> json) => _$PaymentMethodDTOFromJson(json);
+  @override
+  Map<String, dynamic> toJson() => _$PaymentMethodDTOToJson(this);
+}

frontend/pshared/lib/data/dto/payment/russian_bank.dart

@@ -0,0 +1,28 @@
+import 'package:json_annotation/json_annotation.dart';
+
+part 'russian_bank.g.dart';
+
+
+@JsonSerializable()
+class RussianBankAccountPaymentDataDTO {
+  final String recipientName;
+  final String inn;
+  final String kpp;
+  final String bankName;
+  final String bik;
+  final String accountNumber;
+  final String correspondentAccount;
+
+  const RussianBankAccountPaymentDataDTO({
+    required this.recipientName,
+    required this.inn,
+    required this.kpp,
+    required this.bankName,
+    required this.bik,
+    required this.accountNumber,
+    required this.correspondentAccount,
+  });
+
+  factory RussianBankAccountPaymentDataDTO.fromJson(Map<String, dynamic> json) => _$RussianBankAccountPaymentDataDTOFromJson(json);
+  Map<String, dynamic> toJson() => _$RussianBankAccountPaymentDataDTOToJson(this);
+}

frontend/pshared/lib/data/dto/payment/wallet.dart

@@ -0,0 +1,16 @@
+import 'package:json_annotation/json_annotation.dart';
+
+part 'wallet.g.dart';
+
+
+@JsonSerializable()
+class WalletPaymentDataDTO {
+  final String walletId;
+
+  const WalletPaymentDataDTO({
+    required this.walletId,
+  });
+
+  factory WalletPaymentDataDTO.fromJson(Map<String, dynamic> json) => _$WalletPaymentDataDTOFromJson(json);
+  Map<String, dynamic> toJson() => _$WalletPaymentDataDTOToJson(this);
+}

frontend/pshared/lib/data/dto/recipient/recipient.dart

@@ -0,0 +1,39 @@
+import 'package:json_annotation/json_annotation.dart';
+
+import 'package:pshared/data/dto/date_time.dart';
+import 'package:pshared/data/dto/permissions/bound.dart';
+
+part 'recipient.g.dart';
+
+
+@JsonSerializable()
+class RecipientDTO extends PermissionBoundDTO {
+  final String name;
+  final String? description;
+  final String email;
+  final String? avatarUrl;
+  final String status;
+  final String type;
+
+  @JsonKey(defaultValue: false)
+  final bool isArchived;
+
+  const RecipientDTO({
+    required super.id,
+    required super.createdAt,
+    required super.updatedAt,
+    required super.permissionRef,
+    required super.organizationRef,
+    required this.name,
+    required this.email,
+    required this.status,
+    required this.type,
+    this.description,
+    this.avatarUrl,
+    this.isArchived = false,
+  });
+
+  factory RecipientDTO.fromJson(Map<String, dynamic> json) => _$RecipientDTOFromJson(json);
+  @override
+  Map<String, dynamic> toJson() => _$RecipientDTOToJson(this);
+}

frontend/pshared/lib/data/mapper/payment/card.dart

@@ -0,0 +1,19 @@
+import 'package:pshared/data/dto/payment/card.dart';
+import 'package:pshared/models/payment/methods/card.dart';
+
+
+extension CardPaymentMethodMapper on CardPaymentMethod {
+  CardPaymentDataDTO toDTO() => CardPaymentDataDTO(
+    pan: pan,
+    firstName: firstName,
+    lastName: lastName,
+  );
+}
+
+extension CardPaymentDataDTOMapper on CardPaymentDataDTO {
+  CardPaymentMethod toDomain() => CardPaymentMethod(
+    pan: pan,
+    firstName: firstName,
+    lastName: lastName,
+  );
+}

frontend/pshared/lib/data/mapper/payment/crypto_address.dart

@@ -0,0 +1,19 @@
+import 'package:pshared/data/dto/payment/crypto_address.dart';
+import 'package:pshared/models/payment/methods/crypto_address.dart';
+
+
+extension CryptoAddressPaymentMethodMapper on CryptoAddressPaymentMethod {
+  CryptoAddressPaymentDataDTO toDTO() => CryptoAddressPaymentDataDTO(
+    address: address,
+    network: network,
+    destinationTag: destinationTag,
+  );
+}
+
+extension CryptoAddressPaymentDataDTOMapper on CryptoAddressPaymentDataDTO {
+  CryptoAddressPaymentMethod toDomain() => CryptoAddressPaymentMethod(
+    address: address,
+    network: network,
+    destinationTag: destinationTag,
+  );
+}

frontend/pshared/lib/data/mapper/payment/iban.dart

@@ -0,0 +1,21 @@
+import 'package:pshared/data/dto/payment/iban.dart';
+import 'package:pshared/models/payment/methods/iban.dart';
+
+
+extension IbanPaymentMethodMapper on IbanPaymentMethod {
+  IbanPaymentDataDTO toDTO() => IbanPaymentDataDTO(
+    iban: iban,
+    accountHolder: accountHolder,
+    bic: bic,
+    bankName: bankName,
+  );
+}
+
+extension IbanPaymentDataDTOMapper on IbanPaymentDataDTO {
+  IbanPaymentMethod toDomain() => IbanPaymentMethod(
+    iban: iban,
+    accountHolder: accountHolder,
+    bic: bic,
+    bankName: bankName,
+  );
+}

frontend/pshared/lib/data/mapper/payment/method.dart

@@ -0,0 +1,81 @@
+import 'package:pshared/data/dto/payment/card.dart';
+import 'package:pshared/data/dto/payment/crypto_address.dart';
+import 'package:pshared/data/dto/payment/iban.dart';
+import 'package:pshared/data/dto/payment/method.dart';
+import 'package:pshared/data/dto/payment/russian_bank.dart';
+import 'package:pshared/data/dto/payment/wallet.dart';
+import 'package:pshared/data/mapper/payment/crypto_address.dart';
+import 'package:pshared/data/mapper/payment/card.dart';
+import 'package:pshared/data/mapper/payment/iban.dart';
+import 'package:pshared/data/mapper/payment/russian_bank.dart';
+import 'package:pshared/data/mapper/payment/type.dart';
+import 'package:pshared/data/mapper/payment/wallet.dart';
+import 'package:pshared/models/organization/bound.dart';
+import 'package:pshared/models/payment/methods/card.dart';
+import 'package:pshared/models/payment/methods/crypto_address.dart';
+import 'package:pshared/models/payment/methods/data.dart';
+import 'package:pshared/models/payment/methods/iban.dart';
+import 'package:pshared/models/payment/methods/russian_bank.dart';
+import 'package:pshared/models/payment/methods/wallet.dart';
+import 'package:pshared/models/payment/payment_method.dart';
+import 'package:pshared/models/payment/type.dart';
+import 'package:pshared/models/permissions/bound.dart';
+import 'package:pshared/models/storable.dart';
+
+
+extension PaymentMethodModelMapper on PaymentMethodModel {
+  PaymentMethodDTO toDTO() => PaymentMethodDTO(
+    id: storable.id,
+    createdAt: storable.createdAt,
+    updatedAt: storable.updatedAt,
+    permissionRef: permissionBound.permissionRef,
+    organizationRef: permissionBound.organizationRef,
+    recipientRef: recipientRef,
+    type: paymentTypeToValue(type),
+    data: _dataToJson(data),
+    isArchived: isArchived,
+  );
+
+  Map<String, dynamic> _dataToJson(PaymentMethodData data) {
+    switch (data.type) {
+      case PaymentType.card:
+        return (data as CardPaymentMethod).toDTO().toJson();
+      case PaymentType.iban:
+        return (data as IbanPaymentMethod).toDTO().toJson();
+      case PaymentType.bankAccount:
+        return (data as RussianBankAccountPaymentMethod).toDTO().toJson();
+      case PaymentType.wallet:
+        return (data as WalletPaymentMethod).toDTO().toJson();
+      case PaymentType.cryptoAddress:
+        return (data as CryptoAddressPaymentMethod).toDTO().toJson();
+    }
+  }
+}
+
+extension PaymentMethodDTOMapper on PaymentMethodDTO {
+  PaymentMethodModel toDomain() => PaymentMethodModel(
+    storable: newStorable(id: id, createdAt: createdAt, updatedAt: updatedAt),
+    permissionBound: newPermissionBound(
+      organizationBound: newOrganizationBound(organizationRef: organizationRef),
+      permissionRef: permissionRef,
+    ),
+    recipientRef: recipientRef,
+    data: _dataToDomain(paymentTypeFromValue(type), data),
+    isArchived: isArchived,
+  );
+
+  PaymentMethodData _dataToDomain(PaymentType paymentType, Map<String, dynamic> payload) {
+    switch (paymentType) {
+      case PaymentType.card:
+        return CardPaymentDataDTO.fromJson(payload).toDomain();
+      case PaymentType.iban:
+        return IbanPaymentDataDTO.fromJson(payload).toDomain();
+      case PaymentType.bankAccount:
+        return RussianBankAccountPaymentDataDTO.fromJson(payload).toDomain();
+      case PaymentType.wallet:
+        return WalletPaymentDataDTO.fromJson(payload).toDomain();
+      case PaymentType.cryptoAddress:
+        return CryptoAddressPaymentDataDTO.fromJson(payload).toDomain();
+    }
+  }
+}

frontend/pshared/lib/data/mapper/payment/russian_bank.dart

@@ -0,0 +1,27 @@
+import 'package:pshared/data/dto/payment/russian_bank.dart';
+import 'package:pshared/models/payment/methods/russian_bank.dart';
+
+
+extension RussianBankPaymentMethodMapper on RussianBankAccountPaymentMethod {
+  RussianBankAccountPaymentDataDTO toDTO() => RussianBankAccountPaymentDataDTO(
+    recipientName: recipientName,
+    inn: inn,
+    kpp: kpp,
+    bankName: bankName,
+    bik: bik,
+    accountNumber: accountNumber,
+    correspondentAccount: correspondentAccount,
+  );
+}
+
+extension RussianBankAccountPaymentDataDTOMapper on RussianBankAccountPaymentDataDTO {
+  RussianBankAccountPaymentMethod toDomain() => RussianBankAccountPaymentMethod(
+    recipientName: recipientName,
+    inn: inn,
+    kpp: kpp,
+    bankName: bankName,
+    bik: bik,
+    accountNumber: accountNumber,
+    correspondentAccount: correspondentAccount,
+  );
+}

frontend/pshared/lib/data/mapper/payment/type.dart

@@ -0,0 +1,34 @@
+import 'package:pshared/models/payment/type.dart';
+
+
+PaymentType paymentTypeFromValue(String value) {
+  switch (value) {
+    case 'iban':
+      return PaymentType.iban;
+    case 'card':
+      return PaymentType.card;
+    case 'bankAccount':
+      return PaymentType.bankAccount;
+    case 'wallet':
+      return PaymentType.wallet;
+    case 'cryptoAddress':
+      return PaymentType.cryptoAddress;
+    default:
+      return PaymentType.iban;
+  }
+}
+
+String paymentTypeToValue(PaymentType type) {
+  switch (type) {
+    case PaymentType.iban:
+      return 'iban';
+    case PaymentType.card:
+      return 'card';
+    case PaymentType.bankAccount:
+      return 'bankAccount';
+    case PaymentType.wallet:
+      return 'wallet';
+    case PaymentType.cryptoAddress:
+      return 'cryptoAddress';
+  }
+}

frontend/pshared/lib/data/mapper/payment/wallet.dart

@@ -0,0 +1,13 @@
+import 'package:pshared/data/dto/payment/wallet.dart';
+import 'package:pshared/models/payment/methods/wallet.dart';
+
+
+extension WalletPaymentMethodMapper on WalletPaymentMethod {
+  WalletPaymentDataDTO toDTO() => WalletPaymentDataDTO(
+    walletId: walletId,
+  );
+}
+
+extension WalletPaymentDataDTOMapper on WalletPaymentDataDTO {
+  WalletPaymentMethod toDomain() => WalletPaymentMethod(walletId: walletId);
+}

frontend/pshared/lib/data/mapper/recipient/recipient.dart

@@ -0,0 +1,85 @@
+import 'package:pshared/data/dto/recipient/recipient.dart';
+import 'package:pshared/models/describable.dart';
+import 'package:pshared/models/organization/bound.dart';
+import 'package:pshared/models/permissions/bound.dart';
+import 'package:pshared/models/recipient/recipient_model.dart';
+import 'package:pshared/models/recipient/status.dart';
+import 'package:pshared/models/recipient/type.dart';
+import 'package:pshared/models/storable.dart';
+
+
+extension RecipientModelMapper on RecipientModel {
+  RecipientDTO toDTO() => RecipientDTO(
+    id: storable.id,
+    createdAt: storable.createdAt,
+    updatedAt: storable.updatedAt,
+    permissionRef: permissionBound.permissionRef,
+    organizationRef: permissionBound.organizationRef,
+    name: name,
+    description: description,
+    email: email,
+    avatarUrl: avatarUrl,
+    status: _recipientStatusToValue(status),
+    type: _recipientTypeToValue(type),
+    isArchived: isArchived,
+  );
+}
+
+extension RecipientDTOMapper on RecipientDTO {
+  RecipientModel toDomain() => RecipientModel(
+    storable: newStorable(id: id, createdAt: createdAt, updatedAt: updatedAt),
+    permissionBound: newPermissionBound(
+      organizationBound: newOrganizationBound(organizationRef: organizationRef),
+      permissionRef: permissionRef,
+    ),
+    describable: newDescribable(name: name, description: description),
+    email: email,
+    avatarUrl: avatarUrl,
+    status: _recipientStatusFromValue(status),
+    type: _recipientTypeFromValue(type),
+    isArchived: isArchived,
+  );
+}
+
+RecipientStatus _recipientStatusFromValue(String value) {
+  switch (value) {
+    case 'ready':
+      return RecipientStatus.ready;
+    case 'registered':
+      return RecipientStatus.registered;
+    case 'notRegistered':
+      return RecipientStatus.notRegistered;
+    default:
+      return RecipientStatus.ready;
+  }
+}
+
+String _recipientStatusToValue(RecipientStatus status) {
+  switch (status) {
+    case RecipientStatus.ready:
+      return 'ready';
+    case RecipientStatus.registered:
+      return 'registered';
+    case RecipientStatus.notRegistered:
+      return 'notRegistered';
+  }
+}
+
+RecipientType _recipientTypeFromValue(String value) {
+  switch (value) {
+    case 'external':
+      return RecipientType.external;
+    case 'internal':
+    default:
+      return RecipientType.internal;
+  }
+}
+
+String _recipientTypeToValue(RecipientType type) {
+  switch (type) {
+    case RecipientType.internal:
+      return 'internal';
+    case RecipientType.external:
+      return 'external';
+  }
+}

frontend/pshared/lib/models/payment/methods/crypto_address.dart

@@ -0,0 +1,18 @@
+import 'package:pshared/models/payment/methods/data.dart';
+import 'package:pshared/models/payment/type.dart';
+
+
+class CryptoAddressPaymentMethod extends PaymentMethodData {
+  @override
+  final PaymentType type = PaymentType.cryptoAddress;
+
+  final String address;
+  final String network;
+  final String? destinationTag;
+
+  CryptoAddressPaymentMethod({
+    required this.address,
+    required this.network,
+    this.destinationTag,
+  });
+}

frontend/pshared/lib/models/payment/payment_method.dart

@@ -0,0 +1,46 @@
+import 'package:pshared/models/payment/methods/data.dart';
+import 'package:pshared/models/payment/type.dart';
+import 'package:pshared/models/permissions/bound.dart';
+import 'package:pshared/models/storable.dart';
+
+
+class PaymentMethodModel implements PermissionBound, Storable {
+  final Storable storable;
+  final PermissionBound permissionBound;
+  final String recipientRef;
+  final PaymentMethodData data;
+  final bool isArchived;
+
+  const PaymentMethodModel({
+    required this.storable,
+    required this.permissionBound,
+    required this.recipientRef,
+    required this.data,
+    this.isArchived = false,
+  });
+
+  PaymentType get type => data.type;
+
+  @override
+  String get id => storable.id;
+  @override
+  DateTime get createdAt => storable.createdAt;
+  @override
+  DateTime get updatedAt => storable.updatedAt;
+
+  @override
+  String get organizationRef => permissionBound.organizationRef;
+  @override
+  String get permissionRef => permissionBound.permissionRef;
+
+  PaymentMethodModel copyWith({
+    PaymentMethodData? data,
+    bool? isArchived,
+  }) => PaymentMethodModel(
+    storable: storable,
+    permissionBound: permissionBound,
+    recipientRef: recipientRef,
+    data: data ?? this.data,
+    isArchived: isArchived ?? this.isArchived,
+  );
+}

frontend/pshared/lib/models/payment/type.dart

@@ -3,4 +3,5 @@ enum PaymentType {
   iban, 
   wallet, 
   card,
+  cryptoAddress,
 }

frontend/pshared/lib/models/recipient/recipient.dart

@@ -1,5 +1,6 @@
 import 'package:pshared/models/payment/methods/card.dart';
 import 'package:pshared/models/payment/methods/iban.dart';
+import 'package:pshared/models/payment/methods/crypto_address.dart';
 import 'package:pshared/models/payment/methods/russian_bank.dart';
 import 'package:pshared/models/payment/methods/wallet.dart';
 import 'package:pshared/models/recipient/status.dart';
@@ -16,6 +17,7 @@ class Recipient {
   final IbanPaymentMethod? iban;
   final RussianBankAccountPaymentMethod? bank;
   final WalletPaymentMethod? wallet;
+  final CryptoAddressPaymentMethod? cryptoAddress;
 
   const Recipient({
     this.avatarUrl,
@@ -27,6 +29,7 @@ class Recipient {
     this.iban,
     this.bank,
     this.wallet,
+    this.cryptoAddress,
   });
 
   /// Convenience factory for quickly creating mock recipients.
@@ -39,6 +42,7 @@ class Recipient {
     IbanPaymentMethod? iban,
     RussianBankAccountPaymentMethod? bank,
     WalletPaymentMethod? wallet,
+    CryptoAddressPaymentMethod? cryptoAddress,
   }) =>
       Recipient(
         avatarUrl: null,
@@ -50,6 +54,7 @@ class Recipient {
         iban: iban,
         bank: bank,
         wallet: wallet,
+        cryptoAddress: cryptoAddress,
       );
 
   bool matchesQuery(String q) {
@@ -71,6 +76,9 @@ class Recipient {
       bank?.bik,
       bank?.correspondentAccount,
       wallet?.walletId,
+      cryptoAddress?.address,
+      cryptoAddress?.network,
+      cryptoAddress?.destinationTag,
     ];
 
     return searchable.any((field) => field?.toLowerCase().contains(q) ?? false);

frontend/pshared/lib/models/recipient/recipient_model.dart

@@ -0,0 +1,64 @@
+import 'package:pshared/models/describable.dart';
+import 'package:pshared/models/permissions/bound/describable.dart';
+import 'package:pshared/models/permissions/bound.dart';
+import 'package:pshared/models/recipient/status.dart';
+import 'package:pshared/models/recipient/type.dart';
+import 'package:pshared/models/storable.dart';
+
+
+class RecipientModel implements PermissionBoundStorableDescribable {
+  final Storable storable;
+  final PermissionBound permissionBound;
+  final Describable describable;
+  final String email;
+  final String? avatarUrl;
+  final RecipientStatus status;
+  final RecipientType type;
+  final bool isArchived;
+
+  const RecipientModel({
+    required this.storable,
+    required this.permissionBound,
+    required this.describable,
+    required this.email,
+    required this.status,
+    required this.type,
+    this.avatarUrl,
+    this.isArchived = false,
+  });
+
+  @override
+  String get id => storable.id;
+  @override
+  DateTime get createdAt => storable.createdAt;
+  @override
+  DateTime get updatedAt => storable.updatedAt;
+
+  @override
+  String get organizationRef => permissionBound.organizationRef;
+  @override
+  String get permissionRef => permissionBound.permissionRef;
+
+  @override
+  String get name => describable.name;
+  @override
+  String? get description => describable.description;
+
+  RecipientModel copyWith({
+    Describable? describable,
+    String? email,
+    String? Function()? avatarUrl,
+    RecipientStatus? status,
+    RecipientType? type,
+    bool? isArchived,
+  }) => RecipientModel(
+    storable: storable,
+    permissionBound: permissionBound,
+    describable: describableCopyWithOther(this.describable, describable),
+    email: email ?? this.email,
+    avatarUrl: avatarUrl != null ? avatarUrl() : this.avatarUrl,
+    status: status ?? this.status,
+    type: type ?? this.type,
+    isArchived: isArchived ?? this.isArchived,
+  );
+}