From 8f24cc7b4f34a0713ddffb865a2d94cb4b522942 Mon Sep 17 00:00:00 2001 From: kouamschekina <146363175+kouamschekina@users.noreply.github.com> Date: Thu, 11 Apr 2024 17:09:58 +0100 Subject: [PATCH] fix: backend tests that caused the CI/CD pipeline to fail (#129) * fix: fixed the SendMoneyImpl test and CompareHashPassword test * fix: fixed the SendMoneyImpl test and CompareHashPassword test * test: commented defective tests * test: uncommented defective tests * fix(test): fixed the BackendHealthTest and ApplicationsTest --- .../repository/UserRepository.java | 5 ++--- .../services/CheckBalanceController.java | 17 +++++++---------- .../services_tests/SendMoneyImplTest.java | 2 +- .../utils_test/CompareHashPasswordTest.java | 12 ++++++++---- .../powerpaybackend/utils_test/RunWith.java | 0 5 files changed, 18 insertions(+), 18 deletions(-) create mode 100644 power-pay-backend/src/test/java/com/adorsys/gis/powerpay/powerpaybackend/utils_test/RunWith.java diff --git a/power-pay-backend/src/main/java/com/adorsys/gis/powerpay/powerpaybackend/repository/UserRepository.java b/power-pay-backend/src/main/java/com/adorsys/gis/powerpay/powerpaybackend/repository/UserRepository.java index 4635a4aa..f225aa74 100644 --- a/power-pay-backend/src/main/java/com/adorsys/gis/powerpay/powerpaybackend/repository/UserRepository.java +++ b/power-pay-backend/src/main/java/com/adorsys/gis/powerpay/powerpaybackend/repository/UserRepository.java @@ -1,6 +1,5 @@ package com.adorsys.gis.powerpay.powerpaybackend.repository; -import com.adorsys.gis.powerpay.powerpaybackend.domain.Transaction; import com.adorsys.gis.powerpay.powerpaybackend.domain.User; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; @@ -8,6 +7,6 @@ import java.util.Optional; @Repository -public interface UserRepository extends JpaRepository { - Optional findByUserId(String userId); +public interface UserRepository extends JpaRepository { + Optional findByPhoneNumber(String phoneNumber); } diff --git a/power-pay-backend/src/main/java/com/adorsys/gis/powerpay/powerpaybackend/services/CheckBalanceController.java b/power-pay-backend/src/main/java/com/adorsys/gis/powerpay/powerpaybackend/services/CheckBalanceController.java index 54085a78..8e877eea 100644 --- a/power-pay-backend/src/main/java/com/adorsys/gis/powerpay/powerpaybackend/services/CheckBalanceController.java +++ b/power-pay-backend/src/main/java/com/adorsys/gis/powerpay/powerpaybackend/services/CheckBalanceController.java @@ -20,22 +20,19 @@ public class CheckBalanceController { private final UserRepository userRepository; @Autowired - public CheckBalanceController(CheckBalance checkBalanceService,UserRepository userRepository){ + public CheckBalanceController(CheckBalance checkBalanceService, UserRepository userRepository) { this.checkBalanceService = checkBalanceService; this.userRepository = userRepository; } @GetMapping("/{userId}") - public ResponseEntity checkBalance(@PathVariable String userId){ - Optional user = userRepository.findByUserId(userId); - if(user.isPresent()){ + public ResponseEntity checkBalance(@PathVariable String userId) { + Optional user = userRepository.findByPhoneNumber(userId); + if (user.isPresent()) { Double balance = checkBalanceService.checkBalance(userId); - return ResponseEntity.ok("Balance for user ID" + " : " +balance); - } - else { + return ResponseEntity.ok("Balance for user ID" + " : " + balance); + } else { return ResponseEntity.status(HttpStatus.NOT_FOUND).body("User not found"); } - } } - - +} diff --git a/power-pay-backend/src/test/java/com/adorsys/gis/powerpay/powerpaybackend/services_tests/SendMoneyImplTest.java b/power-pay-backend/src/test/java/com/adorsys/gis/powerpay/powerpaybackend/services_tests/SendMoneyImplTest.java index 39c92d0b..2d49076b 100644 --- a/power-pay-backend/src/test/java/com/adorsys/gis/powerpay/powerpaybackend/services_tests/SendMoneyImplTest.java +++ b/power-pay-backend/src/test/java/com/adorsys/gis/powerpay/powerpaybackend/services_tests/SendMoneyImplTest.java @@ -16,7 +16,7 @@ import com.adorsys.gis.powerpay.powerpaybackend.services.SendMoneyImpl; @RunWith(SpringRunner.class) -@SpringBootTest +@SpringBootTest(classes = {SendMoneyImpl.class}) public class SendMoneyImplTest { @Autowired diff --git a/power-pay-backend/src/test/java/com/adorsys/gis/powerpay/powerpaybackend/utils_test/CompareHashPasswordTest.java b/power-pay-backend/src/test/java/com/adorsys/gis/powerpay/powerpaybackend/utils_test/CompareHashPasswordTest.java index 52e5c7f4..a6e70cfe 100644 --- a/power-pay-backend/src/test/java/com/adorsys/gis/powerpay/powerpaybackend/utils_test/CompareHashPasswordTest.java +++ b/power-pay-backend/src/test/java/com/adorsys/gis/powerpay/powerpaybackend/utils_test/CompareHashPasswordTest.java @@ -1,14 +1,18 @@ package com.adorsys.gis.powerpay.powerpaybackend.utils_test; +import static org.junit.jupiter.api.Assertions.*; + import org.junit.jupiter.api.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; import com.adorsys.gis.powerpay.powerpaybackend.utils.DataSecurityService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.*; -import static org.junit.jupiter.api.Assertions.assertTrue; -@SpringBootTest +@RunWith(SpringRunner.class) +@SpringBootTest(classes={DataSecurityService.class}) public class CompareHashPasswordTest { @Autowired diff --git a/power-pay-backend/src/test/java/com/adorsys/gis/powerpay/powerpaybackend/utils_test/RunWith.java b/power-pay-backend/src/test/java/com/adorsys/gis/powerpay/powerpaybackend/utils_test/RunWith.java new file mode 100644 index 00000000..e69de29b