byte/expensetracker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

optimize code

Browse Source
This commit is contained in:
mirrerror
2023-10-23 16:48:10 +03:00
parent 3f619eb01b
commit c07e3ca876
4 changed files with 14 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/faf223/expensetrackerfaf/model/Expense.java
View File

@@ -13,8 +13,8 @@ import java.time.LocalDate;
public class Expense implements IMoneyTransaction { public class Expense implements IMoneyTransaction {
@Id @Id
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
@Getter(AccessLevel.NONE) @Column(name = "expense_id")
private Long expenseId; private Long id;
@ManyToOne() @ManyToOne()
@JoinColumn(name = "user_uuid") @JoinColumn(name = "user_uuid")
@@ -28,11 +28,5 @@ public class Expense implements IMoneyTransaction {
private LocalDate date; private LocalDate date;
private BigDecimal amount; private BigDecimal amount;
@Override
public Long getId() {
return expenseId;
}
} }

26
src/main/java/com/faf223/expensetrackerfaf/model/ExpenseCategory.java
View File

@@ -1,32 +1,16 @@
package com.faf223.expensetrackerfaf.model; package com.faf223.expensetrackerfaf.model;
import jakarta.persistence.Entity; import jakarta.persistence.*;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import lombok.AccessLevel;
import lombok.Data; import lombok.Data;
import lombok.Getter;
@Data @Data
@Entity(name = "expense_categories") @Entity(name = "expense_categories")
public class ExpenseCategory implements IMoneyTransactionCategory { public class ExpenseCategory implements IMoneyTransactionCategory {
@Id @Id
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
@Getter(AccessLevel.NONE) @Column(name = "category_id")
private Long categoryId; private Long id;
@Getter(AccessLevel.NONE)
private String categoryName;
@Override
public Long getId() {
return categoryId;
}
@Override
public String getName() {
return categoryName;
}
@Column(name = "category_name")
private String name;
} }

9
src/main/java/com/faf223/expensetrackerfaf/model/Income.java
View File

@@ -14,8 +14,8 @@ import java.time.LocalDate;
public class Income implements IMoneyTransaction { public class Income implements IMoneyTransaction {
@Id @Id
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
@Getter(AccessLevel.NONE) @Column(name = "income_id")
private Long incomeId; private Long id;
@ManyToOne @ManyToOne
@JoinColumn(name = "user_uuid") @JoinColumn(name = "user_uuid")
@@ -29,9 +29,4 @@ public class Income implements IMoneyTransaction {
private LocalDate date; private LocalDate date;
private BigDecimal amount; private BigDecimal amount;
@Override
public Long getId() {
return incomeId;
}
} }

25
src/main/java/com/faf223/expensetrackerfaf/model/IncomeCategory.java
View File

@@ -1,32 +1,17 @@
package com.faf223.expensetrackerfaf.model; package com.faf223.expensetrackerfaf.model;
import jakarta.persistence.Entity; import jakarta.persistence.*;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import lombok.AccessLevel;
import lombok.Data; import lombok.Data;
import lombok.Getter;
@Data @Data
@Entity(name = "income_categories") @Entity(name = "income_categories")
public class IncomeCategory implements IMoneyTransactionCategory { public class IncomeCategory implements IMoneyTransactionCategory {
@Id @Id
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
@Getter(AccessLevel.NONE) @Column(name = "category_id")
private Long categoryId; private Long id;
@Getter(AccessLevel.NONE) @Column(name = "category_name")
private String categoryName; private String name;
@Override
public Long getId() {
return categoryId;
}
@Override
public String getName() {
return categoryName;
}
} }