Skip to content

Refactor sale model to remove duplicate code #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mark79-github merged 3 commits into from
Sep 16, 2025
Merged

Refactor sale model to remove duplicate code #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
25242ae
Add SaleBaseModel abstract class
mark79-github Sep 16, 2025
0118d01
Refactor SaleServiceModel to extend SaleBaseModel
mark79-github Sep 16, 2025
07d55ae
Refactor SaleViewModel to extend SaleBaseModel
mark79-github Sep 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions src/main/java/bg/softuni/invoice/model/base/SaleBaseModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
}
}
32 changes: 2 additions & 30 deletions src/main/java/bg/softuni/invoice/model/service/SaleServiceModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
}
Expand Down
31 changes: 2 additions & 29 deletions src/main/java/bg/softuni/invoice/model/view/SaleViewModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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() {
Expand All @@ -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;
}
Expand Down