From 3a923c7c574158ab7910694e8198111b9550e4e5 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Sat, 14 Sep 2024 21:43:56 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20Application=20Service=E3=82=92?= =?UTF-8?q?=E3=83=AA=E3=83=95=E3=82=A1=E3=82=AF=E3=82=BF=E3=83=AA=E3=83=B3?= =?UTF-8?q?=E3=82=B02?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/actor/DeleteLocalActor.kt | 5 ---- .../core/application/actor/GetActorDetail.kt | 8 ------ .../actor/GetActorDetailApplicationService.kt | 6 +++++ .../core/application/actor/GetUserDetail.kt | 19 ------------- .../actor/GetUserDetailApplicationService.kt | 2 ++ .../application/actor/MigrationLocalActor.kt | 3 --- .../MigrationLocalActorApplicationService.kt | 2 ++ .../application/actor/RegisterLocalActor.kt | 22 --------------- .../RegisterLocalActorApplicationService.kt | 5 ++++ ...AlsoKnownAsLocalActorApplicationService.kt | 8 ------ ...StartDeleteLocalActorApplicationService.kt | 3 +++ .../application/actor/SuspendLocalActor.kt | 3 --- .../SuspendLocalActorApplicationService.kt | 2 ++ .../application/actor/UnsuspendLocalActor.kt | 3 --- .../UnsuspendLocalActorApplicationService.kt | 2 ++ .../application/RegisterApplication.kt | 26 ------------------ .../RegisterApplicationApplicationService.kt | 21 ++++++++++++--- .../core/application/filter/DeleteFilter.kt | 19 ------------- .../core/application/filter/GetFilter.kt | 19 ------------- .../core/application/filter/RegisterFilter.kt | 27 ------------------- .../filter/RegisterFilterKeyword.kt | 24 ----------------- .../UserDeleteFilterApplicationService.kt | 2 ++ .../filter/UserGetFilterApplicationService.kt | 2 ++ .../UserRegisterFilterApplicationService.kt | 12 +++++++++ .../Application.kt} | 4 +-- 25 files changed, 58 insertions(+), 191 deletions(-) delete mode 100644 hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/DeleteLocalActor.kt delete mode 100644 hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/GetActorDetail.kt delete mode 100644 hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/GetUserDetail.kt delete mode 100644 hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/MigrationLocalActor.kt delete mode 100644 hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/RegisterLocalActor.kt delete mode 100644 hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/SetAlsoKnownAsLocalActorApplicationService.kt delete mode 100644 hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/SuspendLocalActor.kt delete mode 100644 hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/UnsuspendLocalActor.kt delete mode 100644 hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/application/RegisterApplication.kt delete mode 100644 hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/filter/DeleteFilter.kt delete mode 100644 hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/filter/GetFilter.kt delete mode 100644 hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/filter/RegisterFilter.kt delete mode 100644 hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/filter/RegisterFilterKeyword.kt rename hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/{application/RegisteredApplication.kt => model/Application.kt} (89%) diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/DeleteLocalActor.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/DeleteLocalActor.kt deleted file mode 100644 index a00a4556..00000000 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/DeleteLocalActor.kt +++ /dev/null @@ -1,5 +0,0 @@ -package dev.usbharu.hideout.core.application.actor - -import dev.usbharu.hideout.core.domain.model.actor.ActorId - -data class DeleteLocalActor(val actorId: ActorId) diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/GetActorDetail.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/GetActorDetail.kt deleted file mode 100644 index 8089a404..00000000 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/GetActorDetail.kt +++ /dev/null @@ -1,8 +0,0 @@ -package dev.usbharu.hideout.core.application.actor - -import dev.usbharu.hideout.core.domain.model.support.acct.Acct - -data class GetActorDetail( - val actorName: Acct? = null, - val id: Long? = null -) diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/GetActorDetailApplicationService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/GetActorDetailApplicationService.kt index c47c467e..ec8b44a2 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/GetActorDetailApplicationService.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/GetActorDetailApplicationService.kt @@ -7,6 +7,7 @@ import dev.usbharu.hideout.core.config.ApplicationConfig import dev.usbharu.hideout.core.domain.model.actor.ActorId import dev.usbharu.hideout.core.domain.model.actor.ActorRepository import dev.usbharu.hideout.core.domain.model.media.MediaRepository +import dev.usbharu.hideout.core.domain.model.support.acct.Acct import dev.usbharu.hideout.core.domain.model.support.principal.Principal import org.slf4j.LoggerFactory import org.springframework.stereotype.Component @@ -48,3 +49,8 @@ class GetActorDetailApplicationService( private val logger = LoggerFactory.getLogger(GetActorDetailApplicationService::class.java) } } + +data class GetActorDetail( + val actorName: Acct? = null, + val id: Long? = null +) \ No newline at end of file diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/GetUserDetail.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/GetUserDetail.kt deleted file mode 100644 index 16ece3c9..00000000 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/GetUserDetail.kt +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2024 usbharu - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package dev.usbharu.hideout.core.application.actor - -data class GetUserDetail(val id: Long) diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/GetUserDetailApplicationService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/GetUserDetailApplicationService.kt index c6a3a4b1..29b7f20c 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/GetUserDetailApplicationService.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/GetUserDetailApplicationService.kt @@ -51,3 +51,5 @@ class GetUserDetailApplicationService( val logger = LoggerFactory.getLogger(GetUserDetailApplicationService::class.java) } } + +data class GetUserDetail(val id: Long) \ No newline at end of file diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/MigrationLocalActor.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/MigrationLocalActor.kt deleted file mode 100644 index 71f7fe96..00000000 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/MigrationLocalActor.kt +++ /dev/null @@ -1,3 +0,0 @@ -package dev.usbharu.hideout.core.application.actor - -data class MigrationLocalActor(val from: Long, val to: Long) diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/MigrationLocalActorApplicationService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/MigrationLocalActorApplicationService.kt index 24a36249..fb28172d 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/MigrationLocalActorApplicationService.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/MigrationLocalActorApplicationService.kt @@ -74,3 +74,5 @@ class MigrationLocalActorApplicationService( private val logger = LoggerFactory.getLogger(MigrationLocalActorApplicationService::class.java) } } + +data class MigrationLocalActor(val from: Long, val to: Long) \ No newline at end of file diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/RegisterLocalActor.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/RegisterLocalActor.kt deleted file mode 100644 index b54f2504..00000000 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/RegisterLocalActor.kt +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (C) 2024 usbharu - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package dev.usbharu.hideout.core.application.actor - -data class RegisterLocalActor( - val name: String, - val password: String, -) diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/RegisterLocalActorApplicationService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/RegisterLocalActorApplicationService.kt index 27adac58..27a7e23c 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/RegisterLocalActorApplicationService.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/RegisterLocalActorApplicationService.kt @@ -76,3 +76,8 @@ class RegisterLocalActorApplicationService( private val logger = LoggerFactory.getLogger(RegisterLocalActorApplicationService::class.java) } } + +data class RegisterLocalActor( + val name: String, + val password: String, +) \ No newline at end of file diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/SetAlsoKnownAsLocalActorApplicationService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/SetAlsoKnownAsLocalActorApplicationService.kt deleted file mode 100644 index 3f676614..00000000 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/SetAlsoKnownAsLocalActorApplicationService.kt +++ /dev/null @@ -1,8 +0,0 @@ -package dev.usbharu.hideout.core.application.actor - -import org.springframework.stereotype.Service - -@Service -interface SetAlsoKnownAsLocalActorApplicationService { - suspend fun setAlsoKnownAs(actorId: Long, alsoKnownAs: List) -} diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/StartDeleteLocalActorApplicationService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/StartDeleteLocalActorApplicationService.kt index 288fdf22..3d6b5761 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/StartDeleteLocalActorApplicationService.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/StartDeleteLocalActorApplicationService.kt @@ -20,6 +20,7 @@ import dev.usbharu.hideout.core.application.exception.InternalServerException import dev.usbharu.hideout.core.application.exception.PermissionDeniedException import dev.usbharu.hideout.core.application.shared.LocalUserAbstractApplicationService import dev.usbharu.hideout.core.application.shared.Transaction +import dev.usbharu.hideout.core.domain.model.actor.ActorId import dev.usbharu.hideout.core.domain.model.actor.ActorRepository import dev.usbharu.hideout.core.domain.model.support.principal.LocalUser import org.slf4j.LoggerFactory @@ -44,3 +45,5 @@ class StartDeleteLocalActorApplicationService( private val logger = LoggerFactory.getLogger(StartDeleteLocalActorApplicationService::class.java) } } + +data class DeleteLocalActor(val actorId: ActorId) \ No newline at end of file diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/SuspendLocalActor.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/SuspendLocalActor.kt deleted file mode 100644 index a566ce97..00000000 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/SuspendLocalActor.kt +++ /dev/null @@ -1,3 +0,0 @@ -package dev.usbharu.hideout.core.application.actor - -data class SuspendLocalActor(val actorId: Long) diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/SuspendLocalActorApplicationService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/SuspendLocalActorApplicationService.kt index eaeba5e7..ad678767 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/SuspendLocalActorApplicationService.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/SuspendLocalActorApplicationService.kt @@ -42,3 +42,5 @@ class SuspendLocalActorApplicationService( private val logger = LoggerFactory.getLogger(SuspendLocalActorApplicationService::class.java) } } + +data class SuspendLocalActor(val actorId: Long) \ No newline at end of file diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/UnsuspendLocalActor.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/UnsuspendLocalActor.kt deleted file mode 100644 index a8107458..00000000 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/UnsuspendLocalActor.kt +++ /dev/null @@ -1,3 +0,0 @@ -package dev.usbharu.hideout.core.application.actor - -data class UnsuspendLocalActor(val actorId: Long) diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/UnsuspendLocalActorApplicationService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/UnsuspendLocalActorApplicationService.kt index 019753e8..e0024181 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/UnsuspendLocalActorApplicationService.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/UnsuspendLocalActorApplicationService.kt @@ -42,3 +42,5 @@ class UnsuspendLocalActorApplicationService( private val logger = LoggerFactory.getLogger(UnsuspendLocalActorApplicationService::class.java) } } + +data class UnsuspendLocalActor(val actorId: Long) \ No newline at end of file diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/application/RegisterApplication.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/application/RegisterApplication.kt deleted file mode 100644 index f39b957f..00000000 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/application/RegisterApplication.kt +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (C) 2024 usbharu - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package dev.usbharu.hideout.core.application.application - -import java.net.URI - -data class RegisterApplication( - val name: String, - val redirectUris: Set, - val useRefreshToken: Boolean, - val scopes: Set, -) diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/application/RegisterApplicationApplicationService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/application/RegisterApplicationApplicationService.kt index 752b4a78..3b057729 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/application/RegisterApplicationApplicationService.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/application/RegisterApplicationApplicationService.kt @@ -16,6 +16,7 @@ package dev.usbharu.hideout.core.application.application +import dev.usbharu.hideout.core.application.model.Application import dev.usbharu.hideout.core.application.shared.AbstractApplicationService import dev.usbharu.hideout.core.application.shared.Transaction import dev.usbharu.hideout.core.domain.model.application.Application @@ -34,6 +35,7 @@ import org.springframework.security.oauth2.server.authorization.client.Registere import org.springframework.security.oauth2.server.authorization.settings.ClientSettings import org.springframework.security.oauth2.server.authorization.settings.TokenSettings import org.springframework.stereotype.Service +import java.net.URI import java.time.Duration @Service @@ -44,9 +46,15 @@ class RegisterApplicationApplicationService( private val registeredClientRepository: RegisteredClientRepository, transaction: Transaction, private val applicationRepository: ApplicationRepository, -) : AbstractApplicationService(transaction, logger) { +) : AbstractApplicationService( + transaction, + logger +) { - override suspend fun internalExecute(command: RegisterApplication, principal: Principal): RegisteredApplication { + override suspend fun internalExecute( + command: RegisterApplication, + principal: Principal + ): dev.usbharu.hideout.core.application.model.Application { val id = idGenerateService.generateId() val clientSecret = secureTokenGenerator.generate() val registeredClient = RegisteredClient @@ -82,7 +90,7 @@ class RegisterApplicationApplicationService( val application = Application(ApplicationId(id), ApplicationName(command.name)) applicationRepository.save(application) - return RegisteredApplication( + return dev.usbharu.hideout.core.application.model.Application( id = id, name = command.name, clientSecret = clientSecret, @@ -95,3 +103,10 @@ class RegisterApplicationApplicationService( private val logger = LoggerFactory.getLogger(RegisterApplicationApplicationService::class.java) } } + +data class RegisterApplication( + val name: String, + val redirectUris: Set, + val useRefreshToken: Boolean, + val scopes: Set, +) \ No newline at end of file diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/filter/DeleteFilter.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/filter/DeleteFilter.kt deleted file mode 100644 index 52a2bf0a..00000000 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/filter/DeleteFilter.kt +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2024 usbharu - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package dev.usbharu.hideout.core.application.filter - -data class DeleteFilter(val filterId: Long) diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/filter/GetFilter.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/filter/GetFilter.kt deleted file mode 100644 index b9089ab0..00000000 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/filter/GetFilter.kt +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2024 usbharu - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package dev.usbharu.hideout.core.application.filter - -data class GetFilter(val filterId: Long) diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/filter/RegisterFilter.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/filter/RegisterFilter.kt deleted file mode 100644 index 3fd9a35f..00000000 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/filter/RegisterFilter.kt +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (C) 2024 usbharu - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package dev.usbharu.hideout.core.application.filter - -import dev.usbharu.hideout.core.domain.model.filter.FilterAction -import dev.usbharu.hideout.core.domain.model.filter.FilterContext - -data class RegisterFilter( - val filterName: String, - val filterContext: Set, - val filterAction: FilterAction, - val filterKeywords: Set, -) diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/filter/RegisterFilterKeyword.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/filter/RegisterFilterKeyword.kt deleted file mode 100644 index b6e3ed31..00000000 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/filter/RegisterFilterKeyword.kt +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (C) 2024 usbharu - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package dev.usbharu.hideout.core.application.filter - -import dev.usbharu.hideout.core.domain.model.filter.FilterMode - -data class RegisterFilterKeyword( - val keyword: String, - val filterMode: FilterMode, -) diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/filter/UserDeleteFilterApplicationService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/filter/UserDeleteFilterApplicationService.kt index 19b07618..ab63ba14 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/filter/UserDeleteFilterApplicationService.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/filter/UserDeleteFilterApplicationService.kt @@ -44,3 +44,5 @@ class UserDeleteFilterApplicationService(private val filterRepository: FilterRep private val logger = LoggerFactory.getLogger(UserDeleteFilterApplicationService::class.java) } } + +data class DeleteFilter(val filterId: Long) \ No newline at end of file diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/filter/UserGetFilterApplicationService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/filter/UserGetFilterApplicationService.kt index afad3897..1bb16d64 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/filter/UserGetFilterApplicationService.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/filter/UserGetFilterApplicationService.kt @@ -45,3 +45,5 @@ class UserGetFilterApplicationService(private val filterRepository: FilterReposi private val logger = LoggerFactory.getLogger(UserGetFilterApplicationService::class.java) } } + +data class GetFilter(val filterId: Long) \ No newline at end of file diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/filter/UserRegisterFilterApplicationService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/filter/UserRegisterFilterApplicationService.kt index 68b7dc0f..4ff24099 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/filter/UserRegisterFilterApplicationService.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/filter/UserRegisterFilterApplicationService.kt @@ -61,3 +61,15 @@ class UserRegisterFilterApplicationService( private val logger = LoggerFactory.getLogger(UserRegisterFilterApplicationService::class.java) } } + +data class RegisterFilter( + val filterName: String, + val filterContext: Set, + val filterAction: FilterAction, + val filterKeywords: Set, +) + +data class RegisterFilterKeyword( + val keyword: String, + val filterMode: FilterMode, +) \ No newline at end of file diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/application/RegisteredApplication.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/model/Application.kt similarity index 89% rename from hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/application/RegisteredApplication.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/model/Application.kt index a5a18032..38e93779 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/application/RegisteredApplication.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/model/Application.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package dev.usbharu.hideout.core.application.application +package dev.usbharu.hideout.core.application.model import java.net.URI -data class RegisteredApplication( +data class Application( val id: Long, val name: String, val redirectUris: Set,