Store generated products in database via Exposed ORM

beleavemebe · beleavemebe · commit 7acd3fe6dfe3 · 2022-04-09T14:19:01.000+03:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -3,6 +3,7 @@ val kotlin_version: String by project
 val logback_version: String by project
 val exposed_version: String by project
 val faker_version: String by project
+val postgresql_version: String by project
 
 plugins {
     application
@@ -26,6 +27,7 @@ dependencies {
     implementation("org.jetbrains.exposed:exposed-dao:$exposed_version")
     implementation("org.jetbrains.exposed:exposed-jdbc:$exposed_version")
     implementation("org.jetbrains.exposed:exposed-jodatime:$exposed_version")
+    implementation("org.postgresql:postgresql:$postgresql_version")
     implementation("io.github.serpro69:kotlin-faker:$faker_version")
     implementation("io.ktor:ktor-serialization-kotlinx-json:$ktor_version")
     implementation("io.ktor:ktor-client-serialization:$ktor_version")
diff --git a/gradle.properties b/gradle.properties
@@ -2,5 +2,6 @@ ktor_version=2.0.0-beta-1
 kotlin_version=1.6.10
 logback_version=1.2.3
 exposed_version=0.37.3
+postgresql_version=42.3.3
 faker_version=1.10.0
 kotlin.code.style=official
diff --git a/src/main/kotlin/com/narcissus/marketplace/api/Application.kt b/src/main/kotlin/com/narcissus/marketplace/api/Application.kt
@@ -1,5 +1,6 @@
 package com.narcissus.marketplace.api
 
+import com.narcissus.marketplace.api.data.db.initDatabase
 import io.ktor.server.engine.*
 import io.ktor.server.netty.*
 import com.narcissus.marketplace.api.route.*
@@ -25,6 +26,7 @@ fun main() {
                 }
 
                 initConfig()
+                initDatabase()
                 configureRouting()
             }
         }
diff --git a/src/main/kotlin/com/narcissus/marketplace/api/data/EntityProduct.kt b/src/main/kotlin/com/narcissus/marketplace/api/data/EntityProduct.kt
@@ -1,20 +1,42 @@
 package com.narcissus.marketplace.api.data
 
+import com.narcissus.marketplace.api.model.Product
 import org.jetbrains.exposed.dao.UUIDEntity
 import org.jetbrains.exposed.dao.UUIDEntityClass
 import org.jetbrains.exposed.dao.id.EntityID
 import java.util.*
 
 
 class EntityProduct(id: EntityID<UUID>) : UUIDEntity(id) {
+    fun toProduct(): Product =
+        Product(
+            id.value.toString(),
+            name,
+            productImg150,
+            productImg300,
+            productImg600,
+            departmentId,
+            departmentName,
+            type,
+            price,
+            saleInfo?.toSaleInfo(),
+            inStock,
+            color,
+            material,
+            rating,
+            sales,
+            description,
+            reviews.map(EntityReview::toReview),
+            similarProducts.map(EntitySimilarProducts::similarProductId),
+        )
+
     companion object : UUIDEntityClass<EntityProduct>(Products)
 
     var productImg150 by Products.productImg150
     var productImg300 by Products.productImg300
     var productImg600 by Products.productImg600
     var name by Products.name
     var price by Products.price
-    var saleInfo by EntitySaleInfo referencedOn Products.saleInfo
     var type by Products.type
     var departmentId by Products.departmentId
     var departmentName by Products.departmentName
@@ -24,5 +46,7 @@ class EntityProduct(id: EntityID<UUID>) : UUIDEntity(id) {
     var rating by Products.rating
     var sales by Products.sales
     var description by Products.description
-    var reviews by EntityReview referencedOn Products.reviews
+    val saleInfo by EntitySaleInfo optionalReferencedOn Products.saleInfo
+    val reviews by EntityReview optionalReferrersOn Reviews.product
+    val similarProducts by EntitySimilarProducts optionalReferrersOn SimilarProducts.product
 }
diff --git a/src/main/kotlin/com/narcissus/marketplace/api/data/EntityReview.kt b/src/main/kotlin/com/narcissus/marketplace/api/data/EntityReview.kt
@@ -1,5 +1,6 @@
 package com.narcissus.marketplace.api.data
 
+import com.narcissus.marketplace.api.model.Review
 import org.jetbrains.exposed.dao.UUIDEntity
 import org.jetbrains.exposed.dao.UUIDEntityClass
 import org.jetbrains.exposed.dao.id.EntityID
@@ -8,9 +9,19 @@ import java.util.*
 class EntityReview(id: EntityID<UUID>) : UUIDEntity(id) {
     companion object : UUIDEntityClass<EntityReview>(Reviews)
 
-    val product by EntityProduct referencedOn Reviews.product
+    var product by EntityProduct optionalReferencedOn Reviews.product
     var author by Reviews.author
     var details by Reviews.details
     var rating by Reviews.rating
     var avatar by Reviews.avatar
+
+    fun toReview(): Review =
+        Review(
+            id.value.toString(),
+            product?.id?.value.toString(),
+            author,
+            details,
+            rating,
+            avatar,
+        )
 }
diff --git a/src/main/kotlin/com/narcissus/marketplace/api/data/EntitySaleInfo.kt b/src/main/kotlin/com/narcissus/marketplace/api/data/EntitySaleInfo.kt
@@ -1,10 +1,19 @@
 package com.narcissus.marketplace.api.data
 
+import com.narcissus.marketplace.api.model.SaleInfo
 import org.jetbrains.exposed.dao.IntEntity
 import org.jetbrains.exposed.dao.IntEntityClass
 import org.jetbrains.exposed.dao.id.EntityID
 
 class EntitySaleInfo(id: EntityID<Int>) : IntEntity(id) {
+    fun toSaleInfo(): SaleInfo {
+        return SaleInfo(
+            prevPrice,
+            percentOff,
+            msRemaining
+        )
+    }
+
     companion object : IntEntityClass<EntitySaleInfo>(SalesInfo)
 
     val product by EntityProduct referencedOn SalesInfo.product
diff --git a/src/main/kotlin/com/narcissus/marketplace/api/data/EntitySimilarProducts.kt b/src/main/kotlin/com/narcissus/marketplace/api/data/EntitySimilarProducts.kt
@@ -0,0 +1,12 @@
+package com.narcissus.marketplace.api.data
+
+import org.jetbrains.exposed.dao.IntEntity
+import org.jetbrains.exposed.dao.IntEntityClass
+import org.jetbrains.exposed.dao.id.EntityID
+
+class EntitySimilarProducts(id: EntityID<Int>) : IntEntity(id) {
+    companion object : IntEntityClass<EntitySimilarProducts>(SimilarProducts)
+
+    var product by EntityProduct optionalReferencedOn SimilarProducts.product
+    var similarProductId by SimilarProducts.similarProductId
+}
diff --git a/src/main/kotlin/com/narcissus/marketplace/api/data/Products.kt b/src/main/kotlin/com/narcissus/marketplace/api/data/Products.kt
@@ -8,15 +8,15 @@ object Products : UUIDTable() {
     var productImg600 = varchar("product_img_600", length = 127)
     var name = varchar("name", length = 127)
     var price = integer("price")
-    var saleInfo = reference("sale_info", SalesInfo)
-    var type = varchar("type", length = 30)
-    var departmentId = varchar("type", length = 30)
-    var departmentName = varchar("type", length = 30)
+    var saleInfo = optReference("sale_info", SalesInfo)
+    var type = varchar("type", length = 127)
+    var departmentId = varchar("department_id", length = 127)
+    var departmentName = varchar("department_name", length = 127)
     var inStock = integer("in_stock")
-    var color = varchar("color", length = 15)
-    var material = varchar("material", length = 30)
+    var color = varchar("color", length = 127)
+    var material = varchar("material", length = 127)
     var rating = integer("rating")
     var sales = integer("sales")
     var description = text("description")
-    var reviews = reference("reviews", Reviews)
+    var similarProducts = optReference("similar_products", Products)
 }
diff --git a/src/main/kotlin/com/narcissus/marketplace/api/data/Reviews.kt b/src/main/kotlin/com/narcissus/marketplace/api/data/Reviews.kt
@@ -3,7 +3,7 @@ package com.narcissus.marketplace.api.data
 import org.jetbrains.exposed.dao.id.UUIDTable
 
 object Reviews : UUIDTable() {
-    val product = SalesInfo.reference("product", Products)
+    val product = optReference("product", Products)
     var author = varchar("author", length = 127)
     var details = text("details")
     var rating = integer("rating")
diff --git a/src/main/kotlin/com/narcissus/marketplace/api/data/SimilarProducts.kt b/src/main/kotlin/com/narcissus/marketplace/api/data/SimilarProducts.kt
@@ -0,0 +1,8 @@
+package com.narcissus.marketplace.api.data
+
+import org.jetbrains.exposed.dao.id.IntIdTable
+
+object SimilarProducts : IntIdTable() {
+    val product = optReference("product", Products)
+    val similarProductId = varchar("similar", 63)
+}
diff --git a/src/main/kotlin/com/narcissus/marketplace/api/data/db/Database.kt b/src/main/kotlin/com/narcissus/marketplace/api/data/db/Database.kt
@@ -0,0 +1,31 @@
+package com.narcissus.marketplace.api.data.db
+
+import com.narcissus.marketplace.api.data.Products
+import com.narcissus.marketplace.api.data.Reviews
+import com.narcissus.marketplace.api.data.SalesInfo
+import com.narcissus.marketplace.api.data.SimilarProducts
+import io.ktor.server.application.*
+import org.jetbrains.exposed.sql.Database
+import org.jetbrains.exposed.sql.SchemaUtils
+import org.jetbrains.exposed.sql.transactions.transaction
+
+fun Application.initDatabase() {
+    val dbConfig = environment.config.config("database")
+    val host = dbConfig.property("host").getString()
+    val port = dbConfig.property("port").getString()
+    val name = dbConfig.property("name").getString()
+    val user = dbConfig.property("user").getString()
+    val password = dbConfig.property("password").getString()
+
+    Database.connect(
+        url = "jdbc:postgresql://$host:$port/$name",
+        driver = "org.postgresql.Driver",
+        user = user,
+        password = password,
+    )
+
+    transaction {
+        val tables = arrayOf(Products, Reviews, SalesInfo, SimilarProducts)
+        SchemaUtils.createMissingTablesAndColumns(*tables)
+    }
+}
diff --git a/src/main/kotlin/com/narcissus/marketplace/api/dataset/DatasetGenerator.kt b/src/main/kotlin/com/narcissus/marketplace/api/dataset/DatasetGenerator.kt
@@ -139,6 +139,9 @@ class DatasetGenerator {
                     .shuffled()
                     .take(5)
                     .toList()
+                    .map {
+                        it.id
+                    }
 
                 result += product.copy(similarProducts = similarProducts)
             }
diff --git a/src/main/kotlin/com/narcissus/marketplace/api/model/Product.kt b/src/main/kotlin/com/narcissus/marketplace/api/model/Product.kt
@@ -21,5 +21,50 @@ data class Product(
     val sales: Int,
     val description: String,
     val reviews: List<Review>,
-    val similarProducts: List<Product>,
-)
+    val similarProducts: List<String>,
+) {
+    fun toProductDetails(): ProductDetails =
+        ProductDetails(
+            id,
+            productImg600,
+            name,
+            price,
+            type,
+            departmentName,
+            inStock,
+            color,
+            material,
+            rating,
+            sales,
+            description,
+            reviews,
+            similarProducts
+        )
+
+    fun toProductPreview(): ProductPreview =
+        ProductPreview(
+            id,
+            productImg300,
+            name,
+            price,
+            type,
+            departmentName,
+            inStock,
+            color,
+            material,
+            rating,
+            sales,
+        )
+
+    fun toSimilarProduct(): SimilarProduct =
+        SimilarProduct(
+            id,
+            productImg300,
+            name,
+            price,
+            type,
+            departmentName,
+            inStock,
+            rating
+        )
+}
diff --git a/src/main/kotlin/com/narcissus/marketplace/api/model/ProductDetails.kt b/src/main/kotlin/com/narcissus/marketplace/api/model/ProductDetails.kt
@@ -44,6 +44,6 @@ data class ProductDetails(
     @SerialName("product_reviews")
     val reviewsList: List<Review>,
 
-    @SerialName("product_similar")
-    val similarProductsList: List<SimilarProduct>,
+    @SerialName("product_similar_ids")
+    val similarProductsList: List<String>,
 )
diff --git a/src/main/kotlin/com/narcissus/marketplace/api/model/request/OrderRequest.kt b/src/main/kotlin/com/narcissus/marketplace/api/model/request/OrderRequest.kt
@@ -5,6 +5,7 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class OrderRequest(
+    @SerialName("id")
     val id: String,
     @SerialName("order_items")
     val orderItems: List<OrderRequestItem>
diff --git a/src/main/kotlin/com/narcissus/marketplace/api/repository/product/ProductRepository.kt b/src/main/kotlin/com/narcissus/marketplace/api/repository/product/ProductRepository.kt
@@ -1,6 +1,7 @@
 package com.narcissus.marketplace.api.repository.product
 
 import com.narcissus.marketplace.api.Config
+import com.narcissus.marketplace.api.model.Product
 import com.narcissus.marketplace.api.repository.product.dummyproductsapi.DummyProductsServiceImpl
 import io.ktor.client.*
 
@@ -13,12 +14,15 @@ interface ProductRepository {
     suspend fun searchProducts(query: String, page: Int, perPage: Int): String
     suspend fun searchProductsTopRated(query: String, page: Int, perPage: Int): String
     suspend fun searchProductsTopSales(query: String, page: Int, perPage: Int): String
+    suspend fun insertAll(products: List<Product>)
 
     companion object {
         fun newInstance(): ProductRepository {
-            return DummyProductsServiceImpl(
-                apiKey = Config::apiKey,
-                httpClient = HttpClient()
+            return ProductRepositoryImpl(
+                apiService = DummyProductsServiceImpl(
+                    apiKey = Config::apiKey,
+                    httpClient = HttpClient()
+                )
             )
         }
     }
diff --git a/src/main/kotlin/com/narcissus/marketplace/api/repository/product/ProductRepositoryImpl.kt b/src/main/kotlin/com/narcissus/marketplace/api/repository/product/ProductRepositoryImpl.kt
diff --git a/src/main/kotlin/com/narcissus/marketplace/api/repository/product/dummyproductsapi/DummyProductsServiceImpl.kt b/src/main/kotlin/com/narcissus/marketplace/api/repository/product/dummyproductsapi/DummyProductsServiceImpl.kt
diff --git a/src/main/kotlin/com/narcissus/marketplace/api/route/Routing.kt b/src/main/kotlin/com/narcissus/marketplace/api/route/Routing.kt
diff --git a/src/main/kotlin/com/narcissus/marketplace/api/service/checkout/CheckoutService.kt b/src/main/kotlin/com/narcissus/marketplace/api/service/checkout/CheckoutService.kt
diff --git a/src/main/resources/application.conf b/src/main/resources/application.conf
diff --git a/src/test/kotlin/com/narcissus/marketplace/api/dataset/ProductsDatasetTest.kt b/src/test/kotlin/com/narcissus/marketplace/api/dataset/ProductsDatasetTest.kt

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`package com.narcissus.marketplace.api`
`2`	`2`
	`3`	`+import com.narcissus.marketplace.api.data.db.initDatabase`
`3`	`4`	`import io.ktor.server.engine.*`
`4`	`5`	`import io.ktor.server.netty.*`
`5`	`6`	`import com.narcissus.marketplace.api.route.*`
`@@ -25,6 +26,7 @@ fun main() {`
`25`	`26`	`}`
`26`	`27`
`27`	`28`	`initConfig()`
	`29`	`+ initDatabase()`
`28`	`30`	`configureRouting()`
`29`	`31`	`}`
`30`	`32`	`}`