Skip to content

Commit

Permalink
[Merge] :: fix/#30
Browse files Browse the repository at this point in the history
pull request #32 from 8Bit-beep/fix/#30
  • Loading branch information
heunseoRyu authored May 25, 2024
2 parents 3980bc4 + ce20c22 commit 0ca6f9e
Show file tree
Hide file tree
Showing 11 changed files with 25 additions and 24 deletions.
2 changes: 1 addition & 1 deletion src/main/java/com/beep/beep/domain/beep/domain/Room.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ public class Room {
private String name;

@Column(nullable = false)
private int floor;
private Integer floor;
}
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public List<AttendanceByCodeRes> 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))
Expand All @@ -54,7 +54,7 @@ public StudentByUserRes studentByUser(UserVO userVO) {
.fetchFirst();
}

private ConstructorExpression<StudentByUserRes> studentInfoConstructorExpression(UserVO vo) {
private ConstructorExpression<StudentByUserRes> studentInfoConstructorExpression() {
return Projections.constructor(StudentByUserRes.class,
user.name,
user.email,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
@Builder @AllArgsConstructor
public class RoomVO {
private String code;
private String floor;
private Integer floor;
private String name;
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;

}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
@Setter
public class StudentByGradeClsReq {

private int grade;
private int cls;
private Integer grade;
private Integer cls;

}
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ public class StudentByGradeClsRes {

private String name;

private int num;
private Integer num;

private String floor;
private Integer floor;

private String roomName;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

}
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ public class StudentByUserRes {
private Integer cls;
private Integer num;

private Integer floor;
private String roomName;

}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

0 comments on commit 0ca6f9e

Please sign in to comment.