From 5f4cdd24799063d45a71431152c9f4281c29b28a Mon Sep 17 00:00:00 2001 From: Matteo Giordano Date: Thu, 16 Jul 2020 11:34:50 +0200 Subject: [PATCH 1/3] Retrieve bulk import result --- .../dto/model/dto/BulkImportResultDTO.java | 56 +++++++++++++++++++ .../platform/apiclient/api/BulkApi.java | 4 ++ 2 files changed, 60 insertions(+) create mode 100644 cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/BulkImportResultDTO.java diff --git a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/BulkImportResultDTO.java b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/BulkImportResultDTO.java new file mode 100644 index 000000000..549b0667a --- /dev/null +++ b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/BulkImportResultDTO.java @@ -0,0 +1,56 @@ +package com.cloudesire.platform.apiclient.dto.model.dto; + +import com.cloudesire.platform.apiclient.response.error.ErrorResponseEntry; + +import java.util.List; + +public class BulkImportResultDTO extends DTO +{ + private String requestId; + + private UrlEntityDTO executor; + + private String type; + + private List errors; + + public String getRequestId() + { + return requestId; + } + + public void setRequestId( String requestId ) + { + this.requestId = requestId; + } + + public UrlEntityDTO getExecutor() + { + return executor; + } + + public void setExecutor( UrlEntityDTO executor ) + { + this.executor = executor; + } + + public String getType() + { + return type; + } + + public void setType( String type ) + { + this.type = type; + } + + public List getErrors() + { + return errors; + } + + public void setErrors( List errors ) + { + this.errors = errors; + } +} diff --git a/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/api/BulkApi.java b/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/api/BulkApi.java index 55ed777f1..b6a7b526e 100644 --- a/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/api/BulkApi.java +++ b/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/api/BulkApi.java @@ -1,5 +1,6 @@ package com.cloudesire.platform.apiclient.api; +import com.cloudesire.platform.apiclient.dto.model.dto.BulkImportResultDTO; import okhttp3.MultipartBody; import okhttp3.ResponseBody; import retrofit2.Call; @@ -60,4 +61,7 @@ public interface BulkApi @Multipart @PUT( "bulk/users" ) Call saveUsers( @Part MultipartBody.Part file ); + + @GET( "bulk/result/{requestId}" ) + Call getResult( @Path( "requestId" ) String requestId ); } From f03231286a581f87295dd694f96ce12f2e3bdbd0 Mon Sep 17 00:00:00 2001 From: Matteo Giordano Date: Tue, 21 Jul 2020 10:59:06 +0200 Subject: [PATCH 2/3] Document API --- .../apiclient/dto/model/dto/BulkImportResultDTO.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/BulkImportResultDTO.java b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/BulkImportResultDTO.java index 549b0667a..a0f17a723 100644 --- a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/BulkImportResultDTO.java +++ b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/BulkImportResultDTO.java @@ -1,15 +1,20 @@ package com.cloudesire.platform.apiclient.dto.model.dto; import com.cloudesire.platform.apiclient.response.error.ErrorResponseEntry; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.util.List; +@ApiModel( "Bulk import execution result" ) public class BulkImportResultDTO extends DTO { + @ApiModelProperty( "Bulk import request ID" ) private String requestId; private UrlEntityDTO executor; + @ApiModelProperty( value = "What kind of import it has been requested", example = "CatalogCloudPricingCsvDTO,CatalogDistributorPricingCsvDTO" ) private String type; private List errors; From ddc7a49be39b1b869f15adbb0c9d2fae285c61e1 Mon Sep 17 00:00:00 2001 From: Matteo Giordano Date: Tue, 21 Jul 2020 16:28:22 +0200 Subject: [PATCH 3/3] Get all --- .../dto/model/dto/BulkImportResultDTO.java | 17 +++++++++++++++++ .../platform/apiclient/api/BulkApi.java | 4 ++++ 2 files changed, 21 insertions(+) diff --git a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/BulkImportResultDTO.java b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/BulkImportResultDTO.java index a0f17a723..785f80888 100644 --- a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/BulkImportResultDTO.java +++ b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/BulkImportResultDTO.java @@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty; import java.util.List; +import java.util.Objects; @ApiModel( "Bulk import execution result" ) public class BulkImportResultDTO extends DTO @@ -58,4 +59,20 @@ public void setErrors( List errors ) { this.errors = errors; } + + @Override + public boolean equals( Object o ) + { + if ( this == o ) return true; + if ( o == null || getClass() != o.getClass() ) return false; + BulkImportResultDTO that = (BulkImportResultDTO) o; + return Objects.equals( requestId, that.requestId ) && Objects.equals( executor, that.executor ) + && Objects.equals( type, that.type ); + } + + @Override + public int hashCode() + { + return Objects.hash( requestId, executor, type ); + } } diff --git a/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/api/BulkApi.java b/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/api/BulkApi.java index b6a7b526e..8a6154f8a 100644 --- a/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/api/BulkApi.java +++ b/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/api/BulkApi.java @@ -13,6 +13,7 @@ import retrofit2.http.QueryMap; import retrofit2.http.Streaming; +import java.util.List; import java.util.Map; public interface BulkApi @@ -62,6 +63,9 @@ public interface BulkApi @PUT( "bulk/users" ) Call saveUsers( @Part MultipartBody.Part file ); + @GET( "bulk/result" ) + Call> getResults(); + @GET( "bulk/result/{requestId}" ) Call getResult( @Path( "requestId" ) String requestId ); }