chore: refactor application structure

src/main/kotlin/odyseja/odysejapka/domain/Progress.kt → src/main/kotlin/odyseja/odysejapka/Progress.kt

@@ -1,3 +1,3 @@
-package odyseja.odysejapka.domain
+package odyseja.odysejapka
 
 data class Progress(val progress: Int, val status: Status)

src/main/kotlin/odyseja/odysejapka/domain/Status.kt → src/main/kotlin/odyseja/odysejapka/Status.kt

@@ -1,4 +1,4 @@
-package odyseja.odysejapka.domain
+package odyseja.odysejapka
 
 enum class Status {
     STOPPED, RUNNING

src/main/kotlin/odyseja/odysejapka/rest/AgeController.kt → src/main/kotlin/odyseja/odysejapka/age/AgeController.kt

@@ -1,9 +1,6 @@
-package odyseja.odysejapka.rest
+package odyseja.odysejapka.age
 
-import odyseja.odysejapka.domain.AgeEntity
-import odyseja.odysejapka.service.AgeService
 import org.springframework.security.access.annotation.Secured
-import org.springframework.security.access.prepost.PreAuthorize
 import org.springframework.web.bind.annotation.*
 import java.security.Principal
 

src/main/kotlin/odyseja/odysejapka/domain/AgeEntity.kt → src/main/kotlin/odyseja/odysejapka/age/AgeEntity.kt

@@ -1,4 +1,4 @@
-package odyseja.odysejapka.domain
+package odyseja.odysejapka.age
 
 import javax.persistence.Column
 import javax.persistence.Entity

src/main/kotlin/odyseja/odysejapka/service/AgeRepository.kt → src/main/kotlin/odyseja/odysejapka/age/AgeRepository.kt

@@ -1,6 +1,5 @@
-package odyseja.odysejapka.service
+package odyseja.odysejapka.age
 
-import odyseja.odysejapka.domain.AgeEntity
 import org.springframework.data.repository.CrudRepository
 
 interface AgeRepository : CrudRepository<AgeEntity, Int> {

src/main/kotlin/odyseja/odysejapka/service/AgeService.kt → src/main/kotlin/odyseja/odysejapka/age/AgeService.kt

@@ -1,6 +1,6 @@
-package odyseja.odysejapka.service
+package odyseja.odysejapka.age
 
-import odyseja.odysejapka.domain.AgeEntity
+import odyseja.odysejapka.change.ChangeService
 import org.springframework.stereotype.Service
 
 @Service

src/main/kotlin/odyseja/odysejapka/rest/BreakingChangeController.kt → src/main/kotlin/odyseja/odysejapka/breaking/change/BreakingChangeController.kt

@@ -1,6 +1,5 @@
-package odyseja.odysejapka.rest
+package odyseja.odysejapka.breaking.change
 
-import odyseja.odysejapka.service.BreakingChangeService
 import org.springframework.security.access.annotation.Secured
 import org.springframework.web.bind.annotation.*
 

src/main/kotlin/odyseja/odysejapka/domain/BreakingChangeEntity.kt → src/main/kotlin/odyseja/odysejapka/breaking/change/BreakingChangeEntity.kt

@@ -1,6 +1,5 @@
-package odyseja.odysejapka.domain
+package odyseja.odysejapka.breaking.change
 
-import odyseja.odysejapka.rest.BreakingChangeController
 import javax.persistence.Column
 import javax.persistence.Entity
 import javax.persistence.Id

src/main/kotlin/odyseja/odysejapka/service/BreakingChangeRepository.kt → src/main/kotlin/odyseja/odysejapka/breaking/change/BreakingChangeRepository.kt

@@ -1,6 +1,5 @@
-package odyseja.odysejapka.service
+package odyseja.odysejapka.breaking.change
 
-import odyseja.odysejapka.domain.BreakingChangeEntity
 import org.springframework.data.repository.CrudRepository
 
 interface BreakingChangeRepository : CrudRepository<BreakingChangeEntity, Int> {

src/main/kotlin/odyseja/odysejapka/service/BreakingChangeService.kt → src/main/kotlin/odyseja/odysejapka/breaking/change/BreakingChangeService.kt

@@ -1,7 +1,5 @@
-package odyseja.odysejapka.service
+package odyseja.odysejapka.breaking.change
 
-import odyseja.odysejapka.domain.BreakingChangeEntity
-import odyseja.odysejapka.rest.BreakingChangeController
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
 

src/main/kotlin/odyseja/odysejapka/domain/ChangeEntity.kt → src/main/kotlin/odyseja/odysejapka/change/ChangeEntity.kt

@@ -1,4 +1,4 @@
-package odyseja.odysejapka.domain
+package odyseja.odysejapka.change
 
 import java.sql.Timestamp
 import javax.persistence.*

src/main/kotlin/odyseja/odysejapka/service/ChangeRepository.kt → src/main/kotlin/odyseja/odysejapka/change/ChangeRepository.kt

@@ -1,6 +1,5 @@
-package odyseja.odysejapka.service
+package odyseja.odysejapka.change
 
-import odyseja.odysejapka.domain.ChangeEntity
 import org.springframework.data.repository.CrudRepository
 
 interface ChangeRepository : CrudRepository<ChangeEntity, Int> {

src/main/kotlin/odyseja/odysejapka/service/ChangeService.kt → src/main/kotlin/odyseja/odysejapka/change/ChangeService.kt

@@ -1,7 +1,5 @@
-package odyseja.odysejapka.service
+package odyseja.odysejapka.change
 
-import odyseja.odysejapka.domain.ChangeEntity
-import odyseja.odysejapka.domain.Version
 import org.springframework.stereotype.Service
 import java.sql.Timestamp
 

src/main/kotlin/odyseja/odysejapka/domain/Version.kt → src/main/kotlin/odyseja/odysejapka/change/Version.kt

@@ -1,4 +1,4 @@
-package odyseja.odysejapka.domain
+package odyseja.odysejapka.change
 
 data class Version (
   val version: Int

src/main/kotlin/odyseja/odysejapka/rest/VersionController.kt → src/main/kotlin/odyseja/odysejapka/change/VersionController.kt

@@ -1,7 +1,5 @@
-package odyseja.odysejapka.rest
+package odyseja.odysejapka.change
 
-import odyseja.odysejapka.domain.Version
-import odyseja.odysejapka.service.ChangeService
 import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.RequestMapping
 import org.springframework.web.bind.annotation.RestController

src/main/kotlin/odyseja/odysejapka/rest/CityController.kt → src/main/kotlin/odyseja/odysejapka/city/CityController.kt

@@ -1,7 +1,5 @@
-package odyseja.odysejapka.rest
+package odyseja.odysejapka.city
 
-import odyseja.odysejapka.domain.CityEntity
-import odyseja.odysejapka.service.CityService
 import org.springframework.security.access.annotation.Secured
 import org.springframework.web.bind.annotation.*
 

src/main/kotlin/odyseja/odysejapka/domain/CityEntity.kt → src/main/kotlin/odyseja/odysejapka/city/CityEntity.kt

@@ -1,4 +1,4 @@
-package odyseja.odysejapka.domain
+package odyseja.odysejapka.city
 
 import javax.persistence.*
 

src/main/kotlin/odyseja/odysejapka/service/CityRepository.kt → src/main/kotlin/odyseja/odysejapka/city/CityRepository.kt

@@ -1,8 +1,5 @@
-package odyseja.odysejapka.service
+package odyseja.odysejapka.city
 
-import odyseja.odysejapka.domain.CityEntity
-import org.springframework.data.jpa.repository.Modifying
-import org.springframework.data.jpa.repository.Query
 import org.springframework.data.repository.CrudRepository
 
 interface CityRepository : CrudRepository<CityEntity?, Int?> {

src/main/kotlin/odyseja/odysejapka/service/CityService.kt → src/main/kotlin/odyseja/odysejapka/city/CityService.kt

@@ -1,6 +1,6 @@
-package odyseja.odysejapka.service
+package odyseja.odysejapka.city
 
-import odyseja.odysejapka.domain.CityEntity
+import odyseja.odysejapka.change.ChangeService
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
 

src/main/kotlin/odyseja/odysejapka/drive/SpontanGroup.kt

@@ -1,6 +1,6 @@
 package odyseja.odysejapka.drive
 
-import odyseja.odysejapka.domain.Performance
+import odyseja.odysejapka.timetable.Performance
 
 data class SpontanGroups(val group: Group, val performances: List<Performance>) {
 

src/main/kotlin/odyseja/odysejapka/gad/GadController.kt

@@ -1,6 +1,6 @@
 package odyseja.odysejapka.gad
 
-import odyseja.odysejapka.domain.Progress
+import odyseja.odysejapka.Progress
 import org.springframework.security.access.annotation.Secured
 import org.springframework.web.bind.annotation.*
 

src/main/kotlin/odyseja/odysejapka/gad/GadService.kt

@@ -2,8 +2,8 @@ package odyseja.odysejapka.gad
 
 import GadConfiguration
 import GadRunner
-import odyseja.odysejapka.domain.Progress
-import odyseja.odysejapka.domain.Status
+import odyseja.odysejapka.Progress
+import odyseja.odysejapka.Status
 import org.springframework.stereotype.Service
 
 @Service

src/main/kotlin/odyseja/odysejapka/gad/Team.kt

@@ -1,4 +1,4 @@
-import odyseja.odysejapka.domain.Performance
+import odyseja.odysejapka.timetable.Performance
 
 data class Team(
     val performanceHour: String,

src/main/kotlin/odyseja/odysejapka/domain/Info.kt → src/main/kotlin/odyseja/odysejapka/info/Info.kt

@@ -1,4 +1,4 @@
-package odyseja.odysejapka.domain
+package odyseja.odysejapka.info
 
 data class Info(
   val id: Int,

src/main/kotlin/odyseja/odysejapka/domain/InfoCategoryEntity.kt → src/main/kotlin/odyseja/odysejapka/info/InfoCategoryEntity.kt

@@ -1,4 +1,4 @@
-package odyseja.odysejapka.domain
+package odyseja.odysejapka.info
 
 import javax.persistence.*
 

src/main/kotlin/odyseja/odysejapka/service/InfoCategoryRepository.kt → src/main/kotlin/odyseja/odysejapka/info/InfoCategoryRepository.kt

@@ -1,6 +1,5 @@
-package odyseja.odysejapka.service
+package odyseja.odysejapka.info
 
-import odyseja.odysejapka.domain.InfoCategoryEntity
 import org.springframework.data.repository.CrudRepository
 
 interface InfoCategoryRepository : CrudRepository<InfoCategoryEntity, Int> {

src/main/kotlin/odyseja/odysejapka/rest/InfoController.kt → src/main/kotlin/odyseja/odysejapka/info/InfoController.kt

@@ -1,8 +1,5 @@
-package odyseja.odysejapka.rest
+package odyseja.odysejapka.info
 
-import odyseja.odysejapka.domain.Info
-import odyseja.odysejapka.domain.InfoCategoryEntity
-import odyseja.odysejapka.service.InfoService
 import org.springframework.security.access.annotation.Secured
 import org.springframework.web.bind.annotation.*
 

src/main/kotlin/odyseja/odysejapka/domain/InfoEntity.kt → src/main/kotlin/odyseja/odysejapka/info/InfoEntity.kt

@@ -1,5 +1,6 @@
-package odyseja.odysejapka.domain
+package odyseja.odysejapka.info
 
+import odyseja.odysejapka.city.CityEntity
 import javax.persistence.*
 
 @Entity(name = "info")

src/main/kotlin/odyseja/odysejapka/service/InfoRepository.kt → src/main/kotlin/odyseja/odysejapka/info/InfoRepository.kt

@@ -1,7 +1,6 @@
-package odyseja.odysejapka.service
+package odyseja.odysejapka.info
 
-import odyseja.odysejapka.domain.CityEntity
-import odyseja.odysejapka.domain.InfoEntity
+import odyseja.odysejapka.city.CityEntity
 import org.springframework.data.repository.CrudRepository
 
 

src/main/kotlin/odyseja/odysejapka/service/InfoService.kt → src/main/kotlin/odyseja/odysejapka/info/InfoService.kt

@@ -1,8 +1,7 @@
-package odyseja.odysejapka.service
+package odyseja.odysejapka.info
 
-import odyseja.odysejapka.domain.Info
-import odyseja.odysejapka.domain.InfoCategoryEntity
-import odyseja.odysejapka.domain.InfoEntity
+import odyseja.odysejapka.change.ChangeService
+import odyseja.odysejapka.city.CityRepository
 import org.springframework.stereotype.Service
 
 @Service

src/main/kotlin/odyseja/odysejapka/rest/ProblemController.kt → src/main/kotlin/odyseja/odysejapka/problem/ProblemController.kt

@@ -1,7 +1,5 @@
-package odyseja.odysejapka.rest
+package odyseja.odysejapka.problem
 
-import odyseja.odysejapka.domain.ProblemEntity
-import odyseja.odysejapka.service.ProblemService
 import org.springframework.security.access.annotation.Secured
 import org.springframework.web.bind.annotation.*
 

src/main/kotlin/odyseja/odysejapka/domain/ProblemEntity.kt → src/main/kotlin/odyseja/odysejapka/problem/ProblemEntity.kt

@@ -1,6 +1,8 @@
-package odyseja.odysejapka.domain
+package odyseja.odysejapka.problem
 
-import javax.persistence.*
+import javax.persistence.Column
+import javax.persistence.Entity
+import javax.persistence.Id
 
 @Entity(name = "problem")
 class ProblemEntity(

src/main/kotlin/odyseja/odysejapka/service/ProblemRepository.kt → src/main/kotlin/odyseja/odysejapka/problem/ProblemRepository.kt

@@ -1,6 +1,5 @@
-package odyseja.odysejapka.service
+package odyseja.odysejapka.problem
 
-import odyseja.odysejapka.domain.ProblemEntity
 import org.springframework.data.repository.CrudRepository
 
 interface ProblemRepository : CrudRepository<ProblemEntity, Int> {

src/main/kotlin/odyseja/odysejapka/service/ProblemService.kt → src/main/kotlin/odyseja/odysejapka/problem/ProblemService.kt

@@ -1,6 +1,6 @@
-package odyseja.odysejapka.service
+package odyseja.odysejapka.problem
 
-import odyseja.odysejapka.domain.ProblemEntity
+import odyseja.odysejapka.change.ChangeService
 import org.springframework.stereotype.Service
 
 @Service

src/main/kotlin/odyseja/odysejapka/sak/SakController.kt

@@ -1,6 +1,6 @@
 package odyseja.odysejapka.sak
 
-import odyseja.odysejapka.domain.Progress
+import odyseja.odysejapka.Progress
 import org.springframework.security.access.annotation.Secured
 import org.springframework.web.bind.annotation.*
 

src/main/kotlin/odyseja/odysejapka/sak/SakRunner.kt

@@ -1,10 +1,10 @@
 package odyseja.odysejapka.sak
 
 import com.google.api.services.drive.model.File
-import odyseja.odysejapka.domain.Performance
 import odyseja.odysejapka.drive.DriveAdapter
 import odyseja.odysejapka.drive.SheetAdapter
 import odyseja.odysejapka.drive.SpontanGroups
+import odyseja.odysejapka.timetable.Performance
 import odyseja.odysejapka.timetable.TimeTableService
 import java.util.concurrent.atomic.AtomicInteger
 

src/main/kotlin/odyseja/odysejapka/sak/SakService.kt

@@ -1,8 +1,8 @@
 package odyseja.odysejapka.sak
 
 import SakConfiguration
-import odyseja.odysejapka.domain.Progress
-import odyseja.odysejapka.domain.Status
+import odyseja.odysejapka.Progress
+import odyseja.odysejapka.Status
 import odyseja.odysejapka.timetable.TimeTableService
 import org.springframework.stereotype.Service
 

src/main/kotlin/odyseja/odysejapka/domain/Sponsor.kt → src/main/kotlin/odyseja/odysejapka/sponsor/Sponsor.kt

@@ -1,4 +1,4 @@
-package odyseja.odysejapka.domain
+package odyseja.odysejapka.sponsor
 
 data class Sponsor(
   val id: Int,

src/main/kotlin/odyseja/odysejapka/rest/SponsorController.kt → src/main/kotlin/odyseja/odysejapka/sponsor/SponsorController.kt

@@ -1,9 +1,6 @@
-package odyseja.odysejapka.rest
+package odyseja.odysejapka.sponsor
 
-import odyseja.odysejapka.domain.CityEntity
-import odyseja.odysejapka.domain.Sponsor
-import odyseja.odysejapka.domain.SponsorEntity
-import odyseja.odysejapka.service.SponsorService
+import odyseja.odysejapka.city.CityEntity
 import org.springframework.http.MediaType
 import org.springframework.web.bind.annotation.*
 import org.springframework.web.multipart.MultipartFile

src/main/kotlin/odyseja/odysejapka/domain/SponsorEntity.kt → src/main/kotlin/odyseja/odysejapka/sponsor/SponsorEntity.kt

@@ -1,5 +1,6 @@
-package odyseja.odysejapka.domain
+package odyseja.odysejapka.sponsor
 
+import odyseja.odysejapka.city.CityEntity
 import javax.persistence.*
 
 @Entity(name = "sponsor")

src/main/kotlin/odyseja/odysejapka/service/SponsorRepository.kt → src/main/kotlin/odyseja/odysejapka/sponsor/SponsorRepository.kt

@@ -1,6 +1,5 @@
-package odyseja.odysejapka.service
+package odyseja.odysejapka.sponsor
 
-import odyseja.odysejapka.domain.SponsorEntity
 import org.springframework.data.repository.CrudRepository
 
 interface SponsorRepository : CrudRepository<SponsorEntity, Int> {

src/main/kotlin/odyseja/odysejapka/service/SponsorService.kt → src/main/kotlin/odyseja/odysejapka/sponsor/SponsorService.kt

@@ -1,7 +1,7 @@
-package odyseja.odysejapka.service
+package odyseja.odysejapka.sponsor
 
-import odyseja.odysejapka.domain.Sponsor
-import odyseja.odysejapka.rest.SponsorController
+import odyseja.odysejapka.change.ChangeService
+import odyseja.odysejapka.city.CityRepository
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
 import org.springframework.web.multipart.MultipartFile

src/main/kotlin/odyseja/odysejapka/domain/Stage.kt → src/main/kotlin/odyseja/odysejapka/stage/Stage.kt

@@ -1,3 +1,3 @@
-package odyseja.odysejapka.domain
+package odyseja.odysejapka.stage
 
 class Stage(val id: Int, val number: Int, val city: Int, val name: String)

src/main/kotlin/odyseja/odysejapka/rest/StageController.kt → src/main/kotlin/odyseja/odysejapka/stage/StageController.kt

@@ -1,7 +1,5 @@
-package odyseja.odysejapka.rest
+package odyseja.odysejapka.stage
 
-import odyseja.odysejapka.domain.Stage
-import odyseja.odysejapka.service.StageService
 import org.springframework.security.access.annotation.Secured
 import org.springframework.web.bind.annotation.*
 

src/main/kotlin/odyseja/odysejapka/domain/StageEntity.kt → src/main/kotlin/odyseja/odysejapka/stage/StageEntity.kt

@@ -1,5 +1,6 @@
-package odyseja.odysejapka.domain
+package odyseja.odysejapka.stage
 
+import odyseja.odysejapka.city.CityEntity
 import javax.persistence.*
 
 @Entity(name = "stage")