Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: Use UserService to update a user #3053

Merged
merged 4 commits into from
Feb 16, 2024
Merged

refactor: Use UserService to update a user #3053

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
74dae37
Use UserService to update a user
seakayone Feb 16, 2024
0841037
Use a single query for save in case of create or update
seakayone Feb 16, 2024
e9fc7bc
add type annotation
seakayone Feb 16, 2024
075833b
Use UserService to update the user password
seakayone Feb 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 3 additions & 27 deletions integration/src/test/scala/org/knora/webapi/responders/admin/UsersResponderSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ class UsersResponderSpec extends CoreSpec with ImplicitSender {
private val anythingAdminUser = SharedTestDataADM.anythingAdminUser
private val normalUser = SharedTestDataADM.normalUser

private val incunabulaProjectAdminUser = SharedTestDataADM.incunabulaProjectAdminUser

private val imagesProject = SharedTestDataADM.imagesProject
private val incunabulaProject = SharedTestDataADM.incunabulaProject
private val imagesReviewerGroup = SharedTestDataADM.imagesReviewerGroup
Expand Down Expand Up @@ -387,12 +385,7 @@ class UsersResponderSpec extends CoreSpec with ImplicitSender {

// add user to images project (00FF)
UnsafeZioRun.runOrThrow(
UsersResponder.addProjectToUserIsInProject(
normalUser.userIri,
imagesProject.projectIri,
rootUser,
UUID.randomUUID()
)
UsersResponder.addProjectToUserIsInProject(normalUser.userIri, imagesProject.projectIri, UUID.randomUUID())
)

val membershipsAfterUpdate =
Expand All @@ -419,7 +412,6 @@ class UsersResponderSpec extends CoreSpec with ImplicitSender {
UsersResponder.addProjectToUserIsInProject(
normalUser.userIri,
incunabulaProject.projectIri,
incunabulaProjectAdminUser,
UUID.randomUUID()
)
)
Expand Down Expand Up @@ -452,7 +444,6 @@ class UsersResponderSpec extends CoreSpec with ImplicitSender {
UsersResponder.addProjectToUserIsInProjectAdminGroup(
normalUser.userIri,
imagesProject.projectIri,
rootUser,
UUID.randomUUID()
)
)
Expand All @@ -467,7 +458,6 @@ class UsersResponderSpec extends CoreSpec with ImplicitSender {
UsersResponder.removeProjectFromUserIsInProjectAndIsInProjectAdminGroup(
normalUser.userIri,
imagesProject.projectIri,
rootUser,
UUID.randomUUID()
)
)
Expand Down Expand Up @@ -502,7 +492,6 @@ class UsersResponderSpec extends CoreSpec with ImplicitSender {
UsersResponder.addProjectToUserIsInProjectAdminGroup(
normalUser.userIri,
imagesProject.projectIri,
rootUser,
UUID.randomUUID()
)
)
Expand All @@ -520,20 +509,14 @@ class UsersResponderSpec extends CoreSpec with ImplicitSender {

// add user as project member to images project
UnsafeZioRun.runOrThrow(
UsersResponder.addProjectToUserIsInProject(
normalUser.userIri,
imagesProject.projectIri,
rootUser,
UUID.randomUUID()
)
UsersResponder.addProjectToUserIsInProject(normalUser.userIri, imagesProject.projectIri, UUID.randomUUID())
)

// add user as project admin to images project
UnsafeZioRun.runOrThrow(
UsersResponder.addProjectToUserIsInProjectAdminGroup(
normalUser.userIri,
imagesProject.projectIri,
rootUser,
UUID.randomUUID()
)
)
Expand All @@ -559,7 +542,6 @@ class UsersResponderSpec extends CoreSpec with ImplicitSender {
UsersResponder.removeProjectFromUserIsInProjectAdminGroup(
normalUser.userIri,
imagesProject.projectIri,
rootUser,
UUID.randomUUID()
)
)
Expand All @@ -582,12 +564,7 @@ class UsersResponderSpec extends CoreSpec with ImplicitSender {
membershipsBeforeUpdate should equal(Seq())

UnsafeZioRun.runOrThrow(
UsersResponder.addGroupToUserIsInGroup(
normalUser.userIri,
imagesReviewerGroup.groupIri,
rootUser,
UUID.randomUUID()
)
UsersResponder.addGroupToUserIsInGroup(normalUser.userIri, imagesReviewerGroup.groupIri, UUID.randomUUID())
)

val membershipsAfterUpdate =
Expand All @@ -612,7 +589,6 @@ class UsersResponderSpec extends CoreSpec with ImplicitSender {
UsersResponder.removeGroupFromUserIsInGroup(
normalUser.userIri,
imagesReviewerGroup.groupIri,
rootUser,
UUID.randomUUID()
)
)
Expand Down
8 changes: 2 additions & 6 deletions ...main/scala/org/knora/webapi/messages/admin/responder/usersmessages/UsersMessagesADM.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,8 @@ case class UserGetByIriADM(
* @param requestingUser the user initiating the request.
* @param apiRequestID the ID of the API request.
*/
case class UserGroupMembershipRemoveRequestADM(
userIri: UserIri,
groupIri: GroupIri,
requestingUser: User,
apiRequestID: UUID
) extends UsersResponderRequestADM
case class UserGroupMembershipRemoveRequestADM(userIri: UserIri, groupIri: GroupIri, apiRequestID: UUID)
extends UsersResponderRequestADM

// Responses

Expand Down
7 changes: 1 addition & 6 deletions webapi/src/main/scala/org/knora/webapi/responders/admin/GroupsResponderADM.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,12 +606,7 @@
members.map { (user: User) =>
messageRelay
.ask[UserOperationResponseADM](
UserGroupMembershipRemoveRequestADM(
user.userIri,
changedGroup.groupIri,
KnoraSystemInstances.Users.SystemUser,
apiRequestID
)
UserGroupMembershipRemoveRequestADM(user.userIri, changedGroup.groupIri, apiRequestID)

Check warning on line 609 in webapi/src/main/scala/org/knora/webapi/responders/admin/GroupsResponderADM.scala

View check run for this annotation

Codecov / codecov/patch

webapi/src/main/scala/org/knora/webapi/responders/admin/GroupsResponderADM.scala#L609 

Added line #L609 was not covered by tests
)
}

Expand Down