-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
de59fe4
commit 43d11c8
Showing
25 changed files
with
3,365 additions
and
186 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
24 changes: 0 additions & 24 deletions
24
obs/obs-rest-server/src/main/java/com/adorsys/webank/obs/resource/BankingResource.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
24 changes: 24 additions & 0 deletions
24
obs/obs-rest-server/src/test/java/com/adorsys/webank/obs/Config/WebConfig.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
package com.adorsys.webank.obs.Config; | ||
|
||
import org.springframework.context.annotation.Bean; | ||
import org.springframework.context.annotation.Configuration; | ||
import org.springframework.web.servlet.config.annotation.CorsRegistry; | ||
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; | ||
|
||
@Configuration | ||
public class WebConfig { | ||
|
||
@Bean | ||
public WebMvcConfigurer corsConfigurer() { | ||
return new WebMvcConfigurer() { | ||
@Override | ||
public void addCorsMappings(CorsRegistry registry) { | ||
registry.addMapping("/**") // Applies to all endpoints | ||
.allowedOrigins("http://localhost:5173") // Replace with your frontend URL | ||
.allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS") | ||
.allowedHeaders("*") | ||
.allowCredentials(true); | ||
} | ||
}; | ||
} | ||
} |
103 changes: 57 additions & 46 deletions
103
...s-rest-server/src/test/java/com/adorsys/webank/obs/resource/RegistrationResourceTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,46 +1,57 @@ | ||
package com.adorsys.webank.obs.resource; | ||
|
||
import com.adorsys.webank.obs.dto.RegistrationRequest; | ||
import com.adorsys.webank.obs.service.RegistrationServiceApi; | ||
import org.junit.jupiter.api.BeforeEach; | ||
import org.junit.jupiter.api.Test; | ||
import org.mockito.InjectMocks; | ||
import org.mockito.Mock; | ||
import org.mockito.MockitoAnnotations; | ||
import org.springframework.http.HttpStatus; | ||
import org.springframework.http.ResponseEntity; | ||
|
||
import static org.junit.jupiter.api.Assertions.assertEquals; | ||
import static org.mockito.Mockito.when; | ||
|
||
public class RegistrationResourceTest { | ||
|
||
@InjectMocks | ||
private RegistrationResource registrationResource; // Class under test | ||
|
||
@Mock | ||
private RegistrationServiceApi registrationService; // Mocked dependency | ||
|
||
@BeforeEach | ||
void setUp() { | ||
MockitoAnnotations.openMocks(this); | ||
} | ||
|
||
@Test | ||
void registerAccount_ShouldReturnSuccessfulResponse() { | ||
// Arrange | ||
RegistrationRequest registrationRequest = new RegistrationRequest(); | ||
registrationRequest.setPhoneNumber("1234567890"); | ||
registrationRequest.setPublicKey("testPublicKey"); | ||
|
||
String expectedResponse = "Registration successful"; | ||
when(registrationService.registerAccount(registrationRequest)).thenReturn(expectedResponse); | ||
|
||
// Act | ||
ResponseEntity<String> responseEntity = registrationResource.registerAccount(registrationRequest); | ||
|
||
// Assert | ||
assertEquals(HttpStatus.OK, responseEntity.getStatusCode()); | ||
assertEquals(expectedResponse, responseEntity.getBody()); | ||
} | ||
} | ||
//package com.adorsys.webank.obs.resource; | ||
// | ||
//import com.adorsys.webank.obs.dto.RegistrationRequest; | ||
//import com.adorsys.webank.obs.service.RegistrationServiceApi; | ||
//import com.fasterxml.jackson.databind.ObjectMapper; | ||
//import org.junit.jupiter.api.Test; | ||
//import org.springframework.beans.factory.annotation.Autowired; | ||
//import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; | ||
//import org.springframework.boot.test.context.SpringBootTest; | ||
//import org.springframework.boot.test.mock.mockito.MockBean; | ||
//import org.springframework.http.MediaType; | ||
//import org.springframework.test.web.servlet.MockMvc; | ||
//import org.springframework.test.web.servlet.MvcResult; | ||
// | ||
//import static org.mockito.Mockito.when; | ||
//import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; | ||
//import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; | ||
//import static org.junit.jupiter.api.Assertions.assertEquals; | ||
// | ||
//@SpringBootTest | ||
//@AutoConfigureMockMvc | ||
//public class RegistrationResourceTest { | ||
// | ||
// @Autowired | ||
// private MockMvc mockMvc; | ||
// | ||
// @MockBean | ||
// private RegistrationServiceApi registrationService; | ||
// | ||
// @Autowired | ||
// private ObjectMapper objectMapper; | ||
// | ||
// @Test | ||
// public void shouldRegisterAccountSuccessfully() throws Exception { | ||
// // Arrange | ||
// RegistrationRequest request = new RegistrationRequest(); | ||
// request.setPhoneNumber("1234567890"); | ||
// request.setPublicKey("examplePublicKey"); | ||
// | ||
// String expectedMessage = "Registration successful for phone number: 1234567890. Account ID: abc123"; | ||
// when(registrationService.registerAccount(request)).thenReturn(expectedMessage); | ||
// | ||
// // Act | ||
// MvcResult result = mockMvc.perform(post("/api/registration") | ||
// .contentType(MediaType.APPLICATION_JSON) | ||
// .content(objectMapper.writeValueAsString(request))) | ||
// .andExpect(status().isCreated()) // Expecting HTTP 201 Created | ||
// .andReturn(); | ||
// | ||
// // Log the response for debugging purposes | ||
// String actualResponse = result.getResponse().getContentAsString(); | ||
// System.out.println("Response: " + actualResponse); // Print response to console for debugging | ||
// | ||
// // Assert | ||
// assertEquals(expectedMessage, actualResponse, "Response message should match expected message"); | ||
// } | ||
//} |
16 changes: 16 additions & 0 deletions
16
obs/obs-rest-server/src/test/java/com/adorsys/webank/obs/resource/StarterIT.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
package com.adorsys.webank.obs.resource; | ||
|
||
import | ||
org.junit.jupiter.api.Test; | ||
import org.springframework.boot.test.context.SpringBootTest; | ||
|
||
@SpringBootTest(classes = TestOnlineBankingApplication.class) | ||
public class StarterIT { | ||
|
||
@Test | ||
|
||
void start() { | ||
assert true; | ||
} | ||
|
||
} |
39 changes: 39 additions & 0 deletions
39
...st-server/src/test/java/com/adorsys/webank/obs/resource/TestOnlineBankingApplication.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
package com.adorsys.webank.obs.resource; | ||
|
||
import com.adorsys.webank.obs.EnableObsServiceimpl; | ||
import de.adorsys.ledgers.bank.api.service.BankAccountInitService; | ||
import de.adorsys.ledgers.bank.api.service.EnableBankAccountService; | ||
import de.adorsys.ledgers.bank.server.utils.client.ExchangeRateClient; | ||
import de.adorsys.ledgers.postings.impl.EnablePostingService; | ||
import org.jetbrains.annotations.NotNull; | ||
import org.springframework.beans.factory.annotation.Autowired; | ||
import org.springframework.boot.SpringApplication; | ||
import org.springframework.boot.autoconfigure.SpringBootApplication; | ||
import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration; | ||
import org.springframework.boot.context.event.ApplicationReadyEvent; | ||
import org.springframework.cloud.openfeign.EnableFeignClients; | ||
import org.springframework.context.ApplicationListener; | ||
|
||
@SpringBootApplication(exclude = {SecurityAutoConfiguration.class}) | ||
@EnableBankAccountService | ||
@EnableObsServiceimpl | ||
@EnablePostingService | ||
@EnableFeignClients(basePackageClasses = ExchangeRateClient.class) | ||
public class TestOnlineBankingApplication implements ApplicationListener<ApplicationReadyEvent> { | ||
|
||
private final BankAccountInitService bankInitService; | ||
|
||
@Autowired | ||
public TestOnlineBankingApplication(BankAccountInitService bankInitService) { | ||
this.bankInitService = bankInitService; | ||
} | ||
|
||
public static void main(String[] args) { | ||
SpringApplication.run(TestOnlineBankingApplication.class, args); | ||
} | ||
|
||
@Override | ||
public void onApplicationEvent(@NotNull ApplicationReadyEvent event) { | ||
bankInitService.initConfigData(); | ||
} | ||
} |
26 changes: 26 additions & 0 deletions
26
obs/obs-rest-server/src/test/java/com/adorsys/webank/obs/resource/mockbank/Config.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
/* | ||
* Copyright (c) 2018-2024 adorsys GmbH and Co. KG | ||
* All rights are reserved. | ||
*/ | ||
|
||
package com.adorsys.webank.obs.resource.mockbank; | ||
|
||
@org.springframework.context.annotation.Configuration | ||
public class Config { | ||
@org.springframework.context.annotation.Bean | ||
public de.adorsys.ledgers.bank.api.service.domain.ASPSPConfigSource configSource() { | ||
return new MockBankConfigSource(); | ||
} | ||
|
||
@org.springframework.context.annotation.Bean | ||
public java.security.Principal getPrincipal(){ | ||
return () -> "anonymous"; | ||
} | ||
|
||
@org.springframework.context.annotation.Bean | ||
public com.fasterxml.jackson.databind.ObjectMapper objectMapper() { | ||
return new com.fasterxml.jackson.databind.ObjectMapper() | ||
.configure(com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); | ||
|
||
} | ||
} |
Oops, something went wrong.