From 375f0195462caa44ce637fb4636beab147843444 Mon Sep 17 00:00:00 2001 From: Hai Phuc Nguyen Date: Sun, 1 Dec 2024 23:06:46 -0800 Subject: [PATCH] Minor change align with ui improvement (#23) --- .../teams/handler/TeamRequestFieldHandlerRegistry.java | 3 +++ .../io/flexwork/modules/teams/service/TeamService.java | 4 ++-- .../modules/teams/web/rest/TeamController.java | 5 ++--- .../usermanagement/repository/AuthorityRepository.java | 4 +++- .../usermanagement/service/AuthorityService.java | 9 ++++----- .../usermanagement/web/rest/AuthorityController.java | 10 +++------- 6 files changed, 17 insertions(+), 18 deletions(-) diff --git a/server/src/main/java/io/flexwork/modules/teams/handler/TeamRequestFieldHandlerRegistry.java b/server/src/main/java/io/flexwork/modules/teams/handler/TeamRequestFieldHandlerRegistry.java index 4dacc7f7..91db1d88 100644 --- a/server/src/main/java/io/flexwork/modules/teams/handler/TeamRequestFieldHandlerRegistry.java +++ b/server/src/main/java/io/flexwork/modules/teams/handler/TeamRequestFieldHandlerRegistry.java @@ -25,6 +25,9 @@ public TeamRequestFieldHandlerRegistry( @Override protected void initializeFieldHandlers() { + addFieldHandler("requestTitle", new EntityFieldHandler("Title")); + addFieldHandler( + "requestDescription", new EntityFieldHandler("Description")); addFieldHandler("priority", new EntityFieldHandler("Priority")); addFieldHandler( "channel", diff --git a/server/src/main/java/io/flexwork/modules/teams/service/TeamService.java b/server/src/main/java/io/flexwork/modules/teams/service/TeamService.java index 334382ed..18c4e1ad 100644 --- a/server/src/main/java/io/flexwork/modules/teams/service/TeamService.java +++ b/server/src/main/java/io/flexwork/modules/teams/service/TeamService.java @@ -70,7 +70,7 @@ public TeamDTO createTeam(TeamDTO teamDTO) { return teamMapper.toDto(teamRepository.save(team)); } - public Team updateTeam(TeamDTO updatedTeam) { + public TeamDTO updateTeam(TeamDTO updatedTeam) { Team existingTeam = teamRepository .findById(updatedTeam.getId()) @@ -80,7 +80,7 @@ public Team updateTeam(TeamDTO updatedTeam) { "Team not found with id: " + updatedTeam.getId())); teamMapper.updateFromDto(updatedTeam, existingTeam); - return teamRepository.save(existingTeam); + return teamMapper.toDto(teamRepository.save(existingTeam)); } public void deleteTeam(Long id) { diff --git a/server/src/main/java/io/flexwork/modules/teams/web/rest/TeamController.java b/server/src/main/java/io/flexwork/modules/teams/web/rest/TeamController.java index 2e0844c4..d6008b21 100644 --- a/server/src/main/java/io/flexwork/modules/teams/web/rest/TeamController.java +++ b/server/src/main/java/io/flexwork/modules/teams/web/rest/TeamController.java @@ -2,7 +2,6 @@ import io.flexwork.modules.fss.ResourceRemoveEvent; import io.flexwork.modules.fss.service.StorageService; -import io.flexwork.modules.teams.domain.Team; import io.flexwork.modules.teams.service.TeamService; import io.flexwork.modules.teams.service.dto.TeamDTO; import io.flexwork.modules.usermanagement.service.dto.UserDTO; @@ -74,7 +73,7 @@ public ResponseEntity createTeam( } @PutMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE) - public ResponseEntity updateTeam( + public ResponseEntity updateTeam( @RequestPart("teamDTO") TeamDTO team, @RequestPart(value = "file", required = false) MultipartFile file) throws Exception { @@ -87,7 +86,7 @@ public ResponseEntity updateTeam( "teams", UUID.randomUUID().toString(), file.getInputStream()); team.setLogoUrl(teamLogoPath); } - Team updatedTeam = teamService.updateTeam(team); + TeamDTO updatedTeam = teamService.updateTeam(team); // Remove the old logo if (fileRemovedPath.isPresent()) { eventPublisher.publishEvent(new ResourceRemoveEvent(this, fileRemovedPath.get())); diff --git a/server/src/main/java/io/flexwork/modules/usermanagement/repository/AuthorityRepository.java b/server/src/main/java/io/flexwork/modules/usermanagement/repository/AuthorityRepository.java index 09a0637e..db9f8acf 100644 --- a/server/src/main/java/io/flexwork/modules/usermanagement/repository/AuthorityRepository.java +++ b/server/src/main/java/io/flexwork/modules/usermanagement/repository/AuthorityRepository.java @@ -4,6 +4,7 @@ import io.flexwork.modules.usermanagement.domain.User; import java.util.List; import java.util.Optional; +import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; @@ -31,5 +32,6 @@ List findUsersNotInAuthority( Pageable pageable); @Query("SELECT u FROM User u JOIN u.authorities a WHERE a.name = :authorityName") - List findAllUsersByAuthority(@Param("authorityName") String authorityName); + Page findUsersByAuthority( + @Param("authorityName") String authorityName, Pageable pageable); } diff --git a/server/src/main/java/io/flexwork/modules/usermanagement/service/AuthorityService.java b/server/src/main/java/io/flexwork/modules/usermanagement/service/AuthorityService.java index 26dde77b..3fafc613 100644 --- a/server/src/main/java/io/flexwork/modules/usermanagement/service/AuthorityService.java +++ b/server/src/main/java/io/flexwork/modules/usermanagement/service/AuthorityService.java @@ -10,7 +10,6 @@ import io.flexwork.modules.usermanagement.service.mapper.UserMapper; import java.util.List; import java.util.Optional; -import java.util.stream.Collectors; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; @@ -83,10 +82,10 @@ public Optional findAuthorityByName(String authorityName) { } @Transactional(readOnly = true) - public List findAllUsersByAuthority(String authorityName) { - return authorityRepository.findAllUsersByAuthority(authorityName).stream() - .map(userMapper::toDto) - .collect(Collectors.toList()); + public Page findAllUsersByAuthority(String authorityName, Pageable pageable) { + return authorityRepository + .findUsersByAuthority(authorityName, pageable) + .map(userMapper::toDto); } @Transactional(readOnly = true) diff --git a/server/src/main/java/io/flexwork/modules/usermanagement/web/rest/AuthorityController.java b/server/src/main/java/io/flexwork/modules/usermanagement/web/rest/AuthorityController.java index f17719a8..241ec3db 100644 --- a/server/src/main/java/io/flexwork/modules/usermanagement/web/rest/AuthorityController.java +++ b/server/src/main/java/io/flexwork/modules/usermanagement/web/rest/AuthorityController.java @@ -105,13 +105,9 @@ public ResponseEntity deleteAuthority(@PathVariable("id") String id) { } @GetMapping("/{authorityName}/users") - public ResponseEntity> getUsersByAuthority(@PathVariable String authorityName) { - List users = authorityService.findAllUsersByAuthority(authorityName); - - if (users.isEmpty()) { - return ResponseEntity.noContent().build(); - } - + public ResponseEntity> getUsersByAuthority( + @PathVariable String authorityName, Pageable pageable) { + Page users = authorityService.findAllUsersByAuthority(authorityName, pageable); return ResponseEntity.ok(users); }