Skip to content
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
Expand Up @@ -7,6 +7,8 @@
import java.util.UUID;

public record SubmissionResponse(
UUID classId,
UUID assignmentId,
String title,
String content,
LocalDateTime startDate,
Expand All @@ -22,6 +24,8 @@ public record SubmissionResponse(
) {
public static SubmissionResponse from(Submission submission, List<SubmissionAttachmentResponse> sa) {
return new SubmissionResponse(
submission.getClassRoom().getClassRoomId(),
submission.getAssignment().getAssignmentId(),
submission.getAssignment().getTitle(),
submission.getAssignment().getContent(),
submission.getAssignment().getStartDate(),
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package hello.cluebackend.domain.classroom.exception;

import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;

@ResponseStatus(HttpStatus.BAD_REQUEST)
public class AlreadyJoinedClassRoomException extends RuntimeException {
public AlreadyJoinedClassRoomException(String message) {
super(message);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import hello.cluebackend.application.classroom.dto.ClassRoomDto;
import hello.cluebackend.application.classroom.mapper.ClassRoomMapper;
import hello.cluebackend.domain.classroom.exception.AlreadyJoinedClassRoomException;
import hello.cluebackend.domain.classroom.model.ClassRoom;
import hello.cluebackend.domain.user.service.UserService;
import hello.cluebackend.infrastructure.persistence.classroom.ClassRoomJpaRepository;
Expand Down Expand Up @@ -55,6 +56,11 @@ public void deleteClassRoom(UUID userId, UUID classId) {
public void joinClassRoom(UUID userId, String code) {
ClassRoom findClassRoom = classRoomJpaRepository.findByCode(code).orElseThrow(() -> new EntityNotFoundException("classroom not found"));
UserEntity findUser = userService.findById(userId);

if (classRoomUserJpaRepository.existsByClassRoomAndUser(findClassRoom, findUser)) {
throw new AlreadyJoinedClassRoomException("이미 참여한 교실입니다.");
}

ClassRoomUser classRoomUser = ClassRoomUser.create(findClassRoom, findUser);
classRoomUserJpaRepository.save(classRoomUser);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,21 +22,24 @@ public class ClassRoomQueryController {
private final ClassRoomQueryService classRoomQueryService;

@GetMapping
public ResponseEntity<List<ClassRoomCardDto>> getAllClassRooms(@AuthenticationPrincipal CustomOAuth2User customOAuth2User){
public ResponseEntity<List<ClassRoomCardDto>> getAllClassRooms(
@AuthenticationPrincipal CustomOAuth2User customOAuth2User
) {
return ResponseEntity.ok(classRoomQueryService.findMyClassRoomById(customOAuth2User.getUserId()));
}

@GetMapping("/{classId}/all")
public ResponseEntity<ClassRoomAllInfoDto> getAllInfo(
@AuthenticationPrincipal CustomOAuth2User customOAuth2User,
@PathVariable UUID classId
){
) {
return ResponseEntity.ok(classRoomQueryService.getAllInfo(classId));
}

@GetMapping("/{classId}")
public ResponseEntity<ClassRoomDto> findClassRoom(
@PathVariable UUID classId,
@AuthenticationPrincipal CustomOAuth2User customOAuth2User
@AuthenticationPrincipal CustomOAuth2User customOAuth2User,
@PathVariable UUID classId
) {
ClassRoomDto findClassRoomDto = classRoomQueryService.findById(customOAuth2User.getUserId(), classId);
return ResponseEntity.ok(findClassRoomDto);
Expand Down