commit

src/main/java/com/example/afrishop_v3/controllers/AddressController.java

@@ -54,8 +54,26 @@ public class AddressController extends Controller{
 
     @PutMapping("/{addressId}")
     public Result editAddressInfo(@PathVariable("addressId") String addressId,@RequestBody TbCfAddress address) {
-        address.setUserId(user.userId());
+
+        ResultCodeEnum e = ResultCodeEnum.VALIDATE_ERROR;
+        if( !repository.existsById(addressId) )
+            return new Result(e.getCode(),"Address doesn't exist");
+
+        String userId = user.userId();
+        if( address == null )
+            return new Result(e.getCode(),e.getDesc());
+        if( address.getAddressDetail() == null || address.getAddressDetail().trim().isEmpty())
+            return new Result(e.getCode(),"Address is required");
+        if( address.getDeliveryName() == null || address.getDeliveryName().trim().isEmpty())
+            return new Result(e.getCode(),"Delivery name is required");
+        if( address.getPhone() == null || address.getPhone().trim().isEmpty())
+            return new Result(e.getCode(),"Phone is required");
+
+        if( repository.existsByAddressDetailAndUserIdAndAddressIdIsNot(address.getAddressDetail(), userId,addressId))
+            return new Result(e.getCode(),"Address already existed");
+
         address.setAddressId(addressId);
+        address.setUserId(userId);
         return new Result<>(repository.save(address));
     }
 

src/main/java/com/example/afrishop_v3/repository/TbCfAddressRepository.java

@@ -18,4 +18,6 @@ public interface TbCfAddressRepository extends PagingAndSortingRepository<TbCfAd
     void resetToDefault(@Param("user_id") String userId);
 
     boolean existsByAddressDetailAndUserId(String addressDetail, String userId);
+
+    boolean existsByAddressDetailAndUserIdAndAddressIdIsNot(String addressDetail, String userId, String addressId);
 }