message

README.MD

@@ -65,10 +65,13 @@ Note: You may use the String/Long compareTo methods in your code
   - This indicate that payment can be comparable, which means it can be sorted
 2. Fix the syntax error in your CreditCard, Check, and Paypal class by adding the compare method
 3. Create a test for the `compareTo` method. Compare using the getShortDescription()
-  - Example: Given Payment of type Paypal with the short description of `Paypal Tia Mowry tia@mowry.com` and a Check with the short description of `Check Tia Mowry ***4551`, then the `compareTo` method should return a number larger than 0
+  - Example: Given Payment of type Paypal with the short description of `Paypal Tia Mowry tia@mowry.com` and a Check 
+with the short description of `Check Tia Mowry ***4551`, then the `compareTo` method should return a number larger than 0
+
   - The `compareTo` method will return number larger than 0 if this payment comes after payment2
   - The `compareTo` method will return number 0 if this payment has the same information
   - The `compareTo` method will return number less than 0 if this payment comes before payment2
+  
 4. Add the code necessary to make the test pass
 5. Create a new `PaymentSortByPayer` class which implements `java.util.Comparator`
   - This class will sort by payer name
@@ -134,7 +137,7 @@ Note: You may use the String/Long compareTo methods in your code
 
     ```
       Payment[] payments = new Payment[2];
-      Payment paypal = new PayPayl(120L, "Tamara Mowry", "tamara@mowry.com");
+      Payment paypal = new PayPal(120L, "Tamara Mowry", "tamara@mowry.com");
       Payment check = new Check(81L, "Tia Mowry", "11432543", "134344551")
 
       payment[0] = paypal;

pom.xml

@@ -7,6 +7,32 @@
     <groupId>com.zipcoder</groupId>
     <artifactId>payment</artifactId>
     <version>1.0-SNAPSHOT</version>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>RELEASE</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>RELEASE</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
 
 
 </project>

src/main/java/Check.java

@@ -0,0 +1,73 @@
+public class Check implements Payment {
+    private String payerName;
+   private String routingNumber;
+  private String accountNumber;
+    private long id;
+
+    public Check(){
+
+    }
+
+    public Check( long id, String payerName, String routingNumber, String accountNumber){
+this.id = id;
+this.payerName = payerName;
+this.accountNumber = getLastFourAccountNumber(accountNumber);
+this.routingNumber = routingNumber;
+
+
+    }
+
+   public void setId(long id){
+
+       this.id = id;
+   }
+    public long getId() {
+        return id;
+    }
+
+    public String getShortDescription() {
+        return "Check " + getPayerName()  + " " + "***" + getAccountNumber();
+    }
+
+
+    public String getLastFourAccountNumber(String accountNumber){
+
+            return accountNumber.replace(accountNumber.substring(0, accountNumber.length()-4), "");
+
+        }
+
+
+    public void setPayerName(String payerName) {
+       this.payerName = payerName;
+    }
+
+    public String getPayerName() {
+        return payerName;
+    }
+
+    public void setRoutingNumber(String routingNumber) {
+        this.routingNumber = routingNumber;
+    }
+
+    public String getRoutingNumber() {
+       return routingNumber;
+    }
+
+    public void setAccountNumber(String accountNumber){
+       this.accountNumber = accountNumber;
+    }
+
+    public String getAccountNumber(){
+       return accountNumber;
+    }
+
+    public int compareTo(Payment o) {
+
+
+     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/CreditCard.java

@@ -0,0 +1,84 @@
+
+public class CreditCard implements Payment {
+
+private long id;
+private String payerName;
+private String number;
+private int expiredMonth;
+private int expiredYear;
+
+public CreditCard(){
+
+
+}
+
+public CreditCard( long id, String payerName, String number,  int expiredMonth,  int expiredYear){
+
+//id = 0;
+//payerName = "";
+//number = "";
+//expiredMonth = 0;
+//expiredYear = 0;
+
+    }
+
+
+
+    public void setId(long id){
+        this.id = id;
+    }
+
+    public void setPayerName(String payerName){
+        this.payerName = payerName;
+    }
+
+    public void setNumber(String number){
+        this.number = number;
+    }
+
+    public void setExpiredMonth(int expiredMonth){
+        this.expiredMonth = expiredMonth;
+    }
+
+    public void setExpiredYear(int expiredYear){
+        this.expiredYear = expiredYear;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public String getPayerName() {
+        return payerName;
+    }
+
+    public String getShortDescription() {
+        return "CC " + payerName + " "+ number+" " + expiredMonth +
+                "/" + expiredYear;
+    }
+
+
+    public int getExpiredMonth() {
+        return expiredMonth;
+    }
+
+    public int getExpiredYear() {
+        return expiredYear;
+    }
+
+    public String getNumber() {
+        return number;
+    }
+
+
+    public int compareTo(Payment o) {
+
+        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/Payment.java

@@ -0,0 +1,9 @@
+public interface Payment extends Comparable<Payment>{
+
+    public long getId();
+
+    public String getPayerName();
+
+    public String getShortDescription();
+
+}

src/main/java/PaymentPresenter.java

@@ -0,0 +1,45 @@
+import java.util.*;
+
+public class PaymentPresenter {
+
+
+    public String toString(Payment[] payments) {
+        Arrays.sort(payments);
+
+        StringBuilder string = new StringBuilder();
+        for (Payment o : payments) {
+
+            string.append(o.getShortDescription() + "\n");
+        }
+
+
+        return string.toString();
+
+
+    }
+
+    public String toStringByPayerName(Payment[] payments) {
+        Arrays.sort(payments, new paymentSortByPayer());
+
+        StringBuilder string = new StringBuilder();
+        for (Payment o : payments) {
+
+            o.getPayerName();
+
+            string.append(o.getShortDescription() + "\n");
+        }
+        return string.toString();
+    }
+
+    public String toStringById(Payment[] payments) {
+        Arrays.sort(payments, (Payment a, Payment b) -> Long.compare(a.getId(), b.getId()));
+
+        StringBuilder string = new StringBuilder();
+        for (Payment o : payments) {
+
+
+            string.append(o.getShortDescription() + "\n");
+        }
+        return string.toString();
+    }
+}

src/main/java/Paypal.java

@@ -0,0 +1,55 @@
+public class Paypal implements Payment {
+    private long id;
+    private String payerName;
+    private String email;
+
+    public Paypal(){
+
+    }
+
+    public Paypal(long id, String payerName,  String email){
+this.id = id;
+this.payerName = payerName;
+this.email= email;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public String getPayerName() {
+        return payerName;
+    }
+
+    public String getShortDescription() {
+        return "Paypal " + getPayerName() + " " + getEmail();
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public void setPayerName(String payerName) {
+        this.payerName = payerName;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+
+    public int compareTo(Payment o) {
+
+        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 +0,0 @@
-package com.zipcoder.payment;
-
-public class PaymentPresenter {
-
-
-}

src/main/java/paymentSortByPayer.java

@@ -0,0 +1,13 @@
+import java.util.Comparator;
+
+public class paymentSortByPayer implements Comparator<Payment> {
+
+    public paymentSortByPayer(){
+
+    }
+
+    @Override
+    public int compare(Payment o1, Payment o2) {
+        return o1.getPayerName().compareTo(o2.getPayerName());
+    }
+}

src/test/java/CheckTest.java

@@ -0,0 +1,107 @@
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class CheckTest {
+    Check check = new Check();
+    Paypal paypal = new Paypal();
+    CreditCard credit = new CreditCard();
+
+    @Test
+    public void getId() {
+
+
+        long expectedId= 35;
+        check.setId(expectedId);
+
+        long actualId = check.getId();
+
+        assertEquals(expectedId, actualId);
+
+    }
+
+    @Test
+    public void getPayerName() {
+
+
+        String expectedPayerName= "Tia Mowry";
+        check.setPayerName(expectedPayerName);
+
+        String actualPayerName = check.getPayerName();
+
+        assertEquals(expectedPayerName, actualPayerName);
+    }
+
+    @Test
+    public void getRoutingNumber() {
+
+
+        String expectedRoutingNumber = "023456890";
+        check.setRoutingNumber(expectedRoutingNumber);
+
+        String actualRoutingNumber = check.getRoutingNumber();
+
+        assertEquals(expectedRoutingNumber, actualRoutingNumber);
+    }
+
+
+
+    @Test
+    public void getShortDescription() {
+
+
+        String name = "Tia Mowry";
+        String number = "4552";
+
+
+        check.setPayerName(name);
+
+        check.setAccountNumber(number);
+        String expected = "Check " + name  + " " + "***" + number;
+
+        System.out.println(check.getShortDescription());
+        String actual = check.getShortDescription();
+
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void lastFour(){
+        String x = "1234567";
+
+        String expected = "4567";
+
+        String actual = check.getLastFourAccountNumber(x);
+
+        assertEquals(expected, actual);
+
+    }
+
+    @Test
+    public void compareTo() {
+        int expected = 0;
+
+        int actual = check.compareTo(check) ;
+
+        assertEquals(expected,actual);
+    }
+
+    @Test
+    public void compareTo1() {
+        int expected = 1;
+
+        int actual = check.compareTo(credit) ;
+
+        assertEquals(expected,actual);
+    }
+
+    @Test
+    public void compareTo2() {
+        int expected = -1;
+
+        int actual = check.compareTo(paypal) ;
+
+        assertEquals(expected,actual);
+    }
+
+}

src/test/java/CreditCardTest.java

@@ -0,0 +1,134 @@
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class CreditCardTest {
+
+    CreditCard credit = new CreditCard();
+    Payment paypal = new Paypal();
+    Check check = new Check();
+
+    @org.junit.Test
+    public void getId() {
+
+        long expectedId = 35;
+        credit.setId(expectedId);
+
+        long actual = credit.getId();
+
+        assertEquals(expectedId, actual);
+    }
+
+    @org.junit.Test
+    public void getPayerName() {
+
+        String expectedPayerName = "Tia Mowry";
+        credit.setPayerName(expectedPayerName);
+
+        String actual = credit.getPayerName();
+
+        assertEquals(expectedPayerName, actual);
+    }
+
+    @org.junit.Test
+    public void getNumber() {
+
+        String expectedNumber = "4551";
+        credit.setNumber(expectedNumber);
+
+        String actual = credit.getNumber();
+
+        assertEquals(expectedNumber, actual);
+    }
+
+
+    @org.junit.Test
+    public void getShortDescription() {
+
+        String name = "Tia Mowry";
+        String email = "tiamowry&yahoo.com";
+        String number = "4552";
+        int expiredMonth = 9;
+        int expiredYear = 2019;
+
+        credit.setPayerName(name);
+    credit.setExpiredYear(expiredYear);
+    credit.setExpiredMonth(expiredMonth);
+    credit.setNumber(number);
+        String expected = "CC " + name + " " + number + " " + expiredMonth +
+                "/" + expiredYear;
+
+        System.out.println(credit.getShortDescription());
+        String actual = credit.getShortDescription();
+
+        assertEquals(expected, actual);
+    }
+
+    @org.junit.Test
+    public void getExpiredMonth(){
+
+        int expectedExpiredMonth = 10;
+        credit.setExpiredMonth(expectedExpiredMonth);
+
+        int actual = credit.getExpiredMonth();
+
+        assertEquals(expectedExpiredMonth, actual);
+
+    }
+
+    @org.junit.Test
+    public void getExpiredYear(){
+
+        int expectedExpiredYear = 2019;
+        credit.setExpiredYear(expectedExpiredYear);
+
+        int actual = credit.getExpiredYear();
+
+        assertEquals(expectedExpiredYear, actual);
+
+    }
+
+    @Test
+    public void compareToItself() {
+        int expected = 0;
+        credit.setPayerName("A");
+
+        int actual = credit.compareTo(credit) ;
+
+        assertEquals(expected,actual);
+    }
+
+    @Test
+    public void compareToAnotherCreditCard() {
+        int expected = 0;
+        credit.setPayerName("A");
+        credit.setNumber("1235454");
+
+        CreditCard bCreditCard = new CreditCard();
+        bCreditCard.setPayerName("A");
+        bCreditCard.setNumber("1235454");
+
+        int actual =  bCreditCard.compareTo(credit) ;
+
+        assertEquals(expected,actual);
+    }
+
+    @Test
+    public void compareTo1() {
+        int expected = -1;
+
+        int actual = credit.compareTo(check) ;
+
+        assertEquals(expected,actual);
+    }
+
+    @Test
+    public void compareTo2() {
+
+        int expected = -1;
+
+        int actual = credit.compareTo(paypal) ;
+
+        assertEquals(expected,actual);
+    }
+}

src/test/java/PaymentPresenterTest.java

@@ -0,0 +1,72 @@
+import org.junit.Test;
+
+import static junit.framework.TestCase.assertEquals;
+
+public class PaymentPresenterTest {
+    PaymentPresenter payment = new PaymentPresenter();
+
+    @Test
+    public void nothingString() {
+        Payment[] payments = new Payment[0];
+        PaymentPresenter presenter = new PaymentPresenter();
+        String expected = "";
+
+        String actual = presenter.toString(payments);
+
+        assertEquals(expected, actual);
+
+    }
+
+
+    @Test
+    public void toStringMultiple() {
+
+        Paypal paypal = new Paypal(4L, "Tia Mowry", "tia@mowry.com");
+        Check check = new Check(81L, "Tia Mowry", "11432543", "134344551");
+         Payment[] payments = new Payment[]{paypal, check};
+        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);
+        assertEquals(expected, actual);
+    }
+
+
+    @Test
+    public void toStringByPayerName() {
+
+
+        Payment[] payments = new Payment[2];
+        Payment paypal = new Paypal(4L, "Tamara Mowry", "tamara@mowry.com");
+        Payment check = new Check(81L, "Tia Mowry", "11432543", "134344551");
+
+        payments[0] = paypal;
+        payments[1] = check;
+
+        PaymentPresenter presenter = new PaymentPresenter();
+        String expected = "Paypal Tamara Mowry tamara@mowry.com\nCheck Tia Mowry ***4551\n";
+
+        String actual = presenter.toStringByPayerName(payments);
+        assertEquals(expected, actual);
+
+    }
+
+    @Test
+    public void toStringById() {
+        Payment[] payments = new Payment[2];
+        Payment paypal = new Paypal(120L, "Tamara Mowry", "tamara@mowry.com");
+        Payment check = new Check(81L, "Tia Mowry", "11432543", "134344551");
+
+        payments[0] = paypal;
+        payments[1] = check;
+
+        PaymentPresenter presenter = new PaymentPresenter();
+        String expected = "Check Tia Mowry ***4551\nPaypal Tamara Mowry tamara@mowry.com\n";
+
+        String actual = presenter.toStringById(payments);
+        assertEquals(expected, actual);
+    }
+}

src/test/java/PaypalTest.java

@@ -0,0 +1,90 @@
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class PaypalTest {
+    Paypal paypal = new Paypal();
+    Check check = new Check();
+    CreditCard credit = new CreditCard();
+
+    @Test
+    public void getId() {
+
+        long expectedId = 2;
+        paypal.setId(expectedId);
+
+        long actualId = paypal.getId();
+        assertEquals(expectedId,actualId);
+    }
+
+    @Test
+    public void getPayerName() {
+
+        String expectedPayerName = "Tia Mowry";
+        paypal.setPayerName(expectedPayerName);
+
+        String actualPayerName = paypal.getPayerName();
+    assertEquals(expectedPayerName,actualPayerName);
+
+    }
+
+    @Test
+    public void getEmail() {
+
+        String expectedEmail = "tiaM@yahoo.com";
+        paypal.setEmail(expectedEmail);
+
+        String actualEmail = paypal.getEmail();
+        assertEquals(expectedEmail,actualEmail);
+    }
+
+    @Test
+    public void getShortDescription() {
+
+        String name = "Tia Mowry";
+        String email = "tiamowry@yahoo.com";
+
+        paypal.setEmail(email);
+        paypal.setPayerName(name);
+
+        String expected = "Paypal " + name + " " + email;
+
+        System.out.println(paypal.getShortDescription());
+        String actual = paypal.getShortDescription();
+
+        assertEquals(expected, actual);
+
+
+    }
+
+    @Test
+    public void compareTo() {
+
+       int expected = 1;
+
+       int actual = paypal.compareTo(check) ;
+
+        assertEquals(expected,actual);
+    }
+
+    @Test
+    public void compareTo1() {
+
+        int expected = 1;
+
+        int actual = paypal.compareTo(credit) ;
+
+
+        assertEquals(expected,actual);
+    }
+
+    @Test
+    public void compareTo2() {
+
+        int expected = 0;
+
+        int actual = paypal.compareTo(paypal) ;
+
+        assertEquals(expected,actual);
+    }
+}

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

@@ -1,4 +0,0 @@
-package com.zipcoder.payment;
-
-public class PaymentPresenterTest {
-}