Merge pull request #39 from felipemelozx/develop

Develop

Author: felipemelozx

src/main/java/fun/trackmoney/account/controller/AccountController.java

@@ -4,6 +4,7 @@
 import fun.trackmoney.account.dtos.AccountResponseDTO;
 import fun.trackmoney.account.dtos.AccountUpdateRequestDTO;
 import fun.trackmoney.account.service.AccountService;
+import fun.trackmoney.utils.AuthUtils;
 import fun.trackmoney.utils.response.ApiResponse;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -17,15 +18,18 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
+import java.util.UUID;
 
 @RestController
 @RequestMapping("/accounts")
 public class AccountController {
 
   private final AccountService accountService;
+  private final AuthUtils authUtils;
 
-  public AccountController(AccountService accountService) {
+  public AccountController(AccountService accountService, AuthUtils authUtils) {
     this.accountService = accountService;
+    this.authUtils = authUtils;
   }
 
   @PostMapping
@@ -35,13 +39,16 @@ public ResponseEntity<ApiResponse<AccountResponseDTO>> createAccount(@RequestBod
         true, "Account successfully created.", createdAccount, null), HttpStatus.CREATED);
   }
 
+
   @GetMapping
   public ResponseEntity<ApiResponse<List<AccountResponseDTO>>> findAllAccounts() {
-    List<AccountResponseDTO> accounts = accountService.findAllAccount();
+    UUID email = authUtils.getCurrentUser().getUserId();
+    List<AccountResponseDTO> accounts = accountService.findAllAccount(email);
     return ResponseEntity.ok(new ApiResponse<>(
         true, "Account list retrieved successfully.", accounts, null));
   }
 
+
   @GetMapping("/{id}")
   public ResponseEntity<ApiResponse<AccountResponseDTO>> findAccountById(@PathVariable Integer id) {
     AccountResponseDTO account = accountService.findAccountById(id);

src/main/java/fun/trackmoney/account/mapper/AccountMapper.java

@@ -19,4 +19,6 @@ public interface AccountMapper {
   List<AccountResponseDTO> accountEntityListToAccountResponseList(List<AccountEntity> entities);
 
   AccountEntity accountResponseToEntity(AccountResponseDTO accountById);
+
+  AccountUpdateRequestDTO toAccountRequest(AccountEntity account);
 }

src/main/java/fun/trackmoney/account/repository/AccountRepository.java

@@ -2,6 +2,13 @@
 
 import fun.trackmoney.account.entity.AccountEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+import java.util.UUID;
 
 public interface AccountRepository extends JpaRepository<AccountEntity, Integer> {
+  @Query("SELECT a FROM AccountEntity a WHERE a.user.userId = :userId")
+  List<AccountEntity> findAllByUserEmail(@Param("userId") UUID userId);
 }

src/main/java/fun/trackmoney/account/service/AccountService.java

@@ -11,7 +11,9 @@
 import fun.trackmoney.user.repository.UserRepository;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.List;
+import java.util.UUID;
 
 @Service
 public class AccountService {
@@ -38,8 +40,8 @@ public AccountResponseDTO createAccount(AccountRequestDTO dto) {
            .save(account));
   }
 
-  public List<AccountResponseDTO> findAllAccount() {
-    return accountMapper.accountEntityListToAccountResponseList(accountRepository.findAll());
+  public List<AccountResponseDTO> findAllAccount(UUID userId) {
+    return accountMapper.accountEntityListToAccountResponseList(accountRepository.findAllByUserEmail(userId));
   }
 
   public AccountResponseDTO findAccountById(Integer id) {
@@ -60,4 +62,17 @@ public AccountResponseDTO updateAccountById(Integer id, AccountUpdateRequestDTO
   public void deleteById(Integer id) {
       accountRepository.deleteById(id);
   }
+
+  public void updateAccountBalance(BigDecimal balance, Integer accountId, Boolean isCredit) {
+    var account = accountRepository.findById(accountId)
+        .orElseThrow(() -> new AccountNotFoundException("Account not found!"));
+
+    if (isCredit) {
+      account.setBalance(account.getBalance().add(balance));
+    } else{
+      account.setBalance(account.getBalance().subtract(balance));
+    }
+
+    accountRepository.save(account);
+  }
 }

src/main/java/fun/trackmoney/auth/controller/AuthController.java

@@ -8,6 +8,7 @@
 import fun.trackmoney.utils.response.ApiResponse;
 import jakarta.validation.Valid;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -18,7 +19,7 @@
  * Provides endpoints for user registration.
  */
 @RestController
-@RequestMapping("auth/")
+@RequestMapping("auth")
 public class AuthController {
 
   private final AuthService authService;
@@ -39,7 +40,7 @@ public AuthController(AuthService authService) {
    * @return A ResponseEntity containing an ApiResponse
    *                                    with the result of the registration operation.
    */
-  @PostMapping("register")
+  @PostMapping("/register")
   public ResponseEntity<ApiResponse<UserResponseDTO>> register(
       @RequestBody @Valid UserRequestDTO userDto) {
     return ResponseEntity.ok().body(
@@ -52,7 +53,7 @@ public ResponseEntity<ApiResponse<UserResponseDTO>> register(
     );
   }
 
-  @PostMapping("login")
+  @PostMapping("/login")
   public ResponseEntity<ApiResponse<LoginResponseDTO>> login(@RequestBody LoginRequestDTO loginDto) {
     return ResponseEntity.ok().body(
         new ApiResponse<>(
@@ -63,4 +64,16 @@ public ResponseEntity<ApiResponse<LoginResponseDTO>> login(@RequestBody LoginReq
         )
     );
   }
+
+  @GetMapping("/verify")
+  public ResponseEntity<ApiResponse<Boolean>> verify() {
+    return ResponseEntity.ok().body(
+        new ApiResponse<>(
+            true,
+            "Token is valid!",
+            true,
+            null
+        )
+    );
+  }
 }

src/main/java/fun/trackmoney/budget/controller/BudgetsController.java

@@ -33,9 +33,9 @@ public ResponseEntity<ApiResponse<BudgetResponseDTO>> create(@RequestBody Budget
         new ApiResponse<>(true, "Budget created", budgetsService.create(dto), null));
   }
 
-  @GetMapping
-  public ResponseEntity<ApiResponse<List<BudgetResponseDTO>>> findAll() {
-    var list = budgetsService.findAll();
+  @GetMapping("/findAll/{accountId}")
+  public ResponseEntity<ApiResponse<List<BudgetResponseDTO>>> findAllByAccountId(@PathVariable Integer accountId) {
+    var list = budgetsService.findAllByAccountId(accountId);
     return ResponseEntity.status(HttpStatus.OK).body(
         new ApiResponse<>(true, "Get all Budget",list , null));
   }

src/main/java/fun/trackmoney/budget/dtos/BudgetResponseDTO.java

@@ -9,5 +9,6 @@ public record BudgetResponseDTO (Integer budgetId,
                                  CategoryEntity category,
                                  AccountResponseDTO account,
                                  BigDecimal targetAmount,
-                                 Integer resetDay) {
+                                 Integer resetDay,
+                                 BigDecimal currentAmount) {
 }

src/main/java/fun/trackmoney/budget/entity/BudgetsEntity.java

@@ -38,6 +38,8 @@ public class BudgetsEntity {
   @Column(name = "reset_day")
   private Integer resetDay;
 
+  private BigDecimal currentAmount;
+
   public AccountEntity getAccount() {
     return account;
   }
@@ -58,6 +60,18 @@ public BudgetsEntity(Integer budgetId,
     this.resetDay = resetDay;
   }
 
+  public BudgetsEntity(Integer budgetId,
+                       CategoryEntity category,
+                       AccountEntity account,
+                       UserEntity userEntity,
+                       BigDecimal targetAmount,
+                       Integer resetDay,
+                       BigDecimal currentAmount) {
+    this(budgetId, category, userEntity, targetAmount, resetDay);
+    this.currentAmount = currentAmount;
+    this.account = account;
+  }
+
   public void setAccount(AccountEntity account) {
     this.account = account;
   }
@@ -105,4 +119,12 @@ public UserEntity getUserEntity() {
   public void setUserEntity(UserEntity userEntity) {
     this.userEntity = userEntity;
   }
+
+  public BigDecimal getCurrentAmount() {
+    return currentAmount;
+  }
+
+  public void setCurrentAmount(BigDecimal currentAmount) {
+    this.currentAmount = currentAmount;
+  }
 }

src/main/java/fun/trackmoney/budget/repository/BudgetsRepository.java

@@ -3,5 +3,8 @@
 import fun.trackmoney.budget.entity.BudgetsEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.util.List;
+
 public interface BudgetsRepository extends JpaRepository<BudgetsEntity, Integer> {
+  List<BudgetsEntity> findAllByAccountAccountId(Integer accountId);
 }

src/main/java/fun/trackmoney/budget/service/BudgetsService.java

@@ -12,6 +12,7 @@
 import fun.trackmoney.user.service.UserService;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 @Service
@@ -47,8 +48,25 @@ public BudgetResponseDTO create(BudgetCreateDTO dto) {
     return budgetMapper.entityToResponseDTO(budgetsRepository.save(budgets));
   }
 
-  public List<BudgetResponseDTO> findAll() {
-    return budgetMapper.entityListToResponseList(budgetsRepository.findAll());
+  public List<BudgetResponseDTO> findAllByAccountId(Integer accountId) {
+    return budgetMapper.entityListToResponseList(
+            budgetsRepository.findAllByAccountAccountId(accountId)
+        ).stream()
+        .map(budget -> {
+          BigDecimal currentAmount = budget.currentAmount() == null
+              ? BigDecimal.valueOf(100)
+              : budget.currentAmount();
+
+          return new BudgetResponseDTO(
+              budget.budgetId(),
+              budget.category(),
+              budget.account(),
+              budget.targetAmount(),
+              budget.resetDay(),
+              currentAmount
+          );
+        })
+        .toList();
   }
 
   public BudgetResponseDTO findById(Integer id) {