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