From cbb706773666f605fa77580993870048cf38c8da Mon Sep 17 00:00:00 2001
From: vaidehi4321 <56602405+vaidehi4321@users.noreply.github.com>
Date: Sun, 3 Nov 2019 13:23:20 -0500
Subject: [PATCH] done phone number

---
 .../zipcodewilmington/phone/PhoneNumber.java  |  4 +-
 .../phone/PhoneNumberFactory.java             | 44 ++++++++++++++-----
 2 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/zipcodewilmington/phone/PhoneNumber.java b/src/main/java/com/zipcodewilmington/phone/PhoneNumber.java
index d933eb5..eac8531 100644
--- a/src/main/java/com/zipcodewilmington/phone/PhoneNumber.java
+++ b/src/main/java/com/zipcodewilmington/phone/PhoneNumber.java
@@ -22,9 +22,7 @@ protected PhoneNumber(String phoneNumber) throws InvalidPhoneNumberFormatExcepti
         this.phoneNumberString = phoneNumber;
     }
 
-    public String getAreaCode() {
-        return toString().substring(1, 4);
-    }
+    public String getAreaCode() { return toString().substring(1, 4); }
 
     public String getCentralOfficeCode() {
         return toString().substring(6, 9);
diff --git a/src/main/java/com/zipcodewilmington/phone/PhoneNumberFactory.java b/src/main/java/com/zipcodewilmington/phone/PhoneNumberFactory.java
index 36d323b..878d054 100644
--- a/src/main/java/com/zipcodewilmington/phone/PhoneNumberFactory.java
+++ b/src/main/java/com/zipcodewilmington/phone/PhoneNumberFactory.java
@@ -1,6 +1,7 @@
 package com.zipcodewilmington.phone;
 
 import com.zipcodewilmington.exceptions.InvalidPhoneNumberFormatException;
+import com.zipcodewilmington.tools.RandomNumberFactory;
 
 import java.util.logging.Logger;
 
@@ -11,26 +12,35 @@ public final class PhoneNumberFactory {
     private static final Logger logger = Logger.getGlobal();
 
     private PhoneNumberFactory() {
-        /** This constructor is private
-         *  This class is uninstantiable */
+  /**        This constructor is private
+       *  This class is uninstantiable */
+
     }
 
-    /**
-     * @param phoneNumberCount - number of PhoneNumber objects to instantiate
-     * @return array of randomly generated PhoneNumber objects
+/**
+    * @param phoneNumberCount - number of PhoneNumber objects to instantiate
+    * @return array of randomly generated PhoneNumber objects
      */ //TODO - Implement logic
     public static PhoneNumber[] createRandomPhoneNumberArray(int phoneNumberCount) {
-        return null;
+        PhoneNumber[] phoneBook=new PhoneNumber[phoneNumberCount];
+        for(int i=0;i<phoneNumberCount;i++){
+            phoneBook[i]=createRandomPhoneNumber();
+        }
+        return phoneBook;
     }
 
     /**
      * @return an instance of PhoneNumber with randomly generated phone number value
      */ //TODO - Implement logic
     public static PhoneNumber createRandomPhoneNumber() {
-        return createPhoneNumberSafely(-1, -1, -1);
-    }
 
 
+        Integer areaCode = RandomNumberFactory.createInteger(100, 900);
+        Integer centralOfficeCode = RandomNumberFactory.createInteger(100, 900);
+        Integer phoneLineCode = RandomNumberFactory.createInteger(1000, 9999);
+        return createPhoneNumberSafely(areaCode,centralOfficeCode,phoneLineCode);
+    }
+
     /**
      * @param areaCode          - 3 digit code
      * @param centralOfficeCode - 3 digit code
@@ -38,7 +48,15 @@ public static PhoneNumber createRandomPhoneNumber() {
      * @return a new phone number object
      */ //TODO - if input is valid, return respective PhoneNumber object, else return null
     public static PhoneNumber createPhoneNumberSafely(int areaCode, int centralOfficeCode, int phoneLineCode) {
-        return createPhoneNumber(null);
+            String s=String.format("(%d)-%d-%d",areaCode,centralOfficeCode,phoneLineCode);
+        try{
+
+        return createPhoneNumber(s);}
+        catch (InvalidPhoneNumberFormatException e) {
+            e.printStackTrace();
+            logger.info(s+"is not a valid phone number");
+            return null;
+        }
     }
 
     /**
@@ -46,7 +64,11 @@ public static PhoneNumber createPhoneNumberSafely(int areaCode, int centralOffic
      * @return a new phone number object
      * @throws InvalidPhoneNumberFormatException - thrown if phoneNumberString does not match acceptable format
      */ // TODO - Add throws statement to method signature
-    public static PhoneNumber createPhoneNumber(String phoneNumberString) {
-        return null;
+
+
+    public static PhoneNumber createPhoneNumber(String phoneNumberString)throws InvalidPhoneNumberFormatException
+    {logger.info("Attempting to create a new PhoneNumber object with a value of " + phoneNumberString);
+        return new PhoneNumber(phoneNumberString);
+
     }
 }