fix service publish (#159)

* fix service publish

* fix dataset upload

Author: cyjseagull

wedpr-components/dataset/src/main/java/com/webank/wedpr/components/dataset/common/DatasetStatus.java

@@ -1,12 +1,13 @@
 package com.webank.wedpr.components.dataset.common;
 
+import com.webank.wedpr.components.db.mapper.dataset.dao.Dataset;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 @AllArgsConstructor
 @Getter
 public enum DatasetStatus {
-    Success(0, "Success"),
+    Success(0, "Success"), // Note: 0 is the valid status
     Failure(-1, "Failure"), // dataset is in failure and can be processed by retrying
     Fatal(-2, "Fatal"), // dataset is in failure and can not be processed by retrying
     Created(1, "Created"), // dataset is created and waiting for data source processing
@@ -18,7 +19,8 @@ public enum DatasetStatus {
     UploadingChunkData(5, "UploadingChunkData"), // chunk data is being uploaded
     LoadingDBData(6, "LoadingDBData"), // upload database data
     LoadingExcelData(7, "LoadingExcelData"), // loading excel data
-    MergingChunkData(8, "MergingChunkData"); // merge chunk data
+    MergingChunkData(8, "MergingChunkData"), // merge chunk data
+    InvalidStatus(Dataset.INVALID_DATASET_STATUS, "InvalidStatus");
 
     private final Integer code;
     private final String message;

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

@@ -22,6 +22,7 @@
 @Data
 public class Dataset {
     private static final Logger logger = LoggerFactory.getLogger(Dataset.class);
+    public static final Integer INVALID_DATASET_STATUS = -100000;
 
     @Data
     @NoArgsConstructor
@@ -75,7 +76,7 @@ public static class StoragePathMeta {
     private String approvalChain;
 
     // status, 0：valid
-    private int status;
+    private Integer status = INVALID_DATASET_STATUS;
 
     private String statusDesc;
 
@@ -105,6 +106,13 @@ public void resetMeta() {
         permissions = null;
     }
 
+    public void setStatus(Integer status) {
+        if (status == null) {
+            return;
+        }
+        this.status = status;
+    }
+
     @SneakyThrows(Exception.class)
     public void setDatasetStoragePath(String datasetStoragePath) {
         this.datasetStoragePath = datasetStoragePath;

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

@@ -301,13 +301,22 @@
             <if test="dataset.datasetStoragePath != null and dataset.datasetStoragePath !=''">
                 dataset_storage_path = #{dataset.datasetStoragePath},
             </if>
+            <if test="dataset.status != null and dataset.status != -100000">
+                status = #{dataset.status},
+            </if>
+            <if test="dataset.statusDesc != null and dataset.statusDesc !=''">
+                status_desc = #{dataset.statusDesc},
+            </if>
+            <if test="dataset.datasetVersionHash != null and dataset.datasetVersionHash !=''">
+                dataset_version_hash = #{dataset.datasetVersionHash},
+            </if>
         </set>
         WHERE dataset_id = #{dataset.datasetId}
         <if test="dataset.ownerAgencyName != null and dataset.ownerAgencyName !=''">
-            owner_agency_name = #{dataset.ownerAgencyName},
+            and owner_agency_name = #{dataset.ownerAgencyName}
         </if>
         <if test="dataset.ownerUserName != null and dataset.ownerUserName !=''">
-            owner_user_name = #{dataset.ownerUserName},
+            and owner_user_name = #{dataset.ownerUserName}
         </if>
     </update>
 </mapper>

wedpr-components/service-publish/src/main/java/com/webank/wedpr/components/publish/config/ServicePublisherLoader.java

@@ -2,6 +2,7 @@
 
 import com.webank.wedpr.common.config.WeDPRCommonConfig;
 import com.webank.wedpr.common.utils.WeDPRResponseFactory;
+import com.webank.wedpr.components.db.mapper.service.publish.dao.PublishedServiceMapper;
 import com.webank.wedpr.components.db.mapper.service.publish.dao.ServiceAuthMapper;
 import com.webank.wedpr.components.hook.ServiceHook;
 import com.webank.wedpr.components.loadbalancer.LoadBalancer;
@@ -32,10 +33,6 @@ public class ServicePublisherLoader {
     @Qualifier("resourceSyncer")
     private ResourceSyncer resourceSyncer;
 
-    @Autowired
-    @Qualifier("publishSyncerCommitHandler")
-    PublishSyncerCommitHandler publishSyncerCommitHandler;
-
     @Autowired
     @Qualifier("loadBalancer")
     private LoadBalancer loadBalancer;
@@ -45,6 +42,7 @@ public class ServicePublisherLoader {
     private ServiceHook serviceHook;
 
     @Autowired private ServiceAuthMapper serviceAuthMapper;
+    @Autowired private PublishedServiceMapper publishedServiceMapper;
 
     @PostConstruct
     public void init() {
@@ -68,6 +66,9 @@ public PublishSyncerApi newPublishSyncer() {
                 new ResourceActionRecorderBuilder(agency, resourceType);
         publishSyncer.setResourceSyncer(resourceSyncer);
         publishSyncer.setResourceBuilder(resourceBuilder);
+
+        PublishSyncerCommitHandler publishSyncerCommitHandler =
+                new PublishSyncerCommitHandler(publishedServiceMapper);
         resourceSyncer.registerCommitHandler(resourceType, publishSyncerCommitHandler);
         return publishSyncer;
     }

wedpr-components/service-publish/src/main/java/com/webank/wedpr/components/publish/sync/PublishSyncerCommitHandler.java

@@ -13,23 +13,21 @@
 import java.util.Map;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 
 /**
  * @author zachma
  * @date 2024/8/28
  */
-@Component("publishSyncerCommitHandler")
 public class PublishSyncerCommitHandler implements ResourceSyncer.CommitHandler {
     private static final Logger logger = LoggerFactory.getLogger(PublishSyncerCommitHandler.class);
 
-    @Autowired private PublishedServiceMapper publishedServiceMapper;
+    private PublishedServiceMapper publishedServiceMapper;
 
     private final PublishSyncerImpl syncer;
     private final Map<String, PublishActionHandler> actionHandlerMap = new HashMap<>();
 
-    public PublishSyncerCommitHandler() {
+    public PublishSyncerCommitHandler(PublishedServiceMapper publishedServiceMapper) {
+        this.publishedServiceMapper = publishedServiceMapper;
         this.syncer = new PublishSyncerImpl(publishedServiceMapper);
         actionHandlerMap.put(PublishSyncAction.SYNC.getAction(), new SyncPublishActionHandler());
         actionHandlerMap.put(
@@ -46,15 +44,7 @@ public void call(ResourceSyncer.CommitArgs args) throws WeDPRException {
         String agency = resourceActionRecord.getAgency();
         String action = resourceActionRecord.getResourceAction();
         String content = resourceActionRecord.getResourceContent();
-        String myAgency = WeDPRCommonConfig.getAgency();
-
-        logger.info(
-                "ignore self agency sync message, id: {}, action: {}, content: {}",
-                resourceActionRecord.getResourceID(),
-                action,
-                resourceActionRecord);
-
-        if (agency.equals(myAgency)) {
+        if (agency.equalsIgnoreCase(WeDPRCommonConfig.getAgency())) {
             logger.info(
                     "ignore self agency sync message, id: {}, action: {}, content: {}",
                     resourceActionRecord.getResourceID(),
@@ -76,7 +66,7 @@ public void call(ResourceSyncer.CommitArgs args) throws WeDPRException {
             publishActionHandler.handle(content, syncer);
         } catch (Exception e) {
             logger.error(
-                    "handle dataset sync message exception, id: {}, action: {}, content: {}, e: {}",
+                    "handle service publish sync message exception, id: {}, action: {}, content: {}, e: ",
                     resourceActionRecord.getResourceID(),
                     action,
                     resourceActionRecord,

wedpr-components/service-publish/src/main/java/com/webank/wedpr/components/publish/sync/handler/SyncPublishActionHandler.java

@@ -19,7 +19,7 @@ public void handle(String content, PublishSyncerImpl syncer) throws WeDPRExcepti
             PublishedServiceInfo publishedServiceInfo = PublishedServiceInfo.deserialize(content);
             syncer.syncPublishService(PublishSyncAction.SYNC, publishedServiceInfo);
         } catch (Exception e) {
-            logger.error("sync publish service failed: " + content);
+            logger.error("sync publish service failed, content: {}, error: ", content, e);
             throw new WeDPRException(e);
         }
     }