refactor: rename, extract, move some classes

1. rename `classification` -> `summary`
2. extract `Summary`
3. move `Order` and the static constant Comparators of `Customer`
4. `CustomerRepository` extends `List<Customer>`
5. fix some typos

Author: JoonheeJeong

src/me/smartstore/SmartStoreApp.java

@@ -31,7 +31,7 @@ public SmartStoreApp test() {
                 String id = String.format("%s_%02d", group.name(), j);
                 repository.setTempId(id);
 
-                String name = String.format(Character.toString('a'+j).repeat(4));
+                String name = (char) ('a'+j) + "zzz";
                 repository.setTempName(name);
 
                 Integer spentHours = (int) (Math.random() * 10) + param[0];

src/me/smartstore/customer/Customer.java

@@ -1,16 +1,11 @@
 package me.smartstore.customer;
 
+import me.smartstore.customer.exception.InvalidCustomerIdException;
+import me.smartstore.customer.exception.InvalidCustomerNameException;
 import me.smartstore.group.Group;
-import java.util.Comparator;
 
 public class Customer {
 
-    public static final Comparator<Customer> ORDER_NAME_ASC = Comparator.comparing(e -> e.name);
-    public static final Comparator<Customer> ORDER_NAME_DEC = (e1, e2) -> e2.name.compareTo(e1.name);
-    public static final Comparator<Customer> ORDER_SPENT_HOURS_ASC = Comparator.comparing(e -> e.spentHours);
-    public static final Comparator<Customer> ORDER_SPENT_HOURS_DEC = (e1, e2) -> e2.spentHours.compareTo(e1.spentHours);
-    public static final Comparator<Customer> ORDER_TOTAL_PAID_AMOUNT_ASC = Comparator.comparing(e -> e.totalPaidAmount);
-    public static final Comparator<Customer> ORDER_TOTAL_PAID_AMOUNT_DEC = (e1, e2) -> e2.totalPaidAmount.compareTo(e1.totalPaidAmount);
     public static final String ID_FORMAT =
             "ID Format: 4~16 letters consisting of alphabets, digits, underscore(_)";
     public static final String NAME_FORMAT =
@@ -22,7 +17,6 @@ public class Customer {
     private static final int DEFAULT_TOTAL_PAID_AMOUNT = 0;
     private static final Group DEFAULT_GROUP = Group.NONE;
 
-
     private String id;
     private String name;
     private Integer spentHours;
@@ -41,28 +35,24 @@ public Customer(String id, String name, Integer spentHours, Integer totalPaidAmo
         this.group = group;
     }
 
-    public Customer(Customer e) {
-        copy(e);
+    public Customer(Customer e) { copy(e); }
+
+    public void copy(Customer e) {
+        id = e.id;
+        name = e.name;
+        spentHours = e.spentHours;
+        totalPaidAmount = e.totalPaidAmount;
+        group = e.group;
     }
 
     public String getId() { return id; }
 
-    public void setId(String id) throws InvalidCustomerIdException {
+    public void setId(String id, boolean checked) throws InvalidCustomerIdException {
+        if (!checked)
+            checkIfIdIsValid(id);
         this.id = id;
     }
 
-    public void setName(String name) throws InvalidCustomerNameException {
-        this.name = name;
-    }
-
-    public void setSpentHours(Integer spentHours) {
-        this.spentHours = spentHours;
-    }
-
-    public void setTotalPaidAmount(Integer totalPaidAmount) {
-        this.totalPaidAmount = totalPaidAmount;
-    }
-
     public static void checkIfIdIsValid(String id) throws InvalidCustomerIdException {
         if (!isValidId(id))
             throw new InvalidCustomerIdException("Invalid ID input.\n");
@@ -73,6 +63,13 @@ private static boolean isValidId(String id) {
         return id.matches(ID_PATTERN);
     }
 
+    public String getName() { return name; }
+
+    public void setName(String name) throws InvalidCustomerNameException {
+        checkIfNameIsValid(name);
+        this.name = name;
+    }
+
     public static void checkIfNameIsValid(String name) throws InvalidCustomerNameException {
         if (!isValidName(name))
             throw new InvalidCustomerNameException("Invalid Name input.\n");
@@ -88,18 +85,18 @@ private static void throwIfNull(Object o, String title) {
             throw new IllegalArgumentException(title + " cannot be null.\n");
     }
 
-    public void copy(Customer e) {
-        id = e.id;
-        name = e.name;
-        spentHours = e.spentHours;
-        totalPaidAmount = e.totalPaidAmount;
-        group = e.group;
-    }
+    public Integer getSpentHours() { return spentHours; }
+
+    public void setSpentHours(Integer spentHours) { this.spentHours = spentHours; }
+
+    public Integer getTotalPaidAmount() { return totalPaidAmount; }
+
+    public void setTotalPaidAmount(Integer totalPaidAmount) { this.totalPaidAmount = totalPaidAmount; }
 
     public Group getGroup() { return group; }
 
     public void updateGroup() {
-        group = Group.calculate(spentHours, totalPaidAmount);
+        group = Group.getGroupByParameter(spentHours, totalPaidAmount);
     }
 
     @Override

src/me/smartstore/customer/CustomerRepository.java

@@ -1,66 +1,49 @@
 package me.smartstore.customer;
 
+import me.smartstore.customer.exception.DuplicateCustomerIdException;
+import me.smartstore.customer.exception.InvalidCustomerIdException;
+import me.smartstore.customer.exception.InvalidCustomerNameException;
 import me.smartstore.group.Group;
 
-import java.util.Comparator;
-
-public class CustomerRepository {
+public class CustomerRepository extends List<Customer> {
 
     private static class InstanceHolder {
         private static final CustomerRepository INSTANCE = new CustomerRepository();
     }
     public static CustomerRepository getInstance() { return InstanceHolder.INSTANCE; }
     private CustomerRepository() {}
 
-    private final List<Customer> customerList = new List<>();
-    private static Customer tempCustomer;
-    private static int tempIdx;
-
-    public void checkIfCanAddMore() throws MaxCapacityReachedException {
-        customerList.checkIfReachedMaxCapacity();
-    }
+    private Customer tempCustomer;
+    private int tempIdx;
 
-    public void resetTempCustomer() {
-        tempCustomer = new Customer(null, null);
-    }
+    public void resetTempCustomer() { tempCustomer = new Customer(null, null); }
 
     public void checkIfHasNoDuplicate(String id) throws DuplicateCustomerIdException {
         if (hasCustomerWithId(id))
             throw new DuplicateCustomerIdException("The customer already exists which has same id.");
     }
 
     private boolean hasCustomerWithId(String id) {
-        return findIdxById(id) >= 0;
-    }
-
-    private int findIdxById(String id) {
         assert id != null;
-
-        int size = customerList.size();
-        for (int i = 0; i < size; ++i)
-            if (id.equals(customerList.get(i).getId()))
-                return i;
-        return -1;
+        for (Customer customer : this)
+            if (id.equals(customer.getId()))
+                return true;
+        return false;
     }
 
     public void setTempId(String id) throws InvalidCustomerIdException, DuplicateCustomerIdException {
         Customer.checkIfIdIsValid(id);
         checkIfHasNoDuplicate(id);
-        tempCustomer.setId(id);
+        tempCustomer.setId(id, true);
     }
 
     public void setTempName(String name) throws InvalidCustomerNameException {
-        Customer.checkIfNameIsValid(name);
         tempCustomer.setName(name);
     }
 
-    public void setTempSpentHours(Integer spentHours) {
-        tempCustomer.setSpentHours(spentHours);
-    }
+    public void setTempSpentHours(Integer spentHours) { tempCustomer.setSpentHours(spentHours); }
 
-    public void setTempTotalPaidAmount(Integer totalPaidAmount) {
-        tempCustomer.setTotalPaidAmount(totalPaidAmount);
-    }
+    public void setTempTotalPaidAmount(Integer totalPaidAmount) { tempCustomer.setTotalPaidAmount(totalPaidAmount); }
 
     public String getTempInfo() {
         updateGroupOfTempCustomer();
@@ -70,115 +53,48 @@ public String getTempInfo() {
     public void addTempIntoRepository() {
         // app logic에 따라 다음 두 구문이 true 임을 보장합니다.
         assert tempCustomer != null;
-        assert !customerList.isReachedMaxCapacity();
+        assert !isReachedMaxCapacity();
 
-        customerList.add(tempCustomer);
+        add(tempCustomer);
         tempCustomer = null;
     }
 
-    public boolean isTempIdNull() {
-        return tempCustomer.getId() == null;
-    }
-
-    public int size() {
-        return customerList.size();
-    }
+    public boolean isTempIdNull() {return tempCustomer.getId() == null; }
 
     public String deleteAndGetInfoOf(int num) {
         int idx = num - 1;
-        return customerList.remove(idx).toString();
+        return remove(idx).toString();
     }
 
     public String setTempAndGetInfoOf(int num) {
         int idx = num - 1;
-        Customer updatingCustomer = customerList.get(idx);
+        Customer updatingCustomer = get(idx);
         tempCustomer = new Customer(updatingCustomer);
         tempIdx = idx;
         return updatingCustomer.toString();
     }
 
-    public void updateTempInRepository() {
-        customerList.get(tempIdx).copy(tempCustomer);
-    }
+    public void updateTempInRepository() { get(tempIdx).copy(tempCustomer); }
 
     public String getUpdateBeforeAndAfterInfo() {
-        Customer before = customerList.get(tempIdx);
+        Customer before = get(tempIdx);
         Customer after = tempCustomer;
         updateGroupOfTempCustomer();
         return String.format("\nNo. %2d\n", tempIdx) +
                 "Before: " + before + '\n'+
                 "After : " + after;
     }
 
-    public void updateGroupOfTempCustomer() {
-        tempCustomer.updateGroup();
-    }
-
-    public String getSummary() {
-        Group[] groups = Group.values();
-        int len = groups.length;
-        StringBuilder[] stringBuilders = new StringBuilder[len];
-        int[] cnt = new int[len];
-        for (int i = 0; i < len; ++i) {
-            StringBuilder sb = new StringBuilder();
-            sb.append('\n').append("==============================")
-                    .append(groups[i])
-                    .append("==============================").append('\n');
-            stringBuilders[i] = sb;
-        }
-
-        int size = customerList.size();
-        for (int i = 0; i < size; ++i) {
-            Customer customer = customerList.get(i);
-            Group group = customer.getGroup();
-            for (int j = 0; j < len; ++j) {
-                if (group == groups[j]) {
-                    stringBuilders[j].append(customer).append('\n');
-                    cnt[j]++;
-                    break;
-                }
-            }
-        }
-
-        StringBuilder sb = new StringBuilder();
-        for (int i = 0; i < len; ++i) {
-            sb.append(stringBuilders[i]);
-            if (cnt[i] == 0)
-                sb.append("No Customers.").append('\n');
-        }
-        return sb.append('\n').toString();
-    }
-
-    public String getSummaryByName(Order order) {
-        Comparator<Customer> cmp = order == Order.ASCENDING ? Customer.ORDER_NAME_ASC
-                                                            : Customer.ORDER_NAME_DEC;
-        customerList.sort(cmp);
-        return getSummary();
-    }
-
-    public String getSummaryBySpentHours(Order order) {
-        Comparator<Customer> cmp = order == Order.ASCENDING ? Customer.ORDER_SPENT_HOURS_ASC
-                                                            : Customer.ORDER_SPENT_HOURS_DEC;
-        customerList.sort(cmp);
-        return getSummary();
-    }
-
-    public String getSummaryByTotalPaidAmount(Order order) {
-        Comparator<Customer> cmp = order == Order.ASCENDING ? Customer.ORDER_TOTAL_PAID_AMOUNT_ASC
-                                                            : Customer.ORDER_TOTAL_PAID_AMOUNT_DEC;
-        customerList.sort(cmp);
-        return getSummary();
-    }
+    public void updateGroupOfTempCustomer() { tempCustomer.updateGroup(); }
 
     public void updateGroupIn(Group group) {
         Group[] groups = Group.values();
         int idx = 0;
         while (groups[idx] != group)
             idx++;
+        assert idx > 0;
         Group rightLowGroup = groups[idx - 1];
-        int size = customerList.size();
-        for (int i = 0; i < size; ++i) {
-            Customer customer = customerList.get(i);
+        for (Customer customer : this) {
             Group g = customer.getGroup();
             if (g == group || g == rightLowGroup)
                 customer.updateGroup();
@@ -187,7 +103,7 @@ public void updateGroupIn(Group group) {
 
     @Override
     public String toString() {
-        if (customerList.isEmpty()) return "No Customers." + " Please input one first.\n";
-        return customerList.toString();
+        if (isEmpty()) return "No Customers." + " Please input one first.\n";
+        return super.toString();
     }
 }