Merge branch 'BE/userinfo' into 'backend'

Be/userinfo

See merge request s11-webmobile1-sub2/S11P12A701!128

backend/src/main/java/com/edufocus/edufocus/qna/controller/QnaController.java

@@ -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) {

backend/src/main/java/com/edufocus/edufocus/qna/entity/Qna.java

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

backend/src/main/java/com/edufocus/edufocus/qna/entity/QnaResponseDto.java

@@ -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()
         );
     }
 

backend/src/main/java/com/edufocus/edufocus/qna/service/QnaService.java

@@ -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;
 

backend/src/main/java/com/edufocus/edufocus/qna/service/QnaServiceImpl.java

@@ -91,11 +91,12 @@ public class QnaServiceImpl implements QnaService {
     }
 
     @Override
-    public QnaResponseDto getQna(Long id) {
+    public QnaResponseDto getQna(Long id, Long userId) {
-        Optional<Qna> qna;
+
+        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;
 
     }
 

backend/src/main/java/com/edufocus/edufocus/report/controller/ReportController.java

@@ -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))
@@ -56,7 +56,6 @@ public class ReportController {
     }
 
 
-
     @GetMapping("/reportDetail/{reportId}")
     public ResponseEntity<ReportDetailResponseDto> searchDetailReport(@PathVariable("reportId") long reportId) {
         ReportDetailResponseDto detailReport = reportService.reportDetail(reportId);
@@ -64,6 +63,10 @@ public class ReportController {
         return new ResponseEntity<>(detailReport, HttpStatus.OK);
     }
 
+<<<<<<< HEAD
+
+=======
+>>>>>>> 935331e7e93d9c25ec6f32ba6155ed19b5fd60f9
     @GetMapping("/teacher/reportSet/{lectureId}")
     public ResponseEntity<List<ReportSetResponse>> searchReportSets(@PathVariable("lectureId") long lectureId) {
         List<ReportSetResponse> reportSetResponses = reportService.findReportSets(lectureId);