Add mobile phone number

Devskiller · Jul 11, 2020 · 147d742 · 147d742
1 parent f4c6a92
commit 147d742
Show file tree

Hide file tree

Showing 5 changed files with 74 additions and 4 deletions.
diff --git a/src/main/java/com/devskiller/jfairy/producer/person/DefaultPersonProvider.java b/src/main/java/com/devskiller/jfairy/producer/person/DefaultPersonProvider.java
@@ -23,6 +23,7 @@ public class DefaultPersonProvider implements PersonProvider {
 
 	protected Person.Sex sex;
 	protected String telephoneNumberFormat;
+	protected String mobileTelephoneNumberFormat;
 	protected Integer age;
 	protected LocalDate dateOfBirth;
 	protected Company company;
@@ -33,6 +34,7 @@ public class DefaultPersonProvider implements PersonProvider {
 	protected String email;
 	protected String username;
 	protected String telephoneNumber;
+	protected String mobileTelephoneNumber;
 	protected String password;
 	protected String companyEmail;
 	protected String nationalIdentityCardNumber;
@@ -97,9 +99,10 @@ public Person get() {
 		generatePassportNumber();
 		generateAddress();
 		generateNationality();
+		generateMobileTelephoneNumber();
 
 		return new Person(firstName, middleName, lastName, address, email,
-			username, password, sex, telephoneNumber, dateOfBirth, age,
+			username, password, sex, telephoneNumber, mobileTelephoneNumber, dateOfBirth, age,
 			nationalIdentityCardNumber, nationalIdentificationNumber, passportNumber,
 			company, companyEmail, nationality);
 	}
@@ -176,6 +179,17 @@ public void generateTelephoneNumber() {
 		telephoneNumber = baseProducer.numerify(telephoneNumberFormat);
 	}
 
+	@Override
+	public void generateMobileTelephoneNumber() {
+		if (mobileTelephoneNumber != null) {
+			return;
+		}
+		if (mobileTelephoneNumberFormat == null) {
+			mobileTelephoneNumberFormat = dataMaster.getRandomValue(TELEPHONE_NUMBER_FORMATS);
+		}
+		mobileTelephoneNumber = baseProducer.numerify(mobileTelephoneNumberFormat);
+	}
+
 	@Override
 	public void generateAge() {
 		if (dateOfBirth != null) {
@@ -260,6 +274,11 @@ public void setTelephoneNumberFormat(String telephoneFormat) {
 		telephoneNumberFormat = telephoneFormat;
 	}
 
+	@Override
+	public void setMobileTelephoneNumberFormat(String mobileTelephoneNumberFormat) {
+		this.mobileTelephoneNumberFormat = mobileTelephoneNumberFormat;
+	}
+
 	@Override
 	public void setSex(Person.Sex sex) {
 		this.sex = sex;
@@ -305,6 +324,11 @@ public void setTelephoneNumber(String telephoneNumber) {
 		this.telephoneNumber = telephoneNumber;
 	}
 
+	@Override
+	public void setMobileTelephoneNumber(String telephoneNumber) {
+		this.telephoneNumber = telephoneNumber;
+	}
+
 	@Override
 	public void setDateOfBirth(LocalDate dateOfBirth) {
 		this.dateOfBirth = dateOfBirth;

diff --git a/src/main/java/com/devskiller/jfairy/producer/person/Person.java b/src/main/java/com/devskiller/jfairy/producer/person/Person.java
@@ -22,6 +22,7 @@ public enum Sex {
 	private final String password;
 	private final Sex sex;
 	private final String telephoneNumber;
+	private final String mobileTelephoneNumber;
 	private final LocalDate dateOfBirth;
 	private final Integer age;
 	private final Company company;
@@ -32,9 +33,10 @@ public enum Sex {
 	private final Country nationality;
 
 	public Person(String firstName, String middleName, String lastName, Address address, String email, String username,
-	              String password, Sex sex, String telephoneNumber, LocalDate dateOfBirth, Integer age,
-	              String nationalIdentityCardNumber, String nationalIdentificationNumber, String passportNumber,
-	              Company company, String companyEmail, Country nationality) {
+	              String password, Sex sex, String telephoneNumber, String mobileTelephoneNumber,
+				  LocalDate dateOfBirth, Integer age, String nationalIdentityCardNumber,
+				  String nationalIdentificationNumber, String passportNumber, Company company, String companyEmail,
+				  Country nationality) {
 		this.nationalIdentityCardNumber = nationalIdentityCardNumber;
 		this.address = address;
 		this.firstName = firstName;
@@ -45,6 +47,7 @@ public Person(String firstName, String middleName, String lastName, Address addr
 		this.password = password;
 		this.sex = sex;
 		this.telephoneNumber = telephoneNumber;
+		this.mobileTelephoneNumber = mobileTelephoneNumber;
 		this.dateOfBirth = dateOfBirth;
 		this.age = age;
 		this.nationalIdentificationNumber = nationalIdentificationNumber;
@@ -102,6 +105,10 @@ public String getTelephoneNumber() {
 		return telephoneNumber;
 	}
 
+	public String getMobileTelephoneNumber() {
+		return mobileTelephoneNumber;
+	}
+
 	public LocalDate getDateOfBirth() {
 		return dateOfBirth;
 	}

diff --git a/src/main/java/com/devskiller/jfairy/producer/person/PersonProperties.java b/src/main/java/com/devskiller/jfairy/producer/person/PersonProperties.java
@@ -73,6 +73,15 @@ public void apply(PersonProvider person, BaseProducer baseProducer) {
 		};
 	}
 
+	public static PersonProperty mobileTelephoneFormat(final String mobileTelephoneNumberFormat) {
+		return new PersonProperty() {
+			@Override
+			public void apply(PersonProvider person, BaseProducer baseProducer) {
+				person.setMobileTelephoneNumberFormat(mobileTelephoneNumberFormat);
+			}
+		};
+	}
+
 	public static PersonProperty withCompany(final Company company) {
 		return new PersonProperty() {
 			@Override
@@ -145,6 +154,15 @@ public void apply(PersonProvider personProvider, BaseProducer baseProducer) {
 		};
 	}
 
+	public static PersonProperty withMobileTelephoneNumber(final String mobileTelephoneNumber) {
+		return new PersonProperty() {
+			@Override
+			public void apply(PersonProvider personProvider, BaseProducer baseProducer) {
+				personProvider.setMobileTelephoneNumber(mobileTelephoneNumber);
+			}
+		};
+	}
+
 	public static PersonProperty withDateOfBirth(final LocalDate dateOfBirth) {
 		return new PersonProperty() {
 			@Override

diff --git a/src/main/java/com/devskiller/jfairy/producer/person/PersonProvider.java b/src/main/java/com/devskiller/jfairy/producer/person/PersonProvider.java
@@ -39,6 +39,8 @@ public interface PersonProvider extends Provider<Person> {
 
 	void generateTelephoneNumber();
 
+	void generateMobileTelephoneNumber();
+
 	void generateAge();
 
 	void generateDateOfBirth();
@@ -57,6 +59,8 @@ public interface PersonProvider extends Provider<Person> {
 
 	void setTelephoneNumberFormat(String telephoneFormat);
 
+	void setMobileTelephoneNumberFormat(String telephoneFormat);
+
 	void setSex(Person.Sex sex);
 
 	void setAge(int age);
@@ -75,6 +79,8 @@ public interface PersonProvider extends Provider<Person> {
 
 	void setTelephoneNumber(String telephoneNumber);
 
+	void setMobileTelephoneNumber(String telephoneNumber);
+
 	void setDateOfBirth(LocalDate dateOfBirth);
 
 	void setPassword(String password);

diff --git a/src/test/groovy/com/devskiller/jfairy/producer/person/PersonSpec.groovy b/src/test/groovy/com/devskiller/jfairy/producer/person/PersonSpec.groovy
@@ -18,6 +18,7 @@ import static com.devskiller.jfairy.producer.person.PersonProperties.female
 import static com.devskiller.jfairy.producer.person.PersonProperties.male
 import static com.devskiller.jfairy.producer.person.PersonProperties.maxAge
 import static com.devskiller.jfairy.producer.person.PersonProperties.minAge
+import static com.devskiller.jfairy.producer.person.PersonProperties.mobileTelephoneFormat
 import static com.devskiller.jfairy.producer.person.PersonProperties.telephoneFormat
 import static com.devskiller.jfairy.producer.person.PersonProperties.withAddress
 import static com.devskiller.jfairy.producer.person.PersonProperties.withAge
@@ -145,6 +146,20 @@ class PersonSpec extends Specification {
 			person.telephoneNumber ==~ /\d\d\d--\d\d\d/
 	}
 
+	def "should create mobile telephone number"() {
+		when:
+			Person person = fairy.person()
+		then:
+			person.mobileTelephoneNumber
+	}
+
+	def "should create mobile telephone number in defined format"() {
+		when:
+			Person person = fairy.person(mobileTelephoneFormat("###--###"))
+		then:
+			person.mobileTelephoneNumber ==~ /\d\d\d--\d\d\d/
+	}
+
 	def "should create birth date"() {
 		when:
 			Person person = fairy.person()