default preset subs

app/src/main/java/com/biganto/visual/roompark/conductor/dialogs/StartPlansDownloadingDialogController.kt

@@ -82,7 +82,12 @@ class StartPlansDownloadingDialogController : Controller {
 
         snackbar = ActivityModule.provideSnackBar(rpActivity)
 
+        view.findViewById<MaterialTextView>(R.id.download_dialog_title)
+            .text = resources?.getString(R.string.download_all_plans_notice_text)
 
+        view.findViewById<MaterialTextView>(R.id.all_tours_size_textView)
+            .text = resources?.getString(R.string.download_all_plans_size_title
+            ,"0")
 
         file.freeSpace.bytesToSize().let {
             view.findViewById<MaterialTextView>(R.id.disk_size_textView)

app/src/main/java/com/biganto/visual/roompark/conductor/dialogs/tour_chooser/StartToursDownloadingDialogController.kt

@@ -76,6 +76,14 @@ class StartToursDownloadingDialogController : Controller {
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup): View {
         val view = inflater.inflate(getLayoutId(), container, false)
 
+
+        view.findViewById<MaterialTextView>(R.id.download_dialog_title)
+            .text = resources?.getString(R.string.download_all_tours_notice_text)
+
+        view.findViewById<MaterialTextView>(R.id.all_tours_size_textView)
+            .text = resources?.getString(R.string.download_all_tours_size_title
+            ,"0")
+
         snackbar = ActivityModule.provideSnackBar(rpActivity)
 
         file.freeSpace.bytesToSize().let {

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

@@ -4,11 +4,13 @@ import com.biganto.visual.androidplayer.data.repository.local.ILocalStore
 import com.biganto.visual.roompark.data.local.UserState
 import com.biganto.visual.roompark.data.repository.api.room_park.IRoomParkApi
 import com.biganto.visual.roompark.data.repository.db.IDb
+import com.biganto.visual.roompark.data.repository.db.requrey.model.SubscriptionEntity
 import com.biganto.visual.roompark.data.repository.db.requrey.model.UserEntity
 import com.biganto.visual.roompark.data.repository.mapper.fromRaw
 import com.biganto.visual.roompark.domain.contract.AuthContract
 import com.biganto.visual.roompark.domain.custom_exception.CustomApiException
 import com.biganto.visual.roompark.domain.model.AuthInfoModel
+import com.biganto.visual.roompark.domain.model.SubscriptionTopic
 import com.biganto.visual.roompark.domain.model.fromEntity
 import io.reactivex.Completable
 import io.reactivex.Observable
@@ -37,6 +39,18 @@ class AuthContractModule @Inject constructor(
         api.authenticate(email,password)
             .map ( ::fromRaw )
             .flatMap{ db.upsertUser(it)  }
+            .flatMap {user ->
+                val userSubs = user.subscriptions?.map { it as SubscriptionEntity }
+                if (!userSubs.isNullOrEmpty()){
+                    val newSubs = defaultSubsList(user).filter {defSub ->
+                        !userSubs.map { it.topic }.contains(defSub.topic)
+                    }.toList()
+                    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)
@@ -60,3 +74,41 @@ class AuthContractModule @Inject constructor(
         } }
 
 }
+
+private fun defaultSubsList(owner:UserEntity) = arrayListOf(
+    SubscriptionEntity().apply {
+        setTopic(SubscriptionTopic.Progress_1().topicName)
+        setOwner(owner)
+        setState(false)
+    }
+    ,SubscriptionEntity().apply {
+        setTopic(SubscriptionTopic.Progress_2().topicName)
+        setOwner(owner)
+        setState(false)
+    }
+    ,SubscriptionEntity().apply {
+        setTopic(SubscriptionTopic.Progress_3().topicName)
+        setOwner(owner)
+        setState(false)
+    }
+    ,SubscriptionEntity().apply {
+        setTopic(SubscriptionTopic.Progress_kindergarden().topicName)
+        setOwner(owner)
+        setState(false)
+    }
+    ,SubscriptionEntity().apply {
+        setTopic(SubscriptionTopic.News().topicName)
+        setOwner(owner)
+        setState(false)
+    }
+    ,SubscriptionEntity().apply {
+        setTopic(SubscriptionTopic.Blog().topicName)
+        setOwner(owner)
+        setState(false)
+    }
+    ,SubscriptionEntity().apply {
+        setTopic(SubscriptionTopic.Construction().topicName)
+        setOwner(owner)
+        setState(false)
+    }
+)
\ No newline at end of file

app/src/main/res/layout/tours_download_dialog_screen.xml

@@ -29,6 +29,7 @@
             android:orientation="vertical">
 
             <com.google.android.material.textview.MaterialTextView
+                android:id="@+id/download_dialog_title"
                 style="@style/Default_TextView.Header_Text"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"

app/src/main/res/values/strings.xml

@@ -133,6 +133,7 @@
     <string name="plan_types_download_completed">Загрузка планов завершена.</string>
     <string name="download_plan_types_screen_title">Cкачиваются планировки</string>
     <string name="download_all_tours_notice_text">Загрузить все туры?</string>
+    <string name="download_all_plans_notice_text">Загрузить все \n планировки?</string>
     <string name="download_all_tours_size_title">Размер всех туров: %s</string>
     <string name="download_all_plans_size_title">Размер всех планировок: %s</string>
     <string name="download_all_tours_disk_size_title">Размер свободного места на диске: %s</string>