Backup_Repos/komga
1
0
Fork 0
mirror of https://github.com/gotson/komga.git synced 2025-12-27 02:46:04 +01:00
Code Issues Projects Releases Wiki Activity

refactor: move opds and rest packages under a common api root

Browse source
This commit is contained in:
Gauthier Roebroeck 2021-12-02 18:02:28 +08:00
parent 6517c1f8c4
commit 3085226113
71 changed files with 177 additions and 177 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/BookDtoDao.kt
View file

@ -6,12 +6,12 @@ import org.gotson.komga.infrastructure.datasource.SqliteUdfDataSource
import org.gotson.komga.infrastructure.search.LuceneEntity
import org.gotson.komga.infrastructure.search.LuceneHelper
import org.gotson.komga.infrastructure.web.toFilePath
import org.gotson.komga.interfaces.rest.dto.AuthorDto
import org.gotson.komga.interfaces.rest.dto.BookDto
import org.gotson.komga.interfaces.rest.dto.BookMetadataDto
import org.gotson.komga.interfaces.rest.dto.MediaDto
import org.gotson.komga.interfaces.rest.dto.ReadProgressDto
import org.gotson.komga.interfaces.rest.persistence.BookDtoRepository
import org.gotson.komga.interfaces.api.persistence.BookDtoRepository
import org.gotson.komga.interfaces.api.rest.dto.AuthorDto
import org.gotson.komga.interfaces.api.rest.dto.BookDto
import org.gotson.komga.interfaces.api.rest.dto.BookMetadataDto
import org.gotson.komga.interfaces.api.rest.dto.MediaDto
import org.gotson.komga.interfaces.api.rest.dto.ReadProgressDto
import org.gotson.komga.jooq.Tables
import org.gotson.komga.jooq.tables.records.BookMetadataRecord
import org.gotson.komga.jooq.tables.records.BookRecord

2
komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/ReadProgressDao.kt
View file

@ -2,7 +2,7 @@ package org.gotson.komga.infrastructure.jooq
import org.gotson.komga.domain.model.ReadProgress
import org.gotson.komga.domain.persistence.ReadProgressRepository
import org.gotson.komga.interfaces.rest.dto.toUTC
import org.gotson.komga.infrastructure.language.toUTC
import org.gotson.komga.jooq.Tables
import org.gotson.komga.jooq.tables.records.ReadProgressRecord
import org.jooq.DSLContext

6
komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/ReadProgressDtoDao.kt
View file

@ -1,8 +1,8 @@
package org.gotson.komga.infrastructure.jooq
import org.gotson.komga.interfaces.rest.dto.TachiyomiReadProgressDto
import org.gotson.komga.interfaces.rest.dto.TachiyomiReadProgressV2Dto
import org.gotson.komga.interfaces.rest.persistence.ReadProgressDtoRepository
import org.gotson.komga.interfaces.api.persistence.ReadProgressDtoRepository
import org.gotson.komga.interfaces.api.rest.dto.TachiyomiReadProgressDto
import org.gotson.komga.interfaces.api.rest.dto.TachiyomiReadProgressV2Dto
import org.gotson.komga.jooq.Tables
import org.jooq.AggregateFunction
import org.jooq.Condition

12
komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/SeriesDtoDao.kt
View file

@ -8,12 +8,12 @@ import org.gotson.komga.infrastructure.datasource.SqliteUdfDataSource
import org.gotson.komga.infrastructure.search.LuceneEntity
import org.gotson.komga.infrastructure.search.LuceneHelper
import org.gotson.komga.infrastructure.web.toFilePath
import org.gotson.komga.interfaces.rest.dto.AuthorDto
import org.gotson.komga.interfaces.rest.dto.BookMetadataAggregationDto
import org.gotson.komga.interfaces.rest.dto.GroupCountDto
import org.gotson.komga.interfaces.rest.dto.SeriesDto
import org.gotson.komga.interfaces.rest.dto.SeriesMetadataDto
import org.gotson.komga.interfaces.rest.persistence.SeriesDtoRepository
import org.gotson.komga.interfaces.api.persistence.SeriesDtoRepository
import org.gotson.komga.interfaces.api.rest.dto.AuthorDto
import org.gotson.komga.interfaces.api.rest.dto.BookMetadataAggregationDto
import org.gotson.komga.interfaces.api.rest.dto.GroupCountDto
import org.gotson.komga.interfaces.api.rest.dto.SeriesDto
import org.gotson.komga.interfaces.api.rest.dto.SeriesMetadataDto
import org.gotson.komga.jooq.Tables
import org.gotson.komga.jooq.tables.records.BookMetadataAggregationRecord
import org.gotson.komga.jooq.tables.records.SeriesMetadataRecord

4
komga/src/main/kotlin/org/gotson/komga/infrastructure/language/Utils.kt
View file

@ -4,6 +4,7 @@ import org.apache.commons.lang3.StringUtils
import java.time.LocalDate
import java.time.LocalDateTime
import java.time.ZoneId
import java.time.ZoneOffset
import java.time.temporal.ChronoUnit
import java.time.temporal.TemporalUnit
import java.util.Date
@ -44,3 +45,6 @@ fun LocalDateTime.notEquals(other: LocalDateTime, precision: TemporalUnit = Chro
fun String.stripAccents(): String = StringUtils.stripAccents(this)
fun LocalDate.toDate(): Date = Date.from(this.atStartOfDay(ZoneId.of("Z")).toInstant())
fun LocalDateTime.toUTC(): LocalDateTime =
atZone(ZoneId.systemDefault()).withZoneSameInstant(ZoneOffset.UTC).toLocalDateTime()

4
komga/src/main/kotlin/org/gotson/komga/infrastructure/search/LuceneEntity.kt
View file

@ -8,8 +8,8 @@ import org.apache.lucene.document.TextField
import org.gotson.komga.domain.model.ReadList
import org.gotson.komga.domain.model.SeriesCollection
import org.gotson.komga.infrastructure.language.toDate
import org.gotson.komga.interfaces.rest.dto.BookDto
import org.gotson.komga.interfaces.rest.dto.SeriesDto
import org.gotson.komga.interfaces.api.rest.dto.BookDto
import org.gotson.komga.interfaces.api.rest.dto.SeriesDto
enum class LuceneEntity(val type: String, val id: String, val defaultFields: Array<String>) {
Book("book", "book_id", arrayOf("title", "isbn")),

8
komga/src/main/kotlin/org/gotson/komga/infrastructure/search/SearchIndexLifecycle.kt
View file

@ -13,10 +13,10 @@ import org.gotson.komga.domain.persistence.SeriesCollectionRepository
import org.gotson.komga.infrastructure.jms.QUEUE_SSE
import org.gotson.komga.infrastructure.jms.QUEUE_SSE_SELECTOR
import org.gotson.komga.infrastructure.jms.TOPIC_FACTORY
import org.gotson.komga.interfaces.rest.dto.BookDto
import org.gotson.komga.interfaces.rest.dto.SeriesDto
import org.gotson.komga.interfaces.rest.persistence.BookDtoRepository
import org.gotson.komga.interfaces.rest.persistence.SeriesDtoRepository
import org.gotson.komga.interfaces.api.persistence.BookDtoRepository
import org.gotson.komga.interfaces.api.persistence.SeriesDtoRepository
import org.gotson.komga.interfaces.api.rest.dto.BookDto
import org.gotson.komga.interfaces.api.rest.dto.SeriesDto
import org.springframework.data.domain.Page
import org.springframework.data.domain.PageRequest
import org.springframework.data.domain.Pageable

3
komga/src/main/kotlin/org/gotson/komga/interfaces/api/Constants.kt Normal file
View file

@ -0,0 +1,3 @@
package org.gotson.komga.interfaces.api
internal const val MARK_READ = "markread"

33
komga/src/main/kotlin/org/gotson/komga/interfaces/opds/OpdsController.kt → komga/src/main/kotlin/org/gotson/komga/interfaces/api/opds/OpdsController.kt
View file

@ -1,4 +1,4 @@
package org.gotson.komga.interfaces.opds
package org.gotson.komga.interfaces.api.opds
import mu.KotlinLogging
import org.apache.commons.io.FilenameUtils
@ -23,20 +23,21 @@ import org.gotson.komga.domain.persistence.SeriesMetadataRepository
import org.gotson.komga.domain.persistence.SeriesRepository
import org.gotson.komga.infrastructure.jooq.UnpagedSorted
import org.gotson.komga.infrastructure.security.KomgaPrincipal
import org.gotson.komga.interfaces.opds.dto.OpdsAuthor
import org.gotson.komga.interfaces.opds.dto.OpdsEntryAcquisition
import org.gotson.komga.interfaces.opds.dto.OpdsEntryNavigation
import org.gotson.komga.interfaces.opds.dto.OpdsFeed
import org.gotson.komga.interfaces.opds.dto.OpdsFeedAcquisition
import org.gotson.komga.interfaces.opds.dto.OpdsFeedNavigation
import org.gotson.komga.interfaces.opds.dto.OpdsLinkFeedNavigation
import org.gotson.komga.interfaces.opds.dto.OpdsLinkFileAcquisition
import org.gotson.komga.interfaces.opds.dto.OpdsLinkImage
import org.gotson.komga.interfaces.opds.dto.OpdsLinkImageThumbnail
import org.gotson.komga.interfaces.opds.dto.OpdsLinkPageStreaming
import org.gotson.komga.interfaces.opds.dto.OpdsLinkRel
import org.gotson.komga.interfaces.opds.dto.OpdsLinkSearch
import org.gotson.komga.interfaces.opds.dto.OpenSearchDescription
import org.gotson.komga.interfaces.api.MARK_READ
import org.gotson.komga.interfaces.api.opds.dto.OpdsAuthor
import org.gotson.komga.interfaces.api.opds.dto.OpdsEntryAcquisition
import org.gotson.komga.interfaces.api.opds.dto.OpdsEntryNavigation
import org.gotson.komga.interfaces.api.opds.dto.OpdsFeed
import org.gotson.komga.interfaces.api.opds.dto.OpdsFeedAcquisition
import org.gotson.komga.interfaces.api.opds.dto.OpdsFeedNavigation
import org.gotson.komga.interfaces.api.opds.dto.OpdsLinkFeedNavigation
import org.gotson.komga.interfaces.api.opds.dto.OpdsLinkFileAcquisition
import org.gotson.komga.interfaces.api.opds.dto.OpdsLinkImage
import org.gotson.komga.interfaces.api.opds.dto.OpdsLinkImageThumbnail
import org.gotson.komga.interfaces.api.opds.dto.OpdsLinkPageStreaming
import org.gotson.komga.interfaces.api.opds.dto.OpdsLinkRel
import org.gotson.komga.interfaces.api.opds.dto.OpdsLinkSearch
import org.gotson.komga.interfaces.api.opds.dto.OpenSearchDescription
import org.springframework.data.domain.PageRequest
import org.springframework.data.domain.Sort
import org.springframework.http.HttpHeaders
@ -72,8 +73,6 @@ private const val ROUTE_READLISTS_ALL = "readlists"
private const val ROUTE_PUBLISHERS_ALL = "publishers"
private const val ROUTE_SEARCH = "search"
internal const val MARK_READ = "markread"
private const val ID_SERIES_ALL = "allSeries"
private const val ID_SERIES_LATEST = "latestSeries"
private const val ID_BOOKS_LATEST = "latestBooks"

2
komga/src/main/kotlin/org/gotson/komga/interfaces/opds/dto/OpdsAuthor.kt → komga/src/main/kotlin/org/gotson/komga/interfaces/api/opds/dto/OpdsAuthor.kt
View file

@ -1,4 +1,4 @@
package org.gotson.komga.interfaces.opds.dto
package org.gotson.komga.interfaces.api.opds.dto
import com.fasterxml.jackson.annotation.JsonInclude
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty

2
komga/src/main/kotlin/org/gotson/komga/interfaces/opds/dto/OpdsEntry.kt → komga/src/main/kotlin/org/gotson/komga/interfaces/api/opds/dto/OpdsEntry.kt
View file

@ -1,4 +1,4 @@
package org.gotson.komga.interfaces.opds.dto
package org.gotson.komga.interfaces.api.opds.dto
import com.fasterxml.jackson.annotation.JsonInclude
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper

2
komga/src/main/kotlin/org/gotson/komga/interfaces/opds/dto/OpdsFeed.kt → komga/src/main/kotlin/org/gotson/komga/interfaces/api/opds/dto/OpdsFeed.kt
View file

@ -1,4 +1,4 @@
package org.gotson.komga.interfaces.opds.dto
package org.gotson.komga.interfaces.api.opds.dto
import com.fasterxml.jackson.databind.annotation.JsonSerialize
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper

2
komga/src/main/kotlin/org/gotson/komga/interfaces/opds/dto/OpdsLink.kt → komga/src/main/kotlin/org/gotson/komga/interfaces/api/opds/dto/OpdsLink.kt
View file

@ -1,4 +1,4 @@
package org.gotson.komga.interfaces.opds.dto
package org.gotson.komga.interfaces.api.opds.dto
import com.fasterxml.jackson.databind.annotation.JsonSerialize
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty

2
komga/src/main/kotlin/org/gotson/komga/interfaces/opds/dto/OpenSearchDescription.kt → komga/src/main/kotlin/org/gotson/komga/interfaces/api/opds/dto/OpenSearchDescription.kt
View file

@ -1,4 +1,4 @@
package org.gotson.komga.interfaces.opds.dto
package org.gotson.komga.interfaces.api.opds.dto
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement

2
komga/src/main/kotlin/org/gotson/komga/interfaces/opds/dto/XmlNamespaces.kt → komga/src/main/kotlin/org/gotson/komga/interfaces/api/opds/dto/XmlNamespaces.kt
View file

@ -1,4 +1,4 @@
package org.gotson.komga.interfaces.opds.dto
package org.gotson.komga.interfaces.api.opds.dto
const val ATOM = "http://www.w3.org/2005/Atom"
const val OPDS_PSE = "http://vaemendis.net/opds-pse/ns"

4
komga/src/main/kotlin/org/gotson/komga/interfaces/rest/persistence/BookDtoRepository.kt → komga/src/main/kotlin/org/gotson/komga/interfaces/api/persistence/BookDtoRepository.kt
View file

@ -1,7 +1,7 @@
package org.gotson.komga.interfaces.rest.persistence
package org.gotson.komga.interfaces.api.persistence
import org.gotson.komga.domain.model.BookSearchWithReadProgress
import org.gotson.komga.interfaces.rest.dto.BookDto
import org.gotson.komga.interfaces.api.rest.dto.BookDto
import org.springframework.data.domain.Page
import org.springframework.data.domain.Pageable

6
komga/src/main/kotlin/org/gotson/komga/interfaces/rest/persistence/ReadProgressDtoRepository.kt → komga/src/main/kotlin/org/gotson/komga/interfaces/api/persistence/ReadProgressDtoRepository.kt
View file

@ -1,7 +1,7 @@
package org.gotson.komga.interfaces.rest.persistence
package org.gotson.komga.interfaces.api.persistence
import org.gotson.komga.interfaces.rest.dto.TachiyomiReadProgressDto
import org.gotson.komga.interfaces.rest.dto.TachiyomiReadProgressV2Dto
import org.gotson.komga.interfaces.api.rest.dto.TachiyomiReadProgressDto
import org.gotson.komga.interfaces.api.rest.dto.TachiyomiReadProgressV2Dto
interface ReadProgressDtoRepository {
fun findProgressBySeries(seriesId: String, userId: String,): TachiyomiReadProgressDto

6
komga/src/main/kotlin/org/gotson/komga/interfaces/rest/persistence/SeriesDtoRepository.kt → komga/src/main/kotlin/org/gotson/komga/interfaces/api/persistence/SeriesDtoRepository.kt
View file

@ -1,8 +1,8 @@
package org.gotson.komga.interfaces.rest.persistence
package org.gotson.komga.interfaces.api.persistence
import org.gotson.komga.domain.model.SeriesSearchWithReadProgress
import org.gotson.komga.interfaces.rest.dto.GroupCountDto
import org.gotson.komga.interfaces.rest.dto.SeriesDto
import org.gotson.komga.interfaces.api.rest.dto.GroupCountDto
import org.gotson.komga.interfaces.api.rest.dto.SeriesDto
import org.springframework.data.domain.Page
import org.springframework.data.domain.Pageable

24
komga/src/main/kotlin/org/gotson/komga/interfaces/rest/BookController.kt → komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/BookController.kt
View file

@ -1,4 +1,4 @@
package org.gotson.komga.interfaces.rest
package org.gotson.komga.interfaces.api.rest
import io.swagger.v3.oas.annotations.Operation
import io.swagger.v3.oas.annotations.Parameter
@ -33,17 +33,17 @@ import org.gotson.komga.infrastructure.swagger.PageableAsQueryParam
import org.gotson.komga.infrastructure.swagger.PageableWithoutSortAsQueryParam
import org.gotson.komga.infrastructure.web.getMediaTypeOrDefault
import org.gotson.komga.infrastructure.web.setCachePrivate
import org.gotson.komga.interfaces.opds.MARK_READ
import org.gotson.komga.interfaces.rest.dto.BookDto
import org.gotson.komga.interfaces.rest.dto.BookImportBatchDto
import org.gotson.komga.interfaces.rest.dto.BookMetadataUpdateDto
import org.gotson.komga.interfaces.rest.dto.PageDto
import org.gotson.komga.interfaces.rest.dto.ReadListDto
import org.gotson.komga.interfaces.rest.dto.ReadProgressUpdateDto
import org.gotson.komga.interfaces.rest.dto.patch
import org.gotson.komga.interfaces.rest.dto.restrictUrl
import org.gotson.komga.interfaces.rest.dto.toDto
import org.gotson.komga.interfaces.rest.persistence.BookDtoRepository
import org.gotson.komga.interfaces.api.MARK_READ
import org.gotson.komga.interfaces.api.persistence.BookDtoRepository
import org.gotson.komga.interfaces.api.rest.dto.BookDto
import org.gotson.komga.interfaces.api.rest.dto.BookImportBatchDto
import org.gotson.komga.interfaces.api.rest.dto.BookMetadataUpdateDto
import org.gotson.komga.interfaces.api.rest.dto.PageDto
import org.gotson.komga.interfaces.api.rest.dto.ReadListDto
import org.gotson.komga.interfaces.api.rest.dto.ReadProgressUpdateDto
import org.gotson.komga.interfaces.api.rest.dto.patch
import org.gotson.komga.interfaces.api.rest.dto.restrictUrl
import org.gotson.komga.interfaces.api.rest.dto.toDto
import org.springframework.core.io.FileSystemResource
import org.springframework.data.domain.Page
import org.springframework.data.domain.PageRequest

6
komga/src/main/kotlin/org/gotson/komga/interfaces/rest/ClaimController.kt → komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/ClaimController.kt
View file

@ -1,9 +1,9 @@
package org.gotson.komga.interfaces.rest
package org.gotson.komga.interfaces.api.rest
import org.gotson.komga.domain.model.KomgaUser
import org.gotson.komga.domain.service.KomgaUserLifecycle
import org.gotson.komga.interfaces.rest.dto.UserDto
import org.gotson.komga.interfaces.rest.dto.toDto
import org.gotson.komga.interfaces.api.rest.dto.UserDto
import org.gotson.komga.interfaces.api.rest.dto.toDto
import org.springframework.http.HttpStatus
import org.springframework.http.MediaType
import org.springframework.validation.annotation.Validated

2
komga/src/main/kotlin/org/gotson/komga/interfaces/rest/ErrorHandlingControllerAdvice.kt → komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/ErrorHandlingControllerAdvice.kt
View file

@ -1,4 +1,4 @@
package org.gotson.komga.interfaces.rest
package org.gotson.komga.interfaces.api.rest
import org.springframework.http.HttpStatus
import org.springframework.web.bind.MethodArgumentNotValidException

2
komga/src/main/kotlin/org/gotson/komga/interfaces/rest/FileSystemController.kt → komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/FileSystemController.kt
View file

@ -1,4 +1,4 @@
package org.gotson.komga.interfaces.rest
package org.gotson.komga.interfaces.api.rest
import com.fasterxml.jackson.annotation.JsonInclude
import org.springframework.http.HttpStatus

12
komga/src/main/kotlin/org/gotson/komga/interfaces/rest/LibraryController.kt → komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/LibraryController.kt
View file

@ -1,4 +1,4 @@
package org.gotson.komga.interfaces.rest
package org.gotson.komga.interfaces.api.rest
import org.gotson.komga.application.tasks.HIGH_PRIORITY
import org.gotson.komga.application.tasks.TaskReceiver
@ -13,11 +13,11 @@ import org.gotson.komga.domain.persistence.SeriesRepository
import org.gotson.komga.domain.service.LibraryLifecycle
import org.gotson.komga.infrastructure.security.KomgaPrincipal
import org.gotson.komga.infrastructure.web.filePathToUrl
import org.gotson.komga.interfaces.rest.dto.LibraryCreationDto
import org.gotson.komga.interfaces.rest.dto.LibraryDto
import org.gotson.komga.interfaces.rest.dto.LibraryUpdateDto
import org.gotson.komga.interfaces.rest.dto.toDomain
import org.gotson.komga.interfaces.rest.dto.toDto
import org.gotson.komga.interfaces.api.rest.dto.LibraryCreationDto
import org.gotson.komga.interfaces.api.rest.dto.LibraryDto
import org.gotson.komga.interfaces.api.rest.dto.LibraryUpdateDto
import org.gotson.komga.interfaces.api.rest.dto.toDomain
import org.gotson.komga.interfaces.api.rest.dto.toDto
import org.springframework.http.HttpStatus
import org.springframework.http.MediaType
import org.springframework.security.access.prepost.PreAuthorize

2
komga/src/main/kotlin/org/gotson/komga/interfaces/rest/LoginController.kt → komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/LoginController.kt
View file

@ -1,4 +1,4 @@
package org.gotson.komga.interfaces.rest
package org.gotson.komga.interfaces.api.rest
import org.springframework.http.HttpStatus
import org.springframework.http.MediaType

2
komga/src/main/kotlin/org/gotson/komga/interfaces/rest/OAuth2Controller.kt → komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/OAuth2Controller.kt
View file

@ -1,4 +1,4 @@
package org.gotson.komga.interfaces.rest
package org.gotson.komga.interfaces.api.rest
import org.springframework.http.MediaType
import org.springframework.security.oauth2.client.registration.InMemoryClientRegistrationRepository

24
komga/src/main/kotlin/org/gotson/komga/interfaces/rest/ReadListController.kt → komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/ReadListController.kt
View file

@ -1,4 +1,4 @@
package org.gotson.komga.interfaces.rest
package org.gotson.komga.interfaces.api.rest
import io.swagger.v3.oas.annotations.Parameter
import io.swagger.v3.oas.annotations.media.Content
@ -26,17 +26,17 @@ import org.gotson.komga.infrastructure.security.KomgaPrincipal
import org.gotson.komga.infrastructure.swagger.AuthorsAsQueryParam
import org.gotson.komga.infrastructure.swagger.PageableWithoutSortAsQueryParam
import org.gotson.komga.infrastructure.web.Authors
import org.gotson.komga.interfaces.rest.dto.BookDto
import org.gotson.komga.interfaces.rest.dto.ReadListCreationDto
import org.gotson.komga.interfaces.rest.dto.ReadListDto
import org.gotson.komga.interfaces.rest.dto.ReadListRequestResultDto
import org.gotson.komga.interfaces.rest.dto.ReadListUpdateDto
import org.gotson.komga.interfaces.rest.dto.TachiyomiReadProgressDto
import org.gotson.komga.interfaces.rest.dto.TachiyomiReadProgressUpdateDto
import org.gotson.komga.interfaces.rest.dto.restrictUrl
import org.gotson.komga.interfaces.rest.dto.toDto
import org.gotson.komga.interfaces.rest.persistence.BookDtoRepository
import org.gotson.komga.interfaces.rest.persistence.ReadProgressDtoRepository
import org.gotson.komga.interfaces.api.persistence.BookDtoRepository
import org.gotson.komga.interfaces.api.persistence.ReadProgressDtoRepository
import org.gotson.komga.interfaces.api.rest.dto.BookDto
import org.gotson.komga.interfaces.api.rest.dto.ReadListCreationDto
import org.gotson.komga.interfaces.api.rest.dto.ReadListDto
import org.gotson.komga.interfaces.api.rest.dto.ReadListRequestResultDto
import org.gotson.komga.interfaces.api.rest.dto.ReadListUpdateDto
import org.gotson.komga.interfaces.api.rest.dto.TachiyomiReadProgressDto
import org.gotson.komga.interfaces.api.rest.dto.TachiyomiReadProgressUpdateDto
import org.gotson.komga.interfaces.api.rest.dto.restrictUrl
import org.gotson.komga.interfaces.api.rest.dto.toDto
import org.springframework.core.io.FileSystemResource
import org.springframework.data.domain.Page
import org.springframework.data.domain.PageRequest

6
komga/src/main/kotlin/org/gotson/komga/interfaces/rest/ReferentialController.kt → komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/ReferentialController.kt
View file

@ -1,11 +1,11 @@
package org.gotson.komga.interfaces.rest
package org.gotson.komga.interfaces.api.rest
import io.swagger.v3.oas.annotations.Parameter
import org.gotson.komga.domain.persistence.ReferentialRepository
import org.gotson.komga.infrastructure.security.KomgaPrincipal
import org.gotson.komga.infrastructure.swagger.PageableWithoutSortAsQueryParam
import org.gotson.komga.interfaces.rest.dto.AuthorDto
import org.gotson.komga.interfaces.rest.dto.toDto
import org.gotson.komga.interfaces.api.rest.dto.AuthorDto
import org.gotson.komga.interfaces.api.rest.dto.toDto
import org.springframework.data.domain.Page
import org.springframework.data.domain.PageRequest
import org.springframework.data.domain.Pageable

16
komga/src/main/kotlin/org/gotson/komga/interfaces/rest/SeriesCollectionController.kt → komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/SeriesCollectionController.kt
View file

@ -1,4 +1,4 @@
package org.gotson.komga.interfaces.rest
package org.gotson.komga.interfaces.api.rest
import io.swagger.v3.oas.annotations.Parameter
import io.swagger.v3.oas.annotations.media.Content
@ -19,13 +19,13 @@ import org.gotson.komga.infrastructure.security.KomgaPrincipal
import org.gotson.komga.infrastructure.swagger.AuthorsAsQueryParam
import org.gotson.komga.infrastructure.swagger.PageableWithoutSortAsQueryParam
import org.gotson.komga.infrastructure.web.Authors
import org.gotson.komga.interfaces.rest.dto.CollectionCreationDto
import org.gotson.komga.interfaces.rest.dto.CollectionDto
import org.gotson.komga.interfaces.rest.dto.CollectionUpdateDto
import org.gotson.komga.interfaces.rest.dto.SeriesDto
import org.gotson.komga.interfaces.rest.dto.restrictUrl
import org.gotson.komga.interfaces.rest.dto.toDto
import org.gotson.komga.interfaces.rest.persistence.SeriesDtoRepository
import org.gotson.komga.interfaces.api.persistence.SeriesDtoRepository
import org.gotson.komga.interfaces.api.rest.dto.CollectionCreationDto
import org.gotson.komga.interfaces.api.rest.dto.CollectionDto
import org.gotson.komga.interfaces.api.rest.dto.CollectionUpdateDto
import org.gotson.komga.interfaces.api.rest.dto.SeriesDto
import org.gotson.komga.interfaces.api.rest.dto.restrictUrl
import org.gotson.komga.interfaces.api.rest.dto.toDto
import org.springframework.data.domain.Page
import org.springframework.data.domain.PageRequest
import org.springframework.data.domain.Pageable

32
komga/src/main/kotlin/org/gotson/komga/interfaces/rest/SeriesController.kt → komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/SeriesController.kt
View file

@ -1,4 +1,4 @@
package org.gotson.komga.interfaces.rest
package org.gotson.komga.interfaces.api.rest
import io.swagger.v3.oas.annotations.Operation
import io.swagger.v3.oas.annotations.Parameter
@ -41,21 +41,21 @@ import org.gotson.komga.infrastructure.swagger.PageableAsQueryParam
import org.gotson.komga.infrastructure.swagger.PageableWithoutSortAsQueryParam
import org.gotson.komga.infrastructure.web.Authors
import org.gotson.komga.infrastructure.web.DelimitedPair
import org.gotson.komga.interfaces.rest.dto.BookDto
import org.gotson.komga.interfaces.rest.dto.CollectionDto
import org.gotson.komga.interfaces.rest.dto.GroupCountDto
import org.gotson.komga.interfaces.rest.dto.SeriesDto
import org.gotson.komga.interfaces.rest.dto.SeriesMetadataUpdateDto
import org.gotson.komga.interfaces.rest.dto.SeriesThumbnailDto
import org.gotson.komga.interfaces.rest.dto.TachiyomiReadProgressDto
import org.gotson.komga.interfaces.rest.dto.TachiyomiReadProgressUpdateDto
import org.gotson.komga.interfaces.rest.dto.TachiyomiReadProgressUpdateV2Dto
import org.gotson.komga.interfaces.rest.dto.TachiyomiReadProgressV2Dto
import org.gotson.komga.interfaces.rest.dto.restrictUrl
import org.gotson.komga.interfaces.rest.dto.toDto
import org.gotson.komga.interfaces.rest.persistence.BookDtoRepository
import org.gotson.komga.interfaces.rest.persistence.ReadProgressDtoRepository
import org.gotson.komga.interfaces.rest.persistence.SeriesDtoRepository
import org.gotson.komga.interfaces.api.persistence.BookDtoRepository
import org.gotson.komga.interfaces.api.persistence.ReadProgressDtoRepository
import org.gotson.komga.interfaces.api.persistence.SeriesDtoRepository
import org.gotson.komga.interfaces.api.rest.dto.BookDto
import org.gotson.komga.interfaces.api.rest.dto.CollectionDto
import org.gotson.komga.interfaces.api.rest.dto.GroupCountDto
import org.gotson.komga.interfaces.api.rest.dto.SeriesDto
import org.gotson.komga.interfaces.api.rest.dto.SeriesMetadataUpdateDto
import org.gotson.komga.interfaces.api.rest.dto.SeriesThumbnailDto
import org.gotson.komga.interfaces.api.rest.dto.TachiyomiReadProgressDto
import org.gotson.komga.interfaces.api.rest.dto.TachiyomiReadProgressUpdateDto
import org.gotson.komga.interfaces.api.rest.dto.TachiyomiReadProgressUpdateV2Dto
import org.gotson.komga.interfaces.api.rest.dto.TachiyomiReadProgressV2Dto
import org.gotson.komga.interfaces.api.rest.dto.restrictUrl
import org.gotson.komga.interfaces.api.rest.dto.toDto
import org.springframework.core.io.FileSystemResource
import org.springframework.data.domain.Page
import org.springframework.data.domain.PageRequest

2
komga/src/main/kotlin/org/gotson/komga/interfaces/rest/TaskController.kt → komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/TaskController.kt
View file

@ -1,4 +1,4 @@
package org.gotson.komga.interfaces.rest
package org.gotson.komga.interfaces.api.rest
import org.gotson.komga.domain.model.ROLE_ADMIN
import org.gotson.komga.infrastructure.jms.JmsQueueLifecycle

4
komga/src/main/kotlin/org/gotson/komga/interfaces/rest/TransientBooksController.kt → komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/TransientBooksController.kt
View file

@ -1,4 +1,4 @@
package org.gotson.komga.interfaces.rest
package org.gotson.komga.interfaces.api.rest
import com.jakewharton.byteunits.BinaryByteUnit
import mu.KotlinLogging
@ -10,7 +10,7 @@ import org.gotson.komga.domain.persistence.TransientBookRepository
import org.gotson.komga.domain.service.TransientBookLifecycle
import org.gotson.komga.infrastructure.web.getMediaTypeOrDefault
import org.gotson.komga.infrastructure.web.toFilePath
import org.gotson.komga.interfaces.rest.dto.PageDto
import org.gotson.komga.interfaces.api.rest.dto.PageDto
import org.springframework.http.HttpStatus
import org.springframework.http.MediaType
import org.springframework.http.ResponseEntity

20
komga/src/main/kotlin/org/gotson/komga/interfaces/rest/UserController.kt → komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/UserController.kt
View file

@ -1,4 +1,4 @@
package org.gotson.komga.interfaces.rest
package org.gotson.komga.interfaces.api.rest
import io.swagger.v3.oas.annotations.Parameter
import mu.KotlinLogging
@ -12,15 +12,15 @@ import org.gotson.komga.domain.persistence.LibraryRepository
import org.gotson.komga.domain.service.KomgaUserLifecycle
import org.gotson.komga.infrastructure.jooq.UnpagedSorted
import org.gotson.komga.infrastructure.security.KomgaPrincipal
import org.gotson.komga.interfaces.rest.dto.AuthenticationActivityDto
import org.gotson.komga.interfaces.rest.dto.PasswordUpdateDto
import org.gotson.komga.interfaces.rest.dto.RolesUpdateDto
import org.gotson.komga.interfaces.rest.dto.SharedLibrariesUpdateDto
import org.gotson.komga.interfaces.rest.dto.UserCreationDto
import org.gotson.komga.interfaces.rest.dto.UserDto
import org.gotson.komga.interfaces.rest.dto.UserWithSharedLibrariesDto
import org.gotson.komga.interfaces.rest.dto.toDto
import org.gotson.komga.interfaces.rest.dto.toWithSharedLibrariesDto
import org.gotson.komga.interfaces.api.rest.dto.AuthenticationActivityDto
import org.gotson.komga.interfaces.api.rest.dto.PasswordUpdateDto
import org.gotson.komga.interfaces.api.rest.dto.RolesUpdateDto
import org.gotson.komga.interfaces.api.rest.dto.SharedLibrariesUpdateDto
import org.gotson.komga.interfaces.api.rest.dto.UserCreationDto
import org.gotson.komga.interfaces.api.rest.dto.UserDto
import org.gotson.komga.interfaces.api.rest.dto.UserWithSharedLibrariesDto
import org.gotson.komga.interfaces.api.rest.dto.toDto
import org.gotson.komga.interfaces.api.rest.dto.toWithSharedLibrariesDto
import org.springdoc.core.converters.models.PageableAsQueryParam
import org.springframework.core.env.Environment
import org.springframework.data.domain.Page

2
komga/src/main/kotlin/org/gotson/komga/interfaces/rest/dto/AuthenticationActivityDto.kt → komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/AuthenticationActivityDto.kt
View file

@ -1,4 +1,4 @@
package org.gotson.komga.interfaces.rest.dto
package org.gotson.komga.interfaces.api.rest.dto
import com.fasterxml.jackson.annotation.JsonFormat
import org.gotson.komga.domain.model.AuthenticationActivity

2
komga/src/main/kotlin/org/gotson/komga/interfaces/rest/dto/AuthorDto.kt → komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/AuthorDto.kt
View file

@ -1,4 +1,4 @@
package org.gotson.komga.interfaces.rest.dto
package org.gotson.komga.interfaces.api.rest.dto
import org.gotson.komga.domain.model.Author

2
komga/src/main/kotlin/org/gotson/komga/interfaces/rest/dto/BookDto.kt → komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/BookDto.kt
View file

@ -1,4 +1,4 @@
package org.gotson.komga.interfaces.rest.dto
package org.gotson.komga.interfaces.api.rest.dto
import com.fasterxml.jackson.annotation.JsonFormat
import com.jakewharton.byteunits.BinaryByteUnit

2
komga/src/main/kotlin/org/gotson/komga/interfaces/rest/dto/BookImportBatchDto.kt → komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/BookImportBatchDto.kt
View file

@ -1,4 +1,4 @@
package org.gotson.komga.interfaces.rest.dto
package org.gotson.komga.interfaces.api.rest.dto
import org.gotson.komga.domain.model.CopyMode

2
komga/src/main/kotlin/org/gotson/komga/interfaces/rest/dto/BookMetadataUpdateDto.kt → komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/BookMetadataUpdateDto.kt
View file

@ -1,4 +1,4 @@
package org.gotson.komga.interfaces.rest.dto
package org.gotson.komga.interfaces.api.rest.dto
import org.gotson.komga.domain.model.Author
import org.gotson.komga.domain.model.BookMetadata

2
komga/src/main/kotlin/org/gotson/komga/interfaces/rest/dto/CollectionCreationDto.kt → komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/CollectionCreationDto.kt
View file

@ -1,4 +1,4 @@
package org.gotson.komga.interfaces.rest.dto
package org.gotson.komga.interfaces.api.rest.dto
import org.hibernate.validator.constraints.UniqueElements
import javax.validation.constraints.NotBlank

3
komga/src/main/kotlin/org/gotson/komga/interfaces/rest/dto/CollectionDto.kt → komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/CollectionDto.kt
View file

@ -1,7 +1,8 @@
package org.gotson.komga.interfaces.rest.dto
package org.gotson.komga.interfaces.api.rest.dto
import com.fasterxml.jackson.annotation.JsonFormat
import org.gotson.komga.domain.model.SeriesCollection
import org.gotson.komga.infrastructure.language.toUTC
import java.time.LocalDateTime
data class CollectionDto(

2
komga/src/main/kotlin/org/gotson/komga/interfaces/rest/dto/CollectionUpdateDto.kt → komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/CollectionUpdateDto.kt
View file

@ -1,4 +1,4 @@
package org.gotson.komga.interfaces.rest.dto
package org.gotson.komga.interfaces.api.rest.dto
import org.gotson.komga.infrastructure.validation.NullOrNotBlank
import org.gotson.komga.infrastructure.validation.NullOrNotEmpty

2
komga/src/main/kotlin/org/gotson/komga/interfaces/rest/dto/GroupCountDto.kt → komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/GroupCountDto.kt
View file

@ -1,4 +1,4 @@
package org.gotson.komga.interfaces.rest.dto
package org.gotson.komga.interfaces.api.rest.dto
data class GroupCountDto(
val group: String,

2
komga/src/main/kotlin/org/gotson/komga/interfaces/rest/dto/LibraryCreationDto.kt → komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/LibraryCreationDto.kt
View file

@ -1,4 +1,4 @@
package org.gotson.komga.interfaces.rest.dto
package org.gotson.komga.interfaces.api.rest.dto
import javax.validation.constraints.NotBlank

2
komga/src/main/kotlin/org/gotson/komga/interfaces/rest/dto/LibraryDto.kt → komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/LibraryDto.kt
View file

@ -1,4 +1,4 @@
package org.gotson.komga.interfaces.rest.dto
package org.gotson.komga.interfaces.api.rest.dto
import org.gotson.komga.domain.model.Library
import org.gotson.komga.infrastructure.web.toFilePath

2
komga/src/main/kotlin/org/gotson/komga/interfaces/rest/dto/LibraryUpdateDto.kt → komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/LibraryUpdateDto.kt
View file

@ -1,4 +1,4 @@
package org.gotson.komga.interfaces.rest.dto
package org.gotson.komga.interfaces.api.rest.dto
import javax.validation.constraints.NotBlank

2
komga/src/main/kotlin/org/gotson/komga/interfaces/rest/dto/PageDto.kt → komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/PageDto.kt
View file

@ -1,4 +1,4 @@
package org.gotson.komga.interfaces.rest.dto
package org.gotson.komga.interfaces.api.rest.dto
data class PageDto(
val number: Int,

2
komga/src/main/kotlin/org/gotson/komga/interfaces/rest/dto/ReadListCreationDto.kt → komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/ReadListCreationDto.kt
View file

@ -1,4 +1,4 @@
package org.gotson.komga.interfaces.rest.dto
package org.gotson.komga.interfaces.api.rest.dto
import org.hibernate.validator.constraints.UniqueElements
import javax.validation.constraints.NotBlank

3
komga/src/main/kotlin/org/gotson/komga/interfaces/rest/dto/ReadListDto.kt → komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/ReadListDto.kt
View file

@ -1,7 +1,8 @@
package org.gotson.komga.interfaces.rest.dto
package org.gotson.komga.interfaces.api.rest.dto
import com.fasterxml.jackson.annotation.JsonFormat
import org.gotson.komga.domain.model.ReadList
import org.gotson.komga.infrastructure.language.toUTC
import java.time.LocalDateTime
data class ReadListDto(

2
komga/src/main/kotlin/org/gotson/komga/interfaces/rest/dto/ReadListRequestResultDto.kt → komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/ReadListRequestResultDto.kt
View file

@ -1,4 +1,4 @@
package org.gotson.komga.interfaces.rest.dto
package org.gotson.komga.interfaces.api.rest.dto
import org.gotson.komga.domain.model.ReadListRequestBook
import org.gotson.komga.domain.model.ReadListRequestResult

2
komga/src/main/kotlin/org/gotson/komga/interfaces/rest/dto/ReadListUpdateDto.kt → komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/ReadListUpdateDto.kt
View file

@ -1,4 +1,4 @@
package org.gotson.komga.interfaces.rest.dto
package org.gotson.komga.interfaces.api.rest.dto
import org.gotson.komga.infrastructure.validation.NullOrNotBlank
import org.gotson.komga.infrastructure.validation.NullOrNotEmpty

2
komga/src/main/kotlin/org/gotson/komga/interfaces/rest/dto/ReadProgressUpdateDto.kt → komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/ReadProgressUpdateDto.kt
View file

@ -1,4 +1,4 @@
package org.gotson.komga.interfaces.rest.dto
package org.gotson.komga.interfaces.api.rest.dto
import javax.validation.Constraint
import javax.validation.ConstraintValidator

2
komga/src/main/kotlin/org/gotson/komga/interfaces/rest/dto/SeriesCoverDto.kt → komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/SeriesCoverDto.kt
View file

@ -1,4 +1,4 @@
package org.gotson.komga.interfaces.rest.dto
package org.gotson.komga.interfaces.api.rest.dto
import org.gotson.komga.domain.model.Library

2
komga/src/main/kotlin/org/gotson/komga/interfaces/rest/dto/SeriesDto.kt → komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/SeriesDto.kt
View file

@ -1,4 +1,4 @@
package org.gotson.komga.interfaces.rest.dto
package org.gotson.komga.interfaces.api.rest.dto
import com.fasterxml.jackson.annotation.JsonFormat
import java.time.LocalDate

2
komga/src/main/kotlin/org/gotson/komga/interfaces/rest/dto/SeriesMetadataUpdateDto.kt → komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/SeriesMetadataUpdateDto.kt
View file

@ -1,4 +1,4 @@
package org.gotson.komga.interfaces.rest.dto
package org.gotson.komga.interfaces.api.rest.dto
import org.gotson.komga.domain.model.SeriesMetadata
import org.gotson.komga.infrastructure.validation.NullOrBlankOrBCP47

2
komga/src/main/kotlin/org/gotson/komga/interfaces/rest/dto/SeriesThumbnailDto.kt → komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/SeriesThumbnailDto.kt
View file

@ -1,4 +1,4 @@
package org.gotson.komga.interfaces.rest.dto
package org.gotson.komga.interfaces.api.rest.dto
import org.gotson.komga.domain.model.ThumbnailSeries

2
komga/src/main/kotlin/org/gotson/komga/interfaces/rest/dto/TachiyomiReadProgressDto.kt → komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/TachiyomiReadProgressDto.kt
View file

@ -1,4 +1,4 @@
package org.gotson.komga.interfaces.rest.dto
package org.gotson.komga.interfaces.api.rest.dto
data class TachiyomiReadProgressDto(
val booksCount: Int,

2
komga/src/main/kotlin/org/gotson/komga/interfaces/rest/dto/TachiyomiReadProgressUpdateDto.kt → komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/TachiyomiReadProgressUpdateDto.kt
View file

@ -1,4 +1,4 @@
package org.gotson.komga.interfaces.rest.dto
package org.gotson.komga.interfaces.api.rest.dto
import javax.validation.constraints.PositiveOrZero

2
komga/src/main/kotlin/org/gotson/komga/interfaces/rest/dto/TachiyomiReadProgressV2Dto.kt → komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/TachiyomiReadProgressV2Dto.kt
View file

@ -1,4 +1,4 @@
package org.gotson.komga.interfaces.rest.dto
package org.gotson.komga.interfaces.api.rest.dto
data class TachiyomiReadProgressV2Dto(
val booksCount: Int,

2
komga/src/main/kotlin/org/gotson/komga/interfaces/rest/dto/UserDto.kt → komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/UserDto.kt
View file

@ -1,4 +1,4 @@
package org.gotson.komga.interfaces.rest.dto
package org.gotson.komga.interfaces.api.rest.dto
import org.gotson.komga.domain.model.KomgaUser
import org.gotson.komga.domain.model.ROLE_ADMIN

8
komga/src/main/kotlin/org/gotson/komga/interfaces/rest/dto/Utils.kt
View file

@ -1,8 +0,0 @@
package org.gotson.komga.interfaces.rest.dto
import java.time.LocalDateTime
import java.time.ZoneId
import java.time.ZoneOffset
fun LocalDateTime.toUTC(): LocalDateTime =
atZone(ZoneId.systemDefault()).withZoneSameInstant(ZoneOffset.UTC).toLocalDateTime()

2
komga/src/test/kotlin/org/gotson/komga/domain/service/LibraryContentLifecycleTest.kt
View file

@ -36,7 +36,7 @@ import org.gotson.komga.domain.persistence.SeriesRepository
import org.gotson.komga.domain.persistence.ThumbnailBookRepository
import org.gotson.komga.infrastructure.hash.Hasher
import org.gotson.komga.infrastructure.language.toIndexedMap
import org.gotson.komga.interfaces.rest.persistence.SeriesDtoRepository
import org.gotson.komga.interfaces.api.persistence.SeriesDtoRepository
import org.junit.jupiter.api.AfterAll
import org.junit.jupiter.api.AfterEach
import org.junit.jupiter.api.BeforeAll

4
komga/src/test/kotlin/org/gotson/komga/interfaces/opds/OpdsControllerTest.kt → komga/src/test/kotlin/org/gotson/komga/interfaces/api/opds/OpdsControllerTest.kt
View file

@ -1,4 +1,4 @@
package org.gotson.komga.interfaces.opds
package org.gotson.komga.interfaces.api.opds
import org.gotson.komga.domain.model.BookPage
import org.gotson.komga.domain.model.KomgaUser
@ -15,7 +15,7 @@ import org.gotson.komga.domain.persistence.SeriesRepository
import org.gotson.komga.domain.service.KomgaUserLifecycle
import org.gotson.komga.domain.service.LibraryLifecycle
import org.gotson.komga.domain.service.SeriesLifecycle
import org.gotson.komga.interfaces.rest.WithMockCustomUser
import org.gotson.komga.interfaces.api.rest.WithMockCustomUser
import org.hamcrest.Matchers
import org.junit.jupiter.api.AfterAll
import org.junit.jupiter.api.AfterEach

2
komga/src/test/kotlin/org/gotson/komga/interfaces/rest/BookControllerTest.kt → komga/src/test/kotlin/org/gotson/komga/interfaces/api/rest/BookControllerTest.kt
View file

@ -1,4 +1,4 @@
package org.gotson.komga.interfaces.rest
package org.gotson.komga.interfaces.api.rest
import org.assertj.core.api.Assertions.assertThat
import org.assertj.core.groups.Tuple.tuple

2
komga/src/test/kotlin/org/gotson/komga/interfaces/rest/ClaimControllerTest.kt → komga/src/test/kotlin/org/gotson/komga/interfaces/api/rest/ClaimControllerTest.kt
View file

@ -1,4 +1,4 @@
package org.gotson.komga.interfaces.rest
package org.gotson.komga.interfaces.api.rest
import org.junit.jupiter.api.extension.ExtendWith
import org.junit.jupiter.params.ParameterizedTest

2
komga/src/test/kotlin/org/gotson/komga/interfaces/rest/FileSystemControllerTest.kt → komga/src/test/kotlin/org/gotson/komga/interfaces/api/rest/FileSystemControllerTest.kt
View file

@ -1,4 +1,4 @@
package org.gotson.komga.interfaces.rest
package org.gotson.komga.interfaces.api.rest
import org.gotson.komga.domain.model.ROLE_ADMIN
import org.gotson.komga.domain.model.ROLE_USER

2
komga/src/test/kotlin/org/gotson/komga/interfaces/rest/LibraryControllerTest.kt → komga/src/test/kotlin/org/gotson/komga/interfaces/api/rest/LibraryControllerTest.kt
View file

@ -1,4 +1,4 @@
package org.gotson.komga.interfaces.rest
package org.gotson.komga.interfaces.api.rest
import org.gotson.komga.domain.model.ROLE_ADMIN
import org.gotson.komga.domain.model.ROLE_USER

2
komga/src/test/kotlin/org/gotson/komga/interfaces/rest/MockSpringSecurity.kt → komga/src/test/kotlin/org/gotson/komga/interfaces/api/rest/MockSpringSecurity.kt
View file

@ -1,4 +1,4 @@
package org.gotson.komga.interfaces.rest
package org.gotson.komga.interfaces.api.rest
import org.gotson.komga.domain.model.KomgaUser
import org.gotson.komga.domain.model.ROLE_ADMIN

2
komga/src/test/kotlin/org/gotson/komga/interfaces/rest/ReadListControllerTest.kt → komga/src/test/kotlin/org/gotson/komga/interfaces/api/rest/ReadListControllerTest.kt
View file

@ -1,4 +1,4 @@
package org.gotson.komga.interfaces.rest
package org.gotson.komga.interfaces.api.rest
import org.gotson.komga.domain.model.Book
import org.gotson.komga.domain.model.ROLE_ADMIN

2
komga/src/test/kotlin/org/gotson/komga/interfaces/rest/SeriesCollectionControllerTest.kt → komga/src/test/kotlin/org/gotson/komga/interfaces/api/rest/SeriesCollectionControllerTest.kt
View file

@ -1,4 +1,4 @@
package org.gotson.komga.interfaces.rest
package org.gotson.komga.interfaces.api.rest
import org.gotson.komga.domain.model.ROLE_ADMIN
import org.gotson.komga.domain.model.Series

2
komga/src/test/kotlin/org/gotson/komga/interfaces/rest/SeriesControllerTest.kt → komga/src/test/kotlin/org/gotson/komga/interfaces/api/rest/SeriesControllerTest.kt
View file

@ -1,4 +1,4 @@
package org.gotson.komga.interfaces.rest
package org.gotson.komga.interfaces.api.rest
import org.assertj.core.api.Assertions.assertThat
import org.gotson.komga.domain.model.BookPage

2
komga/src/test/kotlin/org/gotson/komga/interfaces/rest/UserControllerDemoTest.kt → komga/src/test/kotlin/org/gotson/komga/interfaces/api/rest/UserControllerDemoTest.kt
View file

@ -1,4 +1,4 @@
package org.gotson.komga.interfaces.rest
package org.gotson.komga.interfaces.api.rest
import org.junit.jupiter.api.Test
import org.junit.jupiter.api.extension.ExtendWith

2
komga/src/test/kotlin/org/gotson/komga/interfaces/rest/UserControllerTest.kt → komga/src/test/kotlin/org/gotson/komga/interfaces/api/rest/UserControllerTest.kt
View file

@ -1,4 +1,4 @@
package org.gotson.komga.interfaces.rest
package org.gotson.komga.interfaces.api.rest
import org.gotson.komga.domain.model.ROLE_ADMIN
import org.junit.jupiter.api.extension.ExtendWith