diff --git a/src/main/java/com/javajober/blocks/styleSetting/backgroundSetting/dto/response/BackgroundSettingResponse.java b/src/main/java/com/javajober/blocks/styleSetting/backgroundSetting/dto/response/BackgroundSettingResponse.java index 42cfdd5..4558e03 100644 --- a/src/main/java/com/javajober/blocks/styleSetting/backgroundSetting/dto/response/BackgroundSettingResponse.java +++ b/src/main/java/com/javajober/blocks/styleSetting/backgroundSetting/dto/response/BackgroundSettingResponse.java @@ -25,6 +25,9 @@ public BackgroundSettingResponse(final Long backgroundSettingBlockId, final Stri } public static BackgroundSettingResponse from(final BackgroundSetting backgroundSetting) { + if (backgroundSetting == null) { + return null; + } return BackgroundSettingResponse.builder() .backgroundSettingBlockId(backgroundSetting.getId()) .solidColor(backgroundSetting.getSolidColor()) diff --git a/src/main/java/com/javajober/blocks/styleSetting/blockSetting/dto/response/BlockSettingResponse.java b/src/main/java/com/javajober/blocks/styleSetting/blockSetting/dto/response/BlockSettingResponse.java index 85149a7..dc3bb3d 100644 --- a/src/main/java/com/javajober/blocks/styleSetting/blockSetting/dto/response/BlockSettingResponse.java +++ b/src/main/java/com/javajober/blocks/styleSetting/blockSetting/dto/response/BlockSettingResponse.java @@ -27,6 +27,9 @@ public BlockSettingResponse(final Long blockSettingBlockId, final String shape, } public static BlockSettingResponse from(final BlockSetting blockSetting) { + if (blockSetting == null) { + return null; + } return BlockSettingResponse.builder() .blockSettingBlockId(blockSetting.getId()) .shape(blockSetting.getShape()) diff --git a/src/main/java/com/javajober/blocks/styleSetting/themeSetting/dto/response/ThemeSettingResponse.java b/src/main/java/com/javajober/blocks/styleSetting/themeSetting/dto/response/ThemeSettingResponse.java index 817a03d..009147c 100644 --- a/src/main/java/com/javajober/blocks/styleSetting/themeSetting/dto/response/ThemeSettingResponse.java +++ b/src/main/java/com/javajober/blocks/styleSetting/themeSetting/dto/response/ThemeSettingResponse.java @@ -21,6 +21,9 @@ public ThemeSettingResponse(final Long themeSettingBlockId, final String theme) } public static ThemeSettingResponse from(final ThemeSetting themeSetting) { + if (themeSetting == null) { + return null; + } return ThemeSettingResponse.builder() .themeSettingBlockId(themeSetting.getId()) .theme(themeSetting.getTheme())