Converting Currency is fun, and I am glad that I converted currency (…

src/main/java/io/zipcoder/currencyconverterapplication/ConvertableCurrency.java

@@ -4,4 +4,6 @@ public interface ConvertableCurrency {
     default Double convert(CurrencyType currencyType) {
         return Double.MAX_VALUE;
     }
+
+    CurrencyType getType();
 }

src/main/java/io/zipcoder/currencyconverterapplication/CurrencyConverter.java

@@ -1,7 +1,16 @@
 package io.zipcoder.currencyconverterapplication;
 
-public class CurrencyConverter {
-    public static Double convert(Double amountOfBaseCurrency, ConvertableCurrency sourceCurrencyType, CurrencyType targetCurrencyType) {
-        return sourceCurrencyType.convert(targetCurrencyType) * amountOfBaseCurrency;
+public class CurrencyConverter implements ConvertableCurrency{
+    public static Double convert(Double amountOfBaseCurrency,
+                                 ConvertableCurrency sourceCurrencyType,
+                                 CurrencyType targetCurrencyType) {
+        return sourceCurrencyType.convert(targetCurrencyType) *
+                amountOfBaseCurrency;
+    }
+
+
+    @Override
+    public CurrencyType getType() {
+        return null;
     }
 }

src/main/java/io/zipcoder/currencyconverterapplication/CurrencyType.java

@@ -15,16 +15,18 @@ public enum CurrencyType {
     YEN(231.68);
 
     private final double rate;
+    private final CurrencyType type;
 
     CurrencyType(double rate) {
         this.rate = rate;
+        this.type = this;
     }
 
     public Double getRate() {
         return rate;
     }
 
     public static CurrencyType getTypeOfCurrency(ConvertableCurrency currency) {
-        return null;
+        return currency.getType();
     }
 }

src/main/java/io/zipcoder/currencyconverterapplication/currencies/AustralianDollar.java

@@ -1,6 +1,20 @@
 package io.zipcoder.currencyconverterapplication.currencies;
 
 import io.zipcoder.currencyconverterapplication.ConvertableCurrency;
+import io.zipcoder.currencyconverterapplication.CurrencyType;
 
 public class AustralianDollar implements ConvertableCurrency {
+    private CurrencyType type = CurrencyType.AUSTRALIAN_DOLLAR;
+
+    @Override
+    public Double convert(CurrencyType currency){
+        Double universalAmount = currency.getRate() / CurrencyType.AUSTRALIAN_DOLLAR.getRate();
+        return universalAmount;
+    }
+
+    @Override
+    public CurrencyType getType() {
+        return this.type;
+    }
+
 }

src/main/java/io/zipcoder/currencyconverterapplication/currencies/CanadianDollar.java

@@ -1,6 +1,19 @@
 package io.zipcoder.currencyconverterapplication.currencies;
 
 import io.zipcoder.currencyconverterapplication.ConvertableCurrency;
+import io.zipcoder.currencyconverterapplication.CurrencyType;
 
 public class CanadianDollar implements ConvertableCurrency {
+    private CurrencyType type = CurrencyType.CANADIAN_DOLLAR;
+
+    @Override
+    public Double convert(CurrencyType currency){
+        Double universalAmount = currency.getRate() / CurrencyType.CANADIAN_DOLLAR.getRate();
+        return universalAmount;
+    }
+
+    @Override
+    public CurrencyType getType() {
+        return this.type;
+    }
 }

src/main/java/io/zipcoder/currencyconverterapplication/currencies/ChineseYR.java

@@ -1,6 +1,19 @@
 package io.zipcoder.currencyconverterapplication.currencies;
 
 import io.zipcoder.currencyconverterapplication.ConvertableCurrency;
+import io.zipcoder.currencyconverterapplication.CurrencyType;
 
 public class ChineseYR implements ConvertableCurrency {
+    private CurrencyType type = CurrencyType.CHINESE_YR;
+
+    @Override
+    public Double convert(CurrencyType currency){
+        Double universalAmount = currency.getRate() / CurrencyType.CHINESE_YR.getRate();
+        return universalAmount;
+    }
+
+    @Override
+    public CurrencyType getType() {
+        return this.type;
+    }
 }

src/main/java/io/zipcoder/currencyconverterapplication/currencies/Euro.java

@@ -1,6 +1,19 @@
 package io.zipcoder.currencyconverterapplication.currencies;
 
 import io.zipcoder.currencyconverterapplication.ConvertableCurrency;
+import io.zipcoder.currencyconverterapplication.CurrencyType;
 
 public class Euro implements ConvertableCurrency {
+    private CurrencyType type = CurrencyType.EURO;
+
+    @Override
+    public Double convert(CurrencyType currency){
+        Double universalAmount = currency.getRate() / CurrencyType.EURO.getRate();
+        return universalAmount;
+    }
+
+    @Override
+    public CurrencyType getType() {
+        return type;
+    }
 }

src/main/java/io/zipcoder/currencyconverterapplication/currencies/Franc.java

@@ -1,6 +1,19 @@
 package io.zipcoder.currencyconverterapplication.currencies;
 
 import io.zipcoder.currencyconverterapplication.ConvertableCurrency;
+import io.zipcoder.currencyconverterapplication.CurrencyType;
 
 public class Franc implements ConvertableCurrency {
+    private CurrencyType type = CurrencyType.FRANC;
+
+    @Override
+    public Double convert(CurrencyType currency){
+        Double universalAmount = currency.getRate() / CurrencyType.FRANC.getRate();
+        return universalAmount;
+    }
+
+    @Override
+    public CurrencyType getType() {
+        return this.type;
+    }
 }

src/main/java/io/zipcoder/currencyconverterapplication/currencies/Pound.java

@@ -1,6 +1,19 @@
 package io.zipcoder.currencyconverterapplication.currencies;
 
 import io.zipcoder.currencyconverterapplication.ConvertableCurrency;
+import io.zipcoder.currencyconverterapplication.CurrencyType;
 
 public class Pound implements ConvertableCurrency {
+    private CurrencyType type = CurrencyType.POUND;
+
+    @Override
+    public Double convert(CurrencyType currency){
+        Double universalAmount = currency.getRate() / CurrencyType.POUND.getRate();
+        return universalAmount;
+    }
+
+    @Override
+    public CurrencyType getType() {
+        return this.type;
+    }
 }

src/main/java/io/zipcoder/currencyconverterapplication/currencies/Ringgit.java

@@ -1,6 +1,19 @@
 package io.zipcoder.currencyconverterapplication.currencies;
 
 import io.zipcoder.currencyconverterapplication.ConvertableCurrency;
+import io.zipcoder.currencyconverterapplication.CurrencyType;
 
 public class Ringgit implements ConvertableCurrency {
+    private CurrencyType type = CurrencyType.RINGGIT;
+
+    @Override
+    public Double convert(CurrencyType currency){
+        Double universalAmount = currency.getRate() / CurrencyType.RINGGIT.getRate();
+        return universalAmount;
+    }
+
+    @Override
+    public CurrencyType getType() {
+        return this.type;
+    }
 }

src/main/java/io/zipcoder/currencyconverterapplication/currencies/Rupee.java

@@ -1,6 +1,19 @@
 package io.zipcoder.currencyconverterapplication.currencies;
 
 import io.zipcoder.currencyconverterapplication.ConvertableCurrency;
+import io.zipcoder.currencyconverterapplication.CurrencyType;
 
 public class Rupee implements ConvertableCurrency {
+    private CurrencyType type = CurrencyType.RUPEE;
+
+    @Override
+    public Double convert(CurrencyType currency){
+        Double universalAmount = currency.getRate() / CurrencyType.RUPEE.getRate();
+        return universalAmount;
+    }
+
+    @Override
+    public CurrencyType getType() {
+        return type;
+    }
 }

src/main/java/io/zipcoder/currencyconverterapplication/currencies/SingaporeDollar.java

@@ -1,6 +1,19 @@
 package io.zipcoder.currencyconverterapplication.currencies;
 
 import io.zipcoder.currencyconverterapplication.ConvertableCurrency;
+import io.zipcoder.currencyconverterapplication.CurrencyType;
 
 public class SingaporeDollar implements ConvertableCurrency {
+    private CurrencyType type = CurrencyType.SINGAPORE_DOLLAR;
+
+    @Override
+    public Double convert(CurrencyType currency){
+        Double universalAmount = currency.getRate() / CurrencyType.SINGAPORE_DOLLAR.getRate();
+        return universalAmount;
+    }
+
+    @Override
+    public CurrencyType getType() {
+        return this.type;
+    }
 }

src/main/java/io/zipcoder/currencyconverterapplication/currencies/USDollar.java

@@ -1,6 +1,18 @@
 package io.zipcoder.currencyconverterapplication.currencies;
 
 import io.zipcoder.currencyconverterapplication.ConvertableCurrency;
+import io.zipcoder.currencyconverterapplication.CurrencyType;
 
 public class USDollar implements ConvertableCurrency {
+    private CurrencyType type = CurrencyType.US_DOLLAR;
+
+    @Override
+    public Double convert(CurrencyType currency){
+        Double universalAmount = currency.getRate() / CurrencyType.US_DOLLAR.getRate();
+        return universalAmount;
+    }
+
+    public CurrencyType getType(){
+        return type;
+    }
 }

src/main/java/io/zipcoder/currencyconverterapplication/currencies/UniversalCurrency.java

@@ -1,6 +1,19 @@
 package io.zipcoder.currencyconverterapplication.currencies;
 
 import io.zipcoder.currencyconverterapplication.ConvertableCurrency;
+import io.zipcoder.currencyconverterapplication.CurrencyType;
 
 public class UniversalCurrency implements ConvertableCurrency {
+    private CurrencyType type = CurrencyType.UNIVERSAL_CURRENCY;
+
+    @Override
+    public Double convert(CurrencyType currency){
+        Double universalAmount = currency.getRate() / CurrencyType.UNIVERSAL_CURRENCY.getRate();
+        return universalAmount;
+    }
+
+    @Override
+    public CurrencyType getType() {
+        return this.type;
+    }
 }

src/main/java/io/zipcoder/currencyconverterapplication/currencies/Yen.java

@@ -1,6 +1,19 @@
 package io.zipcoder.currencyconverterapplication.currencies;
 
 import io.zipcoder.currencyconverterapplication.ConvertableCurrency;
+import io.zipcoder.currencyconverterapplication.CurrencyType;
 
 public class Yen implements ConvertableCurrency {
+    private CurrencyType type = CurrencyType.YEN;
+
+    @Override
+    public Double convert(CurrencyType currency){
+        Double universalAmount = currency.getRate() / CurrencyType.YEN.getRate();
+        return universalAmount;
+    }
+
+    @Override
+    public CurrencyType getType() {
+        return type;
+    }
 }