AndriDiki/smartproc-be
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix crud user

Browse Source
This commit is contained in:
dirgantarasiahaan
2023-05-26 17:18:41 +07:00
parent 00dd061bac
commit cab86cf8fa
13 changed files with 49 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/iconplus/smartproc/configuration/JwtTokenUtil.java
View File

@@ -46,7 +46,14 @@ public class JwtTokenUtil implements Serializable {
claims.put("nama", tokenContent.getNama());
claims.put("username", tokenContent.getUsername());
claims.put("user_id", tokenContent.getUserId());
claims.put("roleId", tokenContent.getRoleId());
claims.put("role", tokenContent.getRole());
claims.put("instansiId", tokenContent.getInstansiId());
claims.put("instansi", tokenContent.getInstansi());
claims.put("bidangId", tokenContent.getBidangId());
claims.put("bidang", tokenContent.getBidang());
claims.put("jabatanId", tokenContent.getJabatanId());
claims.put("jabatan", tokenContent.getJabatan());
return doGenerateToken(claims, username, expirationInMs);
}

4
src/main/java/com/iconplus/smartproc/model/entity/Users.java
View File

@@ -39,8 +39,8 @@ public class Users extends BaseEntity {
@Column(name = "bidang_id")
private Long bidangId;
@Column(name = "jabatan")
private String jabatan;
@Column(name = "jabatan_id")
private Long jabatanId;
@Column(name = "role_id")
private Long roleId;

2
src/main/java/com/iconplus/smartproc/model/projection/UserRoleView.java
View File

@@ -10,6 +10,7 @@ public interface UserRoleView {
String getInstansi();
Long getBidangId();
String getBidang();
Long getJabatanId();
String getJabatan();
Boolean getIsActive();
String getPassword();
@@ -25,6 +26,7 @@ public interface UserRoleView {
void setInstansi(String instansi);
void setBidangId(Long bidangId);
void setBidang(String bidang);
void setJabatanId(Long jabatanId);
void setJabatan(String Jabatan);
void setIsActive(Boolean isActive);
void setPassword(String password);

1
src/main/java/com/iconplus/smartproc/model/request/UsersRequest.java
View File

@@ -21,6 +21,7 @@ public class UsersRequest extends BaseRequest {
private Long bidangId;
private String bidang;
private String nama;
private Long jabatanId;
private String jabatan;
private Long roleId;
private String role;

2
src/main/java/com/iconplus/smartproc/model/response/UsersResponse.java
View File

@@ -14,6 +14,8 @@ public class UsersResponse extends BaseResponse {
private Long id;
private String nama;
private String username;
private Long jabatanId;
private String jabatan;
private Long instansiId;

11
src/main/java/com/iconplus/smartproc/model/token/TokenContent.java
View File

@@ -9,8 +9,15 @@ import java.util.Set;
@Data
public class TokenContent {
private Long userId;
private String role;
private Set<String> accessMenu;
private String nama;
private String username;
private Long roleId;
private String role;
private Long instansiId;
private String instansi;
private Long bidangId;
private String bidang;
private Long jabatanId;
private String jabatan;
private Set<String> accessMenu;
}

14
src/main/java/com/iconplus/smartproc/repository/UsersRepository.java
View File

@@ -16,7 +16,8 @@ public interface UsersRepository extends JpaRepository<Users, Long> {
@Query("SELECT u.id as id, " +
"u.nama as nama, " +
"u.username as username, " +
"u.jabatan as jabatan, " +
"u.jabatanId as jabatanId, " +
"j.jabatan as jabatan, " +
"u.roleId as roleId, " +
"r.role as role, " +
"u.bidangId as bidangId, " +
@@ -30,10 +31,11 @@ public interface UsersRepository extends JpaRepository<Users, Long> {
"JOIN Roles r ON r.id = u.roleId " +
"JOIN Bidang b ON b.id = u.bidangId " +
"JOIN Instansi i ON i.id = u.instansiId " +
"JOIN Jabatan j ON j.id = u.jabatanId " +
"Where u.isDelete = false " +
"AND (:search='' " +
"or (UPPER(u.nama) like :search " +
" OR UPPER(u.jabatan) like :search " +
" OR UPPER(j.jabatan) like :search " +
" OR UPPER(r.role) like :search " +
" OR UPPER(b.bidang) like :search " +
" OR UPPER(i.instansi) like :search " +
@@ -48,7 +50,8 @@ public interface UsersRepository extends JpaRepository<Users, Long> {
"u.nama as nama, " +
"u.username as username, " +
"u.password as password, " +
"u.jabatan as jabatan, " +
"u.jabatanId as jabatanId, " +
"j.jabatan as jabatan, " +
"u.roleId as roleId, " +
"r.role as role, " +
"u.bidangId as bidangId, " +
@@ -62,6 +65,7 @@ public interface UsersRepository extends JpaRepository<Users, Long> {
"JOIN Roles r ON r.id = u.roleId " +
"JOIN Bidang b ON b.id = u.bidangId " +
"JOIN Instansi i ON i.id = u.instansiId " +
"JOIN Jabatan j ON j.id = u.jabatanId " +
"Where u.isDelete = false " +
"AND (u.username = :input OR u.email = :input)")
Optional<UserRoleView> getByUsernameOrEmail(String input);
@@ -71,7 +75,8 @@ public interface UsersRepository extends JpaRepository<Users, Long> {
@Query("SELECT u.id as id, " +
"u.nama as nama, " +
"u.username as username, " +
"u.jabatan as jabatan, " +
"u.jabatanId as jabatanId, " +
"j.jabatan as jabatan, " +
"u.roleId as roleId, " +
"r.role as role, " +
"u.bidangId as bidangId, " +
@@ -85,6 +90,7 @@ public interface UsersRepository extends JpaRepository<Users, Long> {
"JOIN Roles r ON r.id = u.roleId " +
"JOIN Bidang b ON b.id = u.bidangId " +
"JOIN Instansi i ON i.id = u.instansiId " +
"JOIN Jabatan j ON j.id = u.jabatanId " +
"Where u.isDelete = false " +
"AND u.id = :id")
Optional<UserRoleView> getUserByIdAndDeletedFase(Long id);

7
src/main/java/com/iconplus/smartproc/service/authentication/LoginService.java
View File

@@ -65,7 +65,14 @@ public class LoginService implements BaseService<LoginRequest, LoginResponse> {
.userId(userRoleView.getId())
.username(userRoleView.getUsername())
.nama(userRoleView.getNama())
.roleId(userRoleView.getRoleId())
.role(userRoleView.getRole())
.instansiId(userRoleView.getInstansiId())
.instansi(userRoleView.getInstansi())
.bidangId(userRoleView.getBidangId())
.bidang(userRoleView.getBidang())
.jabatanId(userRoleView.getJabatanId())
.jabatan(userRoleView.getJabatan())
.accessMenu(new HashSet<>())
.build();

5
src/main/java/com/iconplus/smartproc/service/authentication/TokenManagementService.java
View File

@@ -72,7 +72,12 @@ public class TokenManagementService implements BaseService<RefreshTokenRequest,
.userId(userRoleView.getId())
.username(userRoleView.getUsername())
.nama(userRoleView.getNama())
.roleId(userRoleView.getRoleId())
.role(userRoleView.getRole())
.instansiId(userRoleView.getInstansiId())
.instansi(userRoleView.getInstansi())
.bidangId(userRoleView.getBidangId())
.bidang(userRoleView.getBidang())
.accessMenu(new HashSet<>())
.build();

1
src/main/java/com/iconplus/smartproc/service/manajemenuser/GetListUserService.java
View File

@@ -35,6 +35,7 @@ public class GetListUserService implements BaseService<UsersRequest, GetUsersRes
.id(userRoleView.getId())
.nama(userRoleView.getNama())
.username(userRoleView.getUsername())
.jabatanId(userRoleView.getJabatanId())
.jabatan(userRoleView.getJabatan())
.roleId(userRoleView.getRoleId())
.role(userRoleView.getRole())

1
src/main/java/com/iconplus/smartproc/service/manajemenuser/GetUserByIdService.java
View File

@@ -26,6 +26,7 @@ public class GetUserByIdService implements BaseService<UsersRequest, UsersRespon
.id(userRoleView.getId())
.nama(userRoleView.getNama())
.username(userRoleView.getUsername())
.jabatanId(userRoleView.getJabatanId())
.jabatan(userRoleView.getJabatan())
.roleId(userRoleView.getRoleId())
.role(userRoleView.getRole())

2
src/main/java/com/iconplus/smartproc/service/manajemenuser/PostCreateUserService.java
View File

@@ -36,7 +36,7 @@ public class PostCreateUserService implements BaseService<UsersRequest, UsersRes
.bidangId(input.getBidangId())
.nama(input.getNama())
.username(input.getUsername())
.jabatan(input.getJabatan())
.jabatanId(input.getJabatanId())
.roleId(input.getRoleId())
.email(input.getEmail())
.password(input.getPassword())

2
src/main/java/com/iconplus/smartproc/service/manajemenuser/PutUpdateUserService.java
View File

@@ -31,7 +31,7 @@ public class PutUpdateUserService implements BaseService<UsersRequest, UsersResp
users.setBidangId(input.getBidangId());
users.setNama(input.getNama());
users.setUsername(input.getUsername());
users.setJabatan(input.getJabatan());
users.setJabatanId(input.getJabatanId());
users.setRoleId(input.getRoleId());
users.setEmail(input.getEmail());
users.setPassword(input.getPassword());