latest changes

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,38 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.

.github/workflows/maven.yml

@@ -0,0 +1,35 @@
+# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven
+
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Java CI with Maven
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up JDK 17
+      uses: actions/setup-java@v4
+      with:
+        java-version: '17'
+        distribution: 'temurin'
+        cache: maven
+    - name: Build with Maven
+      run: mvn -B package --file pom.xml
+
+    # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
+    - name: Update dependency graph
+      uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6

pom.xml

@@ -82,6 +82,44 @@
 			<artifactId>spring-boot-starter-json</artifactId>
 			<version>2.5.6</version>
 		</dependency>
+
+		<dependency>
+			<groupId>org.keycloak</groupId>
+			<artifactId>keycloak-admin-client</artifactId>
+			<version>21.1.2</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.keycloak</groupId>
+			<artifactId>keycloak-core</artifactId>
+			<version>21.1.2</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.postgresql</groupId>
+			<artifactId>postgresql</artifactId>
+			<version>42.2.20</version>
+			<scope>runtime</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>jakarta.persistence</groupId>
+			<artifactId>jakarta.persistence-api</artifactId>
+			<version>2.2.3</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.data</groupId>
+			<artifactId>spring-data-jpa</artifactId>
+			<version>2.7.14</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-jpa</artifactId>
+			<version>2.7.14</version>
+		</dependency>
+
 	</dependencies>
 	<build>
 		<plugins>

src/main/java/com/tarento/upsmf/userManagement/UserManagementApplication.java

@@ -1,12 +1,22 @@
 package com.tarento.upsmf.userManagement;
 
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+import org.springframework.web.client.RestTemplate;
 
 @SpringBootApplication
+@EnableJpaRepositories
+@EnableAutoConfiguration
 public class UserManagementApplication {
 	public static void main(String[] args) {
 		SpringApplication.run(UserManagementApplication.class, args);
 	}
 
+	@Bean
+	public RestTemplate restTemplate() {
+		return new RestTemplate();
+	}
 }

src/main/java/com/tarento/upsmf/userManagement/controller/UserController.java

@@ -2,40 +2,110 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.tarento.upsmf.userManagement.handler.UserHandler;
+import com.tarento.upsmf.userManagement.model.Transaction;
+import com.tarento.upsmf.userManagement.services.PaymentService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.net.URISyntaxException;
+import java.sql.SQLException;
+import java.util.List;
+import java.util.Map;
 
-@RestController(value = "/api/v1/user)")
+@RestController
+@RequestMapping(value = "/api/v1/user")
 public class UserController {
 
+    @Autowired
+    PaymentService paymentService;
+
     @Autowired
     private UserHandler userHandler;
 
     @PostMapping(value = "/create", consumes = "application/json", produces = "application/json")
-    public ResponseEntity<JsonNode> createUser(@RequestBody final JsonNode body) throws URISyntaxException {
+    public String createUser(@RequestBody final JsonNode body) throws URISyntaxException, IOException {
         return userHandler.createUser(body);
     }
 
     @PutMapping(value = "/update", consumes = "application/json", produces = "application/json")
-    public ResponseEntity<JsonNode> updateUser(@RequestBody final JsonNode body) throws URISyntaxException {
+    public String updateUser(@RequestBody final JsonNode body) throws URISyntaxException, IOException {
         return userHandler.updateUser(body);
     }
 
+    @PostMapping(value = "/details", consumes = "application/json", produces = "application/json")
+    public String userDetails(@RequestBody final JsonNode body) throws URISyntaxException, IOException {
+        return userHandler.userDetails(body);
+    }
+
+    @PostMapping(value = "/emaildetails", consumes = "application/json", produces = "application/json")
+    public String userEmailDetails(@RequestBody final JsonNode body) throws URISyntaxException, IOException {
+        return userHandler.userEmailDetails(body);
+    }
+
     @PostMapping(value = "/list", consumes = "application/json", produces = "application/json")
-    public ResponseEntity<JsonNode> listUser(@RequestBody final JsonNode body) throws URISyntaxException {
+    public String listUser(@RequestBody final JsonNode body) throws URISyntaxException, IOException {
         return userHandler.listUser(body);
     }
 
+    @GetMapping(value = "/count", produces = "application/json")
+    public String userCount() throws IOException {
+        return userHandler.userCount();
+    }
+
     @PostMapping(value = "/activate", consumes = "application/json", produces = "application/json")
-    public ResponseEntity<JsonNode> activateUser(@RequestBody final JsonNode body) throws URISyntaxException {
+    public String activateUser(@RequestBody final JsonNode body) throws URISyntaxException, IOException {
         return userHandler.activateUser(body);
     }
 
     @PostMapping(value = "/deactivate", consumes = "application/json", produces = "application/json")
-    public ResponseEntity<JsonNode> deactivateUser(@RequestBody final JsonNode body) throws URISyntaxException {
+    public String deactivateUser(@RequestBody final JsonNode body) throws URISyntaxException, IOException {
         return userHandler.deactivateUser(body);
     }
+
+    @GetMapping(value = "/sms/otp", produces = "application/json")
+    public ResponseEntity<String> sendOTP(@RequestParam String phoneNumber, @RequestParam String name, @RequestParam String otp) throws URISyntaxException {
+        return userHandler.sendOTP(phoneNumber, name, otp);
+    }
+
+    @PostMapping(value = "/keycloak/otp", consumes = "application/json", produces = "application/json")
+    public ResponseEntity<String> generateOTP(@RequestBody String email) throws URISyntaxException, IOException {
+        return userHandler.generateOTP(email);
+    }
+
+    @PostMapping(value = "/keycloak/login", consumes = "application/json", produces = "application/json")
+    public ResponseEntity<String> login(@RequestBody JsonNode body ) throws URISyntaxException, IOException {
+        return userHandler.login(body);
+    }
+
+    @PostMapping(value = "/payment", consumes = {"*/*"})
+    public ResponseEntity<String> paymentRedirect(@RequestParam Map<String, String> requestData) throws URISyntaxException, IOException {
+        return userHandler.paymentRedirect(requestData);
+    }
+
+    @PostMapping(value = "/keycloak/usrlogin")
+    public String usrlogin(@RequestBody JsonNode body) throws IOException {
+        return userHandler.usrLogin(body);
+    }
+
+    @PostMapping(value = "/keycloak/usrOTP")
+    public String usrOTP(@RequestBody JsonNode body) throws IOException {
+        return userHandler.usrOTP(body);
+    }
+
+    @GetMapping(value = "/transaction", produces = "application/json")
+    public ResponseEntity<List<Transaction>> getAllTransactions() {
+        return userHandler.getAllTransactions();
+    }
+
+    @GetMapping(value = "/transaction/{uniqueRefNumber}", produces = "application/json")
+    public ResponseEntity<?> getTransactionByUniqueRefNumber(@PathVariable String uniqueRefNumber) {
+        return userHandler.getTransactionByUniqueRefNumber(uniqueRefNumber);
+    }
+
+    @PostMapping(value = "/attribute", produces = "application/json")
+    public ResponseEntity<String> getUserByAttribute(@RequestBody JsonNode body) throws SQLException, IOException, URISyntaxException {
+        return userHandler.getUserByAttribute(body);
+    }
 }