댓글 기능 추가

application/build.gradle

@@ -3,6 +3,8 @@ plugins {
     id 'io.freefair.lombok' version '8.10'
     id 'org.jetbrains.kotlin.plugin.lombok' version '1.8.0'
 
+    //임시 스프링 프록시 기능을 사용하기 위함( all-open)
+    id "org.jetbrains.kotlin.plugin.spring" version "1.4.32"
     /*
     API 명세
      */

application/src/main/java/com/comssa/api/login/aspect/AddLoginStatusAttribute.java → application/src/main/java/com/comssa/api/login/aspect/AddLoginStatusAttributeToView.java

@@ -10,5 +10,5 @@
  */
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
-public @interface AddLoginStatusAttribute {
+public @interface AddLoginStatusAttributeToView {
 }

application/src/main/java/com/comssa/api/login/aspect/LoginAspect.java

@@ -17,7 +17,7 @@ public class LoginAspect {
 	 * 메서드 실행 전후에 이 advice가 실행됩니다.
 	 * Model에 login 상태 부여
 	 */
-	@Around("@annotation(com.comssa.api.login.aspect.AddLoginStatusAttribute)")
+	@Around("@annotation(com.comssa.api.login.aspect.AddLoginStatusAttributeToView)")
 	public Object addLoginStatusAttribute(ProceedingJoinPoint joinPoint) throws Throwable {
 		// 현재 메서드의 파라미터 가져오기
 		Object[] args = joinPoint.getArgs();

application/src/main/java/com/comssa/api/question/common/controller/MainViewController.java

@@ -1,6 +1,6 @@
 package com.comssa.api.question.common.controller;
 
-import com.comssa.api.login.aspect.AddLoginStatusAttribute;
+import com.comssa.api.login.aspect.AddLoginStatusAttributeToView;
 import com.comssa.api.question.common.service.QuestionSelectorService;
 import com.comssa.persistence.question.license.domain.LicenseCategory;
 import com.comssa.persistence.question.license.dto.response.ResponseLicenseSessionDto;
@@ -26,7 +26,7 @@ public class MainViewController {
 	@Value("${resource.base-url}")
 	private String resourceBaseUrl;
 
-	@AddLoginStatusAttribute
+	@AddLoginStatusAttributeToView
 	@GetMapping("/")
 	public String showMainPage(Model model) {
 		List<String> categories = questionSelectorService.getCategories();
@@ -37,7 +37,7 @@ public String showMainPage(Model model) {
 		return "index";
 	}
 
-	@AddLoginStatusAttribute
+	@AddLoginStatusAttributeToView
 	@GetMapping("/license")
 	public String showLicensePage(Model model) {
 		List<ResponseLicensesDto> licenseCategories = questionSelectorService.getLicenseCategories()

application/src/main/java/com/comssa/api/question/license/controller/AdminLicenseQuestionController.java

@@ -4,8 +4,8 @@
 import com.comssa.api.question.license.service.AdminLicenseQuestionChoiceUpdateService;
 import com.comssa.api.question.license.service.AdminLicenseQuestionMakeService;
 import com.comssa.persistence.question.common.dto.request.RequestChangeContentDto;
+import com.comssa.persistence.question.common.dto.response.ResponseMultipleChoiceQuestionDto;
 import com.comssa.persistence.question.common.dto.response.ResponseQuestionChoiceDto;
-import com.comssa.persistence.question.common.dto.response.ResponseQuestionDto;
 import com.comssa.persistence.question.license.dto.request.RequestMakeLicenseMultipleChoiceQuestionDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -34,7 +34,7 @@ public class AdminLicenseQuestionController {
 
 	@ApiOperation("단답형 문제 세션으로 생성")
 	@PostMapping
-	public ResponseEntity<List<ResponseQuestionDto>> makeLicenseQuestionOfSession(
+	public ResponseEntity<List<ResponseMultipleChoiceQuestionDto>> makeLicenseQuestionOfSession(
 		@RequestBody RequestMakeLicenseMultipleChoiceQuestionDto requestMakeLicenseMultipleChoiceQuestionDto) {
 		return ResponseEntity.ok(
 			adminLicenseQuestionMakeService.makeLicenseNormalQuestion(requestMakeLicenseMultipleChoiceQuestionDto));
@@ -51,28 +51,28 @@ public ResponseEntity<String> updateLicenseQuestionWithImage(
 
 	@ApiOperation("단답형 문제 상태 업데이트 - 문제 지문 업데이트")
 	@PatchMapping(value = "/{id}/content")
-	public ResponseEntity<ResponseQuestionDto> changeContent(
+	public ResponseEntity<ResponseMultipleChoiceQuestionDto> changeContent(
 		@PathVariable("id") Long questionId,
 		@RequestBody RequestChangeContentDto requestChangeContentDto) {
-		return ResponseEntity.ok(ResponseQuestionDto.forAdmin(
+		return ResponseEntity.ok(ResponseMultipleChoiceQuestionDto.forLicense(
 			adminLicenseMuiltipleChoiceQuestionUpdateService.changeContent(questionId, requestChangeContentDto)));
 	}
 
 	@ApiOperation("단답형 문제 상태 업데이트 - 문제 해설 업데이트")
 	@PatchMapping(value = "/{id}/description")
-	public ResponseEntity<ResponseQuestionDto> changeDescription(
+	public ResponseEntity<ResponseMultipleChoiceQuestionDto> changeDescription(
 		@PathVariable("id") Long questionId,
 		@RequestBody RequestChangeContentDto requestChangeContentDto) {
-		return ResponseEntity.ok(ResponseQuestionDto.forAdmin(
+		return ResponseEntity.ok(ResponseMultipleChoiceQuestionDto.forLicense(
 			adminLicenseMuiltipleChoiceQuestionUpdateService.changeDescription(questionId, requestChangeContentDto)));
 	}
 
 	@ApiOperation("단답형 문제 상태 업데이트 - 문제 해설 업데이트")
 	@PatchMapping(value = "/{id}/toggle-approve")
-	public ResponseEntity<ResponseQuestionDto> toggleIsApprove(
+	public ResponseEntity<ResponseMultipleChoiceQuestionDto> toggleIsApprove(
 		@PathVariable("id") Long questionId
 	) {
-		return ResponseEntity.ok(ResponseQuestionDto.forAdmin(
+		return ResponseEntity.ok(ResponseMultipleChoiceQuestionDto.forLicense(
 			adminLicenseMuiltipleChoiceQuestionUpdateService.toggleApprove(questionId)));
 	}
 

application/src/main/java/com/comssa/api/question/license/controller/LicenseQuestionGetViewController.java

@@ -1,6 +1,6 @@
 package com.comssa.api.question.license.controller;
 
-import com.comssa.api.login.aspect.AddLoginStatusAttribute;
+import com.comssa.api.login.aspect.AddLoginStatusAttributeToView;
 import com.comssa.api.question.license.service.AdminLicenseQuestionGetService;
 import com.comssa.api.question.license.service.LicenseSessionService;
 import com.comssa.api.question.license.service.UserLicenseQuestionGetService;
@@ -30,7 +30,7 @@ public class LicenseQuestionGetViewController {
 	@Value("${resource.base-url}")
 	private String resourceBaseUrl;
 
-	@AddLoginStatusAttribute
+	@AddLoginStatusAttributeToView
 	@GetMapping("/question/license/{sessionId}")
 	public String getLicenseQuestionsBySession(
 		@PathVariable Long sessionId,

application/src/main/java/com/comssa/api/question/license/service/AdminLicenseQuestionMakeService.java

@@ -3,7 +3,7 @@
 
 import com.comssa.api.question.common.service.FileUploadService;
 import com.comssa.api.question.common.service.implement.QuestionChoiceService;
-import com.comssa.persistence.question.common.dto.response.ResponseQuestionDto;
+import com.comssa.persistence.question.common.dto.response.ResponseMultipleChoiceQuestionDto;
 import com.comssa.persistence.question.license.domain.LicenseCategory;
 import com.comssa.persistence.question.license.domain.LicenseMultipleChoiceQuestion;
 import com.comssa.persistence.question.license.domain.LicenseSession;
@@ -28,7 +28,7 @@ public class AdminLicenseQuestionMakeService {
 	private final QuestionChoiceService questionChoiceService;
 	private final FileUploadService fileUploadService;
 
-	public List<ResponseQuestionDto> makeLicenseNormalQuestion(
+	public List<ResponseMultipleChoiceQuestionDto> makeLicenseNormalQuestion(
 		RequestMakeLicenseMultipleChoiceQuestionDto requestMakeLicenseMultipleChoiceQuestionDto) {
 		LicenseSession licenseSession = licenseSessionService.getLicenseSession(
 			requestMakeLicenseMultipleChoiceQuestionDto.getLicenseSession(),
@@ -42,14 +42,14 @@ public List<ResponseQuestionDto> makeLicenseNormalQuestion(
 			.collect(Collectors.toList());
 	}
 
-	private ResponseQuestionDto saveNormalLicenseQuestion(
+	private ResponseMultipleChoiceQuestionDto saveNormalLicenseQuestion(
 		RequestMakeMultipleChoiceQuestionDto requestMakeMultipleChoiceQuestionDto, LicenseSession licenseSession,
 		LicenseCategory licenseCategory) {
 		LicenseMultipleChoiceQuestion licenseMultipleChoiceQuestion = LicenseMultipleChoiceQuestion.makeWithDto(
 			requestMakeMultipleChoiceQuestionDto, licenseSession, licenseCategory);
 		licenseMultipleChoiceQuestionRepository.save(licenseMultipleChoiceQuestion);
 		questionChoiceService.saveWith(requestMakeMultipleChoiceQuestionDto, licenseMultipleChoiceQuestion);
-		return ResponseQuestionDto.forAdmin(licenseMultipleChoiceQuestion);
+		return ResponseMultipleChoiceQuestionDto.forLicense(licenseMultipleChoiceQuestion);
 	}
 
 	public String updateLicenseQuestionWithImage(Long licenseQuestionId, MultipartFile file) {

application/src/main/java/com/comssa/api/question/major/admin/controller/AdminMajorQuestionController.java

@@ -6,9 +6,9 @@
 import com.comssa.api.question.major.common.exception.DuplicateQuestionException;
 import com.comssa.persistence.question.common.dto.request.RequestChangeContentDto;
 import com.comssa.persistence.question.common.dto.response.ResponseClassifiedMultipleQuestionDto;
-import com.comssa.persistence.question.common.dto.response.ResponseQuestionDto;
+import com.comssa.persistence.question.common.dto.response.ResponseMultipleChoiceQuestionDto;
 import com.comssa.persistence.question.major.admin.dto.RequestMakeMultipleChoiceQuestionDto;
-import com.comssa.persistence.question.major.admin.dto.ResponseMajorQuestionForAdminDto;
+import com.comssa.persistence.question.major.admin.dto.ResponseMajorMultipleChoiceQuestionForAdminDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -47,55 +47,57 @@ public List<ResponseClassifiedMultipleQuestionDto> getAllMajorQuestionForAdmin()
 
 	@ApiOperation("단답형 문제 리스트로 생성")
 	@PostMapping(value = "/question/major-multi")
-	public ResponseEntity<List<ResponseQuestionDto>> makeMultiMajorQuestion(
+	public ResponseEntity<List<ResponseMultipleChoiceQuestionDto>> makeMultiMajorQuestion(
 		@RequestBody List<RequestMakeMultipleChoiceQuestionDto> requestMakeMultipleChoiceQuestionDtos) {
 		return ResponseEntity.ok(
 			adminMajorQuestionMakeService.makeMultipleChoiceQuestions(requestMakeMultipleChoiceQuestionDtos)
 				.stream()
-				.map(ResponseQuestionDto::forAdmin)
+				.map(ResponseMultipleChoiceQuestionDto::forMajor)
 				.collect(Collectors.toList()));
 	}
 
 	@ApiOperation("단답형 문제 단일로 생성")
 	@PostMapping(value = "/question/major-single")
-	public ResponseEntity<ResponseQuestionDto> makeSingleNormalQuestion(
+	public ResponseEntity<ResponseMultipleChoiceQuestionDto> makeSingleNormalQuestion(
 		@RequestBody RequestMakeMultipleChoiceQuestionDto requestMakeMultipleChoiceQuestionDto) throws
 		DuplicateQuestionException {
 		return ResponseEntity.ok(
-			ResponseQuestionDto.forAdmin(
+			ResponseMultipleChoiceQuestionDto.forMajor(
 				adminMajorQuestionMakeService.makeMultipleChoiceQuestion(requestMakeMultipleChoiceQuestionDto)));
 	}
 
 	@ApiOperation("단답형 문제 상태 업데이트 - Approve 토글")
 	@PatchMapping(value = "/question/major/{id}/toggle-approve")
-	public ResponseEntity<ResponseQuestionDto> toggleApproveNormalQuestion(@PathVariable("id") Long questionId) {
-		return ResponseEntity.ok(ResponseMajorQuestionForAdminDto.forAdmin(
+	public ResponseEntity<ResponseMultipleChoiceQuestionDto> toggleApproveNormalQuestion(
+		@PathVariable("id") Long questionId) {
+		return ResponseEntity.ok(ResponseMajorMultipleChoiceQuestionForAdminDto.forMajor(
 			adminMajorMultipleChoiceQuestionUpdateService.toggleApprove(questionId)));
 	}
 
 	@ApiOperation("단답형 문제 상태 업데이트 - 단답형-주관식 토글")
 	@PatchMapping(value = "/question/major/{id}/toggle-multiple")
-	public ResponseEntity<ResponseQuestionDto> toggleCanBeShortAnswered(@PathVariable("id") Long questionId) {
-		return ResponseEntity.ok(ResponseMajorQuestionForAdminDto.forAdmin(
+	public ResponseEntity<ResponseMultipleChoiceQuestionDto> toggleCanBeShortAnswered(
+		@PathVariable("id") Long questionId) {
+		return ResponseEntity.ok(ResponseMajorMultipleChoiceQuestionForAdminDto.forMajor(
 			adminMajorMultipleChoiceQuestionUpdateService.toggleCanBeShortAnswered(questionId)));
 	}
 
 	@ApiOperation("단답형 문제 상태 업데이트 - 문제 업데이트")
 	@PatchMapping(value = "/question/major/{id}/content")
-	public ResponseEntity<ResponseQuestionDto> changeQuestion(
+	public ResponseEntity<ResponseMultipleChoiceQuestionDto> changeQuestion(
 		@PathVariable("id") Long questionId,
 		@RequestBody RequestChangeContentDto requestChangeContentDto) {
-		return ResponseEntity.ok(ResponseMajorQuestionForAdminDto.forAdmin(
+		return ResponseEntity.ok(ResponseMajorMultipleChoiceQuestionForAdminDto.forMajor(
 			adminMajorMultipleChoiceQuestionUpdateService.changeContent(questionId, requestChangeContentDto)));
 	}
 
 	@ApiOperation("단답형 문제 상태 업데이트 - 해설 업데이트")
 	@PatchMapping(value = "/question/major/{id}/description")
-	public ResponseEntity<ResponseQuestionDto> changeDescription(
+	public ResponseEntity<ResponseMultipleChoiceQuestionDto> changeDescription(
 		@PathVariable("id") Long questionId,
 		@RequestBody RequestChangeContentDto requestChangeContentDto
 	) {
-		return ResponseEntity.ok(ResponseMajorQuestionForAdminDto.forAdmin(
+		return ResponseEntity.ok(ResponseMajorMultipleChoiceQuestionForAdminDto.forMajor(
 			adminMajorMultipleChoiceQuestionUpdateService.changeDescription(questionId, requestChangeContentDto)));
 	}
 

application/src/main/java/com/comssa/api/question/major/admin/controller/AdminMajorQuestionViewController.java

@@ -22,7 +22,7 @@ public class AdminMajorQuestionViewController {
 	@Value("${resource.base-url}")
 	private String resourceBaseUrl;
 
-	@GetMapping("/question/update")
+	@GetMapping("/question/major/update")
 	public String updateQuestionPage(Model model) {
 		model.addAttribute("classifiedQuestions",
 			adminMajorQuestionClassifiedGetService.getClassifiedAllMajorQuestions()

application/src/main/java/com/comssa/api/question/major/user/controller/MajorQuestionGetViewController.java

@@ -1,6 +1,6 @@
 package com.comssa.api.question.major.user.controller;
 
-import com.comssa.api.login.aspect.AddLoginStatusAttribute;
+import com.comssa.api.login.aspect.AddLoginStatusAttributeToView;
 import com.comssa.api.question.major.user.service.implement.BasicMajorQuestionClassifiedGetService;
 import com.comssa.persistence.question.common.domain.QuestionCategory;
 import com.comssa.persistence.question.common.dto.response.ResponseClassifiedMultipleQuestionDto;
@@ -26,7 +26,7 @@ public class MajorQuestionGetViewController {
 	@Value("${resource.base-url}")
 	private String resourceBaseUrl;
 
-	@AddLoginStatusAttribute
+	@AddLoginStatusAttributeToView
 	@GetMapping("/question/major")
 	public String getNormalQuestions(
 		@RequestParam(required = false) List<String> levels,

application/src/main/java/com/comssa/api/chatbot/controller/ChatbotController.kt → application/src/main/kotlin/com/comssa/api/chatbot/controller/ChatbotController.kt

@@ -5,7 +5,6 @@ import com.comssa.core.chatbot.dto.response.ChatBotResponseDto
 import com.comssa.core.chatbot.dto.response.ChatBotResponseDto.Companion.from
 import com.comssa.core.chatbot.service.ChatbotService
 import io.swagger.annotations.Api
-import lombok.RequiredArgsConstructor
 import org.springframework.http.ResponseEntity
 import org.springframework.security.core.annotation.AuthenticationPrincipal
 import org.springframework.security.oauth2.core.user.OAuth2User
@@ -15,7 +14,6 @@ import org.springframework.web.bind.annotation.RestController
 
 @RestController
 @Api(tags = ["챗봇"])
-@RequiredArgsConstructor
 class ChatbotController(
 	private val chatbotService: ChatbotService,
 ) {

application/src/main/kotlin/com/comssa/api/comment/controller/CommentController.kt

@@ -0,0 +1,65 @@
+package com.comssa.api.comment.controller
+
+import com.comssa.api.login.aspect.AddLoginStatusAttributeToView
+import com.comssa.core.comment.dto.RequestMakeCommentDto
+import com.comssa.core.comment.dto.ResponseCommentDto
+import com.comssa.core.comment.service.CommentService
+import com.comssa.core.question.common.service.QuestionGetService
+import com.comssa.persistence.question.common.dto.response.ResponseQuestionDto
+import io.swagger.annotations.Api
+import org.springframework.http.ResponseEntity
+import org.springframework.security.core.annotation.AuthenticationPrincipal
+import org.springframework.security.oauth2.core.user.OAuth2User
+import org.springframework.stereotype.Controller
+import org.springframework.ui.Model
+import org.springframework.web.bind.annotation.DeleteMapping
+import org.springframework.web.bind.annotation.GetMapping
+import org.springframework.web.bind.annotation.PathVariable
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RequestBody
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.ResponseBody
+
+@Controller
+@RequestMapping(("/question"))
+@Api(tags = ["댓글"])
+class CommentController(
+	private val commentService: CommentService,
+	private val questionGetService: QuestionGetService,
+) {
+	@ResponseBody
+	@PostMapping("/{questionId}/comment")
+	fun addComment(
+		@PathVariable("questionId") questionId: Long,
+		@RequestBody requestMakeCommentDto: RequestMakeCommentDto,
+		@AuthenticationPrincipal user: OAuth2User?,
+	): ResponseEntity<ResponseCommentDto> =
+		ResponseEntity.ok(commentService.makeComment(requestMakeCommentDto, questionId, user))
+
+	@DeleteMapping("/comment/{commentId}")
+	fun deleteComment(
+		@PathVariable("commentId") commentId: Long,
+		@AuthenticationPrincipal user: OAuth2User?,
+	): ResponseEntity<Void> {
+		commentService.deleteComment(commentId)
+		return ResponseEntity.noContent().build()
+	}
+
+	@GetMapping("/{questionId}/comment")
+	@AddLoginStatusAttributeToView
+	fun getComments(
+		model: Model,
+		@PathVariable("questionId") questionId: Long,
+		@AuthenticationPrincipal user: OAuth2User?,
+	): String {
+		val comments: List<ResponseCommentDto> = commentService.getComments(questionId, user)
+		model.addAttribute("multipleChoice", true)
+		model.addAttribute("comments", comments)
+		val question = questionGetService.getQuestionByIdFetchIfShould(questionId)
+		model.addAttribute(
+			"question",
+			ResponseQuestionDto.forUser(question),
+		)
+		return "commentModal"
+	}
+}

application/src/main/kotlin/com/comssa/api/exceptionHandler/GlobalExceptionHandler.kt

@@ -0,0 +1,18 @@
+package com.comssa.api.exceptionHandler
+
+import com.comssa.persistence.exception.NotLoginException
+import org.springframework.http.HttpStatus
+import org.springframework.http.ResponseEntity
+import org.springframework.web.bind.annotation.ControllerAdvice
+import org.springframework.web.bind.annotation.ExceptionHandler
+
+@ControllerAdvice
+class GlobalExceptionHandler {
+	@ExceptionHandler(NotLoginException::class)
+	fun handleNotLoginException(e: NotLoginException): ResponseEntity<String> =
+		ResponseEntity(e.message, HttpStatus.UNAUTHORIZED)
+
+	@ExceptionHandler(NoSuchElementException::class)
+	fun handleNoSuchElementException(e: NoSuchElementException): ResponseEntity<String> =
+		ResponseEntity(e.message, HttpStatus.NOT_FOUND)
+}

application/src/main/resources/static/css/global-index/style.css

@@ -137,4 +137,14 @@
         height: auto; /* 부모의 높이가 자동으로 조정되도록 설정 */
     }
 
+    /**
+    문제 페이지
+     */
+    .right-box {
+        width: 10%;
+    }
+
+    .left-sidebar {
+        width: 80%;
+    }
 }