diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/VirtualWorker.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/VirtualWorker.java index fe75fd8f7..61036d80c 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/VirtualWorker.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/VirtualWorker.java @@ -30,6 +30,7 @@ import org.navalplanner.business.common.Registry; * This class models a VirtualWorker. * * @author Lorenzo Tilve Álvaro + * @author Fernando Bellas Permuy */ public class VirtualWorker extends Worker { @@ -72,6 +73,11 @@ public class VirtualWorker extends Worker { this.observations = observations; } + @AssertTrue + @Override + public boolean checkConstraintUniqueFirstNameSurnameNif() { + return true; + } @AssertTrue(message = "Virtual worker group name must be unique") public boolean checkConstraintUniqueVirtualGroupName() { diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java index aca6bd991..577929108 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java @@ -128,12 +128,7 @@ public class Worker extends Resource { } @AssertTrue(message = "Worker with the same first name, surname and nif previously existed") - public boolean checkConstraintUniqueFirstName() { - - /* Check if it makes sense to check the constraint .*/ - if (this instanceof VirtualWorker) { - return true; - } + public boolean checkConstraintUniqueFirstNameSurnameNif() { if (!areFirstNameSurnameNifSpecified()) { return true;