From 0660d72e20cb3600f880686f904e56365134b1bb Mon Sep 17 00:00:00 2001 From: Matteo Giordano Date: Fri, 3 Jul 2020 10:25:06 +0200 Subject: [PATCH 1/2] Weight billing item values --- .../dto/model/dto/BillingItemValueDTO.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/BillingItemValueDTO.java b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/BillingItemValueDTO.java index 3f76c1b91..92821b067 100644 --- a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/BillingItemValueDTO.java +++ b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/BillingItemValueDTO.java @@ -50,6 +50,9 @@ public class BillingItemValueDTO extends BaseEntityDTO @Min( 1 ) private Integer step; + @ApiModelProperty( "Weight order for displaying on the marketplace" ) + private Integer weight; + @ApiModelProperty( "The tag for the range, for tagged stairstep values" ) @Size( max = 125, message = INVALID_SIZE ) private String tag; @@ -184,6 +187,17 @@ public BillingItemValueDTO setStep( Integer step ) return this; } + public Integer getWeight() + { + return weight; + } + + public BillingItemValueDTO setWeight( Integer weight ) + { + this.weight = weight; + return this; + } + public String getTag() { return tag; From b34c316a2f6eedb071bc6b1c800b8fadf5d37761 Mon Sep 17 00:00:00 2001 From: Matteo Giordano Date: Fri, 3 Jul 2020 12:47:00 +0200 Subject: [PATCH 2/2] Weight billing items instead --- .../apiclient/dto/model/dto/BillingItemDTO.java | 14 ++++++++++++++ .../dto/model/dto/BillingItemValueDTO.java | 14 -------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/BillingItemDTO.java b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/BillingItemDTO.java index 276bb304a..4273070ba 100644 --- a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/BillingItemDTO.java +++ b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/BillingItemDTO.java @@ -56,6 +56,9 @@ public class BillingItemDTO extends NamedEntityDTO private ApiEndpointDTO endpoint; + @ApiModelProperty( "Weight order for displaying on the marketplace" ) + private Integer weight; + public BillingItemDTO( BillingItemType type, String name, String unit, String description ) { super( name ); @@ -209,6 +212,17 @@ public BillingItemDTO setEndpoint( ApiEndpointDTO endpoint ) return this; } + public Integer getWeight() + { + return weight; + } + + public BillingItemDTO setWeight( Integer weight ) + { + this.weight = weight; + return this; + } + @Override public boolean equals( Object o ) { diff --git a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/BillingItemValueDTO.java b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/BillingItemValueDTO.java index 92821b067..3f76c1b91 100644 --- a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/BillingItemValueDTO.java +++ b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/BillingItemValueDTO.java @@ -50,9 +50,6 @@ public class BillingItemValueDTO extends BaseEntityDTO @Min( 1 ) private Integer step; - @ApiModelProperty( "Weight order for displaying on the marketplace" ) - private Integer weight; - @ApiModelProperty( "The tag for the range, for tagged stairstep values" ) @Size( max = 125, message = INVALID_SIZE ) private String tag; @@ -187,17 +184,6 @@ public BillingItemValueDTO setStep( Integer step ) return this; } - public Integer getWeight() - { - return weight; - } - - public BillingItemValueDTO setWeight( Integer weight ) - { - this.weight = weight; - return this; - } - public String getTag() { return tag;