From ac507b63d8795d878373f1722fba391c0d91ae36 Mon Sep 17 00:00:00 2001 From: Nikollai Date: Fri, 27 Feb 2026 12:07:22 +0100 Subject: [PATCH] Removed duplicate files: - TransactionCalculator.java - SaleCalculator.java - PurchaseCalculator.java --- .../java/temppackage/PurchaseCalculator.java | 36 ---------------- src/main/java/temppackage/SaleCalculator.java | 43 ------------------- .../temppackage/TransactionCalculator.java | 10 ----- 3 files changed, 89 deletions(-) delete mode 100644 src/main/java/temppackage/PurchaseCalculator.java delete mode 100644 src/main/java/temppackage/SaleCalculator.java delete mode 100644 src/main/java/temppackage/TransactionCalculator.java diff --git a/src/main/java/temppackage/PurchaseCalculator.java b/src/main/java/temppackage/PurchaseCalculator.java deleted file mode 100644 index 23df7c5..0000000 --- a/src/main/java/temppackage/PurchaseCalculator.java +++ /dev/null @@ -1,36 +0,0 @@ -package temppackage; - -import java.math.BigDecimal; - -public class PurchaseCalculator implements TransactionCalculator { - private BigDecimal purchasePrice; - private BigDecimal quantity; - - public PurchaseCalculator(Share share) { - this.purchasePrice = share.getPurchasePrice(); - this.quantity = share.getQuantity(); - } - - - - @Override - public BigDecimal calculateGross() { - return this.purchasePrice.multiply(this.quantity); - } - - @Override - public BigDecimal calculateComission() { - BigDecimal gross = this.calculateGross(); - return gross.multiply(BigDecimal.valueOf(0.05)); - } - - @Override - public BigDecimal calculateTax() { - return new BigDecimal("0"); - } - - @Override - public BigDecimal calculateTotal() { - return this.calculateGross().add(this.calculateTax().add(this.calculateComission())); - } -} diff --git a/src/main/java/temppackage/SaleCalculator.java b/src/main/java/temppackage/SaleCalculator.java deleted file mode 100644 index 1860ced..0000000 --- a/src/main/java/temppackage/SaleCalculator.java +++ /dev/null @@ -1,43 +0,0 @@ -package temppackage; - -import java.math.BigDecimal; - -public class SaleCalculator implements TransactionCalculator { - private BigDecimal purchasePrice; - private BigDecimal salesPrice; - private BigDecimal quantity; - - public SaleCalculator(Share share) { - this.purchasePrice = share.getPurchasePrice(); - this.salesPrice = share.getStock().getPrice(); - this.quantity = share.getQuantity(); - } - - @Override - public BigDecimal calculateGross() { - return this.salesPrice.multiply(this.quantity); - } - - @Override - public BigDecimal calculateComission() { - BigDecimal gross = this.calculateGross(); - return gross.multiply(BigDecimal.valueOf(0.05)); - } - - @Override - public BigDecimal calculateTax() { - BigDecimal gross = this.calculateGross(); - BigDecimal comission = this.calculateComission(); - BigDecimal buyPrice = this.purchasePrice.multiply(this.quantity); - BigDecimal earnings = gross.subtract(comission).subtract(comission).subtract(buyPrice); - return earnings.multiply(BigDecimal.valueOf(0.3)); - } - - @Override - public BigDecimal calculateTotal() { - BigDecimal gross = this.calculateGross(); - BigDecimal comission = this.calculateComission(); - BigDecimal tax = this.calculateTax(); - return gross.subtract(comission).subtract(tax); - } -} diff --git a/src/main/java/temppackage/TransactionCalculator.java b/src/main/java/temppackage/TransactionCalculator.java deleted file mode 100644 index 2158e5a..0000000 --- a/src/main/java/temppackage/TransactionCalculator.java +++ /dev/null @@ -1,10 +0,0 @@ -package temppackage; - -import java.math.BigDecimal; - -public interface TransactionCalculator { - public BigDecimal calculateGross(); - public BigDecimal calculateComission(); - public BigDecimal calculateTax(); - public BigDecimal calculateTotal(); -}