-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into feat/PDS-63-getResources
- Loading branch information
Showing
8 changed files
with
110 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
37 changes: 37 additions & 0 deletions
37
src/main/java/com/example/pladialmserver/user/dto/response/UserRes.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
package com.example.pladialmserver.user.dto.response; | ||
|
||
import com.example.pladialmserver.user.entity.User; | ||
import io.swagger.v3.oas.annotations.media.Schema; | ||
import lombok.Builder; | ||
import lombok.Data; | ||
|
||
@Data | ||
@Builder | ||
public class UserRes { | ||
@Schema(type = "Long", description = "1", example = "1") | ||
private Long userId; | ||
@Schema(type = "String", description = "성명", example = "홍길동") | ||
private String name; | ||
@Schema(type = "String", description = "이메일", example = "[email protected]") | ||
private String email; | ||
@Schema(type = "String", description = "부서", example = "마케팅") | ||
private String department; | ||
@Schema(type = "String", description = "직위", example = "팀장") | ||
private String position; | ||
@Schema(type = "String", description = "직책", example = "마케팅 팀장") | ||
private String officeJob; | ||
@Schema(type = "String", description = "역할(일반|관리자)", example = "일반") | ||
private String role; | ||
|
||
public static UserRes toDto (User user){ | ||
return UserRes.builder() | ||
.userId(user.getUserId()) | ||
.name(user.getName()) | ||
.email(user.getEmail()) | ||
.department(user.getDepartment().getName()) | ||
.position(user.getPosition().getName()) | ||
.officeJob(user.getOfficeJob()) | ||
.role(user.getRole().getValue()) | ||
.build(); | ||
} | ||
} |
9 changes: 9 additions & 0 deletions
9
src/main/java/com/example/pladialmserver/user/repository/user/UserCustom.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
package com.example.pladialmserver.user.repository.user; | ||
|
||
import com.example.pladialmserver.user.entity.User; | ||
import org.springframework.data.domain.Page; | ||
import org.springframework.data.domain.Pageable; | ||
|
||
public interface UserCustom { | ||
Page<User> findAllByName(String name, Pageable pageable); | ||
} |
4 changes: 2 additions & 2 deletions
4
...erver/user/repository/UserRepository.java → .../user/repository/user/UserRepository.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,11 @@ | ||
package com.example.pladialmserver.user.repository; | ||
package com.example.pladialmserver.user.repository.user; | ||
|
||
import com.example.pladialmserver.user.entity.User; | ||
import org.springframework.data.jpa.repository.JpaRepository; | ||
|
||
import java.util.Optional; | ||
|
||
public interface UserRepository extends JpaRepository<User, Long> { | ||
public interface UserRepository extends JpaRepository<User, Long>, UserCustom{ | ||
Optional<User> findByEmail(String email); | ||
Boolean existsByEmail(String email); | ||
} |
34 changes: 34 additions & 0 deletions
34
src/main/java/com/example/pladialmserver/user/repository/user/UserRepositoryImpl.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
package com.example.pladialmserver.user.repository.user; | ||
|
||
import com.example.pladialmserver.user.entity.User; | ||
import com.querydsl.core.types.dsl.BooleanExpression; | ||
import com.querydsl.jpa.impl.JPAQueryFactory; | ||
import lombok.RequiredArgsConstructor; | ||
import org.springframework.data.domain.Page; | ||
import org.springframework.data.domain.PageImpl; | ||
import org.springframework.data.domain.Pageable; | ||
import org.springframework.util.StringUtils; | ||
|
||
import java.util.List; | ||
|
||
import static com.example.pladialmserver.user.entity.QUser.user; | ||
|
||
@RequiredArgsConstructor | ||
public class UserRepositoryImpl implements UserCustom { | ||
private final JPAQueryFactory jpaQueryFactory; | ||
|
||
private BooleanExpression findKeyword(String name) { | ||
return StringUtils.hasText(name) ? user.name.contains(name) : null; | ||
} | ||
|
||
@Override | ||
public Page<User> findAllByName(String name, Pageable pageable) { | ||
List<User> content = jpaQueryFactory.selectFrom(user) | ||
.where(findKeyword(name)) | ||
.fetch(); | ||
|
||
int start = (int) pageable.getOffset(); | ||
int end = Math.min((start + pageable.getPageSize()), content.size()); | ||
return new PageImpl<>(content.subList(start, end), pageable, content.size()); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters