From 1009ca7bdbdf30b5b97e9ce0dc2f2ccd7ba79b43 Mon Sep 17 00:00:00 2001 From: Dmitrii Cravcenco Date: Mon, 16 Oct 2023 21:37:04 +0300 Subject: [PATCH 1/9] Add google oauth2 --- pom.xml | 4 ++ .../config/SecurityConfiguration.java | 41 ++++++++++++++++++- 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 49ac77e..ffd641d 100644 --- a/pom.xml +++ b/pom.xml @@ -43,6 +43,10 @@ org.springframework.boot spring-boot-starter-security + + org.springframework.boot + spring-boot-starter-oauth2-client + org.projectlombok diff --git a/src/main/java/com/faf223/expensetrackerfaf/config/SecurityConfiguration.java b/src/main/java/com/faf223/expensetrackerfaf/config/SecurityConfiguration.java index 430f3ff..c95f0f8 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/config/SecurityConfiguration.java +++ b/src/main/java/com/faf223/expensetrackerfaf/config/SecurityConfiguration.java @@ -1,13 +1,25 @@ package com.faf223.expensetrackerfaf.config; import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.authentication.AuthenticationProvider; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; import org.springframework.security.config.http.SessionCreationPolicy; +import org.springframework.security.oauth2.client.registration.ClientRegistration; +import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository; +import org.springframework.security.oauth2.client.registration.InMemoryClientRegistrationRepository; +import org.springframework.security.oauth2.client.userinfo.DefaultOAuth2UserService; +import org.springframework.security.oauth2.client.userinfo.OAuth2UserRequest; +import org.springframework.security.oauth2.client.userinfo.OAuth2UserService; +import org.springframework.security.oauth2.core.AuthorizationGrantType; +import org.springframework.security.oauth2.core.oidc.IdTokenClaimNames; +import org.springframework.security.oauth2.core.user.OAuth2User; import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; @@ -23,7 +35,7 @@ public class SecurityConfiguration { @Bean public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { http - .csrf(csrf -> csrf.disable()) + .csrf(AbstractHttpConfigurer::disable) .authorizeHttpRequests(auth -> auth .requestMatchers("/api/v1/auth/**").permitAll() .anyRequest().authenticated() @@ -31,7 +43,34 @@ public class SecurityConfiguration { .sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS)) .authenticationProvider(authenticationProvider) .addFilterBefore(jwtAuthFilter, UsernamePasswordAuthenticationFilter.class); // will be executed before UsernamePasswordAuthenticationFilter +// .oauth2Login(Customizer.withDefaults()); return http.build(); } + + @Bean + public ClientRegistrationRepository clientRegistrationRepository( + @Value("${spring.security.oauth2.client.registration.google.client-id}") String clientId, + @Value("${spring.security.oauth2.client.registration.google.client-secret}") String clientSecret) { + + ClientRegistration registration = ClientRegistration.withRegistrationId("google") + .clientId(clientId) + .clientSecret(clientSecret) + .clientName("Google") + .authorizationGrantType(AuthorizationGrantType.AUTHORIZATION_CODE) + .redirectUri("http://localhost:8081/login/oauth2/code/{registrationId}") + .scope("openid", "profile", "email") + .authorizationUri("https://accounts.google.com/o/oauth2/auth") + .tokenUri("https://accounts.google.com/o/oauth2/token") + .userInfoUri("https://www.googleapis.com/oauth2/v3/userinfo") + .userNameAttributeName(IdTokenClaimNames.SUB) + .build(); + + return new InMemoryClientRegistrationRepository(registration); + } + + @Bean + public OAuth2UserService oAuth2UserService() { + return new DefaultOAuth2UserService(); + } } From 0698eb2478ea067f82876d05fd93156277e0ce52 Mon Sep 17 00:00:00 2001 From: mirrerror Date: Mon, 23 Oct 2023 16:09:54 +0300 Subject: [PATCH 2/9] make income and expense implement interface --- src/main/java/com/faf223/expensetrackerfaf/model/Expense.java | 3 ++- src/main/java/com/faf223/expensetrackerfaf/model/Income.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/faf223/expensetrackerfaf/model/Expense.java b/src/main/java/com/faf223/expensetrackerfaf/model/Expense.java index 6bdccb1..1194c75 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/model/Expense.java +++ b/src/main/java/com/faf223/expensetrackerfaf/model/Expense.java @@ -1,4 +1,5 @@ package com.faf223.expensetrackerfaf.model; +import com.faf223.expensetrackerfaf.util.IMoneyTransaction; import com.fasterxml.jackson.annotation.JsonIgnore; import jakarta.persistence.*; import lombok.AllArgsConstructor; @@ -13,7 +14,7 @@ import java.time.LocalDate; @AllArgsConstructor @NoArgsConstructor @Entity(name = "expenses") -public class Expense { +public class Expense implements IMoneyTransaction { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long expenseId; diff --git a/src/main/java/com/faf223/expensetrackerfaf/model/Income.java b/src/main/java/com/faf223/expensetrackerfaf/model/Income.java index a4c88f1..b08338d 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/model/Income.java +++ b/src/main/java/com/faf223/expensetrackerfaf/model/Income.java @@ -1,5 +1,6 @@ package com.faf223.expensetrackerfaf.model; +import com.faf223.expensetrackerfaf.util.IMoneyTransaction; import com.fasterxml.jackson.annotation.JsonIgnore; import jakarta.persistence.*; import lombok.AllArgsConstructor; @@ -13,7 +14,7 @@ import java.time.LocalDate; @AllArgsConstructor @NoArgsConstructor @Entity(name = "incomes") -public class Income { +public class Income implements IMoneyTransaction { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long incomeId; From e47f2f8df6650e6e0b8210c36df7fba724cb4cdd Mon Sep 17 00:00:00 2001 From: mirrerror Date: Mon, 23 Oct 2023 16:13:25 +0300 Subject: [PATCH 3/9] move money transaction interface --- src/main/java/com/faf223/expensetrackerfaf/model/Expense.java | 1 - .../expensetrackerfaf/{util => model}/IMoneyTransaction.java | 2 +- src/main/java/com/faf223/expensetrackerfaf/model/Income.java | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) rename src/main/java/com/faf223/expensetrackerfaf/{util => model}/IMoneyTransaction.java (78%) diff --git a/src/main/java/com/faf223/expensetrackerfaf/model/Expense.java b/src/main/java/com/faf223/expensetrackerfaf/model/Expense.java index 1194c75..34b8a0c 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/model/Expense.java +++ b/src/main/java/com/faf223/expensetrackerfaf/model/Expense.java @@ -1,5 +1,4 @@ package com.faf223.expensetrackerfaf.model; -import com.faf223.expensetrackerfaf.util.IMoneyTransaction; import com.fasterxml.jackson.annotation.JsonIgnore; import jakarta.persistence.*; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/faf223/expensetrackerfaf/util/IMoneyTransaction.java b/src/main/java/com/faf223/expensetrackerfaf/model/IMoneyTransaction.java similarity index 78% rename from src/main/java/com/faf223/expensetrackerfaf/util/IMoneyTransaction.java rename to src/main/java/com/faf223/expensetrackerfaf/model/IMoneyTransaction.java index 8817420..312b809 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/util/IMoneyTransaction.java +++ b/src/main/java/com/faf223/expensetrackerfaf/model/IMoneyTransaction.java @@ -1,4 +1,4 @@ -package com.faf223.expensetrackerfaf.util; +package com.faf223.expensetrackerfaf.model; import com.faf223.expensetrackerfaf.model.User; diff --git a/src/main/java/com/faf223/expensetrackerfaf/model/Income.java b/src/main/java/com/faf223/expensetrackerfaf/model/Income.java index b08338d..fc4282b 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/model/Income.java +++ b/src/main/java/com/faf223/expensetrackerfaf/model/Income.java @@ -1,6 +1,5 @@ package com.faf223.expensetrackerfaf.model; -import com.faf223.expensetrackerfaf.util.IMoneyTransaction; import com.fasterxml.jackson.annotation.JsonIgnore; import jakarta.persistence.*; import lombok.AllArgsConstructor; From 0afa1b2b7c193b85f6dd5e4cf0dae4eba95da67a Mon Sep 17 00:00:00 2001 From: mirrerror Date: Mon, 23 Oct 2023 16:38:09 +0300 Subject: [PATCH 4/9] optimize code, add interfaces --- .../dto/mappers/ExpenseMapper.java | 2 +- .../dto/mappers/IncomeMapper.java | 3 +- .../expensetrackerfaf/model/Credential.java | 52 +++++++++---------- .../expensetrackerfaf/model/Expense.java | 12 +++-- .../model/ExpenseCategory.java | 17 +++++- .../model/IMoneyTransaction.java | 9 ++-- .../model/IMoneyTransactionCategory.java | 6 +++ .../expensetrackerfaf/model/Income.java | 12 +++-- .../model/IncomeCategory.java | 16 +++++- .../faf223/expensetrackerfaf/model/Role.java | 1 - .../faf223/expensetrackerfaf/model/User.java | 1 - .../service/ExpenseService.java | 1 - .../service/IncomeService.java | 1 - 13 files changed, 87 insertions(+), 46 deletions(-) create mode 100644 src/main/java/com/faf223/expensetrackerfaf/model/IMoneyTransactionCategory.java diff --git a/src/main/java/com/faf223/expensetrackerfaf/dto/mappers/ExpenseMapper.java b/src/main/java/com/faf223/expensetrackerfaf/dto/mappers/ExpenseMapper.java index 74eeff7..466144f 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/dto/mappers/ExpenseMapper.java +++ b/src/main/java/com/faf223/expensetrackerfaf/dto/mappers/ExpenseMapper.java @@ -20,7 +20,7 @@ public class ExpenseMapper { } public ExpenseDTO toDto(Expense expense) { - return new ExpenseDTO(expense.getExpenseId(), userMapper.toDto(expense.getUser()), + return new ExpenseDTO(expense.getId(), userMapper.toDto(expense.getUser()), expense.getCategory(), expense.getDate(), expense.getAmount()); } diff --git a/src/main/java/com/faf223/expensetrackerfaf/dto/mappers/IncomeMapper.java b/src/main/java/com/faf223/expensetrackerfaf/dto/mappers/IncomeMapper.java index 32ca33e..5bdd805 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/dto/mappers/IncomeMapper.java +++ b/src/main/java/com/faf223/expensetrackerfaf/dto/mappers/IncomeMapper.java @@ -2,7 +2,6 @@ package com.faf223.expensetrackerfaf.dto.mappers; import com.faf223.expensetrackerfaf.dto.IncomeCreationDTO; import com.faf223.expensetrackerfaf.dto.IncomeDTO; -import com.faf223.expensetrackerfaf.model.Expense; import com.faf223.expensetrackerfaf.model.Income; import com.faf223.expensetrackerfaf.service.IncomeService; import org.springframework.beans.factory.annotation.Autowired; @@ -21,7 +20,7 @@ public class IncomeMapper { } public IncomeDTO toDto(Income income) { - return new IncomeDTO(income.getIncomeId(), userMapper.toDto(income.getUser()), + return new IncomeDTO(income.getId(), userMapper.toDto(income.getUser()), income.getCategory(), income.getDate(), income.getAmount()); } diff --git a/src/main/java/com/faf223/expensetrackerfaf/model/Credential.java b/src/main/java/com/faf223/expensetrackerfaf/model/Credential.java index f993e9f..ae93f5f 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/model/Credential.java +++ b/src/main/java/com/faf223/expensetrackerfaf/model/Credential.java @@ -1,35 +1,35 @@ - package com.faf223.expensetrackerfaf.model; +package com.faf223.expensetrackerfaf.model; - import jakarta.persistence.*; - import lombok.AllArgsConstructor; - import lombok.Data; - import lombok.NoArgsConstructor; +import jakarta.persistence.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; - @Data - @Entity(name = "credentials") - @NoArgsConstructor - @AllArgsConstructor - public class Credential { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long credentialId; +@Data +@Entity(name = "credentials") +@NoArgsConstructor +@AllArgsConstructor +public class Credential { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long credentialId; - @ManyToOne - @JoinColumn(name = "user_uuid") - private User user; + @ManyToOne + @JoinColumn(name = "user_uuid") + private User user; - private String email; - private String password; + private String email; + private String password; - @Enumerated(EnumType.STRING) - private Role role; + @Enumerated(EnumType.STRING) + private Role role; - public Credential(User user, String email, String password) { - this.user = user; - this.email = email; - this.password = password; + public Credential(User user, String email, String password) { + this.user = user; + this.email = email; + this.password = password; - this.role = Role.ROLE_USER; - } + this.role = Role.ROLE_USER; } +} diff --git a/src/main/java/com/faf223/expensetrackerfaf/model/Expense.java b/src/main/java/com/faf223/expensetrackerfaf/model/Expense.java index 34b8a0c..f9830d3 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/model/Expense.java +++ b/src/main/java/com/faf223/expensetrackerfaf/model/Expense.java @@ -1,10 +1,7 @@ package com.faf223.expensetrackerfaf.model; import com.fasterxml.jackson.annotation.JsonIgnore; import jakarta.persistence.*; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.ToString; -import lombok.NoArgsConstructor; +import lombok.*; import java.math.BigDecimal; import java.time.LocalDate; @@ -16,6 +13,7 @@ import java.time.LocalDate; public class Expense implements IMoneyTransaction { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) + @Getter(AccessLevel.NONE) private Long expenseId; @ManyToOne() @@ -30,5 +28,11 @@ public class Expense implements IMoneyTransaction { private LocalDate date; private BigDecimal amount; + + @Override + public Long getId() { + return expenseId; + } + } diff --git a/src/main/java/com/faf223/expensetrackerfaf/model/ExpenseCategory.java b/src/main/java/com/faf223/expensetrackerfaf/model/ExpenseCategory.java index 7662ce6..ac8326b 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/model/ExpenseCategory.java +++ b/src/main/java/com/faf223/expensetrackerfaf/model/ExpenseCategory.java @@ -4,14 +4,29 @@ import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; +import lombok.AccessLevel; import lombok.Data; +import lombok.Getter; @Data @Entity(name = "expense_categories") -public class ExpenseCategory { +public class ExpenseCategory implements IMoneyTransactionCategory { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) + @Getter(AccessLevel.NONE) private Long categoryId; + @Getter(AccessLevel.NONE) private String categoryName; + + @Override + public Long getId() { + return categoryId; + } + + @Override + public String getName() { + return categoryName; + } + } diff --git a/src/main/java/com/faf223/expensetrackerfaf/model/IMoneyTransaction.java b/src/main/java/com/faf223/expensetrackerfaf/model/IMoneyTransaction.java index 312b809..f565db3 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/model/IMoneyTransaction.java +++ b/src/main/java/com/faf223/expensetrackerfaf/model/IMoneyTransaction.java @@ -1,11 +1,14 @@ package com.faf223.expensetrackerfaf.model; -import com.faf223.expensetrackerfaf.model.User; +import java.math.BigDecimal; +import java.time.LocalDate; public interface IMoneyTransaction { + Long getId(); + LocalDate getDate(); User getUser(); - int getAmount(); - String getCategory(); + BigDecimal getAmount(); + IMoneyTransactionCategory getCategory(); } diff --git a/src/main/java/com/faf223/expensetrackerfaf/model/IMoneyTransactionCategory.java b/src/main/java/com/faf223/expensetrackerfaf/model/IMoneyTransactionCategory.java new file mode 100644 index 0000000..f326a9b --- /dev/null +++ b/src/main/java/com/faf223/expensetrackerfaf/model/IMoneyTransactionCategory.java @@ -0,0 +1,6 @@ +package com.faf223.expensetrackerfaf.model; + +public interface IMoneyTransactionCategory { + Long getId(); + String getName(); +} diff --git a/src/main/java/com/faf223/expensetrackerfaf/model/Income.java b/src/main/java/com/faf223/expensetrackerfaf/model/Income.java index fc4282b..c7476ed 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/model/Income.java +++ b/src/main/java/com/faf223/expensetrackerfaf/model/Income.java @@ -2,10 +2,8 @@ package com.faf223.expensetrackerfaf.model; import com.fasterxml.jackson.annotation.JsonIgnore; import jakarta.persistence.*; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.ToString; -import lombok.NoArgsConstructor; +import lombok.*; + import java.math.BigDecimal; import java.time.LocalDate; @@ -16,6 +14,7 @@ import java.time.LocalDate; public class Income implements IMoneyTransaction { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) + @Getter(AccessLevel.NONE) private Long incomeId; @ManyToOne @@ -30,4 +29,9 @@ public class Income implements IMoneyTransaction { private LocalDate date; private BigDecimal amount; + + @Override + public Long getId() { + return incomeId; + } } diff --git a/src/main/java/com/faf223/expensetrackerfaf/model/IncomeCategory.java b/src/main/java/com/faf223/expensetrackerfaf/model/IncomeCategory.java index 8bb54f0..08b41f2 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/model/IncomeCategory.java +++ b/src/main/java/com/faf223/expensetrackerfaf/model/IncomeCategory.java @@ -4,15 +4,29 @@ import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; +import lombok.AccessLevel; import lombok.Data; +import lombok.Getter; @Data @Entity(name = "income_categories") -public class IncomeCategory { +public class IncomeCategory implements IMoneyTransactionCategory { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) + @Getter(AccessLevel.NONE) private Long categoryId; + @Getter(AccessLevel.NONE) private String categoryName; + + @Override + public Long getId() { + return categoryId; + } + + @Override + public String getName() { + return categoryName; + } } diff --git a/src/main/java/com/faf223/expensetrackerfaf/model/Role.java b/src/main/java/com/faf223/expensetrackerfaf/model/Role.java index ea04328..6169bd2 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/model/Role.java +++ b/src/main/java/com/faf223/expensetrackerfaf/model/Role.java @@ -1,4 +1,3 @@ - package com.faf223.expensetrackerfaf.model; public enum Role { diff --git a/src/main/java/com/faf223/expensetrackerfaf/model/User.java b/src/main/java/com/faf223/expensetrackerfaf/model/User.java index 339416f..9588570 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/model/User.java +++ b/src/main/java/com/faf223/expensetrackerfaf/model/User.java @@ -1,4 +1,3 @@ - package com.faf223.expensetrackerfaf.model; import jakarta.persistence.*; diff --git a/src/main/java/com/faf223/expensetrackerfaf/service/ExpenseService.java b/src/main/java/com/faf223/expensetrackerfaf/service/ExpenseService.java index 0683998..a72ae8d 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/service/ExpenseService.java +++ b/src/main/java/com/faf223/expensetrackerfaf/service/ExpenseService.java @@ -5,7 +5,6 @@ import com.faf223.expensetrackerfaf.model.User; import com.faf223.expensetrackerfaf.repository.ExpenseRepository; import com.faf223.expensetrackerfaf.repository.UserRepository; import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; diff --git a/src/main/java/com/faf223/expensetrackerfaf/service/IncomeService.java b/src/main/java/com/faf223/expensetrackerfaf/service/IncomeService.java index 63e1bab..a7711d6 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/service/IncomeService.java +++ b/src/main/java/com/faf223/expensetrackerfaf/service/IncomeService.java @@ -5,7 +5,6 @@ import com.faf223.expensetrackerfaf.model.User; import com.faf223.expensetrackerfaf.repository.IncomeRepository; import com.faf223.expensetrackerfaf.repository.UserRepository; import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; From c07e3ca876813d242485f8d51a79e54786aaff75 Mon Sep 17 00:00:00 2001 From: mirrerror Date: Mon, 23 Oct 2023 16:48:10 +0300 Subject: [PATCH 5/9] optimize code --- .../expensetrackerfaf/model/Expense.java | 10 ++----- .../model/ExpenseCategory.java | 26 ++++--------------- .../expensetrackerfaf/model/Income.java | 9 ++----- .../model/IncomeCategory.java | 25 ++++-------------- 4 files changed, 14 insertions(+), 56 deletions(-) diff --git a/src/main/java/com/faf223/expensetrackerfaf/model/Expense.java b/src/main/java/com/faf223/expensetrackerfaf/model/Expense.java index f9830d3..32fe40d 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/model/Expense.java +++ b/src/main/java/com/faf223/expensetrackerfaf/model/Expense.java @@ -13,8 +13,8 @@ import java.time.LocalDate; public class Expense implements IMoneyTransaction { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - @Getter(AccessLevel.NONE) - private Long expenseId; + @Column(name = "expense_id") + private Long id; @ManyToOne() @JoinColumn(name = "user_uuid") @@ -28,11 +28,5 @@ public class Expense implements IMoneyTransaction { private LocalDate date; private BigDecimal amount; - - @Override - public Long getId() { - return expenseId; - } - } diff --git a/src/main/java/com/faf223/expensetrackerfaf/model/ExpenseCategory.java b/src/main/java/com/faf223/expensetrackerfaf/model/ExpenseCategory.java index ac8326b..c5989ea 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/model/ExpenseCategory.java +++ b/src/main/java/com/faf223/expensetrackerfaf/model/ExpenseCategory.java @@ -1,32 +1,16 @@ package com.faf223.expensetrackerfaf.model; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import lombok.AccessLevel; +import jakarta.persistence.*; import lombok.Data; -import lombok.Getter; @Data @Entity(name = "expense_categories") public class ExpenseCategory implements IMoneyTransactionCategory { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - @Getter(AccessLevel.NONE) - private Long categoryId; - - @Getter(AccessLevel.NONE) - private String categoryName; - - @Override - public Long getId() { - return categoryId; - } - - @Override - public String getName() { - return categoryName; - } + @Column(name = "category_id") + private Long id; + @Column(name = "category_name") + private String name; } diff --git a/src/main/java/com/faf223/expensetrackerfaf/model/Income.java b/src/main/java/com/faf223/expensetrackerfaf/model/Income.java index c7476ed..967fa3b 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/model/Income.java +++ b/src/main/java/com/faf223/expensetrackerfaf/model/Income.java @@ -14,8 +14,8 @@ import java.time.LocalDate; public class Income implements IMoneyTransaction { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - @Getter(AccessLevel.NONE) - private Long incomeId; + @Column(name = "income_id") + private Long id; @ManyToOne @JoinColumn(name = "user_uuid") @@ -29,9 +29,4 @@ public class Income implements IMoneyTransaction { private LocalDate date; private BigDecimal amount; - - @Override - public Long getId() { - return incomeId; - } } diff --git a/src/main/java/com/faf223/expensetrackerfaf/model/IncomeCategory.java b/src/main/java/com/faf223/expensetrackerfaf/model/IncomeCategory.java index 08b41f2..237c41f 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/model/IncomeCategory.java +++ b/src/main/java/com/faf223/expensetrackerfaf/model/IncomeCategory.java @@ -1,32 +1,17 @@ package com.faf223.expensetrackerfaf.model; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import lombok.AccessLevel; +import jakarta.persistence.*; import lombok.Data; -import lombok.Getter; @Data @Entity(name = "income_categories") public class IncomeCategory implements IMoneyTransactionCategory { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - @Getter(AccessLevel.NONE) - private Long categoryId; + @Column(name = "category_id") + 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; } From 4fed3dba9e73542707a95f9cdddce3c1fa8708db Mon Sep 17 00:00:00 2001 From: Dmitrii Cravcenco Date: Mon, 23 Oct 2023 18:52:38 +0300 Subject: [PATCH 6/9] Change getting expenses/incomes logic --- .../controller/ExpenseController.java | 24 +++++++++++++++---- .../controller/IncomeController.java | 24 +++++++++++++++---- .../service/ExpenseService.java | 15 ++++++------ .../service/IncomeService.java | 15 ++++++------ 4 files changed, 52 insertions(+), 26 deletions(-) diff --git a/src/main/java/com/faf223/expensetrackerfaf/controller/ExpenseController.java b/src/main/java/com/faf223/expensetrackerfaf/controller/ExpenseController.java index e7f000f..e652add 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/controller/ExpenseController.java +++ b/src/main/java/com/faf223/expensetrackerfaf/controller/ExpenseController.java @@ -8,6 +8,9 @@ import com.faf223.expensetrackerfaf.service.ExpenseService; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.UserDetails; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; @@ -54,11 +57,22 @@ public class ExpenseController { } } - @GetMapping("/{userUuid}") - public ResponseEntity> getExpensesByUser(@PathVariable String userUuid) { - List expenses = expenseService.getExpensesByUserId(userUuid).stream().map(expenseMapper::toDto).collect(Collectors.toList()); - if (!expenses.isEmpty()) return ResponseEntity.ok(expenses); - else return ResponseEntity.notFound().build(); + @GetMapping("/personal-expenses") + public ResponseEntity> getExpensesByUser() { + + Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); + + if (authentication != null && authentication.getPrincipal() instanceof UserDetails userDetails) { + + String email = userDetails.getUsername(); + List expenses = expenseService.getExpensesByEmail(email).stream().map(expenseMapper::toDto).collect(Collectors.toList()); + + if (!expenses.isEmpty()) { + return ResponseEntity.ok(expenses); + } + } + + return ResponseEntity.notFound().build(); } } diff --git a/src/main/java/com/faf223/expensetrackerfaf/controller/IncomeController.java b/src/main/java/com/faf223/expensetrackerfaf/controller/IncomeController.java index 6811d10..f076b79 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/controller/IncomeController.java +++ b/src/main/java/com/faf223/expensetrackerfaf/controller/IncomeController.java @@ -8,6 +8,9 @@ import com.faf223.expensetrackerfaf.service.IncomeService; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.UserDetails; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; @@ -54,11 +57,22 @@ public class IncomeController { } } - @GetMapping("/{userUuid}") - public ResponseEntity> getIncomesByUser(@PathVariable String userUuid) { - List incomes = incomeService.getIncomesByUserId(userUuid).stream().map(incomeMapper::toDto).collect(Collectors.toList()); - if (!incomes.isEmpty()) return ResponseEntity.ok(incomes); - else return ResponseEntity.notFound().build(); + @GetMapping("/personal-incomes") + public ResponseEntity> getIncomesByUser() { + + Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); + + if (authentication != null && authentication.getPrincipal() instanceof UserDetails userDetails) { + + String email = userDetails.getUsername(); + List expenses = incomeService.getIncomesByEmail(email).stream().map(incomeMapper::toDto).collect(Collectors.toList()); + + if (!expenses.isEmpty()) { + return ResponseEntity.ok(expenses); + } + } + + return ResponseEntity.notFound().build(); } } diff --git a/src/main/java/com/faf223/expensetrackerfaf/service/ExpenseService.java b/src/main/java/com/faf223/expensetrackerfaf/service/ExpenseService.java index 0683998..1bea04a 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/service/ExpenseService.java +++ b/src/main/java/com/faf223/expensetrackerfaf/service/ExpenseService.java @@ -1,11 +1,10 @@ package com.faf223.expensetrackerfaf.service; +import com.faf223.expensetrackerfaf.model.Credential; import com.faf223.expensetrackerfaf.model.Expense; -import com.faf223.expensetrackerfaf.model.User; +import com.faf223.expensetrackerfaf.repository.CredentialRepository; import com.faf223.expensetrackerfaf.repository.ExpenseRepository; -import com.faf223.expensetrackerfaf.repository.UserRepository; import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -17,17 +16,17 @@ import java.util.Optional; public class ExpenseService { private final ExpenseRepository expenseRepository; - private final UserRepository userRepository; + private final CredentialRepository credentialRepository; public void createOrUpdateExpense(Expense expense) { expenseRepository.save(expense); } - public List getExpensesByUserId(String userUuid) { + public List getExpensesByEmail(String email) { - Optional user = userRepository.getUserByUserUuid(userUuid); - if (user.isPresent()) { - return expenseRepository.findByUser(user.get()); + Optional credential = credentialRepository.findByEmail(email); + if (credential.isPresent()) { + return expenseRepository.findByUser(credential.get().getUser()); } return new ArrayList<>(); diff --git a/src/main/java/com/faf223/expensetrackerfaf/service/IncomeService.java b/src/main/java/com/faf223/expensetrackerfaf/service/IncomeService.java index 63e1bab..16946a9 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/service/IncomeService.java +++ b/src/main/java/com/faf223/expensetrackerfaf/service/IncomeService.java @@ -1,11 +1,10 @@ package com.faf223.expensetrackerfaf.service; +import com.faf223.expensetrackerfaf.model.Credential; import com.faf223.expensetrackerfaf.model.Income; -import com.faf223.expensetrackerfaf.model.User; +import com.faf223.expensetrackerfaf.repository.CredentialRepository; import com.faf223.expensetrackerfaf.repository.IncomeRepository; -import com.faf223.expensetrackerfaf.repository.UserRepository; import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -17,7 +16,7 @@ import java.util.Optional; public class IncomeService { private final IncomeRepository incomeRepository; - private final UserRepository userRepository; + private final CredentialRepository credentialRepository; public void createOrUpdateIncome(Income income) { incomeRepository.save(income); @@ -27,11 +26,11 @@ public class IncomeService { return incomeRepository.findAll(); } - public List getIncomesByUserId(String userUuid) { + public List getIncomesByEmail(String email) { - Optional user = userRepository.getUserByUserUuid(userUuid); - if (user.isPresent()) { - return incomeRepository.findByUser(user.get()); + Optional credential = credentialRepository.findByEmail(email); + if (credential.isPresent()) { + return incomeRepository.findByUser(credential.get().getUser()); } return new ArrayList<>(); From 84b48afb215f3f0ec28a796b37d625bdba7e19e0 Mon Sep 17 00:00:00 2001 From: Dmitrii Cravcenco Date: Tue, 24 Oct 2023 18:30:37 +0300 Subject: [PATCH 7/9] Fix expense/income creation --- .../config/SecurityConfiguration.java | 27 ------------------- .../expensetrackerfaf/model/Expense.java | 21 ++++++++++----- 2 files changed, 14 insertions(+), 34 deletions(-) diff --git a/src/main/java/com/faf223/expensetrackerfaf/config/SecurityConfiguration.java b/src/main/java/com/faf223/expensetrackerfaf/config/SecurityConfiguration.java index c95f0f8..7343ab9 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/config/SecurityConfiguration.java +++ b/src/main/java/com/faf223/expensetrackerfaf/config/SecurityConfiguration.java @@ -43,34 +43,7 @@ public class SecurityConfiguration { .sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS)) .authenticationProvider(authenticationProvider) .addFilterBefore(jwtAuthFilter, UsernamePasswordAuthenticationFilter.class); // will be executed before UsernamePasswordAuthenticationFilter -// .oauth2Login(Customizer.withDefaults()); - return http.build(); } - @Bean - public ClientRegistrationRepository clientRegistrationRepository( - @Value("${spring.security.oauth2.client.registration.google.client-id}") String clientId, - @Value("${spring.security.oauth2.client.registration.google.client-secret}") String clientSecret) { - - ClientRegistration registration = ClientRegistration.withRegistrationId("google") - .clientId(clientId) - .clientSecret(clientSecret) - .clientName("Google") - .authorizationGrantType(AuthorizationGrantType.AUTHORIZATION_CODE) - .redirectUri("http://localhost:8081/login/oauth2/code/{registrationId}") - .scope("openid", "profile", "email") - .authorizationUri("https://accounts.google.com/o/oauth2/auth") - .tokenUri("https://accounts.google.com/o/oauth2/token") - .userInfoUri("https://www.googleapis.com/oauth2/v3/userinfo") - .userNameAttributeName(IdTokenClaimNames.SUB) - .build(); - - return new InMemoryClientRegistrationRepository(registration); - } - - @Bean - public OAuth2UserService oAuth2UserService() { - return new DefaultOAuth2UserService(); - } } diff --git a/src/main/java/com/faf223/expensetrackerfaf/model/Expense.java b/src/main/java/com/faf223/expensetrackerfaf/model/Expense.java index 6bdccb1..5b09733 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/model/Expense.java +++ b/src/main/java/com/faf223/expensetrackerfaf/model/Expense.java @@ -1,10 +1,8 @@ package com.faf223.expensetrackerfaf.model; +import com.faf223.expensetrackerfaf.util.IMoneyTransaction; import com.fasterxml.jackson.annotation.JsonIgnore; import jakarta.persistence.*; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.ToString; -import lombok.NoArgsConstructor; +import lombok.*; import java.math.BigDecimal; import java.time.LocalDate; @@ -13,10 +11,11 @@ import java.time.LocalDate; @AllArgsConstructor @NoArgsConstructor @Entity(name = "expenses") -public class Expense { +public class Expense implements IMoneyTransaction { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long expenseId; + @Column(name = "expense_id") + private Long id; @ManyToOne() @JoinColumn(name = "user_uuid") @@ -30,5 +29,13 @@ public class Expense { private LocalDate date; private BigDecimal amount; -} + public Expense(LocalDate date, BigDecimal amount) { + } + + public Expense(ExpenseCategory expenseCategory, LocalDate date, BigDecimal amount) { + this.category = expenseCategory; + this.date = date; + this.amount = amount; + } +} \ No newline at end of file From d402514ecbe32f6e72ea473d3405cd1773697657 Mon Sep 17 00:00:00 2001 From: Dmitrii Cravcenco Date: Tue, 24 Oct 2023 18:34:51 +0300 Subject: [PATCH 8/9] Fix expense/income creation --- .../controller/ExpenseController.java | 28 +++++++++++++---- .../controller/IncomeController.java | 31 +++++++++++++------ .../dto/ExpenseCreationDTO.java | 7 ++--- .../expensetrackerfaf/dto/ExpenseDTO.java | 4 ++- .../dto/IncomeCreationDTO.java | 7 ++--- .../expensetrackerfaf/dto/IncomeDTO.java | 6 ++-- .../dto/mappers/ExpenseMapper.java | 15 +++++---- .../dto/mappers/IncomeMapper.java | 16 ++++++---- .../expensetrackerfaf/model/Expense.java | 1 - .../expensetrackerfaf/model/Income.java | 6 ++++ .../service/ExpenseCategoryService.java | 18 +++++++++++ .../service/IncomeCategoryService.java | 17 ++++++++++ .../service/UserService.java | 12 +++++++ 13 files changed, 127 insertions(+), 41 deletions(-) create mode 100644 src/main/java/com/faf223/expensetrackerfaf/service/ExpenseCategoryService.java create mode 100644 src/main/java/com/faf223/expensetrackerfaf/service/IncomeCategoryService.java diff --git a/src/main/java/com/faf223/expensetrackerfaf/controller/ExpenseController.java b/src/main/java/com/faf223/expensetrackerfaf/controller/ExpenseController.java index e652add..f8cbb19 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/controller/ExpenseController.java +++ b/src/main/java/com/faf223/expensetrackerfaf/controller/ExpenseController.java @@ -4,8 +4,13 @@ import com.faf223.expensetrackerfaf.dto.ExpenseCreationDTO; import com.faf223.expensetrackerfaf.dto.ExpenseDTO; import com.faf223.expensetrackerfaf.dto.mappers.ExpenseMapper; import com.faf223.expensetrackerfaf.model.Expense; +import com.faf223.expensetrackerfaf.model.ExpenseCategory; +import com.faf223.expensetrackerfaf.model.User; +import com.faf223.expensetrackerfaf.service.ExpenseCategoryService; import com.faf223.expensetrackerfaf.service.ExpenseService; +import com.faf223.expensetrackerfaf.service.UserService; import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.core.Authentication; @@ -23,7 +28,9 @@ import java.util.stream.Collectors; public class ExpenseController { private final ExpenseService expenseService; + private final UserService userService; private final ExpenseMapper expenseMapper; + private final ExpenseCategoryService expenseCategoryService; @GetMapping() @PreAuthorize("hasRole('ADMIN')") @@ -37,14 +44,24 @@ public class ExpenseController { public ResponseEntity createNewExpense(@RequestBody ExpenseCreationDTO expenseDTO, BindingResult bindingResult) { Expense expense = expenseMapper.toExpense(expenseDTO); - if (!bindingResult.hasErrors()) { + + Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); + + if (authentication != null && authentication.getPrincipal() instanceof UserDetails userDetails) { + + String email = userDetails.getUsername(); + User user = userService.getUserByEmail(email); + expense.setUser(user); + expenseService.createOrUpdateExpense(expense); - return ResponseEntity.ok(expenseMapper.toDto(expense)); - } else { - return ResponseEntity.notFound().build(); + ExpenseDTO createdExpenseDTO = expenseMapper.toDto(expense); + return ResponseEntity.status(HttpStatus.CREATED).body(createdExpenseDTO); } + + return ResponseEntity.notFound().build(); } + // TODO: has to be checked on auto extracting Uuid @PatchMapping() public ResponseEntity updateExpense(@RequestBody ExpenseCreationDTO expenseDTO, BindingResult bindingResult) { @@ -74,5 +91,4 @@ public class ExpenseController { return ResponseEntity.notFound().build(); } -} - +} \ No newline at end of file diff --git a/src/main/java/com/faf223/expensetrackerfaf/controller/IncomeController.java b/src/main/java/com/faf223/expensetrackerfaf/controller/IncomeController.java index f076b79..85526b0 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/controller/IncomeController.java +++ b/src/main/java/com/faf223/expensetrackerfaf/controller/IncomeController.java @@ -1,11 +1,15 @@ package com.faf223.expensetrackerfaf.controller; +import com.faf223.expensetrackerfaf.dto.ExpenseDTO; import com.faf223.expensetrackerfaf.dto.IncomeCreationDTO; import com.faf223.expensetrackerfaf.dto.IncomeDTO; import com.faf223.expensetrackerfaf.dto.mappers.IncomeMapper; import com.faf223.expensetrackerfaf.model.Income; +import com.faf223.expensetrackerfaf.model.User; import com.faf223.expensetrackerfaf.service.IncomeService; +import com.faf223.expensetrackerfaf.service.UserService; import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.core.Authentication; @@ -23,6 +27,7 @@ import java.util.stream.Collectors; public class IncomeController { private final IncomeService incomeService; + private final UserService userService; private final IncomeMapper incomeMapper; @GetMapping() @@ -37,12 +42,21 @@ public class IncomeController { public ResponseEntity createNewIncome(@RequestBody IncomeCreationDTO incomeDTO, BindingResult bindingResult) { Income income = incomeMapper.toIncome(incomeDTO); - if (!bindingResult.hasErrors()) { + Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); + + if (authentication != null && authentication.getPrincipal() instanceof UserDetails userDetails) { + + String email = userDetails.getUsername(); + User user = userService.getUserByEmail(email); + income.setUser(user); + + System.out.println(income); incomeService.createOrUpdateIncome(income); - return ResponseEntity.ok(incomeMapper.toDto(income)); - } else { - return ResponseEntity.notFound().build(); + IncomeDTO createdIncomeDTO = incomeMapper.toDto(income); + return ResponseEntity.status(HttpStatus.CREATED).body(createdIncomeDTO); } + + return ResponseEntity.notFound().build(); } @PatchMapping() @@ -65,14 +79,13 @@ public class IncomeController { if (authentication != null && authentication.getPrincipal() instanceof UserDetails userDetails) { String email = userDetails.getUsername(); - List expenses = incomeService.getIncomesByEmail(email).stream().map(incomeMapper::toDto).collect(Collectors.toList()); + List incomes = incomeService.getIncomesByEmail(email).stream().map(incomeMapper::toDto).collect(Collectors.toList()); - if (!expenses.isEmpty()) { - return ResponseEntity.ok(expenses); + if (!incomes.isEmpty()) { + return ResponseEntity.ok(incomes); } } return ResponseEntity.notFound().build(); } -} - +} \ No newline at end of file diff --git a/src/main/java/com/faf223/expensetrackerfaf/dto/ExpenseCreationDTO.java b/src/main/java/com/faf223/expensetrackerfaf/dto/ExpenseCreationDTO.java index eb3eea5..5434b68 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/dto/ExpenseCreationDTO.java +++ b/src/main/java/com/faf223/expensetrackerfaf/dto/ExpenseCreationDTO.java @@ -11,9 +11,6 @@ import java.time.LocalDate; @Data @AllArgsConstructor public class ExpenseCreationDTO { - private long expenseId; - private User user; - private ExpenseCategory expenseCategory; - private LocalDate date; + private int expenseCategory; private BigDecimal amount; -} +} \ No newline at end of file diff --git a/src/main/java/com/faf223/expensetrackerfaf/dto/ExpenseDTO.java b/src/main/java/com/faf223/expensetrackerfaf/dto/ExpenseDTO.java index b18643a..e956e14 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/dto/ExpenseDTO.java +++ b/src/main/java/com/faf223/expensetrackerfaf/dto/ExpenseDTO.java @@ -1,6 +1,7 @@ package com.faf223.expensetrackerfaf.dto; import com.faf223.expensetrackerfaf.model.ExpenseCategory; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.AllArgsConstructor; import lombok.Data; @@ -9,10 +10,11 @@ import java.time.LocalDate; @Data @AllArgsConstructor +@JsonIgnoreProperties({"expenseCategory"}) public class ExpenseDTO { private long expenseId; private UserDTO userDTO; private ExpenseCategory expenseCategory; private LocalDate date; private BigDecimal amount; -} +} \ No newline at end of file diff --git a/src/main/java/com/faf223/expensetrackerfaf/dto/IncomeCreationDTO.java b/src/main/java/com/faf223/expensetrackerfaf/dto/IncomeCreationDTO.java index 2671bb1..620071e 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/dto/IncomeCreationDTO.java +++ b/src/main/java/com/faf223/expensetrackerfaf/dto/IncomeCreationDTO.java @@ -11,9 +11,6 @@ import java.time.LocalDate; @Data @AllArgsConstructor public class IncomeCreationDTO { - private long incomeId; - private User user; - private IncomeCategory category; - private LocalDate date; + private int incomeCategory; private BigDecimal amount; -} +} \ No newline at end of file diff --git a/src/main/java/com/faf223/expensetrackerfaf/dto/IncomeDTO.java b/src/main/java/com/faf223/expensetrackerfaf/dto/IncomeDTO.java index 3ee4998..b494bfb 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/dto/IncomeDTO.java +++ b/src/main/java/com/faf223/expensetrackerfaf/dto/IncomeDTO.java @@ -1,6 +1,7 @@ package com.faf223.expensetrackerfaf.dto; import com.faf223.expensetrackerfaf.model.IncomeCategory; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.AllArgsConstructor; import lombok.Data; @@ -9,10 +10,11 @@ import java.time.LocalDate; @Data @AllArgsConstructor +@JsonIgnoreProperties({"incomeCategory"}) public class IncomeDTO { private long incomeId; private UserDTO userDTO; - private IncomeCategory category; + private IncomeCategory incomeCategory; private LocalDate date; private BigDecimal amount; -} +} \ No newline at end of file diff --git a/src/main/java/com/faf223/expensetrackerfaf/dto/mappers/ExpenseMapper.java b/src/main/java/com/faf223/expensetrackerfaf/dto/mappers/ExpenseMapper.java index 466144f..fc5bcd1 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/dto/mappers/ExpenseMapper.java +++ b/src/main/java/com/faf223/expensetrackerfaf/dto/mappers/ExpenseMapper.java @@ -3,19 +3,24 @@ package com.faf223.expensetrackerfaf.dto.mappers; import com.faf223.expensetrackerfaf.dto.ExpenseCreationDTO; import com.faf223.expensetrackerfaf.dto.ExpenseDTO; import com.faf223.expensetrackerfaf.model.Expense; +import com.faf223.expensetrackerfaf.service.ExpenseCategoryService; import com.faf223.expensetrackerfaf.service.ExpenseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.time.LocalDate; + @Component public class ExpenseMapper { private final ExpenseService expenseService; + private final ExpenseCategoryService expenseCategoryService; private final UserMapper userMapper; @Autowired - public ExpenseMapper(ExpenseService expenseService, UserMapper userMapper) { + public ExpenseMapper(ExpenseService expenseService, ExpenseCategoryService expenseCategoryService, UserMapper userMapper) { this.expenseService = expenseService; + this.expenseCategoryService = expenseCategoryService; this.userMapper = userMapper; } @@ -25,10 +30,8 @@ public class ExpenseMapper { } public Expense toExpense(ExpenseCreationDTO expenseDTO) { - Expense expense = expenseService.getExpenseById(expenseDTO.getExpenseId()); - if(expense == null) return new Expense(expenseDTO.getExpenseId(), expenseDTO.getUser(), - expenseDTO.getExpenseCategory(), expenseDTO.getDate(), expenseDTO.getAmount()); - return expense; + + return new Expense(expenseCategoryService.getExpenseCategory(expenseDTO.getExpenseCategory()), LocalDate.now(), expenseDTO.getAmount()); } -} +} \ No newline at end of file diff --git a/src/main/java/com/faf223/expensetrackerfaf/dto/mappers/IncomeMapper.java b/src/main/java/com/faf223/expensetrackerfaf/dto/mappers/IncomeMapper.java index 5bdd805..0224ac5 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/dto/mappers/IncomeMapper.java +++ b/src/main/java/com/faf223/expensetrackerfaf/dto/mappers/IncomeMapper.java @@ -2,20 +2,26 @@ package com.faf223.expensetrackerfaf.dto.mappers; import com.faf223.expensetrackerfaf.dto.IncomeCreationDTO; import com.faf223.expensetrackerfaf.dto.IncomeDTO; +import com.faf223.expensetrackerfaf.model.Expense; import com.faf223.expensetrackerfaf.model.Income; +import com.faf223.expensetrackerfaf.service.IncomeCategoryService; import com.faf223.expensetrackerfaf.service.IncomeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.time.LocalDate; + @Component public class IncomeMapper { private final IncomeService incomeService; + private final IncomeCategoryService incomeCategoryService; private final UserMapper userMapper; @Autowired - public IncomeMapper(IncomeService incomeService, UserMapper userMapper) { + public IncomeMapper(IncomeService incomeService, IncomeCategoryService incomeCategoryService, UserMapper userMapper) { this.incomeService = incomeService; + this.incomeCategoryService = incomeCategoryService; this.userMapper = userMapper; } @@ -25,10 +31,8 @@ public class IncomeMapper { } public Income toIncome(IncomeCreationDTO incomeDTO) { - Income income = incomeService.getIncomeById(incomeDTO.getIncomeId()); - if(income == null) return new Income(incomeDTO.getIncomeId(), incomeDTO.getUser(), - incomeDTO.getCategory(), incomeDTO.getDate(), incomeDTO.getAmount()); - return income; + + return new Income(incomeCategoryService.getExpenseCategory(incomeDTO.getIncomeCategory()), LocalDate.now(), incomeDTO.getAmount()); } -} +} \ No newline at end of file diff --git a/src/main/java/com/faf223/expensetrackerfaf/model/Expense.java b/src/main/java/com/faf223/expensetrackerfaf/model/Expense.java index 5b09733..322bb52 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/model/Expense.java +++ b/src/main/java/com/faf223/expensetrackerfaf/model/Expense.java @@ -1,5 +1,4 @@ package com.faf223.expensetrackerfaf.model; -import com.faf223.expensetrackerfaf.util.IMoneyTransaction; import com.fasterxml.jackson.annotation.JsonIgnore; import jakarta.persistence.*; import lombok.*; diff --git a/src/main/java/com/faf223/expensetrackerfaf/model/Income.java b/src/main/java/com/faf223/expensetrackerfaf/model/Income.java index 967fa3b..cba3dac 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/model/Income.java +++ b/src/main/java/com/faf223/expensetrackerfaf/model/Income.java @@ -29,4 +29,10 @@ public class Income implements IMoneyTransaction { private LocalDate date; private BigDecimal amount; + + public Income(IncomeCategory incomeCategory, LocalDate date, BigDecimal amount) { + this.category = incomeCategory; + this.date = date; + this.amount = amount; + } } diff --git a/src/main/java/com/faf223/expensetrackerfaf/service/ExpenseCategoryService.java b/src/main/java/com/faf223/expensetrackerfaf/service/ExpenseCategoryService.java new file mode 100644 index 0000000..088f791 --- /dev/null +++ b/src/main/java/com/faf223/expensetrackerfaf/service/ExpenseCategoryService.java @@ -0,0 +1,18 @@ +package com.faf223.expensetrackerfaf.service; + +import com.faf223.expensetrackerfaf.model.ExpenseCategory; +import com.faf223.expensetrackerfaf.repository.ExpenseCategoryRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class ExpenseCategoryService { + + private final ExpenseCategoryRepository expenseCategoryRepository; + + public ExpenseCategory getExpenseCategory(long category) { + return expenseCategoryRepository.getReferenceById(category); + } + +} \ No newline at end of file diff --git a/src/main/java/com/faf223/expensetrackerfaf/service/IncomeCategoryService.java b/src/main/java/com/faf223/expensetrackerfaf/service/IncomeCategoryService.java new file mode 100644 index 0000000..2a143b1 --- /dev/null +++ b/src/main/java/com/faf223/expensetrackerfaf/service/IncomeCategoryService.java @@ -0,0 +1,17 @@ +package com.faf223.expensetrackerfaf.service; + +import com.faf223.expensetrackerfaf.model.IncomeCategory; +import com.faf223.expensetrackerfaf.repository.IncomeCategoryRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class IncomeCategoryService { + + private final IncomeCategoryRepository incomeCategoryRepository; + + public IncomeCategory getExpenseCategory(long category) { + return incomeCategoryRepository.getReferenceById(category); + } +} \ No newline at end of file diff --git a/src/main/java/com/faf223/expensetrackerfaf/service/UserService.java b/src/main/java/com/faf223/expensetrackerfaf/service/UserService.java index 75d3243..20dbc96 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/service/UserService.java +++ b/src/main/java/com/faf223/expensetrackerfaf/service/UserService.java @@ -1,17 +1,21 @@ package com.faf223.expensetrackerfaf.service; +import com.faf223.expensetrackerfaf.model.Credential; import com.faf223.expensetrackerfaf.model.User; +import com.faf223.expensetrackerfaf.repository.CredentialRepository; import com.faf223.expensetrackerfaf.repository.UserRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Optional; @Service @RequiredArgsConstructor public class UserService { private final UserRepository userRepository; + private final CredentialRepository credentialRepository; public void updateUser(User user) { userRepository.save(user); @@ -24,4 +28,12 @@ public class UserService { public User getUserById(String userUuid) { return userRepository.findById(userUuid).orElse(null); } + public User getUserByEmail(String email) { + Optional credential = credentialRepository.findByEmail(email); + if (credential.isPresent()) { + Optional user = userRepository.findById(credential.get().getUser().getUserUuid()); + return user.orElse(null); + } + return null; + } } \ No newline at end of file From 65c5c3f2df2ad71fb6a7263a0ee03b1bb7b17a1c Mon Sep 17 00:00:00 2001 From: mirrerror Date: Tue, 24 Oct 2023 19:59:23 +0300 Subject: [PATCH 9/9] refactor code, add interfaces for services --- .../controller/ExpenseController.java | 15 +++++++++++---- .../controller/IncomeController.java | 19 ++++++++++++++----- .../dto/mappers/ExpenseMapper.java | 2 +- .../dto/mappers/IncomeMapper.java | 3 +-- .../service/ExpenseCategoryService.java | 14 +++++++++++--- .../service/ExpenseService.java | 13 +++++++------ .../service/ICategoryService.java | 12 ++++++++++++ .../service/ITransactionService.java | 14 ++++++++++++++ .../service/IncomeCategoryService.java | 14 +++++++++++--- .../service/IncomeService.java | 13 +++++++------ 10 files changed, 89 insertions(+), 30 deletions(-) create mode 100644 src/main/java/com/faf223/expensetrackerfaf/service/ICategoryService.java create mode 100644 src/main/java/com/faf223/expensetrackerfaf/service/ITransactionService.java diff --git a/src/main/java/com/faf223/expensetrackerfaf/controller/ExpenseController.java b/src/main/java/com/faf223/expensetrackerfaf/controller/ExpenseController.java index f8cbb19..532d01c 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/controller/ExpenseController.java +++ b/src/main/java/com/faf223/expensetrackerfaf/controller/ExpenseController.java @@ -35,7 +35,7 @@ public class ExpenseController { @GetMapping() @PreAuthorize("hasRole('ADMIN')") public ResponseEntity> getAllExpenses() { - List expenses = expenseService.getExpenses().stream().map(expenseMapper::toDto).collect(Collectors.toList()); + List expenses = expenseService.getTransactions().stream().map(expenseMapper::toDto).collect(Collectors.toList()); if (!expenses.isEmpty()) return ResponseEntity.ok(expenses); else return ResponseEntity.notFound().build(); } @@ -53,7 +53,7 @@ public class ExpenseController { User user = userService.getUserByEmail(email); expense.setUser(user); - expenseService.createOrUpdateExpense(expense); + expenseService.createOrUpdate(expense); ExpenseDTO createdExpenseDTO = expenseMapper.toDto(expense); return ResponseEntity.status(HttpStatus.CREATED).body(createdExpenseDTO); } @@ -67,7 +67,7 @@ public class ExpenseController { BindingResult bindingResult) { Expense expense = expenseMapper.toExpense(expenseDTO); if (!bindingResult.hasErrors()) { - expenseService.createOrUpdateExpense(expense); + expenseService.createOrUpdate(expense); return ResponseEntity.ok(expenseMapper.toDto(expense)); } else { return ResponseEntity.notFound().build(); @@ -82,7 +82,7 @@ public class ExpenseController { if (authentication != null && authentication.getPrincipal() instanceof UserDetails userDetails) { String email = userDetails.getUsername(); - List expenses = expenseService.getExpensesByEmail(email).stream().map(expenseMapper::toDto).collect(Collectors.toList()); + List expenses = expenseService.getTransactionsByEmail(email).stream().map(expenseMapper::toDto).collect(Collectors.toList()); if (!expenses.isEmpty()) { return ResponseEntity.ok(expenses); @@ -91,4 +91,11 @@ public class ExpenseController { return ResponseEntity.notFound().build(); } + + @GetMapping("/categories") + public ResponseEntity> getAllCategories() { + List categories = expenseCategoryService.getAllCategories(); + if (!categories.isEmpty()) return ResponseEntity.ok(categories); + else return ResponseEntity.notFound().build(); + } } \ No newline at end of file diff --git a/src/main/java/com/faf223/expensetrackerfaf/controller/IncomeController.java b/src/main/java/com/faf223/expensetrackerfaf/controller/IncomeController.java index 85526b0..aecab85 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/controller/IncomeController.java +++ b/src/main/java/com/faf223/expensetrackerfaf/controller/IncomeController.java @@ -1,11 +1,12 @@ package com.faf223.expensetrackerfaf.controller; -import com.faf223.expensetrackerfaf.dto.ExpenseDTO; import com.faf223.expensetrackerfaf.dto.IncomeCreationDTO; import com.faf223.expensetrackerfaf.dto.IncomeDTO; import com.faf223.expensetrackerfaf.dto.mappers.IncomeMapper; import com.faf223.expensetrackerfaf.model.Income; +import com.faf223.expensetrackerfaf.model.IncomeCategory; import com.faf223.expensetrackerfaf.model.User; +import com.faf223.expensetrackerfaf.service.IncomeCategoryService; import com.faf223.expensetrackerfaf.service.IncomeService; import com.faf223.expensetrackerfaf.service.UserService; import lombok.RequiredArgsConstructor; @@ -29,11 +30,12 @@ public class IncomeController { private final IncomeService incomeService; private final UserService userService; private final IncomeMapper incomeMapper; + private final IncomeCategoryService incomeCategoryService; @GetMapping() @PreAuthorize("hasRole('ADMIN')") public ResponseEntity> getAllIncomes() { - List incomes = incomeService.getIncomes().stream().map(incomeMapper::toDto).collect(Collectors.toList()); + List incomes = incomeService.getTransactions().stream().map(incomeMapper::toDto).collect(Collectors.toList()); if (!incomes.isEmpty()) return ResponseEntity.ok(incomes); else return ResponseEntity.notFound().build(); } @@ -51,7 +53,7 @@ public class IncomeController { income.setUser(user); System.out.println(income); - incomeService.createOrUpdateIncome(income); + incomeService.createOrUpdate(income); IncomeDTO createdIncomeDTO = incomeMapper.toDto(income); return ResponseEntity.status(HttpStatus.CREATED).body(createdIncomeDTO); } @@ -64,7 +66,7 @@ public class IncomeController { BindingResult bindingResult) { Income income = incomeMapper.toIncome(incomeDTO); if (!bindingResult.hasErrors()) { - incomeService.createOrUpdateIncome(income); + incomeService.createOrUpdate(income); return ResponseEntity.ok(incomeMapper.toDto(income)); } else { return ResponseEntity.notFound().build(); @@ -79,7 +81,7 @@ public class IncomeController { if (authentication != null && authentication.getPrincipal() instanceof UserDetails userDetails) { String email = userDetails.getUsername(); - List incomes = incomeService.getIncomesByEmail(email).stream().map(incomeMapper::toDto).collect(Collectors.toList()); + List incomes = incomeService.getTransactionsByEmail(email).stream().map(incomeMapper::toDto).collect(Collectors.toList()); if (!incomes.isEmpty()) { return ResponseEntity.ok(incomes); @@ -88,4 +90,11 @@ public class IncomeController { return ResponseEntity.notFound().build(); } + + @GetMapping("/categories") + public ResponseEntity> getAllCategories() { + List categories = incomeCategoryService.getAllCategories(); + if (!categories.isEmpty()) return ResponseEntity.ok(categories); + else return ResponseEntity.notFound().build(); + } } \ No newline at end of file diff --git a/src/main/java/com/faf223/expensetrackerfaf/dto/mappers/ExpenseMapper.java b/src/main/java/com/faf223/expensetrackerfaf/dto/mappers/ExpenseMapper.java index fc5bcd1..9bc257f 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/dto/mappers/ExpenseMapper.java +++ b/src/main/java/com/faf223/expensetrackerfaf/dto/mappers/ExpenseMapper.java @@ -31,7 +31,7 @@ public class ExpenseMapper { public Expense toExpense(ExpenseCreationDTO expenseDTO) { - return new Expense(expenseCategoryService.getExpenseCategory(expenseDTO.getExpenseCategory()), LocalDate.now(), expenseDTO.getAmount()); + return new Expense(expenseCategoryService.getCategoryById(expenseDTO.getExpenseCategory()), LocalDate.now(), expenseDTO.getAmount()); } } \ No newline at end of file diff --git a/src/main/java/com/faf223/expensetrackerfaf/dto/mappers/IncomeMapper.java b/src/main/java/com/faf223/expensetrackerfaf/dto/mappers/IncomeMapper.java index 0224ac5..a59a2dd 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/dto/mappers/IncomeMapper.java +++ b/src/main/java/com/faf223/expensetrackerfaf/dto/mappers/IncomeMapper.java @@ -31,8 +31,7 @@ public class IncomeMapper { } public Income toIncome(IncomeCreationDTO incomeDTO) { - - return new Income(incomeCategoryService.getExpenseCategory(incomeDTO.getIncomeCategory()), LocalDate.now(), incomeDTO.getAmount()); + return new Income(incomeCategoryService.getCategoryById(incomeDTO.getIncomeCategory()), LocalDate.now(), incomeDTO.getAmount()); } } \ No newline at end of file diff --git a/src/main/java/com/faf223/expensetrackerfaf/service/ExpenseCategoryService.java b/src/main/java/com/faf223/expensetrackerfaf/service/ExpenseCategoryService.java index 088f791..2d90b6a 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/service/ExpenseCategoryService.java +++ b/src/main/java/com/faf223/expensetrackerfaf/service/ExpenseCategoryService.java @@ -5,14 +5,22 @@ import com.faf223.expensetrackerfaf.repository.ExpenseCategoryRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.List; + @Service @RequiredArgsConstructor -public class ExpenseCategoryService { +public class ExpenseCategoryService implements ICategoryService { private final ExpenseCategoryRepository expenseCategoryRepository; - public ExpenseCategory getExpenseCategory(long category) { - return expenseCategoryRepository.getReferenceById(category); + @Override + public List getAllCategories() { + return expenseCategoryRepository.findAll(); + } + + @Override + public ExpenseCategory getCategoryById(long id) { + return expenseCategoryRepository.getReferenceById(id); } } \ No newline at end of file diff --git a/src/main/java/com/faf223/expensetrackerfaf/service/ExpenseService.java b/src/main/java/com/faf223/expensetrackerfaf/service/ExpenseService.java index 1bea04a..4209fd6 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/service/ExpenseService.java +++ b/src/main/java/com/faf223/expensetrackerfaf/service/ExpenseService.java @@ -2,6 +2,7 @@ package com.faf223.expensetrackerfaf.service; import com.faf223.expensetrackerfaf.model.Credential; import com.faf223.expensetrackerfaf.model.Expense; +import com.faf223.expensetrackerfaf.model.IMoneyTransaction; import com.faf223.expensetrackerfaf.repository.CredentialRepository; import com.faf223.expensetrackerfaf.repository.ExpenseRepository; import lombok.RequiredArgsConstructor; @@ -13,16 +14,16 @@ import java.util.Optional; @Service @RequiredArgsConstructor -public class ExpenseService { +public class ExpenseService implements ITransactionService { private final ExpenseRepository expenseRepository; private final CredentialRepository credentialRepository; - public void createOrUpdateExpense(Expense expense) { - expenseRepository.save(expense); + public void createOrUpdate(IMoneyTransaction expense) { + expenseRepository.save((Expense) expense); } - public List getExpensesByEmail(String email) { + public List getTransactionsByEmail(String email) { Optional credential = credentialRepository.findByEmail(email); if (credential.isPresent()) { @@ -32,11 +33,11 @@ public class ExpenseService { return new ArrayList<>(); } - public List getExpenses() { + public List getTransactions() { return expenseRepository.findAll(); } - public Expense getExpenseById(long id) { + public Expense getTransactionById(long id) { return expenseRepository.findById(id).orElse(null); } } \ No newline at end of file diff --git a/src/main/java/com/faf223/expensetrackerfaf/service/ICategoryService.java b/src/main/java/com/faf223/expensetrackerfaf/service/ICategoryService.java new file mode 100644 index 0000000..d48d8f7 --- /dev/null +++ b/src/main/java/com/faf223/expensetrackerfaf/service/ICategoryService.java @@ -0,0 +1,12 @@ +package com.faf223.expensetrackerfaf.service; + +import com.faf223.expensetrackerfaf.model.IMoneyTransactionCategory; + +import java.util.List; + +public interface ICategoryService { + + List getAllCategories(); + IMoneyTransactionCategory getCategoryById(long id); + +} diff --git a/src/main/java/com/faf223/expensetrackerfaf/service/ITransactionService.java b/src/main/java/com/faf223/expensetrackerfaf/service/ITransactionService.java new file mode 100644 index 0000000..6219bef --- /dev/null +++ b/src/main/java/com/faf223/expensetrackerfaf/service/ITransactionService.java @@ -0,0 +1,14 @@ +package com.faf223.expensetrackerfaf.service; + +import com.faf223.expensetrackerfaf.model.IMoneyTransaction; + +import java.util.List; + +public interface ITransactionService { + + void createOrUpdate(IMoneyTransaction transaction); + List getTransactions(); + List getTransactionsByEmail(String email); + IMoneyTransaction getTransactionById(long id); + +} diff --git a/src/main/java/com/faf223/expensetrackerfaf/service/IncomeCategoryService.java b/src/main/java/com/faf223/expensetrackerfaf/service/IncomeCategoryService.java index 2a143b1..b7ce745 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/service/IncomeCategoryService.java +++ b/src/main/java/com/faf223/expensetrackerfaf/service/IncomeCategoryService.java @@ -5,13 +5,21 @@ import com.faf223.expensetrackerfaf.repository.IncomeCategoryRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.List; + @Service @RequiredArgsConstructor -public class IncomeCategoryService { +public class IncomeCategoryService implements ICategoryService { private final IncomeCategoryRepository incomeCategoryRepository; - public IncomeCategory getExpenseCategory(long category) { - return incomeCategoryRepository.getReferenceById(category); + @Override + public List getAllCategories() { + return incomeCategoryRepository.findAll(); + } + + @Override + public IncomeCategory getCategoryById(long id) { + return incomeCategoryRepository.getReferenceById(id); } } \ No newline at end of file diff --git a/src/main/java/com/faf223/expensetrackerfaf/service/IncomeService.java b/src/main/java/com/faf223/expensetrackerfaf/service/IncomeService.java index 16946a9..8287d01 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/service/IncomeService.java +++ b/src/main/java/com/faf223/expensetrackerfaf/service/IncomeService.java @@ -1,6 +1,7 @@ package com.faf223.expensetrackerfaf.service; import com.faf223.expensetrackerfaf.model.Credential; +import com.faf223.expensetrackerfaf.model.IMoneyTransaction; import com.faf223.expensetrackerfaf.model.Income; import com.faf223.expensetrackerfaf.repository.CredentialRepository; import com.faf223.expensetrackerfaf.repository.IncomeRepository; @@ -13,20 +14,20 @@ import java.util.Optional; @Service @RequiredArgsConstructor -public class IncomeService { +public class IncomeService implements ITransactionService { private final IncomeRepository incomeRepository; private final CredentialRepository credentialRepository; - public void createOrUpdateIncome(Income income) { - incomeRepository.save(income); + public void createOrUpdate(IMoneyTransaction income) { + incomeRepository.save((Income) income); } - public List getIncomes() { + public List getTransactions() { return incomeRepository.findAll(); } - public List getIncomesByEmail(String email) { + public List getTransactionsByEmail(String email) { Optional credential = credentialRepository.findByEmail(email); if (credential.isPresent()) { @@ -36,7 +37,7 @@ public class IncomeService { return new ArrayList<>(); } - public Income getIncomeById(long id) { + public Income getTransactionById(long id) { return incomeRepository.findById(id).orElse(null); } }