From a6aed7ac4e776d9bca379058f95b0353198b8f4e Mon Sep 17 00:00:00 2001
From: vran <vran_dev@foxmail.com>
Date: Sat, 12 Mar 2022 13:13:47 +0800
Subject: [PATCH] feat: add more detail info in databaseTypes

---
 .../com/databasir/api/DatabaseTypeController.java |  5 ++---
 .../database/data/DatabaseTypeSimpleResponse.java | 15 +++++++++++++++
 .../database/service/DatabaseTypeService.java     | 11 +++++++++--
 3 files changed, 26 insertions(+), 5 deletions(-)
 create mode 100644 core/src/main/java/com/databasir/core/domain/database/data/DatabaseTypeSimpleResponse.java

diff --git a/api/src/main/java/com/databasir/api/DatabaseTypeController.java b/api/src/main/java/com/databasir/api/DatabaseTypeController.java
index b86eee4..2488f5c 100644
--- a/api/src/main/java/com/databasir/api/DatabaseTypeController.java
+++ b/api/src/main/java/com/databasir/api/DatabaseTypeController.java
@@ -28,9 +28,8 @@ public class DatabaseTypeController {
     private final DatabaseTypeValidator databaseTypeValidator;
 
     @GetMapping(Routes.DatabaseType.LIST_SIMPLE)
-    public JsonData<List<String>> listSimpleDatabaseTypes() {
-        List<String> types = databaseTypeService.listSimpleDatabaseTypes();
-        return JsonData.ok(types);
+    public JsonData<List<DatabaseTypeSimpleResponse>> listSimpleDatabaseTypes() {
+        return JsonData.ok(databaseTypeService.listSimpleDatabaseTypes());
     }
 
     @GetMapping(Routes.DatabaseType.LIST_PAGE)
diff --git a/core/src/main/java/com/databasir/core/domain/database/data/DatabaseTypeSimpleResponse.java b/core/src/main/java/com/databasir/core/domain/database/data/DatabaseTypeSimpleResponse.java
new file mode 100644
index 0000000..0c9fdeb
--- /dev/null
+++ b/core/src/main/java/com/databasir/core/domain/database/data/DatabaseTypeSimpleResponse.java
@@ -0,0 +1,15 @@
+package com.databasir.core.domain.database.data;
+
+import lombok.Data;
+
+@Data
+public class DatabaseTypeSimpleResponse {
+
+    private String databaseType;
+
+    private String description;
+
+    private String urlPattern;
+
+    private String jdbcProtocol;
+}
diff --git a/core/src/main/java/com/databasir/core/domain/database/service/DatabaseTypeService.java b/core/src/main/java/com/databasir/core/domain/database/service/DatabaseTypeService.java
index e17ce71..0d03eff 100644
--- a/core/src/main/java/com/databasir/core/domain/database/service/DatabaseTypeService.java
+++ b/core/src/main/java/com/databasir/core/domain/database/service/DatabaseTypeService.java
@@ -89,10 +89,17 @@ public class DatabaseTypeService {
                 });
     }
 
-    public List<String> listSimpleDatabaseTypes() {
+    public List<DatabaseTypeSimpleResponse> listSimpleDatabaseTypes() {
         return databaseTypeDao.selectAll()
                 .stream()
-                .map(DatabaseTypePojo::getDatabaseType)
+                .map(type -> {
+                    DatabaseTypeSimpleResponse response = new DatabaseTypeSimpleResponse();
+                    response.setDatabaseType(type.getDatabaseType());
+                    response.setUrlPattern(type.getUrlPattern());
+                    response.setDescription(type.getDescription());
+                    response.setJdbcProtocol(type.getJdbcProtocol());
+                    return response;
+                })
                 .collect(Collectors.toList());
     }