From 197f221532a428d9e1f046bad7e0612ea9ded3b2 Mon Sep 17 00:00:00 2001
From: Jan Tymel <410388@mail.muni.cz>
Date: Sat, 6 Feb 2021 11:28:36 +0100
Subject: [PATCH] Add entities-to-ID mapping in order to fix returned values in
 phaseRelation when getting a questionnaire phase detail

Related to #3
---
 .../com/example/demo/mapper/BeanMapper.java    | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/main/java/com/example/demo/mapper/BeanMapper.java b/src/main/java/com/example/demo/mapper/BeanMapper.java
index 37bfe3c5..e1617c69 100644
--- a/src/main/java/com/example/demo/mapper/BeanMapper.java
+++ b/src/main/java/com/example/demo/mapper/BeanMapper.java
@@ -100,5 +100,23 @@ public interface BeanMapper {
 
     QuestionPhaseRelation toEntity(QuestionPhaseRelationDto questionnairePhaseDto);
 
+    @Mapping(target = "phaseId", source = "relatedTrainingPhase")
+    @Mapping(target = "questionIds", source = "questions")
     QuestionPhaseRelationDto toDto(QuestionPhaseRelation questionnairePhase);
+
+    default Long mapTrainingPhaseId(TrainingPhase trainingPhase) {
+        if (trainingPhase == null) {
+            return null;
+        } else {
+            return trainingPhase.getId();
+        }
+    }
+
+    default Long mapQuestionId(Question question) {
+        if (question == null) {
+            return null;
+        } else {
+            return question.getId();
+        }
+    }
 }
-- 
GitLab