finished Table structure, start articles

readme.md

@@ -1,14 +1,14 @@
 # ![RealWorld Example App](logo.png)
 
-> ### Kotlin-Ktor codebase containing real world examples (CRUD, auth, advanced patterns, etc) that adheres to the [RealWorld](https://github.com/gothinkster/realworld) spec and API.
+> ### [Kotlin-Ktor](https://github.com/kotlin/ktor) codebase containing real world examples (CRUD, auth, advanced patterns, etc) that adheres to the [RealWorld](https://github.com/gothinkster/realworld) spec and API.
 
 
 ### [Demo](https://github.com/gothinkster/realworld)    [RealWorld](https://github.com/gothinkster/realworld)
 
 
-This codebase was created to demonstrate a fully fledged fullstack application built with **Kotlin-Ktor** including CRUD operations, authentication, routing, pagination, and more.
+This codebase was created to demonstrate a fully fledged fullstack application built with **[Kotlin-Ktor](https://github.com/kotlin/ktor)** including CRUD operations, authentication, routing, pagination, and more.
 
-We've gone to great lengths to adhere to the **Kotlin-Ktor** community styleguides & best practices.
+We've gone to great lengths to adhere to the **[Kotlin-Ktor](https://github.com/kotlin/ktor)** community styleguides & best practices.
 
 For more information on how to this works with other frontends/backends, head over to the [RealWorld](https://github.com/gothinkster/realworld) repo.
 

src/main/kotlin/me/avo/realworld/kotlin/ktor/data/Article.kt

@@ -11,6 +11,6 @@ data class Article(
         val createdAt: Date,
         val updatedAt: Date,
         val favorited: Boolean,
-        val favoritesCount: Int
-// TODO author
+        val favoritesCount: Int,
+        val author: Profile
 )

src/main/kotlin/me/avo/realworld/kotlin/ktor/data/ArticleQuery.kt

@@ -0,0 +1,25 @@
+package me.avo.realworld.kotlin.ktor.data
+
+import org.jetbrains.ktor.util.ValuesMap
+
+data class ArticleQuery(
+        val tag: String?,
+        val author: String?,
+        val favoritedBy: String?,
+        val limit: Int,
+        val offset: Int
+) {
+
+    companion object {
+
+        fun fromParameter(map: ValuesMap) = ArticleQuery(
+                tag = map["tag"],
+                author = map["author"],
+                favoritedBy = map["favorited"],
+                limit = map["limit"]?.toInt() ?: 20,
+                offset = map["offset"]?.toInt() ?: 0
+        )
+
+    }
+
+}

src/main/kotlin/me/avo/realworld/kotlin/ktor/data/Comment.kt

@@ -6,6 +6,6 @@ data class Comment(
         val id: Int,
         val createdAt: Date,
         val updatedAt: Date,
-        val body: String
-// TODO Author
+        val body: String,
+        val author: Profile
 )

src/main/kotlin/me/avo/realworld/kotlin/ktor/persistence/ArticleSource.kt

@@ -1,11 +1,12 @@
 package me.avo.realworld.kotlin.ktor.persistence
 
 import me.avo.realworld.kotlin.ktor.data.Article
+import me.avo.realworld.kotlin.ktor.data.ArticleQuery
 import me.avo.realworld.kotlin.ktor.data.Comment
 
 interface ArticleSource {
 
-    fun getArticles(): List<Article>
+    fun getArticles(query: ArticleQuery): List<Article>
 
     fun getFeed(): List<Article>
 

src/main/kotlin/me/avo/realworld/kotlin/ktor/persistence/ArticleSourceImpl.kt

@@ -0,0 +1,70 @@
+package me.avo.realworld.kotlin.ktor.persistence
+
+import me.avo.realworld.kotlin.ktor.data.Article
+import me.avo.realworld.kotlin.ktor.data.ArticleQuery
+import me.avo.realworld.kotlin.ktor.data.Comment
+import org.jetbrains.exposed.sql.Op
+import org.jetbrains.exposed.sql.SqlExpressionBuilder
+import org.jetbrains.exposed.sql.select
+import org.jetbrains.exposed.sql.transactions.transaction
+
+class ArticleSourceImpl : ArticleSource {
+
+    override fun getArticles(query: ArticleQuery): List<Article> = transaction {
+        (Articles leftJoin Tags leftJoin Favorites)
+                .select { parseQuery(query) }
+                .orderBy(Articles.createdAt, false)
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    fun parseQuery(query: ArticleQuery): Op<Boolean> = with(SqlExpressionBuilder) {
+        query.tag?.let { Tags.tag eq it }
+
+        TODO()
+    }
+
+    override fun getArticle(slug: String): Article {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    override fun insertArticle(): Article {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    override fun updateArticle(): Article {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    override fun deleteArticle() {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    override fun addComment(comment: Comment): Comment {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    override fun getComments(slug: String): List<Comment> {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    override fun deleteComment(slug: String, id: String) {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    override fun favorite(slug: String): Article {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    override fun unfavorite(slug: String): Article {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    override fun getTags(): List<String> {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    override fun getFeed(): List<Article> {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+}

src/main/kotlin/me/avo/realworld/kotlin/ktor/persistence/Tables.kt

@@ -2,29 +2,47 @@ package me.avo.realworld.kotlin.ktor.persistence
 
 import org.jetbrains.exposed.sql.Table
 
-val tables = arrayOf(Users, Following)
+val tables = arrayOf(Users, Following, Articles, Tags, Comments, Favorites)
 
 object Users : Table("users") {
-
     val id = integer("id").primaryKey().autoIncrement()
     val email = varchar("email", 254)
     val password = varchar("password", 255)
     val username = varchar("name", 50)
     val bio = varchar("bio", 255)
     val image = varchar("image", 255).nullable()
-
 }
 
-
-object Following: Table("following") {
+object Following : Table("following") {
     val sourceId = integer("source_id").primaryKey() references Users.id
     val targetId = integer("target_id").primaryKey() references Users.id
 }
 
 object Articles : Table("articles") {
+    val id = integer("id").primaryKey()
     val slug = varchar("slug", 255)
     val title = varchar("title", 255)
     val description = varchar("description", 255)
     val body = text("body")
+    val createdAt = datetime("createdAt")
+    val updatedAt = datetime("updatedAt")
+    val authorId = integer("author_id") references Users.id
+}
 
+object Tags : Table("tags") {
+    val articleId = integer("article_id") references Articles.id
+    val tag = varchar("tag", 255)
+}
+
+object Favorites : Table("favorites") {
+    val userId = integer("user_id") references Users.id
+    val articleId = integer("article_id") references Articles.id
+}
+
+object Comments : Table("comments") {
+    val id = integer("id").primaryKey()
+    val createdAt = datetime("createdAt")
+    val updatedAt = datetime("updatedAt")
+    val body = text("body")
+    val authorId = integer("author_id") references Users.id
 }

src/main/kotlin/me/avo/realworld/kotlin/ktor/server/Routing.kt

@@ -1,13 +1,11 @@
 package me.avo.realworld.kotlin.ktor.server
 
 import me.avo.realworld.kotlin.ktor.auth.LoginHandler
+import me.avo.realworld.kotlin.ktor.data.ArticleQuery
 import me.avo.realworld.kotlin.ktor.data.LoginCredentials
 import me.avo.realworld.kotlin.ktor.data.RegistrationDetails
 import me.avo.realworld.kotlin.ktor.data.User
-import me.avo.realworld.kotlin.ktor.persistence.ProfileSource
-import me.avo.realworld.kotlin.ktor.persistence.ProfileSourceImpl
-import me.avo.realworld.kotlin.ktor.persistence.UserSource
-import me.avo.realworld.kotlin.ktor.persistence.UserSourceImpl
+import me.avo.realworld.kotlin.ktor.persistence.*
 import me.avo.realworld.kotlin.ktor.util.user
 import org.jetbrains.ktor.application.ApplicationCall
 import org.jetbrains.ktor.application.ApplicationCallPipeline
@@ -83,12 +81,17 @@ fun Routing.setup() = route("api") {
     }
 
     route("articles") {
+        val articleSource: ArticleSource = ArticleSourceImpl()
 
         get {
-            TODO("Get articles")
+            val user = optionalLogin()
+            val query = ArticleQuery.fromParameter(call.parameters)
+            val articles = articleSource.getArticles(query)
+            call.respond(articles)
         }
 
         get("feed") {
+            val user = requireLogin()
             TODO("Feed Articles")
         }