diff --git a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/csv/BaseUserCsvDTO.java b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/csv/BaseUserCsvDTO.java new file mode 100644 index 000000000..8271f1cf0 --- /dev/null +++ b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/csv/BaseUserCsvDTO.java @@ -0,0 +1,203 @@ +package com.cloudesire.platform.apiclient.dto.model.dto.csv; + +import com.cloudesire.platform.apiclient.dto.model.dto.DTO; + +abstract class BaseUserCsvDTO extends DTO +{ + private String name; + + private String surname; + + private String phone; + + private String email; + + private String pec; + + // region Auto-generated code + public String getName() + { + return name; + } + + public void setName( String name ) + { + this.name = name; + } + + public String getSurname() + { + return surname; + } + + public void setSurname( String surname ) + { + this.surname = surname; + } + + public String getPhone() + { + return phone; + } + + public void setPhone( String phone ) + { + this.phone = phone; + } + + public String getEmail() + { + return email; + } + + public void setEmail( String email ) + { + this.email = email; + } + + public String getPec() + { + return pec; + } + + public void setPec( String pec ) + { + this.pec = pec; + } + // endregion + + abstract static class BaseCompany + { + private String name; + + private String vat; + + private String country; + + private String address; + + private String city; + + private String state; + + private String zip; + + private String geocallId; + + private String sdiCode; + + private String pec; + + private String type; + + public String getName() + { + return name; + } + + public void setName( String name ) + { + this.name = name; + } + + public String getVat() + { + return vat; + } + + public void setVat( String vat ) + { + this.vat = vat; + } + + public String getCountry() + { + return country; + } + + public void setCountry( String country ) + { + this.country = country; + } + + public String getAddress() + { + return address; + } + + public void setAddress( String address ) + { + this.address = address; + } + + public String getCity() + { + return city; + } + + public void setCity( String city ) + { + this.city = city; + } + + public String getState() + { + return state; + } + + public void setState( String state ) + { + this.state = state; + } + + public String getZip() + { + return zip; + } + + public void setZip( String zip ) + { + this.zip = zip; + } + + public String getGeocallId() + { + return geocallId; + } + + public void setGeocallId( String geocallId ) + { + this.geocallId = geocallId; + } + + public String getSdiCode() + { + return sdiCode; + } + + public void setSdiCode( String sdiCode ) + { + this.sdiCode = sdiCode; + } + + public String getPec() + { + return pec; + } + + public void setPec( String pec ) + { + this.pec = pec; + } + + public String getType() + { + return type; + } + + public void setType( String type ) + { + this.type = type; + } + } +} diff --git a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/csv/CustomerCsvDTO.java b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/csv/CustomerCsvDTO.java new file mode 100644 index 000000000..74b51efc8 --- /dev/null +++ b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/csv/CustomerCsvDTO.java @@ -0,0 +1,198 @@ +package com.cloudesire.platform.apiclient.dto.model.dto.csv; + +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonUnwrapped; + +@JsonPropertyOrder( { + "userName", "name", "surname", "email", "pec", "phone", "password", "language", "enabled", "acceptedTerms", + "fiscalCode", "companyName", "taxCode" +} ) +public class CustomerCsvDTO extends BaseUserCsvDTO +{ + private String userName; + + private String password; + + private String language; + + private Boolean enabled; + + private Boolean acceptedTerms; + + private String fiscalCode; + + private String companyName; + + private String taxCode; + + @JsonUnwrapped( prefix = "address." ) + private Address address; + + public String getUserName() + { + return userName; + } + + public void setUserName( String userName ) + { + this.userName = userName; + } + + public String getPassword() + { + return password; + } + + public void setPassword( String password ) + { + this.password = password; + } + + public String getLanguage() + { + return language; + } + + public void setLanguage( String language ) + { + this.language = language; + } + + public Boolean getEnabled() + { + return enabled; + } + + public void setEnabled( Boolean enabled ) + { + this.enabled = enabled; + } + + public Boolean getAcceptedTerms() + { + return acceptedTerms; + } + + public void setAcceptedTerms( Boolean acceptedTerms ) + { + this.acceptedTerms = acceptedTerms; + } + + public String getFiscalCode() + { + return fiscalCode; + } + + public void setFiscalCode( String fiscalCode ) + { + this.fiscalCode = fiscalCode; + } + + public Address getAddress() + { + return address; + } + + public void setAddress( Address address ) + { + this.address = address; + } + + public String getCompanyName() + { + return companyName; + } + + public void setCompanyName( String companyName ) + { + this.companyName = companyName; + } + + public String getTaxCode() + { + return taxCode; + } + + public void setTaxCode( String taxCode ) + { + this.taxCode = taxCode; + } + + @JsonPropertyOrder( { + "country", "countryCode", "state", "city", "address", "zipCode" + } ) + public static class Address + { + private String country; + + private String countryCode; + + private String state; + + private String city; + + private String address; + + private String zipCode; + + public String getCountry() + { + return country; + } + + public void setCountry( String country ) + { + this.country = country; + } + + public String getCountryCode() + { + return countryCode; + } + + public void setCountryCode( String countryCode ) + { + this.countryCode = countryCode; + } + + public String getState() + { + return state; + } + + public void setState( String state ) + { + this.state = state; + } + + public String getCity() + { + return city; + } + + public void setCity( String city ) + { + this.city = city; + } + + public String getAddress() + { + return address; + } + + public void setAddress( String address ) + { + this.address = address; + } + + public String getZipCode() + { + return zipCode; + } + + public void setZipCode( String zipCode ) + { + this.zipCode = zipCode; + } + } +} diff --git a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/csv/MyUserCsvDTO.java b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/csv/MyUserCsvDTO.java index ff6f82113..06056f1a0 100644 --- a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/csv/MyUserCsvDTO.java +++ b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/csv/MyUserCsvDTO.java @@ -1,24 +1,13 @@ package com.cloudesire.platform.apiclient.dto.model.dto.csv; -import com.cloudesire.platform.apiclient.dto.model.dto.DTO; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonUnwrapped; import java.util.Date; @JsonPropertyOrder( { "name", "surname", "phone", "email", "pec", "geocallId", "creationDate", "active", "activationDate" } ) -public class MyUserCsvDTO extends DTO +public class MyUserCsvDTO extends BaseUserCsvDTO { - private String name; - - private String surname; - - private String phone; - - private String email; - - private String pec; - private String geocallId; private Date creationDate; @@ -31,56 +20,6 @@ public class MyUserCsvDTO extends DTO private Company company; // region Auto-generated code - public String getName() - { - return name; - } - - public void setName( String name ) - { - this.name = name; - } - - public String getSurname() - { - return surname; - } - - public void setSurname( String surname ) - { - this.surname = surname; - } - - public String getPhone() - { - return phone; - } - - public void setPhone( String phone ) - { - this.phone = phone; - } - - public String getEmail() - { - return email; - } - - public void setEmail( String email ) - { - this.email = email; - } - - public String getPec() - { - return pec; - } - - public void setPec( String pec ) - { - this.pec = pec; - } - public String getGeocallId() { return geocallId; @@ -135,138 +74,7 @@ public void setCompany( Company company ) @JsonPropertyOrder( { "name", "vat", "country", "address", "city", "state", "zip", "geocallId", "sdiCode", "pec", "type" } ) - public static class Company + public static class Company extends BaseCompany { - private String name; - - private String vat; - - private String country; - - private String address; - - private String city; - - private String state; - - private String zip; - - private String geocallId; - - private String sdiCode; - - private String pec; - - private String type; - - public String getName() - { - return name; - } - - public void setName( String name ) - { - this.name = name; - } - - public String getVat() - { - return vat; - } - - public void setVat( String vat ) - { - this.vat = vat; - } - - public String getCountry() - { - return country; - } - - public void setCountry( String country ) - { - this.country = country; - } - - public String getAddress() - { - return address; - } - - public void setAddress( String address ) - { - this.address = address; - } - - public String getCity() - { - return city; - } - - public void setCity( String city ) - { - this.city = city; - } - - public String getState() - { - return state; - } - - public void setState( String state ) - { - this.state = state; - } - - public String getZip() - { - return zip; - } - - public void setZip( String zip ) - { - this.zip = zip; - } - - public String getGeocallId() - { - return geocallId; - } - - public void setGeocallId( String geocallId ) - { - this.geocallId = geocallId; - } - - public String getSdiCode() - { - return sdiCode; - } - - public void setSdiCode( String sdiCode ) - { - this.sdiCode = sdiCode; - } - - public String getPec() - { - return pec; - } - - public void setPec( String pec ) - { - this.pec = pec; - } - - public String getType() - { - return type; - } - - public void setType( String type ) - { - this.type = 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 200a0a1db..44bf8cc81 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 @@ -36,13 +36,18 @@ public interface BulkApi @Streaming Call getResellerCatalog( @Path( "id" ) int id ); + @GET( "bulk/users" ) + @Headers( { "Accept:text/csv" } ) + @Streaming + Call getUsers( @QueryMap Map pageRequest ); + @Multipart @PUT( "bulk/cloudPricings" ) - Call saveCloudPricings( @Part MultipartBody.Part payload ); + Call saveCloudPricings( @Part MultipartBody.Part file ); @Multipart @PUT( "bulk/distributorCatalog/{id}" ) - Call saveDistributorCatalog( @Path( "id" ) int id, @Part MultipartBody.Part payload ); + Call saveDistributorCatalog( @Path( "id" ) int id, @Part MultipartBody.Part file ); @Multipart @PUT( "bulk/plans" ) @@ -50,5 +55,9 @@ public interface BulkApi @Multipart @PUT( "bulk/resellerCatalog/{id}" ) - Call saveResellerCatalog( @Path( "id" ) int id, @Part MultipartBody.Part payload ); + Call saveResellerCatalog( @Path( "id" ) int id, @Part MultipartBody.Part file ); + + @Multipart + @PUT( "bulk/user" ) + Call saveUsers( @Part MultipartBody.Part file ); } diff --git a/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/api/UserApi.java b/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/api/UserApi.java index bbcfd9acb..47c95ad67 100644 --- a/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/api/UserApi.java +++ b/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/api/UserApi.java @@ -4,10 +4,10 @@ import com.cloudesire.platform.apiclient.dto.model.dto.MyUserDTO; import com.cloudesire.platform.apiclient.dto.model.dto.PasswordRecoveryDTO; import com.cloudesire.platform.apiclient.dto.model.dto.PasswordResetDTO; -import com.cloudesire.platform.apiclient.dto.model.dto.StripePaymentMethodDTO; +import com.cloudesire.platform.apiclient.dto.model.dto.PaymentMethodDTO; import com.cloudesire.platform.apiclient.dto.model.dto.SepaDataDTO; +import com.cloudesire.platform.apiclient.dto.model.dto.StripePaymentMethodDTO; import com.cloudesire.platform.apiclient.dto.model.dto.StripeTokenDTO; -import com.cloudesire.platform.apiclient.dto.model.dto.PaymentMethodDTO; import com.cloudesire.platform.apiclient.dto.model.dto.request.UserActivationDTO; import com.cloudesire.platform.apiclient.dto.model.enums.UserRole; import com.cloudesire.platform.apiclient.dto.model.patch.UserPatchDTO;