Merge pull request #272 from PLADI-ALM/fix/PDS-132-updateResource

[PDS-132/fix] 차량, 장비, 회의실 수정 시, null 예외 처리
PLADI-ALM · Dec 2, 2023 · 8d3574a · 8d3574a
2 parents d43cea0 + 8cef4fd
commit 8d3574a
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 17 deletions.
diff --git a/src/main/java/com/example/pladialmserver/office/entity/Office.java b/src/main/java/com/example/pladialmserver/office/entity/Office.java
@@ -1,6 +1,7 @@
 package com.example.pladialmserver.office.entity;
 
 import com.example.pladialmserver.global.entity.BaseEntity;
+import com.example.pladialmserver.global.utils.AwsS3ImageUrlUtil;
 import com.example.pladialmserver.office.dto.request.CreateOfficeReq;
 import lombok.AccessLevel;
 import lombok.Builder;
@@ -13,6 +14,7 @@
 import javax.validation.constraints.Size;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 @Entity
 @Getter
@@ -67,11 +69,11 @@ public static Office toDto(CreateOfficeReq req){
      }
 
     public void updateOffice(CreateOfficeReq request) {
-        if (!name.equals(request.getName())) name = request.getName();
-        if (!location.equals(request.getLocation())) name = request.getLocation();
-        if (!capacity.equals(request.getCapacity())) capacity = request.getCapacity();
-        if (!description.equals(request.getDescription())) description = request.getDescription();
-        if (!imgKey.equals(request.getImgKey())) imgKey = request.getImgKey();
+        if (!Objects.equals(name, request.getName())) name = request.getName();
+        if (!Objects.equals(location, request.getLocation())) location = request.getLocation();
+        if (!Objects.equals(capacity, request.getCapacity())) capacity = request.getCapacity();
+        if (!Objects.equals(description, request.getDescription())) description = request.getDescription();
+        if (!Objects.equals(AwsS3ImageUrlUtil.toUrl(imgKey), request.getImgKey())) imgKey = request.getImgKey();
     }
 
     public void activateOffice() {

diff --git a/src/main/java/com/example/pladialmserver/product/car/entity/Car.java b/src/main/java/com/example/pladialmserver/product/car/entity/Car.java
@@ -10,6 +10,7 @@
 import javax.persistence.*;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+import java.util.Objects;
 
 @Entity
 @Getter
@@ -66,11 +67,11 @@ public void activateResource() {
     }
 
     public void updateCar(CreateProductReq request, User responsibility) {
-        if (!name.equals(request.getName())) name = request.getName();
-        if (!manufacturer.equals(request.getManufacturer())) manufacturer = request.getManufacturer();
-        if (!location.equals(request.getLocation())) location = request.getLocation();
-        if (!description.equals(request.getDescription())) description = request.getDescription();
-        if (!AwsS3ImageUrlUtil.toUrl(imgKey).equals(request.getImgKey())) imgKey = request.getImgKey();
-        if (!user.equals(responsibility)) user = responsibility;
+        if (!Objects.equals(name, request.getName())) name = request.getName();
+        if (!Objects.equals(manufacturer, request.getManufacturer())) manufacturer = request.getManufacturer();
+        if (!Objects.equals(location, request.getLocation())) location = request.getLocation();
+        if (!Objects.equals(description, request.getDescription())) description = request.getDescription();
+        if (!Objects.equals(AwsS3ImageUrlUtil.toUrl(imgKey), request.getImgKey())) imgKey = request.getImgKey();
+        if (!Objects.equals(user, responsibility)) user = responsibility;
     }
 }
diff --git a/src/main/java/com/example/pladialmserver/product/resource/entity/Resource.java b/src/main/java/com/example/pladialmserver/product/resource/entity/Resource.java
@@ -10,6 +10,7 @@
 import javax.persistence.*;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+import java.util.Objects;
 
 @Entity
 @Getter
@@ -69,12 +70,12 @@ public static Resource toDto(CreateProductReq request, User responsibility) {
   }
 
   public void updateResource(CreateProductReq request, User responsibility) {
-    if (!name.equals(request.getName())) name = request.getName();
-    if (!manufacturer.equals(request.getManufacturer())) manufacturer = request.getManufacturer();
-    if (!location.equals(request.getLocation())) location = request.getLocation();
-    if (!description.equals(request.getDescription())) description = request.getDescription();
-    if (!AwsS3ImageUrlUtil.toUrl(imgKey).equals(request.getImgKey())) imgKey = request.getImgKey();
-    if (!user.equals(responsibility)) user = responsibility;
+    if (!Objects.equals(name, request.getName())) name = request.getName();
+    if (!Objects.equals(manufacturer, request.getManufacturer())) manufacturer = request.getManufacturer();
+    if (!Objects.equals(location, request.getLocation())) location = request.getLocation();
+    if (!Objects.equals(description, request.getDescription())) description = request.getDescription();
+    if (!Objects.equals(AwsS3ImageUrlUtil.toUrl(imgKey), request.getImgKey())) imgKey = request.getImgKey();
+    if (!Objects.equals(user, responsibility)) user = responsibility;
   }
 
   // 활성화/비활성화