INTERFACECOMPARABLE

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

@@ -7,7 +7,15 @@ public class Check implements Payment {
 
     String payerName;
 
-    String shortDescription;
+
+    public Check(Long id, String payerName, String accountNumber){
+        this.id = id;
+        this.payerName = payerName;
+        this.accountNumber = accountNumber;
+    }
+
+
+
 
     public String getRoutingNumber() {
         return routingNumber;
@@ -56,13 +64,19 @@ public class Check implements Payment {
     public String getShortDescription() {
 
         String accountNumb = getAccountNumber();
-        String lastFourAcct = accountNumb.substring(accountNumb.length()-4, accountNumb.length());
+        String lastFourAcct = accountNumb.substring(accountNumb.length()-4);
 
-        return "Check " + getPayerName() + " ***" + lastFourAcct;
+        return "Check " + this.payerName + " ***" + lastFourAcct + "\n";
     }
 
 
     public int compareTo(Payment o) {
-        return 0;
+        if(this.getShortDescription().compareTo(o.getShortDescription()) > 0){
+            return 1;
+        } else if(this.getShortDescription().compareTo(o.getShortDescription()) < 0) {
+            return -1;
+        } else {
+            return 0;
+        }
     }
 }

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

@@ -100,7 +100,7 @@ public class CreditCard implements Payment {
         String numb = getNumber();
         String lastFour = getNumber().substring(numb.length()-4, numb.length());
 
-        return "CC " + getPayerName() + " " + lastFour + " " + getExpiredMonth() + "/" + getExpiredYear();
+        return "CC " + this.payerName + " " + lastFour + " " + this.expiredMonth + "/" + this.expiredYear + "\n";
     }
 
 
@@ -115,8 +115,4 @@ public class CreditCard implements Payment {
             return 0;
         }
     }
-
-
-
-
 }

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

@@ -8,7 +8,12 @@ public class PayPal implements Payment{
 
     String email;
 
-    String shortDescription;
+
+
+    public static void main(String[] args){
+        int var = "Paypal Tia Mowry tia@mowry.com".compareTo("Check Tia Mowry ***4551");
+        System.out.println(var);
+    }
 
     public Long getId() {
         return id;
@@ -35,13 +40,27 @@ public class PayPal implements Payment{
     }
 
 
+    public PayPal(Long id, String payerName, String email){
+        this.id = id;
+        this.payerName = payerName;
+        this.email = email;
+    }
+
+
+
 
     public String getShortDescription(){
-        return "PayPal " + getPayerName() + " " + getEmail();
+        return "PayPal " + this.payerName + " " + this.email + "\n";
     }
 
 
     public int compareTo(Payment o) {
-        return 0;
+        if(this.getShortDescription().compareTo(o.getShortDescription()) > 0){
+            return 1;
+        } else if(this.getShortDescription().compareTo(o.getShortDescription()) < 0) {
+            return -1;
+        } else {
+            return 0;
+        }
     }
 }

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

@@ -1,6 +1,50 @@
 package com.zipcoder.payment;
 
+import java.util.Arrays;
+
 public class PaymentPresenter {
 
 
+
+    public String toStringPayer(Payment[] payments) {
+
+        Arrays.sort(payments, new PaymentSortByPayer());
+
+        StringBuilder sb = new StringBuilder();
+
+        for (Payment payment:payments) {
+            sb.append(payment.getShortDescription());
+        }
+
+        return sb.toString();
+    }
+
+
+    public String toString(Payment[] payments) {
+
+        Arrays.sort(payments, new PaymentSortByShortDescription());
+
+        StringBuilder sb = new StringBuilder();
+
+        for (Payment payment:payments) {
+            sb.append(payment.getShortDescription());
+        }
+
+        return sb.toString();
+    }
+
+
+    public String toStringID(Payment[] payments) {
+
+        Arrays.sort(payments, new PaymentSortByID());
+
+        StringBuilder sb = new StringBuilder();
+
+        for (Payment payment:payments) {
+            sb.append(payment.getShortDescription());
+        }
+
+        return sb.toString();
+    }
+
 }

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

@@ -0,0 +1,17 @@
+package com.zipcoder.payment;
+
+import java.util.Comparator;
+
+public class PaymentSortByID implements Comparator<Payment> {
+
+
+    public int compare(Payment o1, Payment o2) {
+        if (o1.getId().compareTo(o2.getId()) > 0){
+            return 1;
+        } else if(o1.getId().compareTo(o2.getId()) < 0) {
+            return -1;
+        } else {
+            return 0;
+        }
+    }
+}

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

@@ -0,0 +1,39 @@
+package com.zipcoder.payment;
+
+import java.util.Comparator;
+
+public class PaymentSortByPayer implements Comparator<Payment> {
+
+
+
+    public int compare(Payment o1, Payment o2) {
+        if (o1.getPayerName().compareTo(o2.getPayerName()) > 0){
+            return 1;
+        } else if(o1.getPayerName().compareTo(o2.getPayerName()) < 0) {
+            return -1;
+        } else {
+            return 0;
+        }
+    }
+
+//    public int compareShortDescription(Payment o1, Payment o2) {
+//        if (o1.getShortDescription().compareTo(o2.getShortDescription()) > 0){
+//            return 1;
+//        } else if(o1.getShortDescription().compareTo(o2.getShortDescription()) < 0) {
+//            return -1;
+//        } else {
+//            return 0;
+//        }
+//    }
+//
+//    public int compareID(Payment o1, Payment o2) {
+//        if (o1.getId().compareTo(o2.getId()) > 0){
+//            return 1;
+//        } else if(o1.getId().compareTo(o2.getId()) < 0) {
+//            return -1;
+//        } else {
+//            return 0;
+//        }
+//    }
+
+}

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

@@ -0,0 +1,17 @@
+package com.zipcoder.payment;
+
+import java.util.Comparator;
+
+public class PaymentSortByShortDescription implements Comparator<Payment> {
+
+
+    public int compare(Payment o1, Payment o2) {
+        if (o1.getShortDescription().compareTo(o2.getShortDescription()) > 0){
+            return 1;
+        } else if(o1.getShortDescription().compareTo(o2.getShortDescription()) < 0) {
+            return -1;
+        } else {
+            return 0;
+        }
+    }
+}

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

@@ -5,7 +5,7 @@ import org.junit.jupiter.api.Test;
 
 public class CheckTest {
 
-    Check check = new Check();
+    Check check = new Check(456L, "no", "123123");
 
 
     @Test
@@ -74,46 +74,42 @@ public class CheckTest {
     @Test
     public void getShortDescriptionTest(){
         //when
-        check.setPayerName("Bob");
+        check.setPayerName("Abed");
         check.setAccountNumber("0001234");
 
         //expected
-        String expected = "Check Bob ***1234";
+        String expected = "Check Abed ***1234\n";
 
         //actual
         String actual = check.getShortDescription();
 
         Assert.assertEquals(expected, actual);
-    //*********************************************************
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
+    }
 
+    //*********************************************************
 
 
+    @Test
+    public void compareTo() {
+        //when
+        check.setPayerName("Abed");
+        check.setAccountNumber("0001234");
+        check.getShortDescription();
 
+        CreditCard cc = new CreditCard();
+        cc.setPayerName("Troy");
+        cc.setNumber("1110000");
+        cc.setExpiredMonth(12);
+        cc.setExpiredYear(2020);
+        cc.getShortDescription();
 
+        //expected
+        int expected = -1;
 
+        //actual
+        int actual = cc.compareTo(check);
 
+        Assert.assertEquals(expected,actual);
+    }
 }

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

@@ -95,13 +95,13 @@ public class CreditCardTest {
     @Test
     public void getShortDescriptionTest(){
         //when
-        cc.setPayerName("Bobby");
+        cc.setPayerName("Troy");
         cc.setNumber("1110000");
         cc.setExpiredMonth(12);
         cc.setExpiredYear(2020);
 
         //expected
-        String expected = "CC Bobby 0000 12/2020";
+        String expected = "CC Troy 0000 12/2020\n";
 
         //actual
         String actual = cc.getShortDescription();
@@ -110,6 +110,22 @@ public class CreditCardTest {
     }
 
 
+    @Test
+    public void compareTo() {
+        //when
+        cc.setPayerName("Troy");
+        cc.setNumber("1110000");
+        cc.setExpiredMonth(12);
+        cc.setExpiredYear(2020);
+        cc.getShortDescription();
 
+        //expected
+        int expected = 0;
 
+        //actual
+        int actual = cc.compareTo(cc);
+
+        Assert.assertEquals(expected,actual);
+
+    }
 }

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

@@ -5,7 +5,7 @@ import org.junit.jupiter.api.Test;
 
 public class PayPalTest {
 
-    PayPal pp = new PayPal();
+    PayPal pp = new PayPal(123L, "yes", "yesyes");
 
     @Test
     public void getIdTest() {
@@ -68,18 +68,24 @@ public class PayPalTest {
     }
 
 
+    @Test
+    public void compareTo() {
+        //when
+        pp.setPayerName("Tia Mowry");
+        pp.setEmail("tia@mowry.com");
+        pp.getShortDescription();
 
+        Check check = new Check(123L, "Tia Mowry", "123123");
+        check.setPayerName("Tia Mowry");
+        check.setAccountNumber("0001234");
+        check.getShortDescription();
 
+        //expected
+        int expected = 1;
 
+        //actual
+        int actual = pp.compareTo(check);
 
-
-
-
-
-
-
-
-
-
-
+        Assert.assertEquals(expected,actual);
+    }
 }

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

@@ -1,4 +1,72 @@
 package com.zipcoder.payment;
 
+import org.junit.Assert;
+import org.junit.jupiter.api.Test;
+
 public class PaymentPresenterTest {
+
+        @Test
+        public void noPaymentTest() {
+        Payment[] payments = new Payment[0];
+
+        PaymentPresenter presenter = new PaymentPresenter();
+        String expected = "";
+
+        String actual = presenter.toString(payments);
+
+        Assert.assertEquals(expected, actual);
+}
+
+    @Test
+    public void multiplePaymentTest(){
+        Payment[] payments = new Payment[2];
+        Payment paypal = new PayPal(4L, "Tia Mowry", "tia@mowry.com");
+        Payment check = new Check(81L, "Tia Mowry", "134344551");
+
+        payments[0] = paypal;
+        payments[1] = check;
+
+        PaymentPresenter presenter = new PaymentPresenter();
+        String expected = "Check Tia Mowry ***4551\nPayPal Tia Mowry tia@mowry.com\n";
+
+        String actual = presenter.toString(payments);
+        Assert.assertEquals(expected, actual);
+    }
+
+
+    @Test
+    public void multiplePaymentTestPayerName(){
+        Payment[] payments = new Payment[2];
+        Payment paypal = new PayPal(4L, "Tia Mowry", "tia@mowry.com");
+        Payment check = new Check(81L, "Alice Wonder", "134344551");
+
+        payments[0] = paypal;
+        payments[1] = check;
+
+        PaymentPresenter presenter = new PaymentPresenter();
+        String expected = "Check Alice Wonder ***4551\nPayPal Tia Mowry tia@mowry.com\n";
+
+        String actual = presenter.toStringPayer(payments);
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void multiplePaymentTestID(){
+        Payment[] payments = new Payment[2];
+        Payment paypal = new PayPal(4L, "Tia Mowry", "tia@mowry.com");
+        Payment check = new Check(81L, "Tia Mowry", "134344551");
+
+        payments[0] = paypal;
+        payments[1] = check;
+
+        PaymentPresenter presenter = new PaymentPresenter();
+        String expected = "PayPal Tia Mowry tia@mowry.com\nCheck Tia Mowry ***4551\n";
+
+        String actual = presenter.toStringID(payments);
+        Assert.assertEquals(expected, actual);
+    }
+
+
+
+
 }

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

@@ -0,0 +1,96 @@
+package com.zipcoder.payment;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.jupiter.api.Test;
+
+import java.util.Arrays;
+
+public class PaymentSortByPayerTest {
+
+    PaymentSortByPayer psbp;
+
+//    Payment payment1;
+//
+//    Payment payment2;
+
+
+//    @Before
+//    public void setup(){
+//        payment1 = new PayPal(123L, "Dexter", "dexter@gmail.com");
+//        payment2 = new Check(456L, "Mandark");
+//
+//    }
+
+//    @Test
+//    public void compareTest(){
+//        System.out.println(payment1.getShortDescription());
+//        System.out.println(payment2.getShortDescription());
+//        //expected
+//        int expected = -1;
+//
+//        //actual
+//        int actual = psbp.compare(payment1, payment2);
+//
+//        Assert.assertEquals(expected, actual);
+//
+//    }
+
+    @Test
+    public void compareTest2(){
+        //when
+        Check check = new Check(123L,"Dexter", "123123");
+        Check check2 = new Check(456L, "Mandark", "456456");
+
+        //expected
+        int expected = -1;
+
+        //actual
+        //int actual = check.getPayerName().compareTo(check2.getPayerName());
+
+        int actual = check.compareTo(check2);
+
+        Assert.assertEquals(expected, actual);
+
+    }
+
+    @Test
+    public void compareTest3(){
+        //when
+        Check check = new Check(123L,"Dexter", "123123");
+        Check check2 = new Check(456L, "Mandark", "456456");
+
+        //expected
+        int expected = 1;
+
+        //actual
+        int actual = check2.compareTo(check);
+
+        Assert.assertEquals(expected, actual);
+
+    }
+
+
+    @Test
+    public void compareTest4(){
+        //when
+        Check check = new Check(123L,"Dexter", "123123");
+        //Check check2 = new Check(456L, "Mandark", "456456");
+
+        //expected
+        int expected = 0;
+
+        //actual
+        int actual = check.compareTo(check);
+
+        Assert.assertEquals(expected, actual);
+
+
+    }
+
+
+
+
+
+
+}