diff --git a/src/main/java/com/example/demo/mapper/BeanMapper.java b/src/main/java/com/example/demo/mapper/BeanMapper.java
index 37bfe3c50e5afc1790696530f6a398436f477f5a..e1617c69d1e2e7f56a7cbd565e132c464308443b 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();
+        }
+    }
 }