#78 [feat] Mapper의 엔티티에서 도메인 객체로의 변환 시 null 값에 대한 예외 처리를 해준다.

KUSITMS-30th-TEAM-A · Nov 26, 2024 · a418d2f · a418d2f
1 parent 32d043c
commit a418d2f
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 0 deletions.
diff --git a/src/main/java/kusitms/backend/result/infra/mapper/ProfileMapper.java b/src/main/java/kusitms/backend/result/infra/mapper/ProfileMapper.java
@@ -6,6 +6,11 @@
 public class ProfileMapper {
 
     public static Profile toDomain(ProfileEntity profileEntity) {
+
+        if (profileEntity == null) {
+            return null;
+        }
+
         return Profile.toDomain(
                 profileEntity.getId(),
                 profileEntity.getImgUrl(),

diff --git a/src/main/java/kusitms/backend/result/infra/mapper/ResultMapper.java b/src/main/java/kusitms/backend/result/infra/mapper/ResultMapper.java
@@ -13,6 +13,10 @@ public class ResultMapper {
 
     public static Result toDomain(ResultEntity resultEntity) {
 
+        if (resultEntity == null) {
+            return null;
+        }
+
         Profile profile = ProfileMapper.toDomain(resultEntity.getProfileEntity());
         List<Zone> zones = resultEntity.getZoneEntities().stream()
                 .map(ZoneMapper::toDomain)

diff --git a/src/main/java/kusitms/backend/result/infra/mapper/ZoneMapper.java b/src/main/java/kusitms/backend/result/infra/mapper/ZoneMapper.java
@@ -6,6 +6,11 @@
 public class ZoneMapper {
 
     public static Zone toDomain(ZoneEntity zoneEntity) {
+
+        if (zoneEntity == null) {
+            return null;
+        }
+
         return Zone.toDomain(
                 zoneEntity.getId(),
                 zoneEntity.getName(),

diff --git a/src/main/java/kusitms/backend/stadium/infra/mapper/EntertainmentMapper.java b/src/main/java/kusitms/backend/stadium/infra/mapper/EntertainmentMapper.java
@@ -7,6 +7,11 @@
 public class EntertainmentMapper {
 
     public static Entertainment toDomain(EntertainmentEntity entertainmentEntity) {
+
+        if (entertainmentEntity == null) {
+            return null;
+        }
+
         return Entertainment.toDomain(
                 entertainmentEntity.getId(),
                 entertainmentEntity.getImgUrl(),

diff --git a/src/main/java/kusitms/backend/stadium/infra/mapper/FoodMapper.java b/src/main/java/kusitms/backend/stadium/infra/mapper/FoodMapper.java
@@ -6,6 +6,11 @@
 public class FoodMapper {
 
     public static Food toDomain(FoodEntity foodEntity) {
+
+        if (foodEntity == null) {
+            return null;
+        }
+
         return Food.toDomain(
                 foodEntity.getId(),
                 foodEntity.getImgUrl(),

diff --git a/src/main/java/kusitms/backend/stadium/infra/mapper/StadiumMapper.java b/src/main/java/kusitms/backend/stadium/infra/mapper/StadiumMapper.java
@@ -13,6 +13,10 @@ public class StadiumMapper {
 
     public static Stadium toDomain(StadiumEntity stadiumEntity) {
 
+        if (stadiumEntity == null) {
+            return null;
+        }
+
         List<Food> foods = stadiumEntity.getFoodEntities().stream()
                 .map(FoodMapper::toDomain)
                 .toList();

diff --git a/src/main/java/kusitms/backend/user/infra/mapper/UserMapper.java b/src/main/java/kusitms/backend/user/infra/mapper/UserMapper.java
@@ -6,6 +6,11 @@
 public class UserMapper {
 
     public static User toDomain(UserEntity userEntity) {
+
+        if (userEntity == null) {
+            return null;
+        }
+
         return User.toDomain(
                 userEntity.getId(),
                 userEntity.getProvider(),