mirror of
https://github.com/msfjarvis/compose-lobsters
synced 2025-08-18 03:17:03 +05:30
api: separate API response model from database model
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
This commit is contained in:
parent
b2d6dd6897
commit
f76628574a
6 changed files with 61 additions and 3 deletions
|
@ -5,7 +5,6 @@ plugins {
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
api(Dependencies.ThirdParty.Retrofit.lib)
|
api(Dependencies.ThirdParty.Retrofit.lib)
|
||||||
implementation(project(":database"))
|
|
||||||
implementation(Dependencies.ThirdParty.Moshi.moshiMetadataReflect)
|
implementation(Dependencies.ThirdParty.Moshi.moshiMetadataReflect)
|
||||||
implementation(Dependencies.ThirdParty.Retrofit.moshi)
|
implementation(Dependencies.ThirdParty.Retrofit.moshi)
|
||||||
testImplementation(Dependencies.Kotlin.Coroutines.core)
|
testImplementation(Dependencies.Kotlin.Coroutines.core)
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
package dev.msfjarvis.lobsters.data.api
|
package dev.msfjarvis.lobsters.data.api
|
||||||
|
|
||||||
import dev.msfjarvis.lobsters.data.local.LobstersPost
|
import dev.msfjarvis.lobsters.model.LobstersPost
|
||||||
import retrofit2.http.GET
|
import retrofit2.http.GET
|
||||||
import retrofit2.http.Query
|
import retrofit2.http.Query
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,10 @@
|
||||||
|
package dev.msfjarvis.lobsters.model
|
||||||
|
|
||||||
|
import com.squareup.moshi.Json
|
||||||
|
|
||||||
|
class KeybaseSignature(
|
||||||
|
@Json(name = "kb_username")
|
||||||
|
val kbUsername: String,
|
||||||
|
@Json(name = "sig_hash")
|
||||||
|
val sigHash: String,
|
||||||
|
)
|
|
@ -0,0 +1,24 @@
|
||||||
|
package dev.msfjarvis.lobsters.model
|
||||||
|
|
||||||
|
import com.squareup.moshi.Json
|
||||||
|
|
||||||
|
class LobstersPost(
|
||||||
|
@Json(name = "short_id")
|
||||||
|
val shortId: String,
|
||||||
|
@Json(name = "short_id_url")
|
||||||
|
val shortIdUrl: String,
|
||||||
|
@Json(name = "created_at")
|
||||||
|
val createdAt: String,
|
||||||
|
val title: String,
|
||||||
|
val url: String,
|
||||||
|
val score: Long,
|
||||||
|
val flags: Long,
|
||||||
|
@Json(name = "comment_count")
|
||||||
|
val commentCount: Long,
|
||||||
|
val description: String,
|
||||||
|
@Json(name = "comments_url")
|
||||||
|
val commentsUrl: String,
|
||||||
|
@Json(name = "submitter_user")
|
||||||
|
val submitterUser: Submitter,
|
||||||
|
val tags: List<String>,
|
||||||
|
)
|
25
api/src/main/java/dev/msfjarvis/lobsters/model/Submitter.kt
Normal file
25
api/src/main/java/dev/msfjarvis/lobsters/model/Submitter.kt
Normal file
|
@ -0,0 +1,25 @@
|
||||||
|
package dev.msfjarvis.lobsters.model
|
||||||
|
|
||||||
|
import com.squareup.moshi.Json
|
||||||
|
|
||||||
|
class Submitter(
|
||||||
|
val username: String,
|
||||||
|
@Json(name = "created_at")
|
||||||
|
val createdAt: String,
|
||||||
|
@Json(name = "is_admin")
|
||||||
|
val isAdmin: Boolean,
|
||||||
|
val about: String,
|
||||||
|
@Json(name = "is_moderator")
|
||||||
|
val isModerator: Boolean,
|
||||||
|
val karma: Long = 0,
|
||||||
|
@Json(name = "avatar_url")
|
||||||
|
val avatarUrl: String,
|
||||||
|
@Json(name = "invited_by_user")
|
||||||
|
val invitedByUser: String,
|
||||||
|
@Json(name = "github_username")
|
||||||
|
val githubUsername: String? = null,
|
||||||
|
@Json(name = "twitter_username")
|
||||||
|
val twitterUsername: String? = null,
|
||||||
|
@Json(name = "keybase_signatures")
|
||||||
|
val keybaseSignatures: List<KeybaseSignature> = emptyList(),
|
||||||
|
)
|
|
@ -63,7 +63,7 @@ class LobstersApiTest {
|
||||||
fun `no moderator posts in test data`() = runBlocking {
|
fun `no moderator posts in test data`() = runBlocking {
|
||||||
val posts = apiClient.getHottestPosts(1)
|
val posts = apiClient.getHottestPosts(1)
|
||||||
val moderatorPosts = posts.asSequence()
|
val moderatorPosts = posts.asSequence()
|
||||||
.filter { it.submitter_user.isModerator }
|
.filter { it.submitterUser.isModerator }
|
||||||
.toSet()
|
.toSet()
|
||||||
assertTrue(moderatorPosts.isEmpty())
|
assertTrue(moderatorPosts.isEmpty())
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue