all: move model classes to database, rename model to api

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

database/src/main/java/dev/msfjarvis/lobsters/model/KeybaseSignature.kt

@@ -0,0 +1,12 @@
+package dev.msfjarvis.lobsters.model
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+class KeybaseSignature(
+  @Json(name = "kb_username")
+  val kbUsername: String,
+  @Json(name = "sig_hash")
+  val sigHash: String
+)

database/src/main/java/dev/msfjarvis/lobsters/model/LobstersPost.kt

@@ -0,0 +1,26 @@
+package dev.msfjarvis.lobsters.model
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+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>,
+)

database/src/main/java/dev/msfjarvis/lobsters/model/Submitter.kt

@@ -0,0 +1,27 @@
+package dev.msfjarvis.lobsters.model
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+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()
+)

database/src/main/java/dev/msfjarvis/lobsters/model/SubmitterAdapter.kt

@@ -0,0 +1,17 @@
+package dev.msfjarvis.lobsters.model
+
+import com.squareup.moshi.Moshi
+import com.squareup.sqldelight.ColumnAdapter
+
+class SubmitterAdapter : ColumnAdapter<Submitter, String> {
+  private val moshi = Moshi.Builder().build()
+  private val submitterJsonAdapter = SubmitterJsonAdapter(moshi)
+
+  override fun decode(databaseValue: String): Submitter {
+    return submitterJsonAdapter.fromJson(databaseValue)!!
+  }
+
+  override fun encode(value: Submitter): String {
+    return submitterJsonAdapter.toJson(value)
+  }
+}

database/src/main/java/dev/msfjarvis/lobsters/model/TagsAdapter.kt

@@ -0,0 +1,17 @@
+package dev.msfjarvis.lobsters.model
+
+import com.squareup.sqldelight.ColumnAdapter
+
+class TagsAdapter : ColumnAdapter<List<String>, String> {
+  override fun decode(databaseValue: String): List<String> {
+    return databaseValue.split(SEPARATOR)
+  }
+
+  override fun encode(value: List<String>): String {
+    return value.joinToString(SEPARATOR)
+  }
+
+  private companion object {
+    private const val SEPARATOR = ","
+  }
+}

database/src/test/java/dev/msfjarvis/lobsters/data/local/SqlDelightQueriesTest.kt

@@ -1,12 +1,10 @@
 package dev.msfjarvis.lobsters.data.local
 
-import com.squareup.moshi.Moshi
-import com.squareup.sqldelight.ColumnAdapter
 import com.squareup.sqldelight.sqlite.driver.JdbcSqliteDriver
 import dev.msfjarvis.lobsters.database.LobstersDatabase
-
 import dev.msfjarvis.lobsters.model.Submitter
-import dev.msfjarvis.lobsters.model.SubmitterJsonAdapter
+import dev.msfjarvis.lobsters.model.SubmitterAdapter
+import dev.msfjarvis.lobsters.model.TagsAdapter
 import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertEquals
 import org.junit.Before
@@ -14,27 +12,7 @@ import org.junit.Test
 
 class SqlDelightQueriesTest {
 
-  private val moshi = Moshi.Builder().build()
-  private val submitterJsonAdapter = SubmitterJsonAdapter(moshi)
   private lateinit var postQueries: PostQueries
-  private val submitterAdapter = object : ColumnAdapter<Submitter, String> {
-    override fun decode(databaseValue: String): Submitter {
-      return submitterJsonAdapter.fromJson(databaseValue)!!
-    }
-
-    override fun encode(value: Submitter): String {
-      return submitterJsonAdapter.toJson(value)
-    }
-  }
-  private val tagsAdapter = object : ColumnAdapter<List<String>, String> {
-    override fun decode(databaseValue: String): List<String> {
-      return databaseValue.split(",")
-    }
-
-    override fun encode(value: List<String>): String {
-      return value.joinToString(",")
-    }
-  }
 
   @Before
   fun setUp() {
@@ -42,9 +20,8 @@ class SqlDelightQueriesTest {
     LobstersDatabase.Schema.create(driver)
     val database = LobstersDatabase(
       driver,
-      LobstersPost.Adapter(submitterAdapter, tagsAdapter)
+      LobstersPost.Adapter(SubmitterAdapter(), TagsAdapter())
     )
-
     postQueries = database.postQueries
   }