Fix MBA-171: Implement REST communication between Spring Boot and Micronaut services

docker-compose.yml

@@ -18,17 +18,20 @@ services:
       start_period: 30s
 
   springboot-app:
-    image: ${DUSER}/${SPRING_IMAGE}
+    build:
+      context: ./springboot-module
+      dockerfile: Dockerfile
     container_name: SpringBoot-Bankapp
     environment:
       - SPRING_DATASOURCE_USERNAME=root
       - SPRING_DATASOURCE_URL=jdbc:mysql://mysql:3306/BankDB?useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=UTC
       - SPRING_DATASOURCE_PASSWORD=Test@123
+      - MICRONAUT_SERVICE_URL=http://micronaut-app:8080
     ports:
       - "8080:8080"
     depends_on:
-      mysql:
-        condition: service_healthy
+      - mysql
+      - micronaut-app
     networks:
       - bankapp
     restart: always
@@ -40,7 +43,9 @@ services:
       start_period: 30s
 
   micronaut-app:
-    image: ${DUSER}/${MICRONAUT_IMAGE}
+    build:
+      context: ./micronaut-module
+      dockerfile: Dockerfile
     container_name: Micronaut-Bankapp
     environment:
       - DATASOURCES_DEFAULT_USERNAME=root
@@ -54,12 +59,6 @@ services:
     networks:
       - bankapp
     restart: always
-    healthcheck:
-      test: ["CMD-SHELL", "curl -f http://localhost:8080/health || exit 1"]
-      interval: 10s
-      timeout: 5s
-      retries: 5
-      start_period: 30s
 
 networks:
   bankapp:

micronaut-module/pom.xml

@@ -35,6 +35,10 @@
 			<groupId>io.micronaut</groupId>
 			<artifactId>micronaut-jackson-databind</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>io.micronaut.serde</groupId>
+			<artifactId>micronaut-serde-jackson</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>io.micronaut</groupId>
 			<artifactId>micronaut-management</artifactId>
@@ -90,6 +94,11 @@
 							<artifactId>micronaut-inject-java</artifactId>
 							<version>${micronaut.version}</version>
 						</path>
+						<path>
+							<groupId>io.micronaut.serde</groupId>
+							<artifactId>micronaut-serde-processor</artifactId>
+							<version>${micronaut.serde.version}</version>
+						</path>
 					</annotationProcessorPaths>
 				</configuration>
 			</plugin>

micronaut-module/src/main/java/com/example/bankapp/micronaut/MicronautBankApplication.java

@@ -1,10 +1,16 @@
 package com.example.bankapp.micronaut;
 
+import com.example.bankapp.model.Account;
+import com.example.bankapp.model.Transaction;
 import io.micronaut.runtime.Micronaut;
+import io.micronaut.serde.annotation.SerdeImport;
 
+@SerdeImport(Account.class)
+@SerdeImport(Transaction.class)
 public class MicronautBankApplication {
 
     public static void main(String[] args) {
-        Micronaut.run(MicronautBankApplication.class, args);
+        Micronaut.run(MicronautBankApplication.class, args)
+            .start();
     }
 }

micronaut-module/src/main/java/com/example/bankapp/micronaut/controller/MicronautBankController.java

@@ -1,18 +1,24 @@
 package com.example.bankapp.micronaut.controller;
 
 import com.example.bankapp.model.Account;
+import com.example.bankapp.model.Transaction;
 import com.example.bankapp.micronaut.service.MicronautAccountService;
+import com.example.bankapp.micronaut.dto.AccountRequest;
+import com.example.bankapp.micronaut.dto.AccountResponse;
+import com.example.bankapp.micronaut.dto.DepositWithdrawRequest;
+import com.example.bankapp.micronaut.dto.TransactionRequest;
+import com.example.bankapp.micronaut.dto.TransactionResponse;
+import com.example.bankapp.micronaut.dto.TransferRequest;
+import java.util.Map;
 import io.micronaut.http.HttpResponse;
+import io.micronaut.http.annotation.Body;
 import io.micronaut.http.annotation.Controller;
 import io.micronaut.http.annotation.Get;
 import io.micronaut.http.annotation.Post;
-import io.micronaut.http.annotation.QueryValue;
 
-import java.math.BigDecimal;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.List;
 
-@Controller
+@Controller("/api")
 public class MicronautBankController {
 
     private final MicronautAccountService accountService;
@@ -21,87 +27,84 @@ public MicronautBankController(MicronautAccountService accountService) {
         this.accountService = accountService;
     }
 
-    @Get("/api/account")
-    public HttpResponse<Account> getAccount(@QueryValue String username) {
+    @Post("/account/find")
+    public HttpResponse<?> findAccount(@Body AccountRequest request) {
         try {
-            Account account = accountService.findAccountByUsername(username);
-            return HttpResponse.ok(account);
+            Account account = accountService.findAccountByUsername(request.getUsername());
+            AccountResponse response = new AccountResponse(account.getId(), account.getUsername(), account.getBalance());
+            return HttpResponse.ok(response);
         } catch (Exception e) {
-            return HttpResponse.serverError();
+            return HttpResponse.serverError().body(Map.of("error", e.getMessage()));
         }
     }
 
-    @Post("/api/register")
-    public HttpResponse<Map<String, String>> registerAccount(@QueryValue String username, 
-                                                           @QueryValue String password) {
+    @Post("/test")
+    public HttpResponse<?> test() {
+        return HttpResponse.ok().body(Map.of("message", "Micronaut service is working"));
+    }
+
+    @Get("/test")
+    public HttpResponse<?> testGet() {
+        return HttpResponse.ok().body(Map.of("message", "Micronaut GET test endpoint is working"));
+    }
+
+    @Post("/account/register")
+    public HttpResponse<?> registerAccount(@Body AccountRequest request) {
         try {
-            accountService.registerAccount(username, password);
-            Map<String, String> response = new HashMap<>();
-            response.put("message", "Account registered successfully");
+            Account account = accountService.registerAccount(request.getUsername(), request.getPassword());
+            AccountResponse response = new AccountResponse(account.getId(), account.getUsername(), account.getBalance());
             return HttpResponse.ok(response);
         } catch (RuntimeException e) {
-            Map<String, String> error = new HashMap<>();
-            error.put("error", e.getMessage());
-            return HttpResponse.badRequest(error);
+            return HttpResponse.badRequest().body(Map.of("error", e.getMessage()));
+        } catch (Exception e) {
+            return HttpResponse.serverError().body(Map.of("error", e.getMessage()));
         }
     }
 
-    @Post("/api/deposit")
-    public HttpResponse<Map<String, String>> deposit(@QueryValue BigDecimal amount, @QueryValue String username) {
+    @Post("/account/deposit")
+    public HttpResponse<?> deposit(@Body DepositWithdrawRequest request) {
         try {
-            Account account = accountService.findAccountByUsername(username);
-            accountService.deposit(account, amount);
-            Map<String, String> response = new HashMap<>();
-            response.put("message", "Deposit successful");
-            return HttpResponse.ok(response);
+            Account account = accountService.findAccountByUsername(request.getUsername());
+            accountService.deposit(account, request.getAmount());
+            return HttpResponse.ok().body(Map.of("message", "Deposit successful"));
         } catch (Exception e) {
-            Map<String, String> error = new HashMap<>();
-            error.put("error", e.getMessage());
-            return HttpResponse.badRequest(error);
+            return HttpResponse.badRequest().body(Map.of("error", e.getMessage()));
         }
     }
 
-    @Post("/api/withdraw")
-    public HttpResponse<Map<String, String>> withdraw(@QueryValue BigDecimal amount, @QueryValue String username) {
+    @Post("/account/withdraw")
+    public HttpResponse<?> withdraw(@Body DepositWithdrawRequest request) {
         try {
-            Account account = accountService.findAccountByUsername(username);
-            accountService.withdraw(account, amount);
-            Map<String, String> response = new HashMap<>();
-            response.put("message", "Withdrawal successful");
-            return HttpResponse.ok(response);
+            Account account = accountService.findAccountByUsername(request.getUsername());
+            accountService.withdraw(account, request.getAmount());
+            return HttpResponse.ok().body(Map.of("message", "Withdrawal successful"));
         } catch (RuntimeException e) {
-            Map<String, String> error = new HashMap<>();
-            error.put("error", e.getMessage());
-            return HttpResponse.badRequest(error);
+            return HttpResponse.badRequest().body(Map.of("error", e.getMessage()));
         }
     }
 
-    @Get("/api/transactions")
-    public HttpResponse<?> getTransactions(@QueryValue String username) {
+    @Post("/account/transactions")
+    public HttpResponse<?> getTransactions(@Body TransactionRequest request) {
         try {
-            Account account = accountService.findAccountByUsername(username);
-            return HttpResponse.ok(accountService.getTransactionHistory(account));
+            Account account = accountService.findAccountByUsername(request.getUsername());
+            List<Transaction> transactions = accountService.getTransactionHistory(account);
+            List<TransactionResponse> transactionResponses = transactions.stream()
+                .map(t -> new TransactionResponse(t.getId(), t.getAmount(), t.getDescription(), t.getTimestamp(), t.getAccount().getUsername()))
+                .collect(java.util.stream.Collectors.toList());
+            return HttpResponse.ok(transactionResponses);
         } catch (Exception e) {
-            Map<String, String> error = new HashMap<>();
-            error.put("error", e.getMessage());
-            return HttpResponse.serverError(error);
+            return HttpResponse.serverError().body(Map.of("error", e.getMessage()));
         }
     }
 
-    @Post("/api/transfer")
-    public HttpResponse<Map<String, String>> transfer(@QueryValue String toUsername, 
-                                                    @QueryValue BigDecimal amount, 
-                                                    @QueryValue String fromUsername) {
+    @Post("/account/transfer")
+    public HttpResponse<?> transfer(@Body TransferRequest request) {
         try {
-            Account fromAccount = accountService.findAccountByUsername(fromUsername);
-            accountService.transferAmount(fromAccount, toUsername, amount);
-            Map<String, String> response = new HashMap<>();
-            response.put("message", "Transfer successful");
-            return HttpResponse.ok(response);
+            Account fromAccount = accountService.findAccountByUsername(request.getFromUsername());
+            accountService.transferAmount(fromAccount, request.getToUsername(), request.getAmount());
+            return HttpResponse.ok().body(Map.of("message", "Transfer successful"));
         } catch (RuntimeException e) {
-            Map<String, String> error = new HashMap<>();
-            error.put("error", e.getMessage());
-            return HttpResponse.badRequest(error);
+            return HttpResponse.badRequest().body(Map.of("error", e.getMessage()));
         }
     }
 }

micronaut-module/src/main/java/com/example/bankapp/micronaut/dto/AccountRequest.java

@@ -0,0 +1,36 @@
+package com.example.bankapp.micronaut.dto;
+
+import io.micronaut.serde.annotation.Serdeable;
+
+@Serdeable
+public class AccountRequest {
+    private String username;
+    private String password;
+
+    public AccountRequest() {}
+
+    public AccountRequest(String username) {
+        this.username = username;
+    }
+
+    public AccountRequest(String username, String password) {
+        this.username = username;
+        this.password = password;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+}

micronaut-module/src/main/java/com/example/bankapp/micronaut/dto/AccountResponse.java

@@ -0,0 +1,43 @@
+package com.example.bankapp.micronaut.dto;
+
+import io.micronaut.serde.annotation.Serdeable;
+import java.math.BigDecimal;
+
+@Serdeable
+public class AccountResponse {
+    private Long id;
+    private String username;
+    private BigDecimal balance;
+
+    public AccountResponse() {}
+
+    public AccountResponse(Long id, String username, BigDecimal balance) {
+        this.id = id;
+        this.username = username;
+        this.balance = balance;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public BigDecimal getBalance() {
+        return balance;
+    }
+
+    public void setBalance(BigDecimal balance) {
+        this.balance = balance;
+    }
+}

micronaut-module/src/main/java/com/example/bankapp/micronaut/dto/DepositWithdrawRequest.java

@@ -0,0 +1,33 @@
+package com.example.bankapp.micronaut.dto;
+
+import io.micronaut.serde.annotation.Serdeable;
+import java.math.BigDecimal;
+
+@Serdeable
+public class DepositWithdrawRequest {
+    private String username;
+    private BigDecimal amount;
+
+    public DepositWithdrawRequest() {}
+
+    public DepositWithdrawRequest(String username, BigDecimal amount) {
+        this.username = username;
+        this.amount = amount;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public BigDecimal getAmount() {
+        return amount;
+    }
+
+    public void setAmount(BigDecimal amount) {
+        this.amount = amount;
+    }
+}

micronaut-module/src/main/java/com/example/bankapp/micronaut/dto/TransactionRequest.java

@@ -0,0 +1,22 @@
+package com.example.bankapp.micronaut.dto;
+
+import io.micronaut.serde.annotation.Serdeable;
+
+@Serdeable
+public class TransactionRequest {
+    private String username;
+
+    public TransactionRequest() {}
+
+    public TransactionRequest(String username) {
+        this.username = username;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+}