From 908b2233995df9a1522b274d516a10b35ac00273 Mon Sep 17 00:00:00 2001 From: mirrerror Date: Thu, 21 Sep 2023 13:41:40 +0300 Subject: [PATCH 1/5] fix expenses and incomes --- src/main/java/com/faf223/expensetrackerfaf/model/Income.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/java/com/faf223/expensetrackerfaf/model/Income.java b/src/main/java/com/faf223/expensetrackerfaf/model/Income.java index 55fbaef..57a2ea6 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/model/Income.java +++ b/src/main/java/com/faf223/expensetrackerfaf/model/Income.java @@ -53,10 +53,6 @@ public class Income implements IMoneyTransaction { return category.getEffectiveName(); } - public void setUserId(User user) { - this.user = user; - } - public void setAmount(int amount) { this.amount = amount; } From 917f551094b0c70dd7142fffed638b94ce2b0695 Mon Sep 17 00:00:00 2001 From: mirrerror Date: Thu, 21 Sep 2023 13:49:48 +0300 Subject: [PATCH 2/5] fix gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index a4e851d..d9273a9 100644 --- a/.gitignore +++ b/.gitignore @@ -32,4 +32,4 @@ build/ ### VS Code ### .vscode/ -!**/src/main/resources/application.properties +/src/main/resources/application.properties From 769b523b801ec3043663c29595db8328a980cf9b Mon Sep 17 00:00:00 2001 From: mirrerror Date: Thu, 21 Sep 2023 14:19:59 +0300 Subject: [PATCH 3/5] move to mysql finally --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index f38313e..d55c78f 100644 --- a/pom.xml +++ b/pom.xml @@ -46,11 +46,11 @@ spring-boot-starter-data-jpa 3.1.3 - + - com.microsoft.sqlserver - mssql-jdbc - 12.4.1.jre11 + com.mysql + mysql-connector-j + 8.1.0 From c05093a2cfc4b7cc23e584acf0bf7dd8b740886f Mon Sep 17 00:00:00 2001 From: Dmitrii Cravcenco Date: Thu, 21 Sep 2023 14:49:49 +0300 Subject: [PATCH 4/5] Add repositories --- .../controller/MainController.java | 2 +- .../com/faf223/expensetrackerfaf/model/User.java | 13 ++----------- .../repository/ExpenseRepository.java | 7 +++++++ .../repository/IncomeRepository.java | 7 +++++++ .../repository/UserRepository.java | 7 +++++++ 5 files changed, 24 insertions(+), 12 deletions(-) create mode 100644 src/main/java/com/faf223/expensetrackerfaf/repository/ExpenseRepository.java create mode 100644 src/main/java/com/faf223/expensetrackerfaf/repository/IncomeRepository.java create mode 100644 src/main/java/com/faf223/expensetrackerfaf/repository/UserRepository.java diff --git a/src/main/java/com/faf223/expensetrackerfaf/controller/MainController.java b/src/main/java/com/faf223/expensetrackerfaf/controller/MainController.java index 6e8d9bf..20112c1 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/controller/MainController.java +++ b/src/main/java/com/faf223/expensetrackerfaf/controller/MainController.java @@ -18,7 +18,7 @@ public class MainController { @GetMapping("/users/get/{id}") public User getUser(@PathVariable int id) { - return new User(id, "Test", null, null, null, null, null, null); + return new User(id, "Test", null, null, null, null, null); } @PostMapping("/users/set/{id}/name") diff --git a/src/main/java/com/faf223/expensetrackerfaf/model/User.java b/src/main/java/com/faf223/expensetrackerfaf/model/User.java index 65ed712..1504f28 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/model/User.java +++ b/src/main/java/com/faf223/expensetrackerfaf/model/User.java @@ -12,8 +12,8 @@ public class User { private long id; private String name; private String email; - private String login; private String password; + @Enumerated(EnumType.STRING) private Role role; @OneToMany(mappedBy = "user") @@ -22,11 +22,10 @@ public class User { @OneToMany(mappedBy = "user") private List incomes; - public User(long id, String name, String email, String login, String password, Role role, List expenses, List incomes) { + public User(long id, String name, String email, String password, Role role, List expenses, List incomes) { this.id = id; this.name = name; this.email = email; - this.login = login; this.password = password; this.role = role; this.expenses = expenses; @@ -59,14 +58,6 @@ public class User { this.email = email; } - public String getLogin() { - return login; - } - - public void setLogin(String login) { - this.login = login; - } - public String getPassword() { return password; } diff --git a/src/main/java/com/faf223/expensetrackerfaf/repository/ExpenseRepository.java b/src/main/java/com/faf223/expensetrackerfaf/repository/ExpenseRepository.java new file mode 100644 index 0000000..edc0209 --- /dev/null +++ b/src/main/java/com/faf223/expensetrackerfaf/repository/ExpenseRepository.java @@ -0,0 +1,7 @@ +package com.faf223.expensetrackerfaf.repository; + +import com.faf223.expensetrackerfaf.model.Expense; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface ExpenseRepository extends JpaRepository { +} diff --git a/src/main/java/com/faf223/expensetrackerfaf/repository/IncomeRepository.java b/src/main/java/com/faf223/expensetrackerfaf/repository/IncomeRepository.java new file mode 100644 index 0000000..818dcfd --- /dev/null +++ b/src/main/java/com/faf223/expensetrackerfaf/repository/IncomeRepository.java @@ -0,0 +1,7 @@ +package com.faf223.expensetrackerfaf.repository; + +import com.faf223.expensetrackerfaf.model.Income; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface IncomeRepository extends JpaRepository { +} diff --git a/src/main/java/com/faf223/expensetrackerfaf/repository/UserRepository.java b/src/main/java/com/faf223/expensetrackerfaf/repository/UserRepository.java new file mode 100644 index 0000000..c944fcb --- /dev/null +++ b/src/main/java/com/faf223/expensetrackerfaf/repository/UserRepository.java @@ -0,0 +1,7 @@ +package com.faf223.expensetrackerfaf.repository; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.security.core.userdetails.User; + +public interface UserRepository extends JpaRepository { +} From c0f3a7f7a74383ffddfc97aca61a6805264c2df4 Mon Sep 17 00:00:00 2001 From: Dmitrii Cravcenco Date: Thu, 21 Sep 2023 14:49:49 +0300 Subject: [PATCH 5/5] Add repositories --- .../controller/MainController.java | 2 +- .../com/faf223/expensetrackerfaf/model/User.java | 13 ++----------- .../repository/ExpenseRepository.java | 7 +++++++ .../repository/IncomeRepository.java | 7 +++++++ .../repository/UserRepository.java | 7 +++++++ 5 files changed, 24 insertions(+), 12 deletions(-) create mode 100644 src/main/java/com/faf223/expensetrackerfaf/repository/ExpenseRepository.java create mode 100644 src/main/java/com/faf223/expensetrackerfaf/repository/IncomeRepository.java create mode 100644 src/main/java/com/faf223/expensetrackerfaf/repository/UserRepository.java diff --git a/src/main/java/com/faf223/expensetrackerfaf/controller/MainController.java b/src/main/java/com/faf223/expensetrackerfaf/controller/MainController.java index 6e8d9bf..20112c1 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/controller/MainController.java +++ b/src/main/java/com/faf223/expensetrackerfaf/controller/MainController.java @@ -18,7 +18,7 @@ public class MainController { @GetMapping("/users/get/{id}") public User getUser(@PathVariable int id) { - return new User(id, "Test", null, null, null, null, null, null); + return new User(id, "Test", null, null, null, null, null); } @PostMapping("/users/set/{id}/name") diff --git a/src/main/java/com/faf223/expensetrackerfaf/model/User.java b/src/main/java/com/faf223/expensetrackerfaf/model/User.java index 65ed712..1504f28 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/model/User.java +++ b/src/main/java/com/faf223/expensetrackerfaf/model/User.java @@ -12,8 +12,8 @@ public class User { private long id; private String name; private String email; - private String login; private String password; + @Enumerated(EnumType.STRING) private Role role; @OneToMany(mappedBy = "user") @@ -22,11 +22,10 @@ public class User { @OneToMany(mappedBy = "user") private List incomes; - public User(long id, String name, String email, String login, String password, Role role, List expenses, List incomes) { + public User(long id, String name, String email, String password, Role role, List expenses, List incomes) { this.id = id; this.name = name; this.email = email; - this.login = login; this.password = password; this.role = role; this.expenses = expenses; @@ -59,14 +58,6 @@ public class User { this.email = email; } - public String getLogin() { - return login; - } - - public void setLogin(String login) { - this.login = login; - } - public String getPassword() { return password; } diff --git a/src/main/java/com/faf223/expensetrackerfaf/repository/ExpenseRepository.java b/src/main/java/com/faf223/expensetrackerfaf/repository/ExpenseRepository.java new file mode 100644 index 0000000..edc0209 --- /dev/null +++ b/src/main/java/com/faf223/expensetrackerfaf/repository/ExpenseRepository.java @@ -0,0 +1,7 @@ +package com.faf223.expensetrackerfaf.repository; + +import com.faf223.expensetrackerfaf.model.Expense; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface ExpenseRepository extends JpaRepository { +} diff --git a/src/main/java/com/faf223/expensetrackerfaf/repository/IncomeRepository.java b/src/main/java/com/faf223/expensetrackerfaf/repository/IncomeRepository.java new file mode 100644 index 0000000..818dcfd --- /dev/null +++ b/src/main/java/com/faf223/expensetrackerfaf/repository/IncomeRepository.java @@ -0,0 +1,7 @@ +package com.faf223.expensetrackerfaf.repository; + +import com.faf223.expensetrackerfaf.model.Income; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface IncomeRepository extends JpaRepository { +} diff --git a/src/main/java/com/faf223/expensetrackerfaf/repository/UserRepository.java b/src/main/java/com/faf223/expensetrackerfaf/repository/UserRepository.java new file mode 100644 index 0000000..c3edd6a --- /dev/null +++ b/src/main/java/com/faf223/expensetrackerfaf/repository/UserRepository.java @@ -0,0 +1,7 @@ +package com.faf223.expensetrackerfaf.repository; + +import com.faf223.expensetrackerfaf.model.User; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface UserRepository extends JpaRepository { +}