From a96446485aa1d4050fa58500d21a00e36a7d31ea Mon Sep 17 00:00:00 2001 From: heunseoRyu Date: Fri, 24 May 2024 17:58:10 +0900 Subject: [PATCH 1/4] [Fix] :: beep fix RoomVO floor data type String -> int --- .../java/com/beep/beep/domain/beep/presentation/dto/RoomVO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/beep/beep/domain/beep/presentation/dto/RoomVO.java b/src/main/java/com/beep/beep/domain/beep/presentation/dto/RoomVO.java index c3c5933..c77b0d8 100644 --- a/src/main/java/com/beep/beep/domain/beep/presentation/dto/RoomVO.java +++ b/src/main/java/com/beep/beep/domain/beep/presentation/dto/RoomVO.java @@ -9,6 +9,6 @@ @Builder @AllArgsConstructor public class RoomVO { private String code; - private String floor; + private int floor; private String name; } From c7f230745dbb16ddda0cbfbf21136bf4c1a64875 Mon Sep 17 00:00:00 2001 From: heunseoRyu Date: Fri, 24 May 2024 18:01:06 +0900 Subject: [PATCH 2/4] [Fix] :: student int to Integer --- .../presentation/dto/response/StudentByGradeClsRes.java | 2 +- .../student/presentation/dto/response/StudentByUserRes.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/beep/beep/domain/student/presentation/dto/response/StudentByGradeClsRes.java b/src/main/java/com/beep/beep/domain/student/presentation/dto/response/StudentByGradeClsRes.java index 3e3c4a0..bc32fc0 100644 --- a/src/main/java/com/beep/beep/domain/student/presentation/dto/response/StudentByGradeClsRes.java +++ b/src/main/java/com/beep/beep/domain/student/presentation/dto/response/StudentByGradeClsRes.java @@ -14,7 +14,7 @@ public class StudentByGradeClsRes { private int num; - private String floor; + private int floor; private String roomName; diff --git a/src/main/java/com/beep/beep/domain/student/presentation/dto/response/StudentByUserRes.java b/src/main/java/com/beep/beep/domain/student/presentation/dto/response/StudentByUserRes.java index dd4e4ff..8209450 100644 --- a/src/main/java/com/beep/beep/domain/student/presentation/dto/response/StudentByUserRes.java +++ b/src/main/java/com/beep/beep/domain/student/presentation/dto/response/StudentByUserRes.java @@ -11,9 +11,9 @@ public class StudentByUserRes { private String name; private String email; - private Integer grade; - private Integer cls; - private Integer num; + private int grade; + private int cls; + private int num; private String roomName; From 545935aae8c1997fcdbe0dcf711d84486fab4aa8 Mon Sep 17 00:00:00 2001 From: heunseoRyu Date: Sat, 25 May 2024 14:45:12 +0900 Subject: [PATCH 3/4] [Fix] :: room, attendance 1. int => Integer 2. fix studentInfo querydsl error --- src/main/java/com/beep/beep/domain/beep/domain/Room.java | 2 +- .../repository/querydsl/impl/AttendanceRepoCustomImpl.java | 4 ++-- .../com/beep/beep/domain/beep/presentation/dto/RoomVO.java | 2 +- .../beep/presentation/dto/response/AttendanceByCodeRes.java | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/beep/beep/domain/beep/domain/Room.java b/src/main/java/com/beep/beep/domain/beep/domain/Room.java index a38ecac..71cebad 100644 --- a/src/main/java/com/beep/beep/domain/beep/domain/Room.java +++ b/src/main/java/com/beep/beep/domain/beep/domain/Room.java @@ -22,5 +22,5 @@ public class Room { private String name; @Column(nullable = false) - private int floor; + private Integer floor; } diff --git a/src/main/java/com/beep/beep/domain/beep/domain/repository/querydsl/impl/AttendanceRepoCustomImpl.java b/src/main/java/com/beep/beep/domain/beep/domain/repository/querydsl/impl/AttendanceRepoCustomImpl.java index 8e15c4f..6f28fb2 100644 --- a/src/main/java/com/beep/beep/domain/beep/domain/repository/querydsl/impl/AttendanceRepoCustomImpl.java +++ b/src/main/java/com/beep/beep/domain/beep/domain/repository/querydsl/impl/AttendanceRepoCustomImpl.java @@ -45,7 +45,7 @@ public List attendanceListByCode(String code) { @Override public StudentByUserRes studentByUser(UserVO userVO) { - return query.select(studentInfoConstructorExpression(userVO)) + return query.select(studentInfoConstructorExpression()) .from(attendance) .innerJoin(user).on(user.idx.eq(attendance.userIdx)) .innerJoin(studentId).on(studentId.userIdx.eq(attendance.userIdx)) @@ -54,7 +54,7 @@ public StudentByUserRes studentByUser(UserVO userVO) { .fetchFirst(); } - private ConstructorExpression studentInfoConstructorExpression(UserVO vo) { + private ConstructorExpression studentInfoConstructorExpression() { return Projections.constructor(StudentByUserRes.class, user.name, user.email, diff --git a/src/main/java/com/beep/beep/domain/beep/presentation/dto/RoomVO.java b/src/main/java/com/beep/beep/domain/beep/presentation/dto/RoomVO.java index c77b0d8..255caf4 100644 --- a/src/main/java/com/beep/beep/domain/beep/presentation/dto/RoomVO.java +++ b/src/main/java/com/beep/beep/domain/beep/presentation/dto/RoomVO.java @@ -9,6 +9,6 @@ @Builder @AllArgsConstructor public class RoomVO { private String code; - private int floor; + private Integer floor; private String name; } diff --git a/src/main/java/com/beep/beep/domain/beep/presentation/dto/response/AttendanceByCodeRes.java b/src/main/java/com/beep/beep/domain/beep/presentation/dto/response/AttendanceByCodeRes.java index d8cae86..0766f43 100644 --- a/src/main/java/com/beep/beep/domain/beep/presentation/dto/response/AttendanceByCodeRes.java +++ b/src/main/java/com/beep/beep/domain/beep/presentation/dto/response/AttendanceByCodeRes.java @@ -10,8 +10,8 @@ public class AttendanceByCodeRes { private String userName; - private int grade; - private int cls; - private int num; + private Integer grade; + private Integer cls; + private Integer num; } From ce20c2299bac017aa33dd844916e6612504af042 Mon Sep 17 00:00:00 2001 From: heunseoRyu Date: Sat, 25 May 2024 14:45:45 +0900 Subject: [PATCH 4/4] [Fix] :: student 1. int => Integer 2. add floor data to StudentByUserRes --- .../com/beep/beep/domain/student/domain/StudentId.java | 6 +++--- .../presentation/dto/request/SaveStudentIdReq.java | 6 +++--- .../presentation/dto/request/StudentByGradeClsReq.java | 4 ++-- .../presentation/dto/response/StudentByGradeClsRes.java | 4 ++-- .../presentation/dto/response/StudentByNameRes.java | 8 ++++---- .../presentation/dto/response/StudentByUserRes.java | 7 ++++--- .../student/presentation/dto/response/StudentRes.java | 6 +++--- 7 files changed, 21 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/beep/beep/domain/student/domain/StudentId.java b/src/main/java/com/beep/beep/domain/student/domain/StudentId.java index 23b8e9d..bb40e09 100644 --- a/src/main/java/com/beep/beep/domain/student/domain/StudentId.java +++ b/src/main/java/com/beep/beep/domain/student/domain/StudentId.java @@ -20,7 +20,7 @@ public class StudentId { private Long userIdx; @Column(nullable = false) - private int cls; - private int grade; - private int num; + private Integer cls; + private Integer grade; + private Integer num; } diff --git a/src/main/java/com/beep/beep/domain/student/presentation/dto/request/SaveStudentIdReq.java b/src/main/java/com/beep/beep/domain/student/presentation/dto/request/SaveStudentIdReq.java index 6f74a56..7a354db 100644 --- a/src/main/java/com/beep/beep/domain/student/presentation/dto/request/SaveStudentIdReq.java +++ b/src/main/java/com/beep/beep/domain/student/presentation/dto/request/SaveStudentIdReq.java @@ -6,7 +6,7 @@ public class SaveStudentIdReq { private String email; - private int grade; - private int cls; - private int num; + private Integer grade; + private Integer cls; + private Integer num; } diff --git a/src/main/java/com/beep/beep/domain/student/presentation/dto/request/StudentByGradeClsReq.java b/src/main/java/com/beep/beep/domain/student/presentation/dto/request/StudentByGradeClsReq.java index d97099d..87244a9 100644 --- a/src/main/java/com/beep/beep/domain/student/presentation/dto/request/StudentByGradeClsReq.java +++ b/src/main/java/com/beep/beep/domain/student/presentation/dto/request/StudentByGradeClsReq.java @@ -8,7 +8,7 @@ @Setter public class StudentByGradeClsReq { - private int grade; - private int cls; + private Integer grade; + private Integer cls; } diff --git a/src/main/java/com/beep/beep/domain/student/presentation/dto/response/StudentByGradeClsRes.java b/src/main/java/com/beep/beep/domain/student/presentation/dto/response/StudentByGradeClsRes.java index bc32fc0..479749f 100644 --- a/src/main/java/com/beep/beep/domain/student/presentation/dto/response/StudentByGradeClsRes.java +++ b/src/main/java/com/beep/beep/domain/student/presentation/dto/response/StudentByGradeClsRes.java @@ -12,9 +12,9 @@ public class StudentByGradeClsRes { private String name; - private int num; + private Integer num; - private int floor; + private Integer floor; private String roomName; diff --git a/src/main/java/com/beep/beep/domain/student/presentation/dto/response/StudentByNameRes.java b/src/main/java/com/beep/beep/domain/student/presentation/dto/response/StudentByNameRes.java index c811eb2..972826b 100644 --- a/src/main/java/com/beep/beep/domain/student/presentation/dto/response/StudentByNameRes.java +++ b/src/main/java/com/beep/beep/domain/student/presentation/dto/response/StudentByNameRes.java @@ -11,11 +11,11 @@ public class StudentByNameRes { private String name; - private int grade; - private int cls; - private int num; + private Integer grade; + private Integer cls; + private Integer num; - private int floor; + private Integer floor; private String roomName; } diff --git a/src/main/java/com/beep/beep/domain/student/presentation/dto/response/StudentByUserRes.java b/src/main/java/com/beep/beep/domain/student/presentation/dto/response/StudentByUserRes.java index 8209450..d9ab1dd 100644 --- a/src/main/java/com/beep/beep/domain/student/presentation/dto/response/StudentByUserRes.java +++ b/src/main/java/com/beep/beep/domain/student/presentation/dto/response/StudentByUserRes.java @@ -11,10 +11,11 @@ public class StudentByUserRes { private String name; private String email; - private int grade; - private int cls; - private int num; + private Integer grade; + private Integer cls; + private Integer num; + private Integer floor; private String roomName; } diff --git a/src/main/java/com/beep/beep/domain/student/presentation/dto/response/StudentRes.java b/src/main/java/com/beep/beep/domain/student/presentation/dto/response/StudentRes.java index 9376123..dffc504 100644 --- a/src/main/java/com/beep/beep/domain/student/presentation/dto/response/StudentRes.java +++ b/src/main/java/com/beep/beep/domain/student/presentation/dto/response/StudentRes.java @@ -13,9 +13,9 @@ public class StudentRes { private String name; private String email; - private int grade; - private int cls; - private int num; + private Integer grade; + private Integer cls; + private Integer num; private String code; }