From 8ff695c1a32131c5c055ee702a4f4c93d1931e23 Mon Sep 17 00:00:00 2001
From: Brian Patterson <brian@zipcoders-MacBook-Pro-5.local>
Date: Sun, 3 Nov 2019 13:11:07 -0500
Subject: [PATCH] completed lab

---
 .../phone/PhoneNumberFactory.java             | 29 ++++++++++++++-----
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zipcodewilmington/phone/PhoneNumberFactory.java b/src/main/java/com/zipcodewilmington/phone/PhoneNumberFactory.java
index 36d323b..38892d4 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;
 
@@ -20,17 +21,23 @@ private PhoneNumberFactory() {
      * @return array of randomly generated PhoneNumber objects
      */ //TODO - Implement logic
     public static PhoneNumber[] createRandomPhoneNumberArray(int phoneNumberCount) {
-        return null;
+        PhoneNumber[]phoneArray = new PhoneNumber[phoneNumberCount];
+        for(int i = 0; i < phoneNumberCount; i++){
+            phoneArray[i]=createRandomPhoneNumber();
+        }
+        return phoneArray;
     }
 
     /**
      * @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, 999);
+        Integer centralOfficeCode = RandomNumberFactory.createInteger(100, 999);
+        Integer phoneLineCode = RandomNumberFactory.createInteger(1000, 9999);
+        return createPhoneNumberSafely(areaCode, centralOfficeCode, phoneLineCode);
+    }
     /**
      * @param areaCode          - 3 digit code
      * @param centralOfficeCode - 3 digit code
@@ -38,7 +45,14 @@ 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 ph = String.format("(%d)-%d-%d", areaCode, centralOfficeCode, phoneLineCode);
+                try{
+                    return createPhoneNumber(ph);
+
+                }catch (InvalidPhoneNumberFormatException e){
+                    e.printStackTrace();
+                }
+        return null;
     }
 
     /**
@@ -46,7 +60,8 @@ 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);
     }
 }