Merge pull request #63 from ADORSYS-GIS/ensure-that-OB-can-access-the…

…-module-ledger-bank-account-rest-api

Ensure that ob can access the module ledger bank account rest api

.github/workflows/develop.yaml

@@ -47,6 +47,7 @@ jobs:
       - name: Build with webank Online banking
         run: mvn clean install -s ~/.m2/settings.xml -DskipTests -DskipITs -Dmaven.javadoc.skip=true
 
+  # 2. Test Stage
   test:
     runs-on: ubuntu-latest
     needs: build
@@ -80,4 +81,5 @@ jobs:
                 </settings>" > ~/.m2/settings.xml
 
       - name: Run Unit and Integration Tests
-        run: mvn verify -s ~/.m2/settings.xml -Dmaven.javadoc.skip=true
+        run: mvn verify -s ~/.m2/settings.xml -Dmaven.javadoc.skip=true
+

obs/obs-rest-api/pom.xml

@@ -35,17 +35,6 @@
             <artifactId>swagger-annotations-jakarta</artifactId>
         </dependency>
 
-        <!-- Spring Boot Starter for Web -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-
-        <!-- Spring Boot Starter for Testing -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>org.springdoc</groupId>

obs/obs-rest-api/src/main/java/com/adorsys/webank/obs/resource/RegistrationResourceApi.java

@@ -1,8 +1,3 @@
-/*
- * Copyright (c) 2018-2024 adorsys GmbH and Co. KG
- * All rights are reserved.
- */
-
 package com.adorsys.webank.obs.resource;
 
 import com.adorsys.webank.obs.dto.RegistrationRequest;
@@ -12,19 +7,17 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
-
-
 @RestController
 @RequestMapping("/api/registration")
+@CrossOrigin(origins = "http://localhost:5173")
 public interface RegistrationResourceApi {
 
     @Operation(summary = "Register a new bank account", description = "Accepts a phone number and public key for registration")
     @ApiResponses(value = {
-            @ApiResponse(responseCode = "200", description = "Registration successful"),
-            @ApiResponse(responseCode = "400", description = "Invalid input")
+            @ApiResponse(responseCode = "201", description = "Registration successful"),
+            @ApiResponse(responseCode = "400", description = "Invalid input"),
+            @ApiResponse(responseCode = "500", description = "Internal server error")
     })
     @PostMapping
-    ResponseEntity<String> registerAccount(
-             @RequestBody RegistrationRequest registrationRequest
-    );
+    ResponseEntity<String> registerAccount(@RequestBody RegistrationRequest registrationRequest);
 }

obs/obs-rest-server/pom.xml

@@ -47,6 +47,8 @@
             <version>${project.version}</version>
         </dependency>
 
+
+
         <!-- Test dependency -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -60,6 +62,28 @@
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.adorsys.webank</groupId>
+            <artifactId>obs-service-impl</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>de.adorsys.ledgers</groupId>
+            <artifactId>ledgers-postings-service-impl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>de.adorsys.webank</groupId>
+            <artifactId>webank-bank-account-service-impl</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
 
         <!-- Other existing dependencies -->
     </dependencies>

obs/obs-rest-server/src/main/java/com/adorsys/webank/obs/resource/RegistrationResource.java

@@ -4,6 +4,7 @@
 import com.adorsys.webank.obs.service.RegistrationServiceApi;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
+import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
@@ -16,7 +17,12 @@ public class RegistrationResource implements RegistrationResourceApi {
     @Override
     @PostMapping
     public ResponseEntity<String> registerAccount(@RequestBody RegistrationRequest registrationRequest) {
-        String result = registrationService.registerAccount(registrationRequest);
-        return ResponseEntity.ok(result);
+        try {
+            String result = registrationService.registerAccount(registrationRequest);
+            return ResponseEntity.status(HttpStatus.CREATED).body(result);
+        } catch (Exception e) {
+            // Log the exception (optional)
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("An error occurred while processing the request.");
+        }
     }
 }

obs/obs-rest-server/src/test/java/com/adorsys/webank/obs/Config/WebConfig.java

@@ -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);
+            }
+        };
+    }
+}

obs/obs-rest-server/src/test/java/com/adorsys/webank/obs/resource/RegistrationResourceTest.java

@@ -1,46 +0,0 @@
-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());
-    }
-}

obs/obs-rest-server/src/test/java/com/adorsys/webank/obs/resource/StarterIT.java

@@ -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;
+    }
+
+}

obs/obs-rest-server/src/test/java/com/adorsys/webank/obs/resource/TestOnlineBankingApplication.java

@@ -0,0 +1,41 @@
+package com.adorsys.webank.obs.resource;
+
+import com.adorsys.webank.obs.EnableObsServiceimpl;
+
+
+import de.adorsys.ledgers.postings.impl.EnablePostingService;
+import de.adorsys.webank.bank.api.service.BankAccountInitService;
+import de.adorsys.webank.bank.api.service.EnableBankAccountService;
+import de.adorsys.webank.bank.server.utils.client.ExchangeRateClient;
+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();
+	}
+}

obs/obs-rest-server/src/test/java/com/adorsys/webank/obs/resource/mockbank/Config.java

@@ -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 MockBankConfigSource 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);
+
+	}
+}

obs/obs-rest-server/src/test/java/com/adorsys/webank/obs/resource/mockbank/MockBankConfigSource.java

@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2018-2024 adorsys GmbH and Co. KG
+ * All rights are reserved.
+ */
+
+package com.adorsys.webank.obs.resource.mockbank;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
+import de.adorsys.webank.bank.api.service.domain.ASPSPConfigData;
+import de.adorsys.webank.bank.api.service.domain.ASPSPConfigSource;
+import de.adorsys.webank.bank.api.service.domain.LedgerAccountModel;
+
+
+//@Component
+public class MockBankConfigSource implements ASPSPConfigSource {
+    private ObjectMapper mapper = new ObjectMapper(new YAMLFactory());
+
+    @Override
+    public ASPSPConfigData aspspConfigData() {
+        java.io.InputStream inputStream = MockBankConfigSource.class.getResourceAsStream("aspsps-config.yml");
+        try {
+            return mapper.readValue(inputStream,ASPSPConfigData.class);
+        } catch (java.io.IOException e) {
+            throw new IllegalStateException(e);
+        }
+    }
+
+    @Override
+    public java.util.List<LedgerAccountModel> chartOfAccount(String coaFile) {
+        java.io.InputStream inputStream = MockBankConfigSource.class.getResourceAsStream(coaFile);
+        LedgerAccountModel[] ledgerAccounts;
+        try {
+            ledgerAccounts = mapper.readValue(inputStream, LedgerAccountModel[].class);
+        } catch (java.io.IOException e) {
+            throw new IllegalStateException(e);
+        }
+        return java.util.Arrays.asList(ledgerAccounts);
+    }
+}

obs/obs-rest-server/src/test/resources/application.properties

@@ -0,0 +1,15 @@
+# H2 Database Configuration
+spring.h2.console.enabled=true
+spring.datasource.url=jdbc:h2:mem:testdb
+
+# Swagger Configuration
+springdoc.api-docs.path=/api-docs
+springdoc.swagger-ui.path=/swagger-ui.html
+
+# Additional Settings (if needed)
+spring.datasource.driver-class-name=org.h2.Driver
+spring.datasource.username=sa
+spring.datasource.password=
+
+# Hibernate DDL auto (update, create-drop, validate, etc.)
+spring.jpa.hibernate.ddl-auto=update

obs/obs-rest-server/src/test/resources/com/adorsys/webank/obs/resource/mockbank/aspsps-config.yml

@@ -0,0 +1,46 @@
+name: mockbank
+ledger: mockbank
+coaFile: sample_coa_banking.yml
+coaExtensions:
+### Hello Bank
+  - shortDesc: Hello Bank
+    name: 11240
+    parent: 1124
+### Clearing account as subaccount of  Deposits with Centralbank - Non-Interest bearing
+  - shortDesc: SEPA-Clearing Account (sepa-credit-transfers)
+    name: 11031
+    parent: 1103
+  - shortDesc: INSTANT_SEPA-Clearing Account (instant-sepa-credit-transfers)
+    name: 11032
+    parent: 1103
+  - shortDesc: TARGET2-Clearing Account (target-2-payments)
+    name: 11033
+    parent: 1103
+  - shortDesc: CROSS_BORDER-Clearing Account (cross-border-credit-transfers)
+    name: 11034
+    parent: 1103
+### Sample Bank Account Bank account Natural persons (households), residents, Interest bearing
+  - shortDesc: Bank Account Marion Mueller
+    name: DE69760700240340283600
+    parent: 2332
+  - shortDesc: Bank Account Anton Brueckner
+    name: DE80760700240271232400
+    parent: 2332
+  - shortDesc: Bank Account Max Musterman
+    name: DE38760700240320465700
+    parent: 2332
+### Payment products supported.
+clearingAccounts:
+  - paymentProduct: SEPA
+    accountNbr: 11031
+  - paymentProduct: INSTANT_SEPA
+    accountNbr: 11032
+  - paymentProduct: TARGET2
+    accountNbr: 11033
+  - paymentProduct: CROSS_BORDER
+    accountNbr: 11034
+bankParentAccount: 2332
+
+
+### Marker used to prevent repeated processing of this config file.
+updateMarkerAccountNbr: 2320