Skip to content

Commit

Permalink
Merge pull request #37 from nhnacademy-be6-5ritang/feature/key-manager
Browse files Browse the repository at this point in the history
refactor: 형식 수정
  • Loading branch information
dlrudgjs104 authored Aug 2, 2024
2 parents 3cad3af + 9436159 commit 45bc8b1
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 30 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,6 @@
@NoArgsConstructor
@Getter
public class Role {

private Long id;


private String roleName;



}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;

import lombok.AccessLevel;
import lombok.Getter;
Expand All @@ -11,29 +10,15 @@
@NoArgsConstructor(access = AccessLevel.PROTECTED)
@Getter
public class User {

private Long id;




private UserStatus status;

private List<UserRole> userRoles = new ArrayList<>();


private String password;


private String email;



public List<String> getAllRoles() {
return userRoles.stream()
.map(UserRole::getRoleName)
.collect(Collectors.toList());
.toList();
}


}
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,8 @@
@NoArgsConstructor
@Getter
public class UserRole {

private Long id;


private User user;

private Role role;

@Builder
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,7 @@
@NoArgsConstructor
@Getter
public class UserStatus {


private Long id;


private String userStatusName;

@Builder
Expand Down

0 comments on commit 45bc8b1

Please sign in to comment.