dont remove default subscriptions on result

app/src/main/java/com/biganto/visual/roompark/data/data_provider/AuthRepository.kt

@@ -41,16 +41,17 @@ class AuthContractModule @Inject constructor(
             .flatMap{ db.upsertUser(it)  }
             .flatMap {user ->
                 val userSubs = user.subscriptions?.map { it as SubscriptionEntity }
+                var newSubs = defaultSubsList(user)
                 if (!userSubs.isNullOrEmpty()){
-                    val newSubs = defaultSubsList(user).filter {defSub ->
+                    newSubs = newSubs.filter {defSub ->
                         !userSubs.map { it.topic }.contains(defSub.topic)
                     }.toList()
+                }
+                if (newSubs.isNullOrEmpty()) return@flatMap Observable.just(user)
                 return@flatMap db.upsert(newSubs)
                     .toObservable()
                     .flatMap { db.refreshUser(user) }
             }
-                else return@flatMap Observable.just(user)
-            }
             .doOnNext{ Timber.d("user id: ${it.uuid}")}
             .doOnNext { local.setRecentUser(it.uuid.toString()).blockingAwait() }
             .map(::fromEntity)
@@ -75,7 +76,7 @@ class AuthContractModule @Inject constructor(
 
 }
 
-private fun defaultSubsList(owner:UserEntity) = arrayListOf(
+private fun defaultSubsList(owner:UserEntity) : List<SubscriptionEntity> = arrayListOf(
     SubscriptionEntity().apply {
         setTopic(SubscriptionTopic.Progress_1().topicName)
         setOwner(owner)
@@ -89,7 +90,7 @@ private fun defaultSubsList(owner:UserEntity) = arrayListOf(
     ,SubscriptionEntity().apply {
         setTopic(SubscriptionTopic.Progress_3().topicName)
         setOwner(owner)
-        setState(false)
+        setState(true)
     }
     ,SubscriptionEntity().apply {
         setTopic(SubscriptionTopic.Progress_kindergarden().topicName)
@@ -99,7 +100,7 @@ private fun defaultSubsList(owner:UserEntity) = arrayListOf(
     ,SubscriptionEntity().apply {
         setTopic(SubscriptionTopic.News().topicName)
         setOwner(owner)
-        setState(false)
+        setState(true)
     }
     ,SubscriptionEntity().apply {
         setTopic(SubscriptionTopic.Blog().topicName)
@@ -109,6 +110,6 @@ private fun defaultSubsList(owner:UserEntity) = arrayListOf(
     ,SubscriptionEntity().apply {
         setTopic(SubscriptionTopic.Construction().topicName)
         setOwner(owner)
-        setState(false)
+        setState(true)
     }
 )
\ No newline at end of file

app/src/main/java/com/biganto/visual/roompark/data/data_provider/SubscriptionRepository.kt

@@ -80,10 +80,14 @@ class SubscriptionRepository  @Inject constructor(
             cachedSub.setState(apiSub.active)
             newSubList.add(cachedSub)
         }
-        userSubs?.filter { !newSubList.map { s ->s.id }.contains(it.id)  }?.toList()
-            ?.let {
-                Timber.w("to delete; ${it.size}")
-                db.deleteSubscriptions(it)
+
+        userSubs?.filter { !newSubList.map { s ->s.id }.contains(it.id)  }?.forEach {
+            (it as SubscriptionEntity).setState(false)
+        }
+
+        userSubs?.forEach {s ->
+            if (newSubList.firstOrNull { s.topic == it.topic && s.number == it.number} == null)
+                newSubList.add(s as SubscriptionEntity)
         }
 
         return db.upsert(newSubList)