Merge pull request #70 from JoaquimLey/stream/episode_15

Stream Episode 15
JoaquimLey · Oct 3, 2018 · da22a3a · da22a3a
2 parents e03d365 + 4a06fdf
commit da22a3a
Show file tree

Hide file tree

Showing 8 changed files with 421 additions and 43 deletions.
diff --git a/README.MD b/README.MD
@@ -57,6 +57,8 @@ Since I'm always working on some side-projects, I decided to document the develo
 
 - Ep.14: https://github.com/JoaquimLey/transport-eta/pull/65
 
+- Ep.15: https://github.com/JoaquimLey/transport-eta/pull/70
+
 
 ## About the author
 Hi, my name is  **Joaquim Ley**, I'm a Software Engineer (Android).

diff --git a/transport-eta-android/data/src/main/java/com/joaquimley/data/TransportRepositoryImpl.kt b/transport-eta-android/data/src/main/java/com/joaquimley/data/TransportRepositoryImpl.kt
@@ -1,38 +1,37 @@
 package com.joaquimley.data
 
+import com.joaquimley.data.mapper.TransportMapper
+import com.joaquimley.data.store.TransportDataStore
 import com.joaquimley.transporteta.domain.model.Transport
 import com.joaquimley.transporteta.domain.repository.TransportRepository
 import io.reactivex.Completable
+import io.reactivex.Flowable
 import io.reactivex.Observable
 
-class TransportRepositoryImpl: TransportRepository {
+class TransportRepositoryImpl(private val transportDataStore: TransportDataStore,
+                              private val mapper: TransportMapper): TransportRepository {
 
     override fun requestTransportEta(transportCode: Int): Observable<Transport> {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        return transportDataStore.requestTransportEta(transportCode).map{ mapper.toModel(it)}
     }
 
     override fun cancelTransportEtaRequest(transportCode: Int?): Completable {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
-    }
-
-    override fun getTransport(transportId: String): Observable<Transport> {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        return transportDataStore.cancelTransportEtaRequest(transportCode)
     }
 
     override fun saveTransport(transport: Transport): Completable {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        return transportDataStore.saveTransport(mapper.toEntity(transport))
     }
 
-    override fun saveTransport(transportList: List<Transport>): Completable {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    override fun deleteTransport(transportId: String): Completable {
+        return transportDataStore.deleteTransport(transportId)
     }
 
-    override fun deleteTransport(transport: Transport): Completable {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    override fun getTransport(transportId: String): Observable<Transport> {
+        return transportDataStore.getTransport(transportId).map { mapper.toModel(it) }
     }
 
-    override fun deleteTransports(transport: List<Transport>): Completable {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    override fun getAll(): Flowable<List<Transport>> {
+        return transportDataStore.getAll().map { mapper.toModel(it) }
     }
-
 }
diff --git a/transport-eta-android/data/src/main/java/com/joaquimley/data/store/TransportDataStore.kt b/transport-eta-android/data/src/main/java/com/joaquimley/data/store/TransportDataStore.kt
@@ -15,17 +15,14 @@ interface TransportDataStore {
 
     fun clearAllFavorites(): Completable
 
-    fun getAll(): Flowable<List<TransportEntity>>
-
-    fun getTransport(transportId: String): Observable<TransportEntity>
-
     fun saveTransport(transport: TransportEntity): Completable
 
-    fun saveTransport(transportList: List<TransportEntity>): Completable
+    fun deleteTransport(transport: String): Completable
 
-    fun deleteTransport(transport: TransportEntity): Completable
+    fun getTransport(transportId: String): Observable<TransportEntity>
+
+    fun getAll(): Flowable<List<TransportEntity>>
 
-    fun deleteTransport(transport: List<TransportEntity>): Completable
 
     // TODO Should these be in the [SmSController] instead?  [RequestEtaUseCase]
     fun requestTransportEta(transportCode: Int): Observable<TransportEntity>

diff --git a/transport-eta-android/data/src/test/java/com/joaquimley/data/FavoritesRepositoryTest.kt b/transport-eta-android/data/src/test/java/com/joaquimley/data/FavoritesRepositoryTest.kt
@@ -6,6 +6,7 @@ import com.joaquimley.data.mapper.TransportMapper
 import com.joaquimley.data.model.TransportEntity
 import com.joaquimley.data.store.TransportDataStore
 import com.joaquimley.transporteta.domain.model.Transport
+import com.joaquimley.transporteta.domain.repository.FavoritesRepository
 import com.nhaarman.mockitokotlin2.*
 import io.reactivex.Completable
 import io.reactivex.Flowable
@@ -20,7 +21,7 @@ class FavoritesRepositoryTest {
     private val mockTransportDataStore = mock<TransportDataStore>()
     private val mockMapper = mock<TransportMapper>()
 
-    private lateinit var favoritesRepository: FavoritesRepositoryImpl
+    private lateinit var favoritesRepository: FavoritesRepository
 
 
     @Before
@@ -214,7 +215,6 @@ class FavoritesRepositoryTest {
 
     // endregion clearAll
 
-
     inner class Robot {
 
         fun stubDataStoreMarkAsFavoriteSuccess(transportEntity: TransportEntity = TransportFactory.makeTransportEntity(false), completable: Completable = Completable.complete()): TransportEntity {
@@ -275,7 +275,5 @@ class FavoritesRepositoryTest {
         fun stubTransportMapperToModel(transportEntity: TransportEntity, transport: Transport) {
             whenever(mockMapper.toModel(transportEntity)).then { transport }
         }
-
-
     }
 }