From 0642c06251d5c9d1a942a4290479e79fe4d44441 Mon Sep 17 00:00:00 2001
From: Dominika Zemanovicova <xzemanov@fi.muni.cz>
Date: Sun, 16 Apr 2023 15:38:00 +0200
Subject: [PATCH] Change AnswerMapper to map to entities inside dto
---
.../moduleexercise/answer/AnswerFacade.java | 9 -------
.../moduleexercise/answer/AnswerMapper.java | 25 +++++++++++++++----
2 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/application/module-exercise/src/main/java/org/fuseri/moduleexercise/answer/AnswerFacade.java b/application/module-exercise/src/main/java/org/fuseri/moduleexercise/answer/AnswerFacade.java
index 57ad9053..d0f88ecb 100644
--- a/application/module-exercise/src/main/java/org/fuseri/moduleexercise/answer/AnswerFacade.java
+++ b/application/module-exercise/src/main/java/org/fuseri/moduleexercise/answer/AnswerFacade.java
@@ -89,15 +89,6 @@ public class AnswerFacade {
* @param id of answer to delete
*/
public void delete(long id) {
- var answer = answerService.find(id);
-
- Question question;
- question = questionService.find(answer.getQuestion().getId());
-
- var questionAnswers = question.getAnswers();
- questionAnswers.removeIf(a -> a.getId() == answer.getId());
- question.setAnswers(questionAnswers);
-
answerService.delete(id);
}
}
diff --git a/application/module-exercise/src/main/java/org/fuseri/moduleexercise/answer/AnswerMapper.java b/application/module-exercise/src/main/java/org/fuseri/moduleexercise/answer/AnswerMapper.java
index f1cb4626..e365d778 100644
--- a/application/module-exercise/src/main/java/org/fuseri/moduleexercise/answer/AnswerMapper.java
+++ b/application/module-exercise/src/main/java/org/fuseri/moduleexercise/answer/AnswerMapper.java
@@ -4,7 +4,12 @@ import org.fuseri.model.dto.exercise.AnswerCreateDto;
import org.fuseri.model.dto.exercise.AnswerDto;
import org.fuseri.model.dto.exercise.AnswerInQuestionCreateDto;
import org.fuseri.moduleexercise.common.DomainMapper;
+import org.fuseri.moduleexercise.question.Question;
+import org.fuseri.moduleexercise.question.QuestionService;
import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.Named;
+import org.springframework.beans.factory.annotation.Autowired;
import java.util.List;
import java.util.Set;
@@ -12,8 +17,16 @@ import java.util.Set;
/**
* Mapper between Answers and their corresponding DTOs
*/
-@Mapper
-public interface AnswerMapper extends DomainMapper<Answer, AnswerDto> {
+@Mapper(componentModel = "spring", uses = {QuestionService.class})
+public abstract class AnswerMapper implements DomainMapper<Answer, AnswerDto> {
+
+ @Autowired
+ private QuestionService questionService;
+
+ @Named("mapIdToQuestion")
+ public Question mapIdToQuestion(Long id) {
+ return questionService.find(id);
+ }
/**
* Convert DTO of type AnswerCreateDto to Answer
@@ -21,7 +34,8 @@ public interface AnswerMapper extends DomainMapper<Answer, AnswerDto> {
* @param dto DTO to be converted
* @return corresponding Answer entity created from DTO
*/
- Answer fromCreateDto(AnswerCreateDto dto);
+ @Mapping(target = "question", source = "dto.questionId", qualifiedByName = "mapIdToQuestion")
+ public abstract Answer fromCreateDto(AnswerCreateDto dto);
/**
* Convert List of AnswerInQuestionCreateDto to List of corresponding Answers
@@ -29,12 +43,13 @@ public interface AnswerMapper extends DomainMapper<Answer, AnswerDto> {
* @param dtos to be converted
* @return corresponding list of Answers
*/
- Set<Answer> fromCreateDtoList(List<AnswerInQuestionCreateDto> dtos);
+ public abstract Set<Answer> fromCreateDtoList(List<AnswerInQuestionCreateDto> dtos);
/**
* Convert DTO of type AnswerInQuestionCreateDto to Answer
+ *
* @param dto DTO to be converted
* @return corresponding Answer entity created from DTO
*/
- Answer fromCreateDto(AnswerInQuestionCreateDto dto);
+ public abstract Answer fromCreateDto(AnswerInQuestionCreateDto dto);
}
--
GitLab