Merge pull request #15 from ywy2090/feature-milestone2-datasource-approval-chain

add approval chain info for dataset

Author: ywy2090

db/wedpr_ddl.sql

@@ -162,21 +162,20 @@ CREATE TABLE if not exists `wedpr_dataset` (
     `dataset_column_count` int DEFAULT 0 COMMENT '数据集列数目',
     `dataset_storage_type` VARCHAR(255) DEFAULT '' COMMENT '数据集存储类型',
     `dataset_storage_path` VARCHAR(1024) DEFAULT '' COMMENT '数据集存储路径',
-    `owner_agency_id` VARCHAR(255) NOT NULL COMMENT '数据集所属机构id',
     `owner_agency_name` VARCHAR(255) NOT NULL COMMENT '数据集所属机构名称',
-    `owner_user_id` VARCHAR(1024) NOT NULL COMMENT '数据集所属用户名id',
     `owner_user_name` VARCHAR(1024) NOT NULL COMMENT '数据集所属用户名',
     `data_source_type` VARCHAR(255) NOT NULL COMMENT '数据源类型 : CSV、DB、XLSX、HDFS、HIVE',
     `data_source_meta` TEXT NOT NULL COMMENT '数据源参数信息，JSON字符串',
     `visibility` int(8) NOT NULL COMMENT '数据集可见性, 0: 私有，1: 公开可见',
     `visibility_details` TEXT NOT NULL COMMENT '数据源可见范围描述, visibility 为1时有效',
+    `approval_chain` TEXT NOT NULL COMMENT '审批链信息',
     `status` tinyint(4) NOT NULL COMMENT '数据集状态, 0: 有效，其他无效',
     `status_desc` VARCHAR(1024) NOT NULL COMMENT '数据集状态描述',
     `create_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
     `update_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     PRIMARY KEY (`dataset_id`),
     INDEX dataset_title_index (`dataset_title`(128)),
-    INDEX owner_agency_id_index (`owner_agency_id`),
+    INDEX owner_agency_name_index (`owner_agency_name`),
     INDEX owner_user_name_index (`owner_user_name`(128)),
     INDEX create_at_index (`create_at`),
     INDEX update_at_index (`update_at`)

wedpr-components/dataset/src/main/java/com/webank/wedpr/components/dataset/controller/DatasetController.java

@@ -122,6 +122,10 @@ public WeDPRResponse createDataset(
             Common.requireNonEmpty("dataSourceType", dataSourceType);
             DataSourceType.isValidDataSourceType(dataSourceType);
 
+            // approval chain info
+            String approvalChain = createDatasetRequest.getApprovalChain();
+            Common.requireNonEmpty("approvalChain", approvalChain);
+
             CreateDatasetResponse data =
                     datasetService.createDataset(userInfo, createDatasetRequest);
             weDPRResponse.setData(data);
@@ -223,8 +227,8 @@ public WeDPRResponse queryDatasetList(
     @GetMapping("listDataset")
     public WeDPRResponse listDataset(
             HttpServletRequest httpServletRequest,
-            @RequestParam(value = "ownerAgencyId", required = false) String ownerAgencyId,
-            @RequestParam(value = "ownerUserId", required = false) String ownerUserId,
+            @RequestParam(value = "ownerAgencyName", required = false) String ownerAgency,
+            @RequestParam(value = "ownerUserName", required = false) String ownerUser,
             @RequestParam(value = "permissionType", required = false) String permissionType,
             @RequestParam(value = "datasetTitle", required = false) String datasetTitle,
             @RequestParam(value = "startTime", required = false) String startTime,
@@ -262,8 +266,8 @@ public WeDPRResponse listDataset(
             ListDatasetResponse listDatasetResponse =
                     datasetService.listDataset(
                             userInfo,
-                            ownerAgencyId,
-                            ownerUserId,
+                            ownerAgency,
+                            ownerUser,
                             datasetTitle,
                             type,
                             startTime,
@@ -398,6 +402,8 @@ public WeDPRResponse updateDatasetList(
                 String datasetLabel = updateDatasetRequest.getDatasetLabel();
                 String datasetDesc = updateDatasetRequest.getDatasetDesc();
                 String datasetId = updateDatasetRequest.getDatasetId();
+                String approvalChain = updateDatasetRequest.getApprovalChain();
+
                 Common.requireNonEmpty("datasetId", datasetId);
                 Common.requireNonEmpty("datasetTitle", datasetTitle);
                 Common.requireNonEmpty("datasetLabel", datasetLabel);
@@ -412,6 +418,8 @@ public WeDPRResponse updateDatasetList(
                     JsonUtils.jsonString2Object(
                             datasetVisibilityDetails, DatasetVisibilityDetails.class);
                 }
+
+                Common.requireNonEmpty("approvalChain", approvalChain);
             }
 
             UserInfo userInfo = UserTokenUtils.getUserInfo(datasetConfig, httpServletRequest);

wedpr-components/dataset/src/main/java/com/webank/wedpr/components/dataset/dao/Dataset.java

@@ -41,16 +41,15 @@ public class Dataset {
     @JsonDeserialize(using = Json2StringDeserializer.class)
     private String dataSourceMeta;
 
-    private String ownerAgencyId;
     private String ownerAgencyName;
-
-    private String ownerUserId;
     private String ownerUserName;
 
     private int visibility;
 
     private String visibilityDetails;
 
+    private String approvalChain;
+
     // status, 0：valid
     private int status;
 

wedpr-components/dataset/src/main/java/com/webank/wedpr/components/dataset/mapper/wapper/DatasetWrapper.java

@@ -86,9 +86,9 @@ public void updateMeta2DB(Dataset dataset) throws DatasetException {
         int status = dataset.getStatus();
         String datasetDesc = dataset.getStatusDesc();
         if (status == DatasetCode.SUCCESS.getCode()) {
-            updateDatasetStatus(datasetId, status, datasetDesc);
-        } else {
             updateDatasetMetaInfo(dataset);
+        } else {
+            updateDatasetStatus(datasetId, status, datasetDesc);
         }
 
         long endTimeMillis = System.currentTimeMillis();

wedpr-components/dataset/src/main/java/com/webank/wedpr/components/dataset/message/CreateDatasetRequest.java

@@ -20,7 +20,11 @@ public class CreateDatasetRequest {
 
     // datasource type
     private String dataSourceType;
-    // datasource meta info,ie params
+    // datasource meta info
     @JsonDeserialize(using = Json2StringDeserializer.class)
     private String dataSourceMeta;
+
+    // approval chain, ["user1", "user2", "user3"]
+    @JsonDeserialize(using = Json2StringDeserializer.class)
+    private String approvalChain;
 }

wedpr-components/dataset/src/main/java/com/webank/wedpr/components/dataset/message/UpdateDatasetRequest.java

@@ -21,4 +21,8 @@ public class UpdateDatasetRequest {
     // dataset visibility description
     @JsonDeserialize(using = Json2StringDeserializer.class)
     private String datasetVisibilityDetails;
+
+    // approval chain, ["user1", "user2", "user3"]
+    @JsonDeserialize(using = Json2StringDeserializer.class)
+    private String approvalChain;
 }

wedpr-components/dataset/src/main/java/com/webank/wedpr/components/dataset/service/DatasetServiceApi.java

@@ -66,8 +66,8 @@ List<Dataset> queryDatasetList(UserInfo userInfo, List<String> datasetIdList)
      * list dataset by various conditions
      *
      * @param userInfo
-     * @param ownerAgencyId
-     * @param ownerUserId
+     * @param ownerAgency
+     * @param ownerUser
      * @param datasetTitle
      * @param permissionType
      * @param startTime
@@ -79,8 +79,8 @@ List<Dataset> queryDatasetList(UserInfo userInfo, List<String> datasetIdList)
      */
     ListDatasetResponse listDataset(
             UserInfo userInfo,
-            String ownerAgencyId,
-            String ownerUserId,
+            String ownerAgency,
+            String ownerUser,
             String datasetTitle,
             Integer permissionType,
             String startTime,

wedpr-components/dataset/src/main/java/com/webank/wedpr/components/dataset/service/DatasetServiceImpl.java

@@ -116,11 +116,12 @@ public Dataset constructDataset(
         dataset.setDatasetColumnCount(0);
         dataset.setVisibility(createDatasetRequest.getDatasetVisibility());
         dataset.setVisibilityDetails(datasetVisibilityDetails);
-        dataset.setOwnerAgencyId(userInfo.getAgency());
+
         dataset.setOwnerAgencyName(userInfo.getAgency());
-        dataset.setOwnerUserId(userInfo.getUser());
         dataset.setOwnerUserName(userInfo.getUser());
 
+        dataset.setApprovalChain(createDatasetRequest.getApprovalChain());
+
         if (dynamicDataSource) {
             dataset.setStatus(DatasetStatus.Success.getCode());
             dataset.setStatusDesc(DatasetStatus.Success.getMessage());
@@ -349,6 +350,7 @@ public Dataset constructDataset(UpdateDatasetRequest updateDatasetRequest) {
         dataset.setDatasetDesc(updateDatasetRequest.getDatasetDesc());
         dataset.setVisibility(updateDatasetRequest.getDatasetVisibility());
         dataset.setVisibilityDetails(datasetVisibilityDetails);
+        dataset.setApprovalChain(updateDatasetRequest.getApprovalChain());
 
         return dataset;
     }

wedpr-components/dataset/src/main/resources/mapper/DatasetMapper.xml

@@ -17,14 +17,13 @@
         <result property="datasetColumnCount" column="dataset_column_count" />
         <result property="datasetStorageType" column="dataset_storage_type" />
         <result property="datasetStoragePath" column="dataset_storage_path" />
-        <result property="ownerAgencyId" column="owner_agency_id" />
         <result property="ownerAgencyName" column="owner_agency_name" />
-        <result property="ownerUserId" column="owner_user_id" />
         <result property="ownerUserName" column="owner_user_name" />
         <result property="dataSourceType" column="data_source_type" />
         <result property="dataSourceMeta" column="data_source_meta" />
         <result property="visibility" column="visibility" />
         <result property="visibilityDetails" column="visibility_details" />
+        <result property="approvalChain" column="approval_chain" />
         <result property="status" column="status" />
         <result property="statusDesc" column="status_desc" />
         <result property="createAt" column="create_at" />
@@ -44,14 +43,13 @@
             dataset_column_count,
             dataset_storage_type,
             dataset_storage_path,
-            owner_agency_id,
             owner_agency_name,
-            owner_user_id,
             owner_user_name,
             data_source_type,
             data_source_meta,
             visibility,
             visibility_details,
+            approval_chain,
             status,
             status_desc,
             create_at,
@@ -139,9 +137,7 @@
             dataset_title,
             dataset_label,
             dataset_desc,
-            owner_agency_id,
             owner_agency_name,
-            owner_user_id,
             owner_user_name,
             dataset_fields,
             dataset_version_hash,
@@ -154,6 +150,7 @@
             data_source_meta,
             visibility,
             visibility_details,
+            approval_chain,
             status,
             status_desc
         )
@@ -162,9 +159,7 @@
             #{datasetTitle},
             #{datasetLabel},
             #{datasetDesc},
-            #{ownerAgencyId},
             #{ownerAgencyName},
-            #{ownerUserId},
             #{ownerUserName},
             #{datasetFields},
             #{datasetVersionHash},
@@ -177,6 +172,7 @@
             #{dataSourceMeta},
             #{visibility},
             #{visibilityDetails},
+            #{approvalChain},
             #{status},
             #{statusDesc}
         )
@@ -190,7 +186,8 @@
             dataset_label = #{datasetLabel},
             dataset_desc = #{datasetDesc},
             visibility = #{visibility},
-            visibility_details = #{visibilityDetails}
+            visibility_details = #{visibilityDetails},
+            approval_chain = #{approvalChain}
         WHERE
             dataset_id = #{datasetId}
     </update>

wedpr-components/mybatis/src/main/java/com/webank/wedpr/components/mybatis/DataSourceConfig.java

@@ -2,7 +2,6 @@
 
 import com.alibaba.druid.pool.DruidDataSource;
 import java.util.Map;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;