학년 반 번호 분리

GApple-T · Dec 31, 2023 · edf4d45 · edf4d45
1 parent 2d37bdf
commit edf4d45
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 9 deletions.
diff --git a/src/main/java/com/gapple/weeingback/domain/auth/domain/dto/request/AuthJoinRequest.java b/src/main/java/com/gapple/weeingback/domain/auth/domain/dto/request/AuthJoinRequest.java
@@ -19,5 +19,12 @@ public class AuthJoinRequest {
     @Pattern(regexp = "^[가-힣]{2,}$", message = "한글 실명을 입력하지 않았습니다.")
     private String name;
 
+    @NotNull
+    private Long grade;
+
+    @NotNull
+    private Long classroom;
+
+    @NotNull
     private Long number;
 }
diff --git a/src/main/java/com/gapple/weeingback/domain/auth/service/implementation/AuthServiceImpl.java b/src/main/java/com/gapple/weeingback/domain/auth/service/implementation/AuthServiceImpl.java
@@ -39,13 +39,15 @@ public class AuthServiceImpl implements AuthService {
     private final Jedis jedis;
 
     @Transactional
-    public void join(AuthJoinRequest req){
-        if(!memberRepository.existsMemberByEmail(req.getEmail())) {
+    public void join(AuthJoinRequest request){
+        if(!memberRepository.existsMemberByEmail(request.getEmail())) {
             Member member = Member.builder()
-                    .email(req.getEmail())
-                    .password(passwordEncoder.encode(req.getPassword()))
-                    .name(req.getName())
-                    .number(req.getNumber())
+                    .email(request.getEmail())
+                    .password(passwordEncoder.encode(request.getPassword()))
+                    .name(request.getName())
+                    .grade(request.getGrade())
+                    .classroom(request.getClassroom())
+                    .number(request.getNumber())
                     .role(AccessRole.ROLE_STUDENT.getName())
                     .build();
 

diff --git a/src/main/java/com/gapple/weeingback/domain/boardgame/domain/Boardgame.java b/src/main/java/com/gapple/weeingback/domain/boardgame/domain/Boardgame.java
@@ -35,7 +35,9 @@ public ToBoardgameDto toDto(Boardgame boardgame){
         List<NumberNameWithId> players = new ArrayList<>();
         boardgame.getMembers().forEach(member ->
             players.add(new NumberNameWithId(
-                    member.getNumber() + " " + member.getName(),
+                    member.getGrade(),
+                    member.getClassroom(),
+                    member.getNumber(),
                     member.getId().toString()
             ))
         );
@@ -44,7 +46,9 @@ public ToBoardgameDto toDto(Boardgame boardgame){
                 boardgame.getId().toString(),
                 boardgame.getMaxOf(),
                 new NumberNameWithId(
-                        creator.getNumber() + " " + creator.getName(),
+                        creator.getGrade(),
+                        creator.getClassroom(),
+                        creator.getNumber(),
                         creator.getId().toString()
                 ),
                 players);

diff --git a/src/main/java/com/gapple/weeingback/domain/member/entity/Member.java b/src/main/java/com/gapple/weeingback/domain/member/entity/Member.java
@@ -30,6 +30,12 @@ public class Member implements GrantedAuthority {
   @Column(columnDefinition = "VARCHAR(20)")
   private String name;
 
+  @Column(columnDefinition = "INTEGER")
+  private Long grade;
+
+  @Column(columnDefinition = "INTEGER")
+  private Long classroom;
+
   @Column(columnDefinition = "INTEGER")
   private Long number;
 

diff --git a/src/main/java/com/gapple/weeingback/domain/member/entity/NumberNameWithId.java b/src/main/java/com/gapple/weeingback/domain/member/entity/NumberNameWithId.java
@@ -7,7 +7,11 @@
 @NoArgsConstructor
 @AllArgsConstructor
 public class NumberNameWithId {
-  private String info;
+  private Long grade;
+
+  private Long classroom;
+
+  private Long number;
 
   private String id;
 }