From 1548e3540ccb6feb72fb4e5a0d8427ef98bd1dfa Mon Sep 17 00:00:00 2001
From: qianmoQ <shicheng@devlive.org>
Date: Tue, 16 Apr 2024 19:26:43 +0800
Subject: [PATCH] [Core] [Dataset] Replace id to code

---
 configure/idea_style.xml                       |  1 -
 .../server/controller/DatabaseController.java  |  8 +++-----
 .../service/service/DatabaseService.java       |  6 ++----
 .../service/impl/DatabaseServiceImpl.java      | 18 ++++++++----------
 core/datacap-ui/src/router/default.ts          |  2 +-
 core/datacap-ui/src/services/database.ts       |  6 +++---
 .../views/pages/admin/source/SourceHome.vue    |  2 +-
 .../views/pages/admin/source/SourceManager.vue |  4 ++--
 8 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/configure/idea_style.xml b/configure/idea_style.xml
index 55bbd5c3..5dd037a2 100644
--- a/configure/idea_style.xml
+++ b/configure/idea_style.xml
@@ -1,6 +1,5 @@
 <code_scheme name="DataCapStyleScheme" version="173">
   <option name="RIGHT_MARGIN" value="180" />
-  <option name="ENABLE_SECOND_REFORMAT" value="true" />
   <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
   <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
   <option name="CLASS_BRACE_STYLE" value="2" />
diff --git a/core/datacap-server/src/main/java/io/edurt/datacap/server/controller/DatabaseController.java b/core/datacap-server/src/main/java/io/edurt/datacap/server/controller/DatabaseController.java
index 8d6bdfb1..f4b566b8 100644
--- a/core/datacap-server/src/main/java/io/edurt/datacap/server/controller/DatabaseController.java
+++ b/core/datacap-server/src/main/java/io/edurt/datacap/server/controller/DatabaseController.java
@@ -9,8 +9,6 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-
 @RestController()
 @RequestMapping(value = "/api/v1/database")
 public class DatabaseController
@@ -26,9 +24,9 @@ public class DatabaseController
         this.service = service;
     }
 
-    @PostMapping(value = "source/{id}")
-    public CommonResponse<List<DatabaseEntity>> fetchBySource(@PathVariable Long id)
+    @PostMapping(value = "source/{code}")
+    public CommonResponse<Object> fetchBySource(@PathVariable String code)
     {
-        return this.service.getAllBySource(id);
+        return this.service.getAllBySource(code);
     }
 }
diff --git a/core/datacap-service/src/main/java/io/edurt/datacap/service/service/DatabaseService.java b/core/datacap-service/src/main/java/io/edurt/datacap/service/service/DatabaseService.java
index ccdb2369..8fa11d70 100644
--- a/core/datacap-service/src/main/java/io/edurt/datacap/service/service/DatabaseService.java
+++ b/core/datacap-service/src/main/java/io/edurt/datacap/service/service/DatabaseService.java
@@ -3,16 +3,14 @@ package io.edurt.datacap.service.service;
 import io.edurt.datacap.common.response.CommonResponse;
 import io.edurt.datacap.service.entity.DatabaseEntity;
 
-import java.util.List;
-
 public interface DatabaseService
         extends BaseService<DatabaseEntity>
 {
     /**
      * Retrieves a list of DatabaseEntity objects based on the provided id.
      *
-     * @param id the id used to filter the results
+     * @param code the code used to filter the results
      * @return a list of DatabaseEntity objects that match the id
      */
-    CommonResponse<List<DatabaseEntity>> getAllBySource(Long id);
+    CommonResponse<Object> getAllBySource(String code);
 }
diff --git a/core/datacap-service/src/main/java/io/edurt/datacap/service/service/impl/DatabaseServiceImpl.java b/core/datacap-service/src/main/java/io/edurt/datacap/service/service/impl/DatabaseServiceImpl.java
index 1983b280..ec0f9cb3 100644
--- a/core/datacap-service/src/main/java/io/edurt/datacap/service/service/impl/DatabaseServiceImpl.java
+++ b/core/datacap-service/src/main/java/io/edurt/datacap/service/service/impl/DatabaseServiceImpl.java
@@ -1,31 +1,29 @@
 package io.edurt.datacap.service.service.impl;
 
 import io.edurt.datacap.common.response.CommonResponse;
-import io.edurt.datacap.service.entity.DatabaseEntity;
-import io.edurt.datacap.service.entity.SourceEntity;
+import io.edurt.datacap.service.repository.SourceRepository;
 import io.edurt.datacap.service.repository.metadata.DatabaseRepository;
 import io.edurt.datacap.service.service.DatabaseService;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 @Service
 public class DatabaseServiceImpl
         implements DatabaseService
 {
     private final DatabaseRepository repository;
+    private final SourceRepository sourceRepository;
 
-    public DatabaseServiceImpl(DatabaseRepository repository)
+    public DatabaseServiceImpl(DatabaseRepository repository, SourceRepository sourceRepository)
     {
         this.repository = repository;
+        this.sourceRepository = sourceRepository;
     }
 
     @Override
-    public CommonResponse<List<DatabaseEntity>> getAllBySource(Long id)
+    public CommonResponse<Object> getAllBySource(String code)
     {
-        SourceEntity source = SourceEntity.builder()
-                .id(id)
-                .build();
-        return CommonResponse.success(this.repository.findAllBySource(source));
+        return sourceRepository.findByCode(code)
+                .map(value -> CommonResponse.success(this.repository.findAllBySource(value)))
+                .orElse(CommonResponse.failure(String.format("Source [ %s ] not found", code)));
     }
 }
diff --git a/core/datacap-ui/src/router/default.ts b/core/datacap-ui/src/router/default.ts
index c6ab767d..d02da066 100644
--- a/core/datacap-ui/src/router/default.ts
+++ b/core/datacap-ui/src/router/default.ts
@@ -215,7 +215,7 @@ const createAdminRouter = (router: any) => {
                 component: () => import('@/views/pages/admin/source/SourceHome.vue')
             },
             {
-                path: 'source/:id/manager',
+                path: 'source/manager/:code',
                 meta: {
                     title: 'common.source',
                     isRoot: false
diff --git a/core/datacap-ui/src/services/database.ts b/core/datacap-ui/src/services/database.ts
index 841fa659..96e59a81 100644
--- a/core/datacap-ui/src/services/database.ts
+++ b/core/datacap-ui/src/services/database.ts
@@ -15,12 +15,12 @@ class DatabaseService
     /**
      * Retrieves all items by source ID.
      *
-     * @param {number} id - The ID of the source.
+     * @param {number} code - The ID of the source.
      * @return {Promise<ResponseModel>} A promise that resolves to the response model.
      */
-    getAllBySource(id: string): Promise<ResponseModel>
+    getAllBySource(code: string): Promise<ResponseModel>
     {
-        return new HttpUtils().post(`${DEFAULT_PATH}/source/${id}`)
+        return new HttpUtils().post(`${DEFAULT_PATH}/source/${code}`)
     }
 }
 
diff --git a/core/datacap-ui/src/views/pages/admin/source/SourceHome.vue b/core/datacap-ui/src/views/pages/admin/source/SourceHome.vue
index 470b59e0..6d5b06b8 100644
--- a/core/datacap-ui/src/views/pages/admin/source/SourceHome.vue
+++ b/core/datacap-ui/src/views/pages/admin/source/SourceHome.vue
@@ -42,7 +42,7 @@
               <DropdownMenuContent>
                 <DropdownMenuGroup>
                   <DropdownMenuItem :disabled="(loginUserId !== row.user.id) || !row.available" class="cursor-pointer">
-                    <RouterLink :to="`/admin/source/${row?.id}/manager`" target="_blank" class="flex items-center">
+                    <RouterLink :to="`/admin/source/manager/${row?.code}`" target="_blank" class="flex items-center">
                       <Cog class="mr-2 h-4 w-4"/>
                       <span>{{ $t('source.common.manager') }}</span>
                     </RouterLink>
diff --git a/core/datacap-ui/src/views/pages/admin/source/SourceManager.vue b/core/datacap-ui/src/views/pages/admin/source/SourceManager.vue
index 038faff3..9237fcc1 100644
--- a/core/datacap-ui/src/views/pages/admin/source/SourceManager.vue
+++ b/core/datacap-ui/src/views/pages/admin/source/SourceManager.vue
@@ -262,8 +262,8 @@ export default defineComponent({
     {
       this.loading = true
       const router = useRouter()
-      const id = router.currentRoute?.value?.params['id']
-      DatabaseService.getAllBySource(id as unknown as string)
+      const code = router.currentRoute?.value?.params['code'] as string
+      DatabaseService.getAllBySource(code)
                      .then(response => {
                        if (response.status) {
                          response.data.forEach((item: { name: null; catalog: null; id: null }) => {