From 25242ae5d1bf11103c4f4fbe9152a217bc1f0966 Mon Sep 17 00:00:00 2001 From: mark79-github <52877024+mark79-github@users.noreply.github.com> Date: Tue, 16 Sep 2025 05:58:16 +0300 Subject: [PATCH 1/3] Add SaleBaseModel abstract class --- .../invoice/model/base/SaleBaseModel.java | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 src/main/java/bg/softuni/invoice/model/base/SaleBaseModel.java diff --git a/src/main/java/bg/softuni/invoice/model/base/SaleBaseModel.java b/src/main/java/bg/softuni/invoice/model/base/SaleBaseModel.java new file mode 100644 index 0000000..62cf38c --- /dev/null +++ b/src/main/java/bg/softuni/invoice/model/base/SaleBaseModel.java @@ -0,0 +1,34 @@ +package bg.softuni.invoice.model.base; + +import java.math.BigDecimal; + +public abstract class SaleBaseModel { + + private String name; + private int quantity; + private BigDecimal price; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getQuantity() { + return quantity; + } + + public void setQuantity(int quantity) { + this.quantity = quantity; + } + + public BigDecimal getPrice() { + return price; + } + + public void setPrice(BigDecimal price) { + this.price = price; + } +} From 0118d01900d4af37eb5afef516a4768dede745f1 Mon Sep 17 00:00:00 2001 From: mark79-github <52877024+mark79-github@users.noreply.github.com> Date: Tue, 16 Sep 2025 05:58:42 +0300 Subject: [PATCH 2/3] Refactor SaleServiceModel to extend SaleBaseModel --- .../model/service/SaleServiceModel.java | 32 ++----------------- 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/src/main/java/bg/softuni/invoice/model/service/SaleServiceModel.java b/src/main/java/bg/softuni/invoice/model/service/SaleServiceModel.java index e414fe7..9080bb7 100644 --- a/src/main/java/bg/softuni/invoice/model/service/SaleServiceModel.java +++ b/src/main/java/bg/softuni/invoice/model/service/SaleServiceModel.java @@ -1,40 +1,12 @@ package bg.softuni.invoice.model.service; +import bg.softuni.invoice.model.base.SaleBaseModel; import bg.softuni.invoice.model.enumerated.VatValue; -import java.math.BigDecimal; +public class SaleServiceModel extends SaleBaseModel { -public class SaleServiceModel { - - private String name; - private int quantity; - private BigDecimal price; private VatValue vatValue; - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public int getQuantity() { - return quantity; - } - - public void setQuantity(int quantity) { - this.quantity = quantity; - } - - public BigDecimal getPrice() { - return price; - } - - public void setPrice(BigDecimal price) { - this.price = price; - } - public VatValue getVatValue() { return vatValue; } From 07d55ae38e170c48bab1e94a32e85090bcb6c460 Mon Sep 17 00:00:00 2001 From: mark79-github <52877024+mark79-github@users.noreply.github.com> Date: Tue, 16 Sep 2025 05:58:59 +0300 Subject: [PATCH 3/3] Refactor SaleViewModel to extend SaleBaseModel --- .../invoice/model/view/SaleViewModel.java | 31 ++----------------- 1 file changed, 2 insertions(+), 29 deletions(-) diff --git a/src/main/java/bg/softuni/invoice/model/view/SaleViewModel.java b/src/main/java/bg/softuni/invoice/model/view/SaleViewModel.java index 12c193d..cde9d42 100644 --- a/src/main/java/bg/softuni/invoice/model/view/SaleViewModel.java +++ b/src/main/java/bg/softuni/invoice/model/view/SaleViewModel.java @@ -1,13 +1,10 @@ package bg.softuni.invoice.model.view; -import java.math.BigDecimal; +import bg.softuni.invoice.model.base.SaleBaseModel; -public class SaleViewModel { +public class SaleViewModel extends SaleBaseModel { private String id; - private String name; - private int quantity; - private BigDecimal price; private int vatValue; public String getId() { @@ -18,30 +15,6 @@ public void setId(String id) { this.id = id; } - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public int getQuantity() { - return quantity; - } - - public void setQuantity(int quantity) { - this.quantity = quantity; - } - - public BigDecimal getPrice() { - return price; - } - - public void setPrice(BigDecimal price) { - this.price = price; - } - public int getVatValue() { return vatValue; }