Merge pull request #18 from pokepay/fix/bankpay

Fix response from getBankPay and createBankPay
pokepay · Sep 29, 2023 · e8dcd22 · e8dcd22
2 parents ad3c26c + 0fe3ba6
commit e8dcd22
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 2.0.7
+* Fixed `getBankPay`, `createBankPay` response from API
+
 ## 2.0.6
 * Added `identifyIndividual` API for My Number
 * Added `createBankPay`, `getBankPay`, `bankpayTopup` APIs for BankPay

diff --git a/android/build.gradle b/android/build.gradle
@@ -44,5 +44,5 @@ dependencies {
     implementation 'com.fasterxml.jackson.core:jackson-annotations:2.11.1'
     implementation 'com.fasterxml.jackson.core:jackson-core:2.11.1'
     implementation 'com.fasterxml.jackson.core:jackson-databind:2.11.1'
-    implementation 'jp.pocket-change.pokepay.android-sdk:pokepaylib:2.0.6'
+    implementation 'jp.pocket-change.pokepay.android-sdk:pokepaylib:2.0.7'
 }
diff --git a/android/src/main/java/jp/pokepay/pokepay_sdk/PokepaySdkPlugin.java b/android/src/main/java/jp/pokepay/pokepay_sdk/PokepaySdkPlugin.java
@@ -17,6 +17,7 @@
 import java.util.Date;
 import java.util.Map;
 import java.util.UUID;
+import java.util.Arrays;
 
 import io.flutter.embedding.engine.plugins.FlutterPlugin;
 import io.flutter.plugin.common.MethodCall;
@@ -930,7 +931,7 @@ private TaskResult invokeMethod()  {
                         GetBankPay req = new GetBankPay(id, privateMoneyId);
                         Pokepay.setEnv(env);
                         BankPay[] res = req.send(accessToken);
-                        return new TaskResult(null, res.toString());
+                        return new TaskResult(null, Arrays.toString(res));
                     }
                     case "bankpayTopUp": {
                         Env env = flutterEnvToSDKEnv((int)call.argument("env"));
@@ -943,6 +944,7 @@ private TaskResult invokeMethod()  {
                         Pokepay.setEnv(env);
                         UserTransaction res = req.send(accessToken);
                       return new TaskResult(null, res.toString());
+                    }
                     case "identifyIndividual": {
                         Env env = flutterEnvToSDKEnv((int)call.argument("env"));
                         String accessToken = call.argument("accessToken");

diff --git a/ios/pokepay_sdk.podspec b/ios/pokepay_sdk.podspec
@@ -4,7 +4,7 @@
 #
 Pod::Spec.new do |s|
   s.name             = 'pokepay_sdk'
-  s.version          = '2.0.6'
+  s.version          = '2.0.7'
   s.summary          = 'Pokepay flutter SDK'
   s.description      = <<-DESC
 Pokepay flutter SDK
@@ -15,7 +15,7 @@ Pokepay flutter SDK
   s.source           = { :path => '.' }
   s.source_files = 'Classes/**/*'
   s.dependency 'Flutter'
-  s.dependency 'Pokepay', '2.0.6'
+  s.dependency 'Pokepay', '2.0.7'
   s.platform = :ios, '12.0'
 
   # Flutter.framework does not contain a i386 slice. Only x86_64 simulators are supported.

diff --git a/lib/bank_api/user.dart b/lib/bank_api/user.dart
@@ -148,7 +148,9 @@ extension UserAPI on PokepayAPI {
     String? privateMoneyId,
   }) async {
     return await invokeMethod<List<BankPay>>(
-      (j) => (j as List<Map<String, dynamic>>).map(BankPay.fromJson).toList(),
+      (j) {
+        return (j as List<dynamic>).map((k) => BankPay.fromJson(k)).toList();
+      },
       'getBankPay',
       {
         'env': this.env.index,

diff --git a/lib/pokepay_sdk.dart b/lib/pokepay_sdk.dart
@@ -114,7 +114,7 @@ void setLogLevel(LogLevel lev) {
 
 const MethodChannel channel = const MethodChannel('jp.pokepay/pokepay_sdk');
 
-Future<T> invokeMethod<T>(T factory(Map<String, dynamic> data),
+Future<T> invokeMethod<T>(T factory(dynamic data),
     String methodName, Map<String, dynamic> args) async {
   try {
     logger.d("methodName: " + methodName + " args: " + args.toString());

diff --git a/lib/responses/bankpay.dart b/lib/responses/bankpay.dart
@@ -9,7 +9,7 @@ class BankPay {
   final String bankCode;
   final String branchNumber;
   final String branchName;
-  final int depositType;
+  final String depositType;
   final String maskedAccountNumber;
   final String accountName;
   final String? privateMoneyId;

diff --git a/lib/responses/bankpay.g.dart b/lib/responses/bankpay.g.dart
diff --git a/lib/responses/bankpay_redirect_url.g.dart b/lib/responses/bankpay_redirect_url.g.dart
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: pokepay_sdk
 description: SDK for pokepay
-version: 2.0.6
+version: 2.0.7
 homepage: https://pay.pocket-change.jp/
 
 environment: