From 4e8cffdbe2fe9a380787590618e8f75bc3d24389 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Tue, 12 Dec 2023 12:02:54 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20Hideout=E3=83=A6=E3=83=BC=E3=82=B6?= =?UTF-8?q?=E3=83=BC=E5=81=B4=E3=81=AE=E8=A8=AD=E5=AE=9A=E3=82=82ActivityP?= =?UTF-8?q?ub=E3=81=A8=E5=90=88=E3=82=8F=E3=81=9B=E3=82=8B=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hideout/core/domain/model/userdetails/UserDetail.kt | 1 - .../exposedrepository/UserDetailRepositoryImpl.kt | 4 ---- .../dev/usbharu/hideout/core/service/user/UpdateUserDto.kt | 2 +- .../dev/usbharu/hideout/core/service/user/UserServiceImpl.kt | 4 ++-- .../hideout/mastodon/service/account/AccountApiService.kt | 2 +- src/main/resources/db/migration/V1__Init_DB.sql | 1 - 6 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/model/userdetails/UserDetail.kt b/src/main/kotlin/dev/usbharu/hideout/core/domain/model/userdetails/UserDetail.kt index f4062917..648ccf7e 100644 --- a/src/main/kotlin/dev/usbharu/hideout/core/domain/model/userdetails/UserDetail.kt +++ b/src/main/kotlin/dev/usbharu/hideout/core/domain/model/userdetails/UserDetail.kt @@ -3,6 +3,5 @@ package dev.usbharu.hideout.core.domain.model.userdetails data class UserDetail( val actorId: Long, val password: String, - val autoAcceptFollowRequest: Boolean, val autoAcceptFolloweeFollowRequest: Boolean ) diff --git a/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/UserDetailRepositoryImpl.kt b/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/UserDetailRepositoryImpl.kt index 10e52cf8..f19e8ecf 100644 --- a/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/UserDetailRepositoryImpl.kt +++ b/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/UserDetailRepositoryImpl.kt @@ -18,13 +18,11 @@ class UserDetailRepositoryImpl : UserDetailRepository { UserDetails.insert { it[actorId] = userDetail.actorId it[password] = userDetail.password - it[autoAcceptFollowRequest] = userDetail.autoAcceptFollowRequest it[autoAcceptFolloweeFollowRequest] = userDetail.autoAcceptFolloweeFollowRequest } } else { UserDetails.update({ UserDetails.actorId eq userDetail.actorId }) { it[password] = userDetail.password - it[autoAcceptFollowRequest] = userDetail.autoAcceptFollowRequest it[autoAcceptFolloweeFollowRequest] = userDetail.autoAcceptFolloweeFollowRequest } } @@ -43,7 +41,6 @@ class UserDetailRepositoryImpl : UserDetailRepository { UserDetail( it[UserDetails.actorId], it[UserDetails.password], - it[UserDetails.autoAcceptFollowRequest], it[UserDetails.autoAcceptFolloweeFollowRequest] ) } @@ -55,6 +52,5 @@ class UserDetailRepositoryImpl : UserDetailRepository { object UserDetails : LongIdTable("user_details") { val actorId = long("actor_id").references(Actors.id) val password = varchar("password", 255) - val autoAcceptFollowRequest = bool("auto_accept_follow_request") val autoAcceptFolloweeFollowRequest = bool("auto_accept_followee_follow_request") } diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/user/UpdateUserDto.kt b/src/main/kotlin/dev/usbharu/hideout/core/service/user/UpdateUserDto.kt index 5406fd02..a02c8d1c 100644 --- a/src/main/kotlin/dev/usbharu/hideout/core/service/user/UpdateUserDto.kt +++ b/src/main/kotlin/dev/usbharu/hideout/core/service/user/UpdateUserDto.kt @@ -7,6 +7,6 @@ data class UpdateUserDto( val description: String, val avatarMedia: Media?, val headerMedia: Media?, - val autoAcceptFollowRequest: Boolean, + val locked: Boolean, val autoAcceptFolloweeFollowRequest: Boolean ) diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/user/UserServiceImpl.kt b/src/main/kotlin/dev/usbharu/hideout/core/service/user/UserServiceImpl.kt index 3a1d20ba..442b676b 100644 --- a/src/main/kotlin/dev/usbharu/hideout/core/service/user/UserServiceImpl.kt +++ b/src/main/kotlin/dev/usbharu/hideout/core/service/user/UserServiceImpl.kt @@ -53,7 +53,7 @@ class UserServiceImpl( locked = false ) val save = actorRepository.save(userEntity) - userDetailRepository.save(UserDetail(nextId, hashedPassword, true, true)) + userDetailRepository.save(UserDetail(nextId, hashedPassword, true)) return save } @@ -106,12 +106,12 @@ class UserServiceImpl( actor.copy( screenName = updateUserDto.screenName, description = updateUserDto.description, + locked = updateUserDto.locked ) ) userDetailRepository.save( userDetail.copy( - autoAcceptFollowRequest = updateUserDto.autoAcceptFollowRequest, autoAcceptFolloweeFollowRequest = updateUserDto.autoAcceptFolloweeFollowRequest ) ) diff --git a/src/main/kotlin/dev/usbharu/hideout/mastodon/service/account/AccountApiService.kt b/src/main/kotlin/dev/usbharu/hideout/mastodon/service/account/AccountApiService.kt index b85b7d67..d94df813 100644 --- a/src/main/kotlin/dev/usbharu/hideout/mastodon/service/account/AccountApiService.kt +++ b/src/main/kotlin/dev/usbharu/hideout/mastodon/service/account/AccountApiService.kt @@ -195,7 +195,7 @@ class AccountApiServiceImpl( description = updateCredentials?.note ?: account.note, avatarMedia = avatarMedia, headerMedia = headerMedia, - autoAcceptFollowRequest = updateCredentials?.locked ?: account.locked, + locked = updateCredentials?.locked ?: account.locked, autoAcceptFolloweeFollowRequest = false ) userService.updateUser(userid, updateUserDto) diff --git a/src/main/resources/db/migration/V1__Init_DB.sql b/src/main/resources/db/migration/V1__Init_DB.sql index 9cdab874..48223f60 100644 --- a/src/main/resources/db/migration/V1__Init_DB.sql +++ b/src/main/resources/db/migration/V1__Init_DB.sql @@ -40,7 +40,6 @@ create table if not exists user_details id bigserial primary key, actor_id bigint not null unique, password varchar(255) not null, - auto_accept_follow_request boolean not null, auto_accept_followee_follow_request boolean not null, constraint fk_user_details_actor_id__id foreign key (actor_id) references actors (id) on delete restrict on update restrict );