Skip to content

Commit

Permalink
Refactor :: Rename KickWorkspaceMemberRequest
Browse files Browse the repository at this point in the history
  • Loading branch information
yeseong0412 committed Oct 19, 2024
1 parent 8db6577 commit 1d2ab16
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,9 @@ class WorkspaceController(
@PatchMapping("/kick")
fun kickWorkspaceMember(
@GetAuthenticatedId userId: Long,
@RequestBody kickWorkspaceMember: KickWorkspaceMember,
@RequestBody kickWorkspaceMemberRequest: KickWorkspaceMemberRequest,
): BaseResponse<Unit> {
return workspaceService.kickWorkspaceMember(userId, kickWorkspaceMember)
return workspaceService.kickWorkspaceMember(userId, kickWorkspaceMemberRequest)
}

}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.seugi.api.domain.workspace.presentation.dto.request

data class KickWorkspaceMember(
data class KickWorkspaceMemberRequest(
val memberList: Set<Long>? = null,
val workspaceId: String? = null,
)
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@ interface WorkspaceService {
manageWorkspaceMemberPermissionRequest: ManageWorkspaceMemberPermissionRequest,
): BaseResponse<Unit>

fun kickWorkspaceMember(userId: Long, kickWorkspaceMember: KickWorkspaceMember): BaseResponse<Unit>
fun kickWorkspaceMember(userId: Long, kickWorkspaceMemberRequest: KickWorkspaceMemberRequest): BaseResponse<Unit>
}
Original file line number Diff line number Diff line change
Expand Up @@ -480,16 +480,19 @@ class WorkspaceServiceImpl(
}

@Transactional
override fun kickWorkspaceMember(userId: Long, kickWorkspaceMember: KickWorkspaceMember): BaseResponse<Unit> {
val workspaceEntity = findWorkspaceById(kickWorkspaceMember.workspaceId ?: "")
override fun kickWorkspaceMember(
userId: Long,
kickWorkspaceMemberRequest: KickWorkspaceMemberRequest,
): BaseResponse<Unit> {
val workspaceEntity = findWorkspaceById(kickWorkspaceMemberRequest.workspaceId ?: "")

if (workspaceEntity.workspaceAdmin != userId && !workspaceEntity.middleAdmin.contains(userId)) throw CustomException(
WorkspaceErrorCode.FORBIDDEN
)

kickWorkspaceMember.memberList?.forEach {
kickWorkspaceMemberRequest.memberList?.forEach {
if (!workspaceEntity.middleAdmin.contains(it)) removeUserFromWorkspace(it, workspaceEntity)
profileAdapter.deleteProfile(it, kickWorkspaceMember.workspaceId ?: "")
profileAdapter.deleteProfile(it, kickWorkspaceMemberRequest.workspaceId ?: "")
}


Expand Down

0 comments on commit 1d2ab16

Please sign in to comment.