From e793191685c3747dd09328f063b8ddc3cf636a1c Mon Sep 17 00:00:00 2001 From: mirrerror Date: Thu, 21 Sep 2023 13:18:56 +0300 Subject: [PATCH 1/6] Change .gitignore and connect to the DB --- .gitignore | 2 ++ src/main/resources/application.properties | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 549e00a..a4e851d 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,5 @@ build/ ### VS Code ### .vscode/ + +!**/src/main/resources/application.properties diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 4d2c5a7..9d6cec6 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,4 +1,4 @@ -spring.datasource.url=jdbc:sqlserver://DANIEL-LAPTOP\\SQLEXPRESS01:1433;databaseName=AdventureWorks2022;user=Daniel1;password=daniel;encrypt=true;trustServerCertificate=true; +spring.datasource.url=jdbc:sqlserver://DESKTOP-53DT8GT\\SQLEXPRESS:1433;databaseName=ExpensesApp;user=dimas;password=123321;encrypt=true;trustServerCertificate=true; spring.datasource.driver-class-name=com.microsoft.sqlserver.jdbc.SQLServerDriver spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.SQLServer2008Dialect spring.jpa.hibernate.naming.physical-strategy=com.faf223.expensetrackerfaf.custom.UppercaseStrategy -- 2.49.1 From 7d334c7c8dcd6e068e2b972b3700f8948982c937 Mon Sep 17 00:00:00 2001 From: Dima <47077994+mirrerror@users.noreply.github.com> Date: Thu, 21 Sep 2023 13:22:09 +0300 Subject: [PATCH 2/6] Delete src/main/resources/application.properties --- src/main/resources/application.properties | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 src/main/resources/application.properties diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties deleted file mode 100644 index 9d6cec6..0000000 --- a/src/main/resources/application.properties +++ /dev/null @@ -1,5 +0,0 @@ -spring.datasource.url=jdbc:sqlserver://DESKTOP-53DT8GT\\SQLEXPRESS:1433;databaseName=ExpensesApp;user=dimas;password=123321;encrypt=true;trustServerCertificate=true; -spring.datasource.driver-class-name=com.microsoft.sqlserver.jdbc.SQLServerDriver -spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.SQLServer2008Dialect -spring.jpa.hibernate.naming.physical-strategy=com.faf223.expensetrackerfaf.custom.UppercaseStrategy - -- 2.49.1 From 6628a3ea207a074003d0691a6422c8075b01ca39 Mon Sep 17 00:00:00 2001 From: mirrerror Date: Thu, 21 Sep 2023 13:22:59 +0300 Subject: [PATCH 3/6] test --- .../faf223/expensetrackerfaf/ExpenseTrackerFafApplication.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/faf223/expensetrackerfaf/ExpenseTrackerFafApplication.java b/src/main/java/com/faf223/expensetrackerfaf/ExpenseTrackerFafApplication.java index 3393d62..eb8ff7d 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/ExpenseTrackerFafApplication.java +++ b/src/main/java/com/faf223/expensetrackerfaf/ExpenseTrackerFafApplication.java @@ -5,7 +5,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication public class ExpenseTrackerFafApplication { - + // TODO: todo public static void main(String[] args) { SpringApplication.run(ExpenseTrackerFafApplication.class, args); } -- 2.49.1 From 34703c5664af782eedcdfa3e70208714fc835c28 Mon Sep 17 00:00:00 2001 From: Dima <47077994+mirrerror@users.noreply.github.com> Date: Thu, 21 Sep 2023 13:24:49 +0300 Subject: [PATCH 4/6] Delete src/main/resources/application.properties --- src/main/resources/application.properties | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 src/main/resources/application.properties diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties deleted file mode 100644 index 4d2c5a7..0000000 --- a/src/main/resources/application.properties +++ /dev/null @@ -1,5 +0,0 @@ -spring.datasource.url=jdbc:sqlserver://DANIEL-LAPTOP\\SQLEXPRESS01:1433;databaseName=AdventureWorks2022;user=Daniel1;password=daniel;encrypt=true;trustServerCertificate=true; -spring.datasource.driver-class-name=com.microsoft.sqlserver.jdbc.SQLServerDriver -spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.SQLServer2008Dialect -spring.jpa.hibernate.naming.physical-strategy=com.faf223.expensetrackerfaf.custom.UppercaseStrategy - -- 2.49.1 From bd5514380be6742555d3cd0a765a030c07d9a2cc Mon Sep 17 00:00:00 2001 From: mirrerror Date: Thu, 21 Sep 2023 13:26:05 +0300 Subject: [PATCH 5/6] remove an unnecessary comment --- .../faf223/expensetrackerfaf/ExpenseTrackerFafApplication.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/faf223/expensetrackerfaf/ExpenseTrackerFafApplication.java b/src/main/java/com/faf223/expensetrackerfaf/ExpenseTrackerFafApplication.java index eb8ff7d..ac0f152 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/ExpenseTrackerFafApplication.java +++ b/src/main/java/com/faf223/expensetrackerfaf/ExpenseTrackerFafApplication.java @@ -5,7 +5,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication public class ExpenseTrackerFafApplication { - // TODO: todo public static void main(String[] args) { SpringApplication.run(ExpenseTrackerFafApplication.class, args); } -- 2.49.1 From 48476e405cde6805e07644dd4500aae47c7717bd Mon Sep 17 00:00:00 2001 From: mirrerror Date: Thu, 21 Sep 2023 13:35:39 +0300 Subject: [PATCH 6/6] fix expenses and incomes --- .../faf223/expensetrackerfaf/model/Expense.java | 15 +++++++++------ .../faf223/expensetrackerfaf/model/Income.java | 17 ++++++++++++----- .../util/IMoneyTransaction.java | 2 -- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/faf223/expensetrackerfaf/model/Expense.java b/src/main/java/com/faf223/expensetrackerfaf/model/Expense.java index 48f80c4..5c43723 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/model/Expense.java +++ b/src/main/java/com/faf223/expensetrackerfaf/model/Expense.java @@ -26,20 +26,23 @@ public class Expense implements IMoneyTransaction { public Expense() {} + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + @Override public User getUser() { return user; } - public void setUserId(int userId) { + public void setUser(User user) { this.user = user; } - @Override - public long getUserId() { - return 0; - } - @Override public int getAmount() { return amount; diff --git a/src/main/java/com/faf223/expensetrackerfaf/model/Income.java b/src/main/java/com/faf223/expensetrackerfaf/model/Income.java index 098c4de..55fbaef 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/model/Income.java +++ b/src/main/java/com/faf223/expensetrackerfaf/model/Income.java @@ -26,14 +26,21 @@ public class Income implements IMoneyTransaction { public Income() {} - @Override - public User getUser() { - return user; + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + public void setUser(User user) { + this.user = user; } @Override - public long getUserId() { - return 0; + public User getUser() { + return user; } @Override diff --git a/src/main/java/com/faf223/expensetrackerfaf/util/IMoneyTransaction.java b/src/main/java/com/faf223/expensetrackerfaf/util/IMoneyTransaction.java index 7dfe2fd..8817420 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/util/IMoneyTransaction.java +++ b/src/main/java/com/faf223/expensetrackerfaf/util/IMoneyTransaction.java @@ -5,8 +5,6 @@ import com.faf223.expensetrackerfaf.model.User; public interface IMoneyTransaction { User getUser(); - - long getUserId(); int getAmount(); String getCategory(); -- 2.49.1