Making the page setting on a PlaidItem mandatory

fabioCollini · Jul 11, 2019 · aea0969 · aea0969
1 parent 80ddd6e
commit aea0969
Show file tree

Hide file tree

Showing 15 changed files with 20 additions and 7 deletions.
diff --git a/app/src/test/java/io/plaidapp/TestData.kt b/app/src/test/java/io/plaidapp/TestData.kt
@@ -65,6 +65,7 @@ val player = User(
 val shot = Shot(
     id = 1L,
     title = "Foo Nick",
+    page = 0,
     description = "",
     images = Images(),
     user = player
@@ -86,6 +87,7 @@ val storyLinks = StoryLinks(
 val story = Story(
     id = storyId,
     title = "Plaid 2.0 was released",
+    page = 0,
     createdAt = createdDate,
     userId = userId,
     links = storyLinks

diff --git a/core/src/main/java/io/plaidapp/core/data/PlaidItem.kt b/core/src/main/java/io/plaidapp/core/data/PlaidItem.kt
@@ -24,7 +24,7 @@ abstract class PlaidItem(
     @Transient open val id: Long,
     @Transient open val title: String,
     @Transient open var url: String? = null,
-    @Transient open val page: Int = 0
+    @Transient open val page: Int
 ) {
     var dataSource: String? = null
     var weight: Float = 0F // used for sorting

diff --git a/core/src/main/java/io/plaidapp/core/designernews/data/stories/model/Story.kt b/core/src/main/java/io/plaidapp/core/designernews/data/stories/model/Story.kt
@@ -29,7 +29,7 @@ fun getDefaultUrl(id: Long) = "https://www.designernews.co/click/stories/$id"
 data class Story(
     @SerializedName("id") override val id: Long,
     @SerializedName("title") override val title: String,
-    @SerializedName("page") override val page: Int = 0,
+    @SerializedName("page") override val page: Int,
     @SerializedName("url")
     override var url: String? = getDefaultUrl(id),
     @SerializedName("comment") val comment: String? = null,

diff --git a/core/src/main/java/io/plaidapp/core/designernews/data/stories/model/StoryResponse.kt b/core/src/main/java/io/plaidapp/core/designernews/data/stories/model/StoryResponse.kt
@@ -21,7 +21,7 @@ import java.util.Date
 
 fun getDefaultStoryUrl(id: Long) = "https://www.designernews.co/click/stories/$id"
 
-fun StoryResponse.toStory(page: Int = 0) = Story(
+fun StoryResponse.toStory(page: Int) = Story(
     id = id,
     title = title,
     page = page,

diff --git a/core/src/main/java/io/plaidapp/core/dribbble/data/api/model/Shot.kt b/core/src/main/java/io/plaidapp/core/dribbble/data/api/model/Shot.kt
@@ -26,7 +26,7 @@ import java.util.Date
 data class Shot(
     @SerializedName("id") override val id: Long,
     @SerializedName("title") override val title: String,
-    @SerializedName("page") override val page: Int = 0,
+    @SerializedName("page") override val page: Int,
     @SerializedName("description") val description: String,
     @SerializedName("images") val images: Images,
     @SerializedName("views_count") val viewsCount: Int = 0,

diff --git a/core/src/main/java/io/plaidapp/core/dribbble/data/search/DribbbleSearchConverter.kt b/core/src/main/java/io/plaidapp/core/dribbble/data/search/DribbbleSearchConverter.kt
@@ -88,6 +88,7 @@ object DribbbleSearchConverter : Converter<ResponseBody, List<Shot>> {
             id = id,
             htmlUrl = htmlUrl,
             title = title,
+            page = 0,
             description = description,
             images = Images(normal = imgUrl),
             animated = animated,

diff --git a/core/src/main/java/io/plaidapp/core/producthunt/data/api/model/Post.kt b/core/src/main/java/io/plaidapp/core/producthunt/data/api/model/Post.kt
@@ -30,4 +30,4 @@ class Post(
     val redirectUrl: String,
     val commentsCount: Int,
     val votesCount: Int
-) : PlaidItem(id, title, url)
+) : PlaidItem(id, title, url, 0)
diff --git a/core/src/test/java/io/plaidapp/core/designernews/data/stories/model/StoryResponseTest.kt b/core/src/test/java/io/plaidapp/core/designernews/data/stories/model/StoryResponseTest.kt
@@ -46,12 +46,13 @@ class StoryResponseTest {
         )
 
         // When converting it to a story
-        val story = storyResponse.toStory()
+        val story = storyResponse.toStory(0)
 
         // The story has the expected data
         val expectedStory = Story(
             id = 987,
             title = "My Plaid story",
+            page = 0,
             comment = "This is amazing",
             commentHtml = "www.plaid.com",
             commentCount = 0,

diff --git a/core/src/test/java/io/plaidapp/core/dribbble/data/TestData.kt b/core/src/test/java/io/plaidapp/core/dribbble/data/TestData.kt
@@ -37,20 +37,23 @@ val shots = listOf(
     Shot(
         id = 1L,
         title = "Foo",
+        page = 0,
         description = "",
         images = Images(),
         user = player
     ),
     Shot(
         id = 2L,
         title = "Bar",
+        page = 0,
         description = "",
         images = Images(),
         user = player
     ),
     Shot(
         id = 3L,
         title = "Baz",
+        page = 0,
         description = "",
         images = Images(),
         user = player

diff --git a/core/src/test/java/io/plaidapp/core/dribbble/data/api/ShotWeigherTest.kt b/core/src/test/java/io/plaidapp/core/dribbble/data/api/ShotWeigherTest.kt
@@ -33,6 +33,7 @@ class ShotWeigherTest {
     private val shot0 = Shot(
         likesCount = 0,
         id = 1L,
+        page = 0,
         title = "Foo",
         description = "",
         images = Images(),

diff --git a/designernews/src/main/java/io/plaidapp/designernews/domain/GetStoryUseCase.kt b/designernews/src/main/java/io/plaidapp/designernews/domain/GetStoryUseCase.kt
@@ -31,7 +31,7 @@ class GetStoryUseCase @Inject constructor(private val storiesRepository: Stories
     operator fun invoke(id: Long): Result<Story> {
         val result = storiesRepository.getStory(id)
         return if (result is Result.Success) {
-            Result.Success(result.data.toStory())
+            Result.Success(result.data.toStory(0))
         } else {
             Result.Error(IllegalStateException("Story $id not cached"))
         }

diff --git a/designernews/src/test/java/io/plaidapp/designernews/domain/GetStoryUseCaseTest.kt b/designernews/src/test/java/io/plaidapp/designernews/domain/GetStoryUseCaseTest.kt
@@ -47,6 +47,7 @@ class GetStoryUseCaseTest {
         Story(
             id = storyId,
             title = "Plaid 2.0 was released",
+            page = 0,
             createdAt = createdDate,
             userId = storyLinks.user,
             links = storyLinks

diff --git a/designernews/src/test/java/io/plaidapp/designernews/ui/story/StoryViewModelTest.kt b/designernews/src/test/java/io/plaidapp/designernews/ui/story/StoryViewModelTest.kt
@@ -62,6 +62,7 @@ class StoryViewModelTest {
     private val testStory = Story(
         id = storyId,
         title = "Plaid 2.0 was released",
+        page = 0,
         createdAt = createdDate,
         userId = userId,
         links = storyLinks

diff --git a/dribbble/src/test/java/io/plaidapp/dribbble/TestData.kt b/dribbble/src/test/java/io/plaidapp/dribbble/TestData.kt
@@ -35,6 +35,7 @@ val player = User(
 val testShot = Shot(
     id = 1L,
     title = "Foo",
+    page = 0,
     description = "Shot Description",
     images = Images(hidpi = "hidpi"),
     user = player,

diff --git a/search/src/test/java/io/plaidapp/search/TestData.kt b/search/src/test/java/io/plaidapp/search/TestData.kt
@@ -41,6 +41,7 @@ val player2 = User(
 val testShot1 = Shot(
     id = 1L,
     title = "Foo Nick",
+    page = 0,
     description = "",
     images = Images(),
     user = player1
@@ -49,6 +50,7 @@ val testShot1 = Shot(
 val testShot2 = Shot(
     id = 199L,
     title = "Foo Flo",
+    page = 0,
     description = "",
     images = Images(),
     user = player2