reoslve dependencies

app/src/main/java/com/biganto/visual/roompark/data/repository/api/IApi.kt

@@ -38,7 +38,7 @@ interface IRoomParkApi {
         showSizes: Boolean,
         showWalls: Boolean,
         showElectric: Boolean
-    ): Observable<List<PlanRaw>>?
+    ): Observable<List<String>>
 
     fun getMultiTour(building: Int, flat: Int): Observable<List<PlanRaw>>
     fun getArticlesPage(feedName:String,

app/src/main/java/com/biganto/visual/roompark/data/repository/api/retrofit/RetrofitRepository.kt

@@ -87,7 +87,7 @@ class RetrofitRepository(retrofit: Retrofit) : IRoomParkApi {
         showSizes: Boolean,
         showWalls: Boolean,
         showElectric: Boolean
-    ): Observable<List<PlanRaw>> =
+    ): Observable<List<String>> =
         api.getPlan(
             estate_id = estateId,
             planType = planType.planId,

app/src/main/java/com/biganto/visual/roompark/data/repository/db/requrey/model/Estate.kt

@@ -41,7 +41,7 @@ interface Estate : Persistable {
     val info_building: Int
     val info_section_begin: Int
     val info_floor: Int
-    @get:OneToMany
+    @get:OneToMany(mappedBy = "id")
     val explications: Set<Explication>?
     val info_floor_max: Int
     @get:Nullable

app/src/main/java/com/biganto/visual/roompark/data/repository/db/requrey/model/Feed.kt

 package com.biganto.visual.roompark.data.repository.db.requrey.model
 
-import io.requery.Entity
-import io.requery.Key
-import io.requery.Persistable
+import io.requery.*
 
 /**
  * Created by Vladislav Bogdashkin on 29.10.2019.
@@ -17,4 +15,7 @@ interface Feed : Persistable {
     val title:String
     @get:Key
     val alias: String
+    @get:OneToMany(mappedBy = "id")
+    @get:Nullable
+    val articles:Set<Article>?
 }
\ No newline at end of file

app/src/main/java/com/biganto/visual/roompark/data/repository/db/requrey/model/ImageAlbum.kt

 package com.biganto.visual.roompark.data.repository.db.requrey.model
 
 import com.biganto.visual.roompark.data.repository.db.requrey.utils.IsoDateConverter
-import io.requery.*
+import io.requery.Convert
+import io.requery.Entity
+import io.requery.Key
+import io.requery.Persistable
 import java.util.*
 
 /**
@@ -16,8 +19,5 @@ interface ImageAlbum : Persistable {
     val title:String
     val sort:Int
     @get:Convert(IsoDateConverter::class)
-    val date: Date
-    @get:ForeignKey(references = ImageAlbum::class, referencedColumn = "id")
-    //TODO(create separate custom junction parent table)
-    val parent_id:Int
+    val published: Date
 }
\ No newline at end of file

app/src/main/java/com/biganto/visual/roompark/data/repository/db/requrey/model/ImageAlbumJunction.kt

+package com.biganto.visual.roompark.data.repository.db.requrey.model
+
+import io.requery.*
+
+/**
+ * Created by Vladislav Bogdashkin on 29.10.2019.
+ */
+
+
+@Entity
+interface ImageAlbumJunction : Persistable {
+    @get:Key
+    @get:Generated
+    val id:Int
+    @get:Nullable
+    val albumId:Int?
+    @get:Nullable
+    val parentId:Int?
+}
\ No newline at end of file

app/src/main/java/com/biganto/visual/roompark/data/repository/db/requrey/model/PlanPreset.kt

@@ -14,6 +14,7 @@ interface PlanPreset : Persistable {
     @get:Generated
     val id: Int
     @get:ForeignKey(references = Estate::class)
+    @get:ManyToOne
     var estateId:Estate
     val planId: Int
     val title:String

app/src/main/java/com/biganto/visual/roompark/data/repository/db/requrey/model/Subscription.kt

@@ -12,8 +12,9 @@ interface Subscription : Persistable {
     @get:Key
     @get:Generated
     val id: Int
+    @get:ForeignKey(references = User::class, referencedColumn = "uuid")
     @get:ManyToOne
-    val user: User
+    val owner: User
     val deviceToken: String
     val topic: String
     val number: String