first working version

Author: Ferum-bot

src/main/kotlin/com/ferum_bot/quotesapi/application/QuotesApiApplication.kt

@@ -32,7 +32,6 @@ import org.springframework.transaction.annotation.EnableTransactionManagement
     AuthorsDataSource::class,
     TagsDataSource::class,
 ])
-@EnableTransactionManagement
 class QuotesApiApplication
 
 fun main(args: Array<String>) {

src/main/kotlin/com/ferum_bot/quotesapi/configurations/RepositoryConfig.kt

@@ -41,31 +41,6 @@ class RepositoryConfig {
     @Autowired
     private lateinit var tagsDataSource: TagsDataSource
 
-    @Bean
-    fun provideDataSource(): DataSource {
-        val builder = EmbeddedDatabaseBuilder()
-        return builder.setType(EmbeddedDatabaseType.HSQL).build()
-    }
-
-    @Bean
-    fun provideLocalContainerManager(): LocalContainerEntityManagerFactoryBean {
-        val vendorAdapter = HibernateJpaVendorAdapter()
-        vendorAdapter.setGenerateDdl(true)
-
-        val factory = LocalContainerEntityManagerFactoryBean()
-        factory.jpaVendorAdapter = vendorAdapter
-        factory.dataSource = provideDataSource()
-        factory.setPackagesToScan("com.ferum_bot.quotesapi.repository.jpa")
-        return factory
-    }
-
-    @Bean
-    fun provideTransactionManager(factory: EntityManagerFactory): PlatformTransactionManager {
-        val txManager = JpaTransactionManager()
-        txManager.entityManagerFactory = factory
-        return txManager
-    }
-
     @Bean
     fun provideQuotesRepository(adapter: QuotesDataSourceAdapter): QuotesRepository {
         return QuotesRepositoryImpl(

src/main/kotlin/com/ferum_bot/quotesapi/configurations/ScanConfig.kt

@@ -1,8 +1,15 @@
 package com.ferum_bot.quotesapi.configurations
 
+import com.ferum_bot.quotesapi.controllers.QuoteAuthorsController
+import com.ferum_bot.quotesapi.controllers.QuotesController
+import com.ferum_bot.quotesapi.controllers.TagsController
 import org.springframework.context.annotation.ComponentScan
 import org.springframework.context.annotation.Configuration
 
 @Configuration
-@ComponentScan("com.ferum_bot.quotesapi.controllers")
+@ComponentScan(basePackageClasses = [
+    QuoteAuthorsController::class,
+    QuotesController::class,
+    TagsController::class,
+])
 class ScanConfig

src/main/kotlin/com/ferum_bot/quotesapi/models/entity/QuoteEntity.kt

@@ -15,12 +15,10 @@ data class QuoteEntity(
 
     var text: String,
 
-    @Column(name = "author")
     @ManyToOne
     @JoinColumn(name = "author_entity_id", referencedColumnName = "id")
     var author: AuthorEntity? = null,
 
-    @Column(name = "tag")
     @ManyToOne
     @JoinColumn(name = "tag_entity_id", referencedColumnName = "id")
     var tag: TagEntity? = null,

src/main/kotlin/com/ferum_bot/quotesapi/repositories/jpa/AuthorsDataSource.kt

@@ -8,7 +8,10 @@ import org.springframework.data.jpa.repository.Query
 
 interface AuthorsDataSource: JpaRepository<AuthorEntity, Long> {
 
-    @Query("SELECT AuthorEntity FROM AuthorEntity WHERE authorFullName LIKE ?1")
+    @Query(
+        value = "SELECT ALL FROM author_entity WHERE author_full_name=?1",
+        nativeQuery = true,
+    )
     fun getAllAuthorsWhereNameContains(text: String, pageable: Pageable): Page<AuthorEntity>
 
 }

src/main/kotlin/com/ferum_bot/quotesapi/repositories/jpa/QuotesDataSource.kt

@@ -7,12 +7,21 @@ import org.springframework.data.repository.CrudRepository
 
 interface QuotesDataSource: JpaRepository<QuoteEntity, Long> {
 
-    @Query("SELECT id FROM QuoteEntity")
+    @Query(
+        value = "SELECT id FROM quote_entity",
+        nativeQuery = true
+    )
     fun getAllAvailableIds(): List<Long>
 
-    @Query("SELECT QuoteEntity FROM QuoteEntity WHERE author.authorFullName = ?1")
+    @Query(
+        value = "SELECT ALL FROM QuoteEntity WHERE author.authorFullName = ?1",
+        nativeQuery = true
+    )
     fun getAllWhereAuthorIs(authorName: String): List<QuoteEntity>
 
-    @Query("SELECT QuoteEntity FROM QuoteEntity  WHERE tag.tagName = ?1")
+    @Query(
+        value = "SELECT ALL FROM QuoteEntity  WHERE tag.tagName = ?1",
+        nativeQuery = true,
+    )
     fun getAllWhereTagIs(tag: String): List<QuoteEntity>
 }

src/main/kotlin/com/ferum_bot/quotesapi/util/RandomUtil.kt

@@ -9,6 +9,11 @@ object RandomUtil {
      * Calculates random Ints between start and end inclusive.
      */
     fun getRandomIntsBetween(start: Int, end: Int, count: Int): List<Int> {
+        val segmentLength = end - start + 1
+        if (segmentLength <= count) {
+            return List(segmentLength) { it }
+        }
+
         val availableInts = mutableSetOf<Int>()
         val seed = System.currentTimeMillis()
         val random = Random(seed)

src/main/resources/application.properties

@@ -1,6 +1,6 @@
 spring.jpa.generate-ddl=true
 
-spring.datasource.username=Matvey
+spring.datasource.username=matvejpopov
 spring.datasource.password=1234567890
+spring.datasource.url=jdbc:postgresql://localhost:5432/postgres
 spring.sql.init.platform=postgres
-spring.sql.init.mode=always