Finished still needs some refactoring I think

src/main/java/com/zipcoder/payment/PaymentPresenter.java

@@ -1,17 +1,24 @@
 package com.zipcoder.payment;
 
+import com.zipcoder.paymentSort.ById;
+import com.zipcoder.paymentSort.ByPayer;
+import com.zipcoder.paymentSort.PaymentOrder;
+import com.zipcoder.paymentSort.ByShortDescription;
+
+import java.util.Comparator;
+
 public class PaymentPresenter {
 
-    PaymentSort ofSort;
+    PaymentOrder order = null;
 
-    public PaymentPresenter(PaymentSort of){
-        this.ofSort = of;
-    }
+    //public PaymentPresenter(){}
 
     public String toString(Payment[] payments){
         StringBuilder sb = new StringBuilder();
 
-        sortBy(payments);
+        if(this.order != null){
+            this.orderBy(payments);
+        }
 
         for(int i = 0; i < payments.length; i++){
             sb.append(payments[i].getShortDescription());
@@ -21,13 +28,33 @@ public class PaymentPresenter {
         return sb.toString();
     }
 
-    public Payment[] byShortName(Payment[] payments){
+    public void setOrderBy(PaymentOrder order){
+        this.order = order;
+    }
+
+    public void orderBy(Payment[] payments){
+        switch(this.order){
+            case SHORTDESCRIPTION:
+                this.bubbleSort(payments, new ByShortDescription());
+                break;
+            case PAYERNAME:
+                this.bubbleSort(payments, new ByPayer());
+                break;
+            case ID:
+                this.bubbleSort(payments, new ById());
+                break;
+            default:
+                break;
+        }
+    }
+
+    public void bubbleSort(Payment[] payments, Comparator<Payment> comparator){
         boolean isNotSorted = true;
 
         while(isNotSorted){
             isNotSorted = false;
             for(int i = 0; i < payments.length - 1; i++){
-                if(payments[i].getShortDescription().compareTo(payments[i + 1].getShortDescription()) > 0){
+                if(comparator.compare(payments[i], payments[i + 1]) > 0){
                     isNotSorted = true;
                     Payment temp = payments[i];
                     payments[i] = payments[i + 1];
@@ -36,9 +63,46 @@ public class PaymentPresenter {
                 }
             }
         }
-        return payments;
+
     }
 
+//
+//    public Payment[] orderByPayerName(Payment[] payments){
+//        boolean isNotSorted = true;
+//
+//        while(isNotSorted){
+//            isNotSorted = false;
+//            for(int i = 0; i < payments.length - 1; i++){
+//                if(payments[i].getPayerName().compareTo(payments[i + 1].getPayerName()) > 0){
+//                    isNotSorted = true;
+//                    Payment temp = payments[i];
+//                    payments[i] = payments[i + 1];
+//                    payments[i+1] = temp;
+//
+//                }
+//            }
+//        }
+//        return payments;
+//    }
+
+//    public Payment[] orderById(Payment[] payments){
+//        boolean isNotSorted = true;
+//
+//        while(isNotSorted){
+//            isNotSorted = false;
+//            for(int i = 0; i < payments.length - 1; i++){
+//                if(payments[i].getId() > payments[i + 1].getId()){
+//                    isNotSorted = true;
+//                    Payment temp = payments[i];
+//                    payments[i] = payments[i + 1];
+//                    payments[i+1] = temp;
+//
+//                }
+//            }
+//        }
+//        return payments;
+//    }
+
 
 
 

src/main/java/com/zipcoder/payment/PaymentSort.java

@@ -1,5 +0,0 @@
-package com.zipcoder.payment;
-
-public enum PaymentSort {
-    ID, PAYERNAME, SHORTDESCRIPTION
-}

src/main/java/com/zipcoder/paymentSort/ById.java

@@ -0,0 +1,22 @@
+package com.zipcoder.paymentSort;
+
+import com.zipcoder.payment.Payment;
+
+import java.util.Comparator;
+
+public class ById implements Comparator<Payment> {
+
+    public int compare(Payment o1, Payment o2) {
+        String id1 = Long.toString(o1.getId());
+        String id2 = Long.toString(o2.getId());
+
+        if(id1.compareTo(id2) > 0){
+            return 1;
+        } else if(o1.getId() < 0){
+            return -1;
+        } else {
+            return 0;
+        }
+    }
+
+}

src/main/java/com/zipcoder/payment/PaymentSortByPayer.java → src/main/java/com/zipcoder/paymentSort/ByPayer.java

@@ -1,8 +1,10 @@
-package com.zipcoder.payment;
+package com.zipcoder.paymentSort;
+
+import com.zipcoder.payment.Payment;
 
 import java.util.Comparator;
 
-public class PaymentSortByPayer implements Comparator<Payment> {
+public class ByPayer implements Comparator<Payment> {
 
     public int compare(Payment o1, Payment o2) {
         if(o1.getPayerName().compareTo(o2.getPayerName()) > 0){
@@ -13,4 +15,5 @@ public class PaymentSortByPayer implements Comparator<Payment> {
             return 0;
         }
     }
+
 }

src/main/java/com/zipcoder/paymentSort/ByShortDescription.java

@@ -0,0 +1,22 @@
+package com.zipcoder.paymentSort;
+
+import com.zipcoder.payment.Payment;
+
+import java.util.Comparator;
+
+public class ByShortDescription implements Comparator<Payment> {
+
+    public int compare(Payment o1, Payment o2) {
+        String str1 = o1.getShortDescription();
+        String str2 = o2.getShortDescription();
+
+        if(str1.compareTo(str2) > 0){
+            return 1;
+        } else if(str1.compareTo(str2) < 0){
+            return -1;
+        } else {
+            return 0;
+        }
+    }
+
+}

src/main/java/com/zipcoder/paymentSort/PaymentOrder.java

@@ -0,0 +1,5 @@
+package com.zipcoder.paymentSort;
+
+public enum PaymentOrder {
+    ID, PAYERNAME, SHORTDESCRIPTION
+}

src/test/java/com/zipcoder/payment/PaymentSortByPayerTest.java → src/test/java/com/zipcoder/payment/PaymentOrderByPayerTest.java

@@ -1,15 +1,16 @@
 package com.zipcoder.payment;
 
+import com.zipcoder.paymentSort.ByPayer;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-class PaymentSortByPayerTest {
+class PaymentOrderByPayerTest {
 
     @Test
     void compairTest1() {
         //When
-        PaymentSortByPayer ps = new PaymentSortByPayer();
+        ByPayer ps = new ByPayer();
         Payment cc = new CreditCard(12, 4111131,"Jimmy Maidanos", 4, 11);
         Payment pp = new Paypal(23, "Nicholas Maidanos", "nmaidanos@gmail.com");
 
@@ -25,7 +26,7 @@ class PaymentSortByPayerTest {
     @Test
     void compairTest2() {
         //When
-        PaymentSortByPayer ps = new PaymentSortByPayer();
+        ByPayer ps = new ByPayer();
         Payment cc = new CreditCard(12, 4111131,"Zimmy Maidanos", 4, 11);
         Payment pp = new Paypal(23, "Nicholas Maidanos", "nmaidanos@gmail.com");
 
@@ -41,7 +42,7 @@ class PaymentSortByPayerTest {
     @Test
     void compairTest3() {
         //When
-        PaymentSortByPayer ps = new PaymentSortByPayer();
+        ByPayer ps = new ByPayer();
         Payment cc = new CreditCard(12, 4111131,"Nicholas Maidanos", 4, 11);
         Payment pp = new Paypal(23, "Nicholas Maidanos", "nmaidanos@gmail.com");
 

src/test/java/com/zipcoder/payment/PaymentPresenterTest.java

@@ -1,5 +1,6 @@
 package com.zipcoder.payment;
 
+import com.zipcoder.paymentSort.PaymentOrder;
 import org.junit.Test;
 
 import static org.junit.Assert.*;
@@ -29,7 +30,8 @@ public class PaymentPresenterTest {
         Payment pp = new Paypal(23, "Nicholas Maidanos", "nmaidanos@gmail.com");
         Payment ck = new Check(46,"Nicholas Maidanos", "8934", "3343234");
 
-        PaymentPresenter paymentp = new PaymentPresenter(PaymentSort.SHORTDESCRIPTION);
+        PaymentPresenter paymentPresenter = new PaymentPresenter();
+        paymentPresenter.setOrderBy(PaymentOrder.SHORTDESCRIPTION);
 
         payments[0] = pp;
         payments[1] = cc;
@@ -38,7 +40,52 @@ public class PaymentPresenterTest {
         String expected = "CC Nicholas Maidanos 1131 4/11\nCheck Nicholas Maidanos ****3234\nPayPal Nicholas Maidanos nmaidanos@gmail.com\n";
 
         //Actual
-        String actual = paymentp.toString(payments);
+        String actual = paymentPresenter.toString(payments);
+
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void SortByPayerId() {
+        //When
+        Payment[] payments = new Payment[3];
+        Payment cc = new CreditCard(3, 4111131,"Nicholas Maidanos", 4, 11);
+        Payment pp = new Paypal(2, "Nicholas Maidanos", "nmaidanos@gmail.com");
+        Payment ck = new Check(1,"Nicholas Maidanos", "8934", "3343234");
+
+        PaymentPresenter paymentPresenter = new PaymentPresenter();
+        paymentPresenter.setOrderBy(PaymentOrder.ID);
+
+        payments[0] = pp;
+        payments[1] = cc;
+        payments[2] = ck;
+        //Expect
+        String expected = "Check Nicholas Maidanos ****3234\nPayPal Nicholas Maidanos nmaidanos@gmail.com\nCC Nicholas Maidanos 1131 4/11\n";
+
+        //Actual
+        String actual = paymentPresenter.toString(payments);
+
+        assertEquals(expected, actual);
+    }
+    @Test
+    public void SortByPayerName() {
+        //When
+        Payment[] payments = new Payment[3];
+        Payment cc = new CreditCard(3, 4111131,"Jimmy Maidanos", 4, 11);
+        Payment pp = new Paypal(2, "Billy Maidanos", "nmaidanos@gmail.com");
+        Payment ck = new Check(1,"Nicholas Maidanos", "8934", "3343234");
+
+        PaymentPresenter paymentPresenter = new PaymentPresenter();
+        paymentPresenter.setOrderBy(PaymentOrder.PAYERNAME);
+
+        payments[0] = cc;
+        payments[1] = ck;
+        payments[2] = pp;
+        //Expect
+        String expected = "PayPal Billy Maidanos nmaidanos@gmail.com\nCC Jimmy Maidanos 1131 4/11\nCheck Nicholas Maidanos ****3234\n";
+
+        //Actual
+        String actual = paymentPresenter.toString(payments);
 
         assertEquals(expected, actual);
     }