Merge pull request #93 from payjp/kitagawa/fix-brand-validation

カードフォーム画面で利用可能ブランドによるカード番号バリデーションが実施されないのを修正
payjp · Dec 18, 2024 · 939b152 · 939b152
2 parents df0b81e + 8f14067
commit 939b152
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/Sources/Views/CardFormView.swift b/Sources/Views/CardFormView.swift
@@ -299,6 +299,10 @@ public class CardFormView: UIView {
         inputPhoneNumberComplete()
     }
 
+    func setAcceptedBrands(_ brands: [CardBrand]) {
+        viewModel.setAcceptedCardBrands(brands)
+    }
+
     func inputCardNumberSuccess(value: CardNumber) {
         cardFormProperties.cardNumberErrorLabel.text = nil
     }

diff --git a/Sources/Views/CardFormViewController.swift b/Sources/Views/CardFormViewController.swift
@@ -297,6 +297,7 @@ extension CardFormViewController: CardFormScreenDelegate {
 
     func reloadBrands(brands: [CardBrand]) {
         accptedBrands = brands
+        cardFormView.setAcceptedBrands(brands)
         brandsView.reloadData()
     }
 

diff --git a/Sources/Views/CardFormViewViewModel.swift b/Sources/Views/CardFormViewViewModel.swift
@@ -80,6 +80,10 @@ protocol CardFormViewViewModelType {
     ///   - completion: 取得結果
     func fetchAcceptedBrands(with tenantId: String?, completion: CardBrandsResult?)
 
+    /// 利用可能ブランドをセットする
+    /// - Parameter brands: 利用可能ブランド
+    func setAcceptedCardBrands(_ brands: [CardBrand])
+
     /// フォームの入力値を取得する
     /// - Parameter completion: 取得結果
     func cardFormInput(completion: (Result<CardFormInput, Error>) -> Void)
@@ -184,7 +188,7 @@ class CardFormViewViewModel: CardFormViewViewModelType {
             // 利用可能ブランドのチェック
             if let acceptedCardBrands = self.acceptedCardBrands {
                 if cardNumberInput.brand != .unknown && !acceptedCardBrands.contains(cardNumberInput.brand) {
-                    return .failure(.cardNumberInvalidError(value: cardNumberInput, isInstant: false))
+                    return .failure(.cardNumberInvalidBrandError(value: cardNumberInput, isInstant: true))
                 }
             }
             // 桁数チェック
@@ -342,6 +346,10 @@ class CardFormViewViewModel: CardFormViewViewModelType {
         }
     }
 
+    func setAcceptedCardBrands(_ brands: [CardBrand]) {
+        self.acceptedCardBrands = brands
+    }
+
     func cardFormInput(completion: (Result<CardFormInput, Error>) -> Void) {
         if let cardNumberString = cardNumber?.value, let month = monthYear?.month,
            let year = monthYear?.year, let cvc = cvc {