refactored model

rate and table models refactored (extensions)

Author: osik2000

src/main/java/pl/pawelosinski/dynatrace/nbp/task/backend/controller/CurrencyController.java

@@ -7,9 +7,9 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.client.HttpClientErrorException;
-import pl.pawelosinski.dynatrace.nbp.task.backend.model.CurrencyRateTable;
-import pl.pawelosinski.dynatrace.nbp.task.backend.model.MinMaxRate;
-import pl.pawelosinski.dynatrace.nbp.task.backend.model.Rate;
+import pl.pawelosinski.dynatrace.nbp.task.backend.model.*;
+import pl.pawelosinski.dynatrace.nbp.task.backend.model.rate.RateC;
+import pl.pawelosinski.dynatrace.nbp.task.backend.model.table.TableA;
 import pl.pawelosinski.dynatrace.nbp.task.backend.service.CurrencyService;
 
 import java.util.Optional;
@@ -22,8 +22,8 @@ public class CurrencyController {
     @Autowired
     private CurrencyService currencyService;
 
-    @GetMapping("/averagerate/{date}")
-    public ResponseEntity<CurrencyRateTable> averageExchangeRate(@RequestParam(value = "currency") String currency, @PathVariable String date) {
+    @GetMapping(value = "/exchanges/{currency}", produces="application/json")
+    public ResponseEntity<TableA> averageExchangeRate(@PathVariable String currency, @RequestParam(value = "date") String date) {
 
         try {
             return ResponseEntity.status(OK).body(currencyService.getRateFromDay(currency, date));
@@ -40,10 +40,10 @@ public ResponseEntity<CurrencyRateTable> averageExchangeRate(@RequestParam(value
         }
     }
 
-    @GetMapping("/minmaxrate/{n}")
-    public ResponseEntity<Optional<MinMaxRate>> averageExchangeRate(@RequestParam(value = "currency") String currency, @PathVariable int n) {
+    @GetMapping(value = "/minmaxrate/{currency}", produces="application/json")
+    public ResponseEntity<Optional<MinMaxRate>> averageExchangeRate(@PathVariable String currency, @RequestParam(value = "quotations") int quotations) {
         try {
-            return ResponseEntity.status(OK).body(currencyService.getMinMaxFromQuotations(n, currency));
+            return ResponseEntity.status(OK).body(currencyService.getMinMaxFromQuotations(quotations, currency));
         } catch (HttpClientErrorException ex) {
             if (ex.getStatusCode() == NOT_FOUND) {
                 return ResponseEntity.status(NOT_FOUND).build();
@@ -57,10 +57,10 @@ public ResponseEntity<Optional<MinMaxRate>> averageExchangeRate(@RequestParam(va
         }
     }
 
-    @GetMapping("/majordifference/{n}")
-    public ResponseEntity<Optional<Rate>> majorDifference(@RequestParam(value = "currency") String currency, @PathVariable int n) {
+    @GetMapping(value = "/majordifference/{currency}", produces="application/json")
+    public ResponseEntity<Optional<RateC>> majorDifference(@PathVariable String currency, @RequestParam(value = "quotations") int quotations){
         try {
-            return ResponseEntity.status(OK).body(currencyService.getDifferenceFromQuotations(n, currency));
+            return ResponseEntity.status(OK).body(currencyService.getDifferenceFromQuotations(quotations, currency));
         } catch (HttpClientErrorException ex) {
             if (ex.getStatusCode() == NOT_FOUND) {
                 return ResponseEntity.status(NOT_FOUND).build();

src/main/java/pl/pawelosinski/dynatrace/nbp/task/backend/model/MinMaxRate.java

@@ -1,30 +1,32 @@
 package pl.pawelosinski.dynatrace.nbp.task.backend.model;
 
+import pl.pawelosinski.dynatrace.nbp.task.backend.model.rate.RateA;
+
 public class MinMaxRate {
-    private Rate min;
-    private Rate max;
+    private RateA min;
+    private RateA max;
 
     public MinMaxRate() {
     }
 
-    public MinMaxRate(Rate min, Rate max) {
+    public MinMaxRate(RateA min, RateA max) {
         this.min = min;
         this.max = max;
     }
 
-    public Rate getMin() {
+    public RateA getMin() {
         return min;
     }
 
-    public void setMin(Rate min) {
+    public void setMin(RateA min) {
         this.min = min;
     }
 
-    public Rate getMax() {
+    public RateA getMax() {
         return max;
     }
 
-    public void setMax(Rate max) {
+    public void setMax(RateA max) {
         this.max = max;
     }
 }

src/main/java/pl/pawelosinski/dynatrace/nbp/task/backend/model/Rate.java

@@ -0,0 +1,32 @@
+package pl.pawelosinski.dynatrace.nbp.task.backend.model.rate;
+
+public class Rate {
+    private String no;
+    private String effectiveDate;
+
+    public Rate() {
+    }
+
+    public Rate(String no, String effectiveDate, double mid, double bid, double ask) {
+        this.no = no;
+        this.effectiveDate = effectiveDate;
+
+    }
+
+    public String getNo() {
+        return no;
+    }
+
+    public void setNo(String no) {
+        this.no = no;
+    }
+
+    public String getEffectiveDate() {
+        return effectiveDate;
+    }
+
+    public void setEffectiveDate(String effectiveDate) {
+        this.effectiveDate = effectiveDate;
+    }
+
+}

src/main/java/pl/pawelosinski/dynatrace/nbp/task/backend/model/rate/Rate.java

@@ -0,0 +1,13 @@
+package pl.pawelosinski.dynatrace.nbp.task.backend.model.rate;
+
+public class RateA extends Rate{
+    private double mid;
+
+    public double getMid() {
+        return mid;
+    }
+
+    public void setMid(double mid) {
+        this.mid = mid;
+    }
+}

src/main/java/pl/pawelosinski/dynatrace/nbp/task/backend/model/rate/RateA.java

@@ -0,0 +1,22 @@
+package pl.pawelosinski.dynatrace.nbp.task.backend.model.rate;
+
+public class RateC extends Rate{
+    private double ask;
+    private double bid;
+
+    public double getAsk() {
+        return ask;
+    }
+
+    public void setAsk(double ask) {
+        this.ask = ask;
+    }
+
+    public double getBid() {
+        return bid;
+    }
+
+    public void setBid(double bid) {
+        this.bid = bid;
+    }
+}

src/main/java/pl/pawelosinski/dynatrace/nbp/task/backend/model/rate/RateC.java

@@ -1,21 +1,17 @@
-package pl.pawelosinski.dynatrace.nbp.task.backend.model;
+package pl.pawelosinski.dynatrace.nbp.task.backend.model.table;
 
-import java.util.List;
-
-public class CurrencyRateTable {
+public class Table {
     private String table = "";
     private String currency = "";
     private String code = "";
-    private List<Rate> rates = List.of();
 
-    public CurrencyRateTable() {
+    public Table() {
     }
 
-    public CurrencyRateTable(String table, String currency, String code, List<Rate> rates) {
+    public Table(String table, String currency, String code) {
         this.table = table;
         this.currency = currency;
         this.code = code;
-        this.rates = rates;
     }
 
     public String getTable() {
@@ -42,12 +38,5 @@ public void setCode(String code) {
         this.code = code;
     }
 
-    public List<Rate> getRates() {
-        return rates;
-    }
-
-    public void setRates(List<Rate> rates) {
-        this.rates = rates;
-    }
 }
 

src/main/java/pl/pawelosinski/dynatrace/nbp/task/backend/model/CurrencyRateTable.java renamed to src/main/java/pl/pawelosinski/dynatrace/nbp/task/backend/model/table/Table.java

@@ -0,0 +1,27 @@
+package pl.pawelosinski.dynatrace.nbp.task.backend.model.table;
+
+import pl.pawelosinski.dynatrace.nbp.task.backend.model.rate.RateA;
+
+import java.util.List;
+
+public class TableA extends Table {
+
+    private List<RateA> rates;
+
+    public List<RateA> getRates() {
+        return rates;
+    }
+
+    public void setRates(List<RateA> rates) {
+        this.rates = rates;
+    }
+
+    public TableA() {
+        super();
+    }
+
+    public TableA(String table, String currency, String code, List<RateA> rates) {
+        super(table, currency, code);
+        this.rates = rates;
+    }
+}

src/main/java/pl/pawelosinski/dynatrace/nbp/task/backend/model/table/TableA.java

@@ -0,0 +1,27 @@
+package pl.pawelosinski.dynatrace.nbp.task.backend.model.table;
+
+import pl.pawelosinski.dynatrace.nbp.task.backend.model.rate.RateC;
+
+import java.util.List;
+
+public class TableC extends Table {
+
+    private List<RateC> rates;
+
+    public List<RateC> getRates() {
+        return rates;
+    }
+
+    public void setRates(List<RateC> rates) {
+        this.rates = rates;
+    }
+
+    public TableC() {
+        super();
+    }
+
+    public TableC(String table, String currency, String code, List<RateC> rates) {
+        super(table, currency, code);
+        this.rates = rates;
+    }
+}