Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/#35 #38

Merged
merged 3 commits into from
Jun 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
package com.beep.beep.domain.beep.domain.repository.querydsl;

import com.beep.beep.domain.beep.presentation.dto.RoomVO;
import com.beep.beep.domain.beep.presentation.dto.response.RoomByFloorRes;

import java.util.List;

public interface RoomRepoCustom {

List<RoomVO> roomListByName(String name);

List<RoomByFloorRes> roomListByFloor(Integer floor);

}

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

import com.beep.beep.domain.beep.domain.repository.querydsl.RoomRepoCustom;
import com.beep.beep.domain.beep.presentation.dto.RoomVO;
import com.beep.beep.domain.beep.presentation.dto.response.RoomByFloorRes;
import com.querydsl.core.types.Projections;
import com.querydsl.jpa.impl.JPAQueryFactory;
import lombok.RequiredArgsConstructor;
Expand All @@ -28,4 +29,14 @@ public List<RoomVO> roomListByName(String name) {
.fetch();
}

@Override
public List<RoomByFloorRes> roomListByFloor(Integer floor) {
return query.select(Projections.constructor(RoomByFloorRes.class,
room.code,
room.name))
.from(room)
.where(room.floor.eq(floor))
.fetch();
}

}
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.beep.beep.domain.beep.presentation;

import com.beep.beep.domain.beep.presentation.dto.request.InitializeAttendanceReq;
import com.beep.beep.domain.beep.presentation.dto.response.RoomByFloorRes;
import com.beep.beep.domain.beep.service.BeepService;
import com.beep.beep.domain.beep.presentation.dto.request.EnterRoomReq;
import com.beep.beep.domain.beep.presentation.dto.request.ExitRoomReq;
Expand Down Expand Up @@ -56,14 +57,22 @@ public void exitRoom(
beepService.exit(request);
}

@GetMapping("/rooms")
@GetMapping("/rooms/name")
@Operation(summary = "실 조회", description = "실 이름으로 실을 조회합니다.(teacher)")
public List<RoomVO> roomListByName(
@RequestParam String name
){
return beepService.roomListByName(name);
}

@GetMapping("/rooms/floor")
@Operation(summary = "실 조회", description = "n층으로 실을 조회합니다.(teacher)")
public List<RoomByFloorRes> roomListByFloor(
@RequestParam Integer floor
){
return beepService.roomListByFloor(floor);
}

@GetMapping("/attendances")
@Operation(summary = "출석 조회", description = "실 코드로 입실한 학생목록 조회합니다. (teacher)")
public List<AttendanceByCodeRes> attendanceByCode(
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package com.beep.beep.domain.beep.presentation.dto.response;

import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;

@Getter
@Builder @AllArgsConstructor
public class RoomByFloorRes {
private String code;
private String name;
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import com.beep.beep.domain.beep.presentation.dto.request.EnterRoomReq;
import com.beep.beep.domain.beep.presentation.dto.request.ExitRoomReq;
import com.beep.beep.domain.beep.presentation.dto.response.AttendanceByCodeRes;
import com.beep.beep.domain.beep.presentation.dto.response.RoomByFloorRes;
import com.beep.beep.global.common.service.UserUtil;
import jakarta.transaction.Transactional;
import lombok.RequiredArgsConstructor;
Expand Down Expand Up @@ -62,6 +63,10 @@ public List<RoomVO> roomListByName(String name){
return roomRepository.roomListByName(name);
}

public List<RoomByFloorRes> roomListByFloor(Integer floor){
return roomRepository.roomListByFloor(floor);
}

public List<AttendanceByCodeRes> attendanceByCode(String code){
return attendanceRepository.attendanceListByCode(code);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public SecurityFilterChain configure(HttpSecurity http) throws Exception {

.requestMatchers("/beep/enter").hasAuthority(STUDENT.getAuthority())
.requestMatchers("/beep/exit").hasAuthority(STUDENT.getAuthority())
.requestMatchers("/beep/rooms").hasAuthority(TEACHER.getAuthority())
.requestMatchers("/beep/rooms/**").hasAuthority(TEACHER.getAuthority())
.requestMatchers(HttpMethod.POST,"/beep/attendances").permitAll()
.requestMatchers(HttpMethod.GET,"/beep/attendances").hasAuthority(TEACHER.getAuthority())

Expand Down
Loading