jhynsoo/edufocus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'BE/userinfo' into 'backend'

Browse Source 
Be/userinfo

See merge request s11-webmobile1-sub2/S11P12A701!128
This commit is contained in:
박정민 2024-08-09 10:23:44 +09:00
commit 5c63fb2362
6 changed files with 45 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/src/main/java/com/edufocus/edufocus/qna/controller/QnaController.java
View File

@ -131,9 +131,11 @@ public class QnaController {
}
@GetMapping("/{id}")
public ResponseEntity<QnaResponseDto> getQna(@PathVariable Long id) {
public ResponseEntity<QnaResponseDto> getQna(@PathVariable Long id, HttpServletRequest request) {
try {
QnaResponseDto findQna = qnaService.getQna(id);
String token = request.getHeader("Authorization");
long userId = Long.parseLong(jwtUtil.getUserId(token));
QnaResponseDto findQna = qnaService.getQna(id, userId);
return new ResponseEntity<>(findQna, HttpStatus.ACCEPTED);
} catch (SQLException e) {

2
backend/src/main/java/com/edufocus/edufocus/qna/entity/Qna.java
View File

@ -52,5 +52,7 @@ public class Qna {
@JoinColumn(name = "lecture_id")
private Lecture lecture;
private boolean isMine;
}

10
backend/src/main/java/com/edufocus/edufocus/qna/entity/QnaResponseDto.java
View File

@ -1,6 +1,7 @@
package com.edufocus.edufocus.qna.entity;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import org.springframework.stereotype.Service;
@ -11,6 +12,7 @@ import java.util.Date;
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class QnaResponseDto {
@ -20,15 +22,17 @@ public class QnaResponseDto {
private String content;
private Date createtAt;
private String answer;
public static QnaResponseDto toEntity(Qna qna)
{
private boolean isMine;
public static QnaResponseDto toEntity(Qna qna) {
return new QnaResponseDto(
qna.getId(),
qna.getTitle(),
qna.getUser().getName(),
qna.getContent(),
qna.getCreatedAt(),
qna.getAnswer()
qna.getAnswer(),
qna.isMine()
);
}

2
backend/src/main/java/com/edufocus/edufocus/qna/service/QnaService.java
View File

@ -20,7 +20,7 @@ public interface QnaService {
void deleteQna(Long id, Long userId) throws SQLException;
QnaResponseDto getQna(Long id) throws SQLException;
QnaResponseDto getQna(Long id, Long userId) throws SQLException;
List<QnaResponseDto> getAllQnasByLecture(Long lectureId, int pageNumber) throws SQLException;

19
backend/src/main/java/com/edufocus/edufocus/qna/service/QnaServiceImpl.java
View File

@ -91,11 +91,12 @@ public class QnaServiceImpl implements QnaService {
}
@Override
public QnaResponseDto getQna(Long id) {
Optional<Qna> qna;
public QnaResponseDto getQna(Long id, Long userId) {
Qna qna;
try {
qna = qnaRepository.findById(id);
qna = qnaRepository.findById(id).orElse(null);
} catch (Exception e) {
@ -103,8 +104,18 @@ public class QnaServiceImpl implements QnaService {
throw new RuntimeException("Qna 없음 " + id, e);
}
QnaResponseDto dto = QnaResponseDto.builder()
.id(qna.getId())
.title(qna.getTitle())
.username(qna.getUser().getName())
.content(qna.getContent())
.createtAt(qna.getCreatedAt())
.answer(qna.getAnswer())
.isMine(userId == qna.getUser().getId())
.build();
return QnaResponseDto.toEntity(qna.get());
return dto;
}

29
backend/src/main/java/com/edufocus/edufocus/report/controller/ReportController.java
View File

@ -29,7 +29,7 @@ public class ReportController {
@PostMapping("/submit/quizSet/{reportSetId}")
public ResponseEntity<?> submit(@PathVariable("reportSetId") UUID reportSetId, @RequestBody ReportRequest reportRequest, HttpServletRequest request) {
String token = request.getHeader("Authorization");
String token = request.getHeader("Authoriza]tion");
long userId = Long.parseLong(jwtUtil.getUserId(token));
if (userService.isTeacher(userId))
@ -49,38 +49,41 @@ public class ReportController {
List<ReportResponse> reportResponses = reportService.findReports(lectureId, userId);
if(reportResponses.isEmpty())
if (reportResponses.isEmpty())
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
return new ResponseEntity<>(reportResponses, HttpStatus.OK);
}
@GetMapping("/reportDetail/{reportId}")
public ResponseEntity<ReportDetailResponseDto> searchDetailReport(@PathVariable("reportId") long reportId){
public ResponseEntity<ReportDetailResponseDto> searchDetailReport(@PathVariable("reportId") long reportId) {
ReportDetailResponseDto detailReport = reportService.reportDetail(reportId);
return new ResponseEntity<>(detailReport, HttpStatus.OK);
}
<<<<<<< HEAD
=======
>>>>>>> 935331e7e93d9c25ec6f32ba6155ed19b5fd60f9
@GetMapping("/teacher/reportSet/{lectureId}")
public ResponseEntity<List<ReportSetResponse>> searchReportSets(@PathVariable("lectureId") long lectureId){
public ResponseEntity<List<ReportSetResponse>> searchReportSets(@PathVariable("lectureId") long lectureId) {
List<ReportSetResponse> reportSetResponses = reportService.findReportSets(lectureId);
if(reportSetResponses.isEmpty())
if (reportSetResponses.isEmpty())
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
return new ResponseEntity<>(reportSetResponses, HttpStatus.OK);
}
@GetMapping("/teacher/report/{reportSetId}")
public ResponseEntity<?> searchReports(@PathVariable("reportSetId") UUID reportSetId){
public ResponseEntity<?> searchReports(@PathVariable("reportSetId") UUID reportSetId) {
List<ReportResponse> reportResponses = reportService.findReports(reportSetId);
if(reportResponses.isEmpty())
if (reportResponses.isEmpty())
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
return new ResponseEntity<>(reportResponses, HttpStatus.OK);
}