From b8967a1ec65d21a62050f8ef759ae861b35c8ab8 Mon Sep 17 00:00:00 2001
From: vran <vran_dev@foxmail.com>
Date: Sat, 21 May 2022 20:00:58 +0800
Subject: [PATCH] feat: add projectName field

---
 .../converter/DocumentSimpleResponseConverter.java        | 4 +++-
 .../document/data/DatabaseDocumentSimpleResponse.java     | 2 ++
 .../core/domain/document/service/DocumentService.java     | 8 ++++++--
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/com/databasir/core/domain/document/converter/DocumentSimpleResponseConverter.java b/core/src/main/java/com/databasir/core/domain/document/converter/DocumentSimpleResponseConverter.java
index 5c5e4f9..6cc79e9 100644
--- a/core/src/main/java/com/databasir/core/domain/document/converter/DocumentSimpleResponseConverter.java
+++ b/core/src/main/java/com/databasir/core/domain/document/converter/DocumentSimpleResponseConverter.java
@@ -21,7 +21,8 @@ public interface DocumentSimpleResponseConverter {
     @Mapping(target = "documentVersion", source = "databaseDocument.version")
     DatabaseDocumentSimpleResponse of(DatabaseDocumentPojo databaseDocument,
                                       List<DatabaseDocumentSimpleResponse.TableData> tables,
-                                      DiffType diffType);
+                                      DiffType diffType,
+                                      String projectName);
 
     DatabaseDocumentSimpleResponse.TableData of(TableDocumentPojo tables,
                                                 Integer discussionCount,
@@ -31,6 +32,7 @@ public interface DocumentSimpleResponseConverter {
                                                               Map<String, Integer> discussionCountMapByTableName,
                                                               Map<String, String> descriptionMapByTableName) {
         return tables.stream()
+                
                 .map(table -> {
                     Integer count = discussionCountMapByTableName.get(table.getName());
                     String description = descriptionMapByTableName.get(table.getName());
diff --git a/core/src/main/java/com/databasir/core/domain/document/data/DatabaseDocumentSimpleResponse.java b/core/src/main/java/com/databasir/core/domain/document/data/DatabaseDocumentSimpleResponse.java
index 7fe1946..041dd9b 100644
--- a/core/src/main/java/com/databasir/core/domain/document/data/DatabaseDocumentSimpleResponse.java
+++ b/core/src/main/java/com/databasir/core/domain/document/data/DatabaseDocumentSimpleResponse.java
@@ -12,6 +12,8 @@ public class DatabaseDocumentSimpleResponse {
 
     private Integer id;
 
+    private String projectName;
+
     private String databaseName;
 
     private String schemaName;
diff --git a/core/src/main/java/com/databasir/core/domain/document/service/DocumentService.java b/core/src/main/java/com/databasir/core/domain/document/service/DocumentService.java
index a1ffe4c..da46e13 100644
--- a/core/src/main/java/com/databasir/core/domain/document/service/DocumentService.java
+++ b/core/src/main/java/com/databasir/core/domain/document/service/DocumentService.java
@@ -208,6 +208,10 @@ public class DocumentService {
     public Optional<DatabaseDocumentSimpleResponse> getSimpleOneByProjectId(Integer projectId,
                                                                             Long version,
                                                                             Long originalVersion) {
+        String projectName = projectDao.selectOptionalById(projectId)
+                .map(ProjectPojo::getName)
+                .orElseThrow(DomainErrors.PROJECT_NOT_FOUND::exception);
+
         Optional<DatabaseDocumentPojo> documentOption;
         if (version == null) {
             documentOption = databaseDocumentDao.selectNotArchivedByProjectId(projectId);
@@ -271,10 +275,10 @@ public class DocumentService {
                 result.sort(Comparator.comparing(DatabaseDocumentSimpleResponse.TableData::getName));
                 DiffType diffType = result.stream()
                         .anyMatch(t -> t.getDiffType() == DiffType.MODIFIED) ? DiffType.MODIFIED : DiffType.NONE;
-                return documentSimpleResponseConverter.of(document, result, diffType);
+                return documentSimpleResponseConverter.of(document, result, diffType, projectName);
             } else {
                 tableMetas.sort(Comparator.comparing(DatabaseDocumentSimpleResponse.TableData::getName));
-                return documentSimpleResponseConverter.of(document, tableMetas, DiffType.NONE);
+                return documentSimpleResponseConverter.of(document, tableMetas, DiffType.NONE, projectName);
             }
         });
     }