Merge pull request #54 from TeamBNBN/BE/user

feat: q&a , answer

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

@@ -1,6 +1,8 @@
 package com.edufocus.edufocus.qna.controller;
 
 import com.edufocus.edufocus.qna.entity.Qna;
+import com.edufocus.edufocus.qna.entity.QnaRequestDto;
+import com.edufocus.edufocus.qna.entity.QnaResponseDto;
 import com.edufocus.edufocus.qna.service.QnaService;
 import com.edufocus.edufocus.user.util.JWTUtil;
 import jakarta.servlet.http.HttpServletRequest;
@@ -21,28 +23,71 @@ import java.util.List;
 public class QnaController {
     private final QnaService qnaService;
     private final JWTUtil jwtUtil;
+    private static int PAGE_SIZE=10;
 
-    @PostMapping
-    public ResponseEntity<Qna> createQna(@RequestBody Qna qna , HttpServletRequest request) {
+
+    @PostMapping("/{lecture_id}")
+    public ResponseEntity<QnaResponseDto> createQna(@PathVariable("lecture_id") Long lecture_id, @RequestBody QnaRequestDto qnaRequestDto , HttpServletRequest request) {
 
 
         try{
             String token = request.getHeader("Authorization");
             Long userId = Long.parseLong(jwtUtil.getUserId(token));
 
-            qnaService.createQna(userId,qna);
-            return new ResponseEntity<>(qna, HttpStatus.CREATED);
+           QnaResponseDto qnaResponseDto= qnaService.createQna(userId,qnaRequestDto,lecture_id);
+            return new ResponseEntity<>( qnaResponseDto,HttpStatus.CREATED);
 
         }catch (Exception e){
             throw new RuntimeException(e);
         }
     }
+
+    @PostMapping({"/answer/create/{qna_id}"})
+    public ResponseEntity<QnaResponseDto> createAnswer(@PathVariable("qna_id") Long qna_id, @RequestBody QnaRequestDto qnaRequestDto)
+    {
+        try {
+            QnaResponseDto responseDto = qnaService.createAnswer(qna_id,qnaRequestDto);
+            return new ResponseEntity<>(responseDto,HttpStatus.ACCEPTED);
+        }
+        catch (Exception e)
+        {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @PutMapping({"/answer/update/{qna_id}"})
+    public ResponseEntity<QnaResponseDto> updateAnswer(@PathVariable("qna_id") Long qna_id, @RequestBody QnaRequestDto qnaRequestDto)
+    {
+        try {
+            QnaResponseDto responseDto = qnaService.updateAnswer(qna_id,qnaRequestDto);
+            return new ResponseEntity<>(responseDto,HttpStatus.ACCEPTED);
+        }
+        catch (Exception e)
+        {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @DeleteMapping("/answer/delete/{qna_id}")
+    public ResponseEntity<QnaResponseDto> deleteAnswer(@PathVariable("qna_id") Long qna_id)
+    {
+        try {
+             qnaService.deleteAnswer(qna_id);
+            return new ResponseEntity<>(HttpStatus.ACCEPTED);
+        }
+        catch (Exception e)
+        {
+            throw new RuntimeException(e);
+        }
+    }
+
+
     @PutMapping("/{id}")
-    public ResponseEntity<Qna> updateQna(@PathVariable Long id, @RequestBody Qna qna) {
+    public ResponseEntity<QnaResponseDto> updateQna(@PathVariable Long id, @RequestBody QnaRequestDto qnaRequestDto) {
 
         try{
-             qnaService.updateQna(id,qna);
-            return new ResponseEntity<>(qna, HttpStatus.ACCEPTED);
+           QnaResponseDto qnaResponseDto=  qnaService.updateQna(id,qnaRequestDto);
+            return new ResponseEntity<>(qnaResponseDto, HttpStatus.ACCEPTED);
 
         }catch (Exception e)
         {
@@ -72,15 +117,12 @@ public class QnaController {
     }
 
     @GetMapping("/all/{id}")
-    public ResponseEntity<List<Qna>> getAllQna(@PathVariable Long id) {
+    public ResponseEntity<List<QnaResponseDto>> getAllQna(@PathVariable Long id) {
         try {
 
-            System.out.print("@@@@@@@@@@@@@@@@@@@@@@@>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>");
-            List<Qna> qnaList= qnaService.getAllQnasByLecture(id);
-            for(Qna qna:qnaList)
-            {
-                System.out.print(qna.toString());
-            }
+
+            List<QnaResponseDto> qnaList= qnaService.getAllQnasByLecture(id,PAGE_SIZE);
+
             return new ResponseEntity<>(qnaList, HttpStatus.ACCEPTED);
         } catch (SQLException e) {
             throw new RuntimeException(e);

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

@@ -3,8 +3,7 @@ package com.edufocus.edufocus.qna.entity;
 import com.edufocus.edufocus.lecture.entity.Lecture;
 import com.edufocus.edufocus.user.model.entity.User;
 import jakarta.persistence.*;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.*;
 import org.checkerframework.checker.units.qual.C;
 
 import java.util.Date;
@@ -12,6 +11,9 @@ import java.util.Date;
 @Entity
 @Getter
 @Setter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class Qna {
 
     // 연관관계 주인
@@ -42,6 +44,7 @@ public class Qna {
     private String answer;
 
 
+    private String name;
     @ManyToOne
     @JoinColumn(name= "id")
     private User user;
@@ -51,4 +54,5 @@ public class Qna {
     private Lecture lecture;
 
 
+
 }

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

@@ -0,0 +1,24 @@
+package com.edufocus.edufocus.qna.entity;
+
+import jakarta.persistence.Column;
+import lombok.*;
+
+@Getter
+public class QnaRequestDto {
+
+
+    private String title;
+    private String content;
+    private String answer;
+
+    public static Qna toEntity(QnaRequestDto qnaRequestDto) {
+        {
+
+            return Qna.builder()
+                    .content(qnaRequestDto.getContent())
+                    .title(qnaRequestDto.getTitle())
+                    .answer(qnaRequestDto.getAnswer())
+                    .build();
+        }
+    }
+}

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

@@ -0,0 +1,38 @@
+package com.edufocus.edufocus.qna.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+
+@Getter
+
+@NoArgsConstructor
+@AllArgsConstructor
+public class QnaResponseDto {
+
+
+    private String title;
+    private String username;
+    private String content;
+    private Date createtAt;
+    private String answer;
+    public static QnaResponseDto toEntity(Qna qna)
+    {
+        return new QnaResponseDto(
+
+                qna.getTitle(),
+                qna.getUser().getName(),
+                qna.getContent(),
+                qna.getCreatedAt(),
+        qna.getAnswer()
+        );
+    }
+
+
+}
+
+
+

backend/src/main/java/com/edufocus/edufocus/qna/repository/QnaRepository.java

@@ -1,6 +1,8 @@
 package com.edufocus.edufocus.qna.repository;
 
 import com.edufocus.edufocus.qna.entity.Qna;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
@@ -11,8 +13,7 @@ import java.util.List;
 @Repository
 public interface QnaRepository extends JpaRepository<Qna, Long> {
 
-    @Query(value = "SELECT * FROM qna WHERE lecture_id = :lectureId", nativeQuery = true)
-    List<Qna> findLecture(@Param("lectureId") Long lectureId);
-
 
+    List<Qna> findByLectureId(Long lecturerId);
+    Page<Qna> findByLectureId(Long lectureId, Pageable pageable);
 }

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

@@ -2,6 +2,8 @@ package com.edufocus.edufocus.qna.service;
 
 import com.edufocus.edufocus.lecture.entity.Lecture;
 import com.edufocus.edufocus.qna.entity.Qna;
+import com.edufocus.edufocus.qna.entity.QnaRequestDto;
+import com.edufocus.edufocus.qna.entity.QnaResponseDto;
 import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -11,9 +13,14 @@ import java.util.List;
 @Service
 public interface QnaService {
 
-    void createQna(Long id,Qna qna) throws SQLException;
-    void updateQna(Long id,Qna qna) throws SQLException;
+    QnaResponseDto createQna(Long id, QnaRequestDto qnaRequestDto, Long lecture_id) throws SQLException;
+    QnaResponseDto updateQna(Long id,QnaRequestDto qnaRequestDto) throws SQLException;
     void deleteQna(Long id) throws SQLException;
     Qna getQna(Long id) throws SQLException;
-    List<Qna> getAllQnasByLecture(Long lectureId) throws SQLException;
+
+    List<QnaResponseDto> getAllQnasByLecture(Long lectureId,int pageNumber) throws SQLException;
+    QnaResponseDto createAnswer(Long id,QnaRequestDto qnaRequestDto) throws SQLException;
+    QnaResponseDto updateAnswer(Long id,QnaRequestDto qnaRequestDto) throws SQLException;
+    void deleteAnswer(Long id) throws SQLException;
+
 }

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

@@ -1,15 +1,28 @@
 package com.edufocus.edufocus.qna.service;
 
+import com.edufocus.edufocus.lecture.entity.Lecture;
+import com.edufocus.edufocus.lecture.repository.LectureRepository;
 import com.edufocus.edufocus.qna.entity.Qna;
+import com.edufocus.edufocus.qna.entity.QnaRequestDto;
+import com.edufocus.edufocus.qna.entity.QnaResponseDto;
 import com.edufocus.edufocus.qna.repository.QnaRepository;
+import com.edufocus.edufocus.user.model.entity.User;
+import com.edufocus.edufocus.user.model.repository.UserRepository;
 import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 
+import java.sql.SQLException;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 @Service
 @Transactional
@@ -17,25 +30,46 @@ import java.util.Optional;
 public class QnaServiceImpl implements QnaService{
 
     private final QnaRepository qnaRepository;
+    private final LectureRepository lectureRepository;
+    private final UserRepository userRepository;
+
 
 
     @Override
-    public void createQna(Long id,Qna qna) {
+    public QnaResponseDto createQna(Long id, QnaRequestDto qnaRequestDto, Long lecture_id) {
 
 
-        qna.setId(id);
+        Lecture lecture = lectureRepository.findById(lecture_id).orElse(null);
+
+        User user = userRepository.findById(id).orElse(null);
+
+
+
+        Qna qna = QnaRequestDto.toEntity(qnaRequestDto);
+        qna.setLecture(lecture);
+        qna.setUser(user);
+
+        qna.setCreatedAt(new Date());
+
         qnaRepository.save(qna);
-
+    return QnaResponseDto.toEntity(qna);
     }
 
     @Override
-    public void updateQna(Long id,Qna qna) {
+    public QnaResponseDto  updateQna(Long id,QnaRequestDto qnaRequestDto) {
 
 
-        Optional<Qna> findQna = qnaRepository.findById(id);
+        Qna findQna = qnaRepository.findById(id)
+                .orElseThrow(() -> new RuntimeException("QnA not found"));
 
-            qna.setModifiedAt(new Date());
-            qnaRepository.save(qna);
+        findQna.setModifiedAt(new Date());
+        findQna.setTitle(qnaRequestDto.getTitle());
+        findQna.setContent(qnaRequestDto.getContent());
+
+            qnaRepository.save(findQna);
+
+
+            return QnaResponseDto.toEntity(findQna);
 
 
     }
@@ -51,11 +85,46 @@ qnaRepository.deleteById(id);
     }
 
     @Override
-    public List<Qna> getAllQnasByLecture(Long lectureId) {
+    public List<QnaResponseDto> getAllQnasByLecture(Long lectureId,int pageSize)
+    {
+
+        Pageable pageable = PageRequest.of(0, pageSize);
+
+        Page<Qna> qnaPage = qnaRepository.findByLectureId(lectureId, pageable);
 
 
-        System.out.printf(lectureId+"!!!!!!!!!!!!!!!!!!!!!!");
-        return qnaRepository.findLecture(lectureId);
+        return qnaPage.getContent().stream()
+                .map(QnaResponseDto::toEntity)
+                .collect(Collectors.toList());
 
     }
+
+    @Override
+    public QnaResponseDto createAnswer(Long id, QnaRequestDto qnaRequestDto) throws SQLException {
+
+        Qna findQna = qnaRepository.findById(id).orElse(null);
+        findQna.setAnswer(qnaRequestDto.getAnswer());
+
+        qnaRepository.save(findQna);
+
+        return QnaResponseDto.toEntity(findQna);
+
+    }
+
+    @Override
+    public QnaResponseDto updateAnswer(Long id, QnaRequestDto qnaRequestDto) throws SQLException {
+
+        Qna findQna = qnaRepository.findById(id).orElse(null);
+        findQna.setAnswer(qnaRequestDto.getAnswer());
+
+        qnaRepository.save(findQna);
+
+        return QnaResponseDto.toEntity(findQna);
+    }
+
+    @Override
+    public void deleteAnswer(Long id) throws SQLException {
+
+        qnaRepository.deleteById(id);
+    }
 }