update card_repository: uses Single

hoc081098 · Jun 18, 2021 · 53009bd · 53009bd
1 parent cdea06a
commit 53009bd
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 37 deletions.
diff --git a/MobileApp/datn/lib/data/repository/card_repository_impl.dart b/MobileApp/datn/lib/data/repository/card_repository_impl.dart
@@ -16,38 +16,39 @@ class CardRepositoryImpl implements CardRepository {
   CardRepositoryImpl(this._authClient, this._cardResponseToCard);
 
   @override
-  Stream<BuiltList<Card>> getCards() async* {
-    final json = await _authClient.getJson(buildUrl('/cards')) as List;
-    yield json
-        .map((e) => CardResponse.fromJson(e))
-        .map(_cardResponseToCard)
-        .toBuiltList();
-  }
+  Single<BuiltList<Card>> getCards() =>
+      Single.fromCallable(() => _authClient.getJson(buildUrl('/cards')))
+          .cast<List>()
+          .map((json) => json
+              .map((e) => CardResponse.fromJson(e))
+              .map(_cardResponseToCard)
+              .toBuiltList());
 
   @override
-  Stream<Card> removeCard(Card card) =>
-      Rx.fromCallable(() => _authClient.delete(buildUrl('/cards/${card.id}')))
-          .mapTo(card);
+  Single<Card> removeCard(Card card) => Single.fromCallable(
+          () => _authClient.delete(buildUrl('/cards/${card.id}')))
+      .mapTo(card)
+      .singleOrError();
 
   @override
-  Stream<Card> addCard({
+  Single<Card> addCard({
     required String cardHolderName,
     required String number,
     required int cvc,
     required int expYear,
     required int expMonth,
-  }) async* {
-    final body = {
-      'card_holder_name': cardHolderName,
-      'number': number,
-      'cvc': cvc.toString(),
-      'exp_month': expMonth,
-      'exp_year': expYear,
-    };
-    final json = await _authClient.postJson(
-      buildUrl('/cards'),
-      body: body,
-    );
-    yield _cardResponseToCard(CardResponse.fromJson(json));
-  }
+  }) =>
+      Single.fromCallable(() {
+        final body = {
+          'card_holder_name': cardHolderName,
+          'number': number,
+          'cvc': cvc.toString(),
+          'exp_month': expMonth,
+          'exp_year': expYear,
+        };
+        return _authClient.postJson(
+          buildUrl('/cards'),
+          body: body,
+        );
+      }).map((json) => CardResponse.fromJson(json)).map(_cardResponseToCard);
 }
diff --git a/MobileApp/datn/lib/domain/repository/card_repository.dart b/MobileApp/datn/lib/domain/repository/card_repository.dart
@@ -1,13 +1,14 @@
 import 'package:built_collection/built_collection.dart';
+import 'package:rxdart_ext/rxdart_ext.dart';
 
 import '../model/card.dart';
 
 abstract class CardRepository {
-  Stream<BuiltList<Card>> getCards();
+  Single<BuiltList<Card>> getCards();
 
-  Stream<Card> removeCard(Card card);
+  Single<Card> removeCard(Card card);
 
-  Stream<Card> addCard({
+  Single<Card> addCard({
     required String cardHolderName,
     required String number,
     required int cvc,

diff --git a/MobileApp/datn/pubspec.lock b/MobileApp/datn/pubspec.lock
@@ -35,7 +35,7 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.5.0"
+    version: "2.6.1"
   boolean_selector:
     dependency: transitive
     description:
@@ -355,7 +355,7 @@ packages:
       name: flutter_bloc_pattern
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   flutter_blurhash:
     dependency: transitive
     description:
@@ -811,7 +811,7 @@ packages:
       name: rxdart_ext
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.1-dev.0"
+    version: "0.1.1-dev.1"
   shared_preferences:
     dependency: "direct main"
     description:
@@ -900,7 +900,7 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0"
+    version: "1.8.1"
   sqflite:
     dependency: transitive
     description:
@@ -935,7 +935,7 @@ packages:
       name: stream_loader
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.2.1"
   stream_transform:
     dependency: transitive
     description:
@@ -970,7 +970,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.19"
+    version: "0.3.0"
   timezone:
     dependency: transitive
     description:

diff --git a/MobileApp/datn/pubspec.yaml b/MobileApp/datn/pubspec.yaml
@@ -67,10 +67,10 @@ dependencies:
   rx_shared_preferences: ^2.1.0
   disposebag: ^1.5.0
   flutter_disposebag: ^1.1.0
-  flutter_bloc_pattern: ^2.1.0
-  rxdart_ext: ^0.1.1-dev.0
+  flutter_bloc_pattern: ^2.1.1
+  rxdart_ext: ^0.1.1-dev.1
   listenable_stream: ^1.1.0
-  stream_loader: ^1.2.0
+  stream_loader: ^1.2.1
   flutter_google_places_hoc081098: ^1.0.0-nullsafety.2
   utils:
     path: ../utils