From 2dc13e8063e017b968be1bafd8cda5c1eb7cc3ae Mon Sep 17 00:00:00 2001
From: Martin Dimitrov <52877024+mark79-github@users.noreply.github.com>
Date: Wed, 17 Sep 2025 06:22:52 +0300
Subject: [PATCH] Revert "Refactor sale model to remove duplicate code"

---
 .../invoice/model/base/SaleBaseModel.java     | 34 -------------------
 .../model/service/SaleServiceModel.java       | 32 +++++++++++++++--
 .../invoice/model/view/SaleViewModel.java     | 31 +++++++++++++++--
 3 files changed, 59 insertions(+), 38 deletions(-)
 delete 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
deleted file mode 100644
index 62cf38c..0000000
--- a/src/main/java/bg/softuni/invoice/model/base/SaleBaseModel.java
+++ /dev/null
@@ -1,34 +0,0 @@
-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;
-    }
-}
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 9080bb7..e414fe7 100644
--- a/src/main/java/bg/softuni/invoice/model/service/SaleServiceModel.java
+++ b/src/main/java/bg/softuni/invoice/model/service/SaleServiceModel.java
@@ -1,12 +1,40 @@
 package bg.softuni.invoice.model.service;
 
-import bg.softuni.invoice.model.base.SaleBaseModel;
 import bg.softuni.invoice.model.enumerated.VatValue;
 
-public class SaleServiceModel extends SaleBaseModel {
+import java.math.BigDecimal;
 
+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;
     }
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 cde9d42..12c193d 100644
--- a/src/main/java/bg/softuni/invoice/model/view/SaleViewModel.java
+++ b/src/main/java/bg/softuni/invoice/model/view/SaleViewModel.java
@@ -1,10 +1,13 @@
 package bg.softuni.invoice.model.view;
 
-import bg.softuni.invoice.model.base.SaleBaseModel;
+import java.math.BigDecimal;
 
-public class SaleViewModel extends SaleBaseModel {
+public class SaleViewModel {
 
     private String id;
+    private String name;
+    private int quantity;
+    private BigDecimal price;
     private int vatValue;
 
     public String getId() {
@@ -15,6 +18,30 @@ 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;
     }