fixes made by @MihajloBOS suggestions

nixos89 · nixos89 · commit 8154cb574c13 · 2021-06-10T18:36:24.000+02:00
diff --git a/src/main/java/org/example/java_kotlin/FirstJavaKotlinGradleApp.java b/src/main/java/org/example/java_kotlin/FirstJavaKotlinGradleApp.java
@@ -1,12 +1,12 @@
 package org.example.java_kotlin;
 
-import org.example.java_kotlin.config.TodoConfiguration;
+import org.example.java_kotlin.config.ToDoConfiguration;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 
 @SpringBootApplication
-@EnableConfigurationProperties(TodoConfiguration.class)
+@EnableConfigurationProperties(ToDoConfiguration.class)
 public class FirstJavaKotlinGradleApp {
 
     public static void main(String[] args) {
diff --git a/src/main/java/org/example/java_kotlin/config/ToDoConfiguration.java b/src/main/java/org/example/java_kotlin/config/ToDoConfiguration.java
@@ -12,7 +12,7 @@
 
 @Configuration
 @ConfigurationProperties("spring.flyway")
-public class TodoConfiguration {
+public class ToDoConfiguration {
 
     @Bean
     public DataSource datasource(
diff --git a/src/main/java/org/example/java_kotlin/controller/ArticleController.kt b/src/main/java/org/example/java_kotlin/controller/ArticleController.kt
@@ -1,15 +1,13 @@
 package org.example.java_kotlin.controller
 
 import org.example.java_kotlin.repositories.ArticleRepository
-import org.example.java_kotlin.repositories.UserRepository
 import org.springframework.http.HttpStatus
 import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.PathVariable
 import org.springframework.web.bind.annotation.RequestMapping
 import org.springframework.web.bind.annotation.RestController
 import org.springframework.web.server.ResponseStatusException
 
-/* These classes are just part of SpringBoot Kotlin tutorial */
 @RestController
 @RequestMapping("/api/article")
 class ArticleController(private val articleRepository: ArticleRepository) {
@@ -21,17 +19,4 @@ class ArticleController(private val articleRepository: ArticleRepository) {
     fun findOne(@PathVariable slug: String) = articleRepository
         .findBySlug(slug) ?: throw ResponseStatusException(HttpStatus.NOT_FOUND, "This article does not exist!")
 
-}
-
-@RestController
-@RequestMapping("/api/user")
-class UserController(private val userRepository: UserRepository) {
-
-    @GetMapping("/")
-    fun findAll() = userRepository.findAll()
-
-    @GetMapping("/{login}")
-    fun findOne(@PathVariable login: String) = userRepository
-        .findByLogin(login) ?: throw ResponseStatusException(HttpStatus.NOT_FOUND, "This user does not exist!")
-
 }
diff --git a/src/main/java/org/example/java_kotlin/controller/TodoController.kt b/src/main/java/org/example/java_kotlin/controller/TodoController.kt
@@ -1,8 +1,8 @@
 package org.example.java_kotlin.controller
 
-import org.example.java_kotlin.model.Todo
+import org.example.java_kotlin.model.ToDoEntity
 import org.example.java_kotlin.repositories.TodoRepository
-import org.example.java_kotlin.service.TodoService
+import org.example.java_kotlin.service.ToDoService
 import org.springframework.http.HttpStatus
 import org.springframework.http.ResponseEntity
 import org.springframework.util.ObjectUtils
@@ -11,33 +11,33 @@ import org.springframework.web.bind.annotation.*
 
 @RestController
 @RequestMapping("/api/todos")
-class TodoController(private val todoRepository: TodoRepository, private val todoService: TodoService) {
+class TodoController(private val todoRepository: TodoRepository, private val toDoService: ToDoService) {
 
     @GetMapping("/{todoId}")
-    fun getTodo(@PathVariable todoId: Long): ResponseEntity<Todo> {
-        val todo = todoService.getTodoById(todoId)
+    fun getTodo(@PathVariable todoId: Long): ResponseEntity<ToDoEntity> {
+        val todo = toDoService.getTodoById(todoId)
         if (todo.isPresent) return ResponseEntity(todo.get(), HttpStatus.OK)
         return ResponseEntity(HttpStatus.NOT_FOUND)
     }
 
     @GetMapping
-    fun getAllTodos(): ResponseEntity<List<Todo>> {
-        val todos = todoService.getAllTodos().toList()
+    fun getAllTodos(): ResponseEntity<List<ToDoEntity>> {
+        val todos = toDoService.getAllTodos().toList()
         if (todos.isNotEmpty()) return ResponseEntity(todos, HttpStatus.OK)
         return ResponseEntity(HttpStatus.NOT_FOUND)
     }
 
     @PostMapping
-    fun createTodo(@Validated @RequestBody todo: Todo): ResponseEntity<Void> {
-        if (todoService.createTodo(todo)) {
+    fun createTodo(@Validated @RequestBody toDoEntity: ToDoEntity): ResponseEntity<Void> {
+        if (toDoService.createTodo(toDoEntity)) {
             return ResponseEntity(HttpStatus.CREATED)
         }
         return ResponseEntity(HttpStatus.INTERNAL_SERVER_ERROR)
     }
 
     @PutMapping("/{todoId}")
-    fun updateTodo(@Validated @RequestBody todo: Todo, @PathVariable("todoId") todoId: Long): ResponseEntity<Void> {
-        val todoUpdated = todoService.updateTodo(todo, todoId)
+    fun updateTodo(@Validated @RequestBody toDoEntity: ToDoEntity, @PathVariable("todoId") todoId: Long): ResponseEntity<Void> {
+        val todoUpdated = toDoService.updateTodo(toDoEntity, todoId)
         if (ObjectUtils.isEmpty(todoUpdated)) {
             return ResponseEntity(HttpStatus.INTERNAL_SERVER_ERROR)
         }
@@ -46,8 +46,8 @@ class TodoController(private val todoRepository: TodoRepository, private val tod
     }
 
     @PatchMapping("/{todoId}")
-    fun partialUpdateTodo(@RequestBody todo: Todo, @PathVariable todoId: Long): ResponseEntity<Void> {
-        val patchedTodo = todoService.patchTodo(todo, todoId)
+    fun partialUpdateTodo(@RequestBody toDoEntity: ToDoEntity, @PathVariable todoId: Long): ResponseEntity<Void> {
+        val patchedTodo = toDoService.patchTodo(toDoEntity, todoId)
         if (ObjectUtils.isEmpty(patchedTodo)) {
             return ResponseEntity(HttpStatus.INTERNAL_SERVER_ERROR)
         }
@@ -56,7 +56,7 @@ class TodoController(private val todoRepository: TodoRepository, private val tod
 
     @DeleteMapping("/{todoId}")
     fun deleteTodo(@PathVariable todoId: Long): ResponseEntity<Void> {
-        if (todoService.deleteTodo(todoId)) {
+        if (toDoService.deleteTodo(todoId)) {
             return ResponseEntity(HttpStatus.NO_CONTENT)
         }
         return ResponseEntity(HttpStatus.NOT_FOUND)
diff --git a/src/main/java/org/example/java_kotlin/controller/UserController.kt b/src/main/java/org/example/java_kotlin/controller/UserController.kt
@@ -0,0 +1,22 @@
+package org.example.java_kotlin.controller
+
+import org.example.java_kotlin.repositories.UserRepository
+import org.springframework.http.HttpStatus
+import org.springframework.web.bind.annotation.GetMapping
+import org.springframework.web.bind.annotation.PathVariable
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+import org.springframework.web.server.ResponseStatusException
+
+@RestController
+@RequestMapping("/api/user")
+class UserController(private val userRepository: UserRepository) {
+
+    @GetMapping("/")
+    fun findAll() = userRepository.findAll()
+
+    @GetMapping("/{login}")
+    fun findOne(@PathVariable login: String) = userRepository
+        .findByLogin(login) ?: throw ResponseStatusException(HttpStatus.NOT_FOUND, "This user does not exist!")
+
+}
diff --git a/src/main/java/org/example/java_kotlin/model/ArticleEntity.kt b/src/main/java/org/example/java_kotlin/model/ArticleEntity.kt
@@ -4,27 +4,16 @@ import org.example.java_kotlin.util.toSlug
 import java.time.LocalDateTime
 import javax.persistence.*
 
-@Entity(name="users")
-class User(
-    var login: String,
-    var firstName: String,
-    var lastName: String,
-    var description: String? = null,
-    @Id
-    @SequenceGenerator(name="user_generator", sequenceName = "user_sequence", allocationSize = 1)
-    @GeneratedValue(generator = "user_generator")
-    var userId: Long? = null)
-
 @Entity(name="article")
-class Article(
+@Table(name="article")
+class ArticleEntity(
     var title: String,
     var headline: String,
     var content: String,
-    @ManyToOne var author: User,
+    @ManyToOne var author: UserEntity,
     var slug: String = title.toSlug(),
     var addedAt: LocalDateTime = LocalDateTime.now(),
     @Id
     @SequenceGenerator(name="article_generator", sequenceName = "article_sequence", allocationSize = 1)
     @GeneratedValue(generator = "article_generator")
-    var articleId: Long? = null)
-
+    var articleId: Long? = null)
diff --git a/src/main/java/org/example/java_kotlin/model/ToDoEntity.kt b/src/main/java/org/example/java_kotlin/model/ToDoEntity.kt
@@ -1,12 +1,10 @@
 package org.example.java_kotlin.model
 
-import javax.persistence.Entity
-import javax.persistence.GeneratedValue
-import javax.persistence.Id
-import javax.persistence.SequenceGenerator
+import javax.persistence.*
 
 @Entity
-data class Todo(
+@Table(name="todo")
+data class ToDoEntity(
     @Id
     @SequenceGenerator(name="todo_generator", sequenceName = "todo_sequence", allocationSize = 1)
     @GeneratedValue(generator = "todo_generator")
diff --git a/src/main/java/org/example/java_kotlin/model/UserEntity.kt b/src/main/java/org/example/java_kotlin/model/UserEntity.kt
@@ -0,0 +1,15 @@
+package org.example.java_kotlin.model
+
+import javax.persistence.*
+
+@Entity(name="users")
+@Table(name="users")
+class UserEntity(
+    var login: String,
+    var firstName: String,
+    var lastName: String,
+    var description: String? = null,
+    @Id
+    @SequenceGenerator(name="user_generator", sequenceName = "user_sequence", allocationSize = 1)
+    @GeneratedValue(generator = "user_generator")
+    var userId: Long? = null)
diff --git a/src/main/java/org/example/java_kotlin/repositories/ArticleRepository.kt b/src/main/java/org/example/java_kotlin/repositories/ArticleRepository.kt
@@ -0,0 +1,11 @@
+package org.example.java_kotlin.repositories
+
+import org.example.java_kotlin.model.ArticleEntity
+import org.springframework.data.repository.CrudRepository
+import org.springframework.stereotype.Repository
+
+@Repository
+interface ArticleRepository: CrudRepository<ArticleEntity, Long> {
+    fun findBySlug(slug: String): ArticleEntity?
+    fun findAllByOrderByAddedAtDesc(): Iterable<ArticleEntity>
+}
diff --git a/src/main/java/org/example/java_kotlin/repositories/Repositories.kt b/src/main/java/org/example/java_kotlin/repositories/Repositories.kt
diff --git a/src/main/java/org/example/java_kotlin/repositories/TodoRepository.kt b/src/main/java/org/example/java_kotlin/repositories/TodoRepository.kt
@@ -0,0 +1,11 @@
+package org.example.java_kotlin.repositories
+
+import org.example.java_kotlin.model.ToDoEntity
+import org.springframework.data.repository.CrudRepository
+import org.springframework.stereotype.Repository
+
+
+@Repository
+interface TodoRepository: CrudRepository<ToDoEntity, Long> {
+    fun findAllByOrderByTodoId(): Iterable<ToDoEntity>
+}
diff --git a/src/main/java/org/example/java_kotlin/repositories/UserRepository.kt b/src/main/java/org/example/java_kotlin/repositories/UserRepository.kt
@@ -0,0 +1,10 @@
+package org.example.java_kotlin.repositories
+
+import org.example.java_kotlin.model.UserEntity
+import org.springframework.data.repository.CrudRepository
+import org.springframework.stereotype.Repository
+
+@Repository
+interface UserRepository: CrudRepository<UserEntity, Long> {
+    fun findByLogin(login: String): UserEntity?
+}
diff --git a/src/main/java/org/example/java_kotlin/service/Services.kt b/src/main/java/org/example/java_kotlin/service/Services.kt
diff --git a/src/main/java/org/example/java_kotlin/service/ToDoService.kt b/src/main/java/org/example/java_kotlin/service/ToDoService.kt
@@ -0,0 +1,13 @@
+package org.example.java_kotlin.service
+
+import org.example.java_kotlin.model.ToDoEntity
+import java.util.*
+
+interface ToDoService {
+    fun getTodoById(toDoId: Long): Optional<ToDoEntity>
+    fun getAllTodos(): Iterable<ToDoEntity>
+    fun createTodo(toDoEntity: ToDoEntity): Boolean
+    fun updateTodo(toDoEntity: ToDoEntity, todoId: Long): ToDoEntity?
+    fun patchTodo(toDoEntity: ToDoEntity, todoId: Long): ToDoEntity?
+    fun deleteTodo(todoId: Long): Boolean
+}
diff --git a/src/main/java/org/example/java_kotlin/service/ToDoServiceImpl.kt b/src/main/java/org/example/java_kotlin/service/ToDoServiceImpl.kt
@@ -0,0 +1,53 @@
+package org.example.java_kotlin.service
+
+import org.example.java_kotlin.model.ToDoEntity
+import org.example.java_kotlin.repositories.TodoRepository
+import org.springframework.stereotype.Service
+import org.springframework.util.ObjectUtils
+import java.util.*
+
+@Service
+class ToDoServiceImpl(private val todoRepository: TodoRepository) : ToDoService {
+
+    override fun getTodoById(toDoId: Long): Optional<ToDoEntity> = todoRepository.findById(toDoId)
+
+    override fun getAllTodos(): Iterable<ToDoEntity> = todoRepository.findAllByOrderByTodoId()
+
+    override fun createTodo(toDoEntity: ToDoEntity): Boolean {
+        val savedTodo = todoRepository.save(toDoEntity)
+        if (ObjectUtils.isEmpty(savedTodo)) {
+            return false
+        }
+        return true
+    }
+
+    override fun updateTodo(toDoEntity: ToDoEntity, todoId: Long): ToDoEntity? {
+        return todoRepository.findById(todoId).map { todoDetails ->
+            val updatedToDoEntity: ToDoEntity = todoDetails.copy(
+                title = toDoEntity.title,
+                description = toDoEntity.description
+            )
+            todoRepository.save(updatedToDoEntity)
+        }.orElse(null)
+    }
+
+    override fun patchTodo(toDoEntity: ToDoEntity, todoId: Long): ToDoEntity? {
+        return todoRepository.findById(todoId).map { todoDetails ->
+            val patchedTodo = todoDetails.copy(
+                title = toDoEntity.title ?: todoDetails.title,
+                description = toDoEntity.description ?: todoDetails.description
+            )
+            todoRepository.save(patchedTodo)
+        }.orElse(null)
+    }
+
+    override fun deleteTodo(todoId: Long): Boolean {
+        val todo = getTodoById(todoId)
+        if (todo.isPresent) {
+            todoRepository.deleteById(todoId)
+            return true
+        }
+        return false
+    }
+
+}
diff --git a/src/main/java/org/example/java_kotlin/service/TodoServiceImpl.kt b/src/main/java/org/example/java_kotlin/service/TodoServiceImpl.kt
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
diff --git a/src/test/java/org/example/java_kotlin/HttpControllersTests.kt b/src/test/java/org/example/java_kotlin/HttpControllersTests.kt
