Refactored system

build.gradle.kts

@@ -43,10 +43,10 @@ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
 
 val jacocoExclude = listOf(
     "**/configuration/**",
-    "**/entity/**",
-    "**/enum/**",
-    "**/repository/**",
-    "**/service/**",
+    "**/entities/**",
+    "**/enums/**",
+    "**/repositories/**",
+    "**/services/**",
     "**/*Application*"
 )
 

src/main/kotlin/server/Application.kt → src/main/kotlin/trik/testsys/Application.kt

@@ -1,4 +1,4 @@
-package server
+package trik.testsys
 
 import org.springframework.boot.SpringApplication
 import org.springframework.boot.autoconfigure.SpringBootApplication

src/main/kotlin/server/configuration/Configuration.kt → src/main/kotlin/trik/testsys/gradingsystem/configuration/Configuration.kt

@@ -1,10 +1,11 @@
-package server.configuration
+package trik.testsys.gradingsystem.configuration
 
 import org.springframework.context.annotation.Configuration
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter
 
+
 @Configuration
 @EnableWebSecurity
 class Configuration : WebSecurityConfigurerAdapter() {

src/main/kotlin/server/controller/FileUploader.kt → src/main/kotlin/trik/testsys/gradingsystem/controllers/FileUploader.kt

@@ -1,14 +1,15 @@
-package server.controller
+package trik.testsys.gradingsystem.controllers
 
 import org.springframework.web.multipart.MultipartFile
 
-import server.enum.FilePostfixes
-import server.enum.Paths
+import trik.testsys.gradingsystem.enums.FilePostfixes
+import trik.testsys.gradingsystem.enums.Paths
 
 import java.io.BufferedOutputStream
 import java.io.File
 import java.io.FileOutputStream
 
+
 class FileUploader(private val file: MultipartFile, private val submissionId: Long) {
 
     fun upload(): Boolean {

src/main/kotlin/server/controller/SubmissionController.kt → src/main/kotlin/trik/testsys/gradingsystem/controllers/SubmissionController.kt

@@ -1,7 +1,7 @@
-package server.controller
+package trik.testsys.gradingsystem.controllers
 
-import server.service.SubmissionService
-import server.enum.*
+import trik.testsys.gradingsystem.services.SubmissionService
+import trik.testsys.gradingsystem.enums.*
 
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.core.io.InputStreamResource
@@ -18,6 +18,7 @@ import java.io.FileInputStream
 import com.beust.klaxon.JsonArray
 import com.beust.klaxon.JsonObject
 
+
 @RequestMapping("/v2/grading-system/submissions")
 @RestController
 class SubmissionController {

src/main/kotlin/server/entity/Submission.kt → src/main/kotlin/trik/testsys/gradingsystem/entities/Submission.kt

@@ -1,13 +1,14 @@
-package server.entity
+package trik.testsys.gradingsystem.entities
 
 import com.beust.klaxon.JsonObject
 
 import org.springframework.boot.context.properties.bind.Name
 
-import server.enum.Status
+import trik.testsys.gradingsystem.enums.Status
 
 import javax.persistence.*
 
+
 @Entity
 @Table(name = "SUBMISSIONS")
 class Submission(

src/main/kotlin/server/enum/FilePostfixes.kt → src/main/kotlin/trik/testsys/gradingsystem/enums/FilePostfixes.kt

@@ -1,4 +1,4 @@
-package server.enum
+package trik.testsys.gradingsystem.enums
 
 enum class FilePostfixes(val text: String) {
 

src/main/kotlin/server/enum/Jsons.kt → src/main/kotlin/trik/testsys/gradingsystem/enums/Jsons.kt

@@ -1,7 +1,8 @@
-package server.enum
+package trik.testsys.gradingsystem.enums
 
 import com.beust.klaxon.JsonObject
 
+
 object Jsons {
 
     val thereIsNoSubmissionJson = JsonObject(
@@ -15,7 +16,7 @@ object Jsons {
     val serverErrorJson = JsonObject(
         mapOf(
             "code" to 500,
-            "error_type" to "server",
+            "error_type" to "trik/testsys/gradingsystem",
             "message" to "Something on server went wrong."
         )
     )

src/main/kotlin/server/enum/Paths.kt → src/main/kotlin/trik/testsys/gradingsystem/enums/Paths.kt

@@ -1,4 +1,5 @@
-package server.enum
+package trik.testsys.gradingsystem.enums
+
 
 enum class Paths(val text: String) {
 

src/main/kotlin/server/enum/Status.kt → src/main/kotlin/trik/testsys/gradingsystem/enums/Status.kt

@@ -1,8 +1,9 @@
-package server.enum
+package trik.testsys.gradingsystem.enums
 
 import com.fasterxml.jackson.annotation.JsonFormat
 import com.fasterxml.jackson.annotation.JsonValue
 
+
 @JsonFormat(shape = JsonFormat.Shape.NUMBER)
 enum class Status(val code: Int) {
     QUEUED(100),

src/main/kotlin/server/enum/TRIKCommands.kt → src/main/kotlin/trik/testsys/gradingsystem/enums/TRIKCommands.kt

@@ -1,4 +1,5 @@
-package server.enum
+package trik.testsys.gradingsystem.enums
+
 
 enum class TRIKCommands(val command: String) {
 

src/main/kotlin/server/repository/SubmissionRepository.kt → src/main/kotlin/trik/testsys/gradingsystem/repositories/SubmissionRepository.kt

@@ -1,10 +1,11 @@
-package server.repository
+package trik.testsys.gradingsystem.repositories
 
-import server.entity.Submission
+import trik.testsys.gradingsystem.entities.Submission
 
 import org.springframework.data.repository.CrudRepository
 import org.springframework.stereotype.Repository
 
+
 @Repository
 interface SubmissionRepository : CrudRepository<Submission, String> {
 

src/main/kotlin/server/service/SubmissionService.kt → src/main/kotlin/trik/testsys/gradingsystem/services/SubmissionService.kt

@@ -1,10 +1,10 @@
-package server.service
+package trik.testsys.gradingsystem.services
 
 import com.beust.klaxon.Klaxon
 
-import server.entity.Submission
-import server.repository.SubmissionRepository
-import server.enum.*
+import trik.testsys.gradingsystem.entities.Submission
+import trik.testsys.gradingsystem.repositories.SubmissionRepository
+import trik.testsys.gradingsystem.enums.*
 
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
@@ -21,6 +21,7 @@ import java.time.format.DateTimeFormatter
 import java.util.concurrent.Executor
 import java.util.concurrent.TimeUnit
 
+
 @Service
 @EnableAsync
 class SubmissionService {

src/test/kotlin/controller/SubmissionControllerTest.kt

@@ -1,10 +1,10 @@
 package controller
 
-import server.Application
-import server.entity.Submission
-import server.enum.Jsons
-import server.enum.Status
-import server.service.SubmissionService
+import trik.testsys.Application
+import trik.testsys.gradingsystem.entities.Submission
+import trik.testsys.gradingsystem.enums.Jsons
+import trik.testsys.gradingsystem.enums.Status
+import trik.testsys.gradingsystem.services.SubmissionService
 
 import org.junit.jupiter.api.Assertions.*
 import org.junit.jupiter.api.Nested

src/test/kotlin/service/SubmissionServiceTest.kt

@@ -0,0 +1,39 @@
+package service
+
+import org.junit.jupiter.api.Assertions.*
+import org.junit.jupiter.api.Test
+import org.springframework.boot.test.context.SpringBootTest
+import org.mockito.Mockito
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.boot.test.mock.mockito.MockBean
+
+import trik.testsys.Application
+import trik.testsys.gradingsystem.entities.Submission
+import trik.testsys.gradingsystem.repositories.SubmissionRepository
+import trik.testsys.gradingsystem.services.SubmissionService
+
+@SpringBootTest(classes = [Application::class])
+class SubmissionServiceTest {
+
+    @Autowired
+    private lateinit var submissionService: SubmissionService
+
+    @MockBean
+    private lateinit var submissionRepository: SubmissionRepository
+
+    @Test
+    fun `getSubmissionById should return null if submission with such id doesn't exist`() {
+        Mockito.`when`(submissionRepository.findSubmissionById(1)).thenReturn(null)
+
+        assertNull(submissionService.getSubmissionOrNull(1))
+    }
+
+    @Test
+    fun `getSubmissionById should return existing submission`() {
+        val expectedSubmission = Submission("task_name", "id", "01.11.1212")
+
+        Mockito.`when`(submissionRepository.findSubmissionById(1)).thenReturn(expectedSubmission)
+
+        assertEquals(expectedSubmission, submissionService.getSubmissionOrNull(1))
+    }
+}