Merge branch 'release/1.26.11.46'

src/main/java/com/bunq/sdk/model/generated/endpoint/GinmonTransaction.java

@@ -0,0 +1,276 @@
+package com.bunq.sdk.model.generated.endpoint;
+
+import com.bunq.sdk.model.core.BunqModel;
+import com.bunq.sdk.model.core.MonetaryAccountReference;
+import com.bunq.sdk.model.generated.object.Amount;
+import com.bunq.sdk.model.generated.object.LabelMonetaryAccount;
+import com.bunq.sdk.model.generated.object.LabelUser;
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Endpoint for reading Ginmon transactions.
+ */
+public class GinmonTransaction extends BunqModel {
+
+  /**
+   * The status of the transaction.
+   */
+  @Expose
+  @SerializedName("status")
+  private String status;
+
+  /**
+   * The status of the transaction.
+   */
+  @Expose
+  @SerializedName("status_description")
+  private String statusDescription;
+
+  /**
+   * The translated status of the transaction.
+   */
+  @Expose
+  @SerializedName("status_description_translated")
+  private String statusDescriptionTranslated;
+
+  /**
+   * The final amount the user will pay or receive.
+   */
+  @Expose
+  @SerializedName("amount_billing")
+  private Amount amountBilling;
+
+  /**
+   * The estimated amount the user will pay or receive.
+   */
+  @Expose
+  @SerializedName("amount_billing_original")
+  private Amount amountBillingOriginal;
+
+  /**
+   * The ISIN of the security.
+   */
+  @Expose
+  @SerializedName("isin")
+  private String isin;
+
+  /**
+   * External identifier of this order at Ginmon.
+   */
+  @Expose
+  @SerializedName("external_identifier")
+  private String externalIdentifier;
+
+  /**
+   * The label of the user.
+   */
+  @Expose
+  @SerializedName("label_user")
+  private LabelUser labelUser;
+
+  /**
+   * The label of the monetary account.
+   */
+  @Expose
+  @SerializedName("label_monetary_account")
+  private LabelMonetaryAccount labelMonetaryAccount;
+
+  /**
+   * The label of the counter monetary account.
+   */
+  @Expose
+  @SerializedName("counter_label_monetary_account")
+  private LabelMonetaryAccount counterLabelMonetaryAccount;
+
+  /**
+   * The id of the event of transaction.
+   */
+  @Expose
+  @SerializedName("event_id")
+  private Integer eventId;
+
+  /**
+   * The status of the transaction.
+   */
+  public String getStatus() {
+    return this.status;
+  }
+
+  public void setStatus(String status) {
+    this.status = status;
+  }
+
+  /**
+   * The status of the transaction.
+   */
+  public String getStatusDescription() {
+    return this.statusDescription;
+  }
+
+  public void setStatusDescription(String statusDescription) {
+    this.statusDescription = statusDescription;
+  }
+
+  /**
+   * The translated status of the transaction.
+   */
+  public String getStatusDescriptionTranslated() {
+    return this.statusDescriptionTranslated;
+  }
+
+  public void setStatusDescriptionTranslated(String statusDescriptionTranslated) {
+    this.statusDescriptionTranslated = statusDescriptionTranslated;
+  }
+
+  /**
+   * The final amount the user will pay or receive.
+   */
+  public Amount getAmountBilling() {
+    return this.amountBilling;
+  }
+
+  public void setAmountBilling(Amount amountBilling) {
+    this.amountBilling = amountBilling;
+  }
+
+  /**
+   * The estimated amount the user will pay or receive.
+   */
+  public Amount getAmountBillingOriginal() {
+    return this.amountBillingOriginal;
+  }
+
+  public void setAmountBillingOriginal(Amount amountBillingOriginal) {
+    this.amountBillingOriginal = amountBillingOriginal;
+  }
+
+  /**
+   * The ISIN of the security.
+   */
+  public String getIsin() {
+    return this.isin;
+  }
+
+  public void setIsin(String isin) {
+    this.isin = isin;
+  }
+
+  /**
+   * External identifier of this order at Ginmon.
+   */
+  public String getExternalIdentifier() {
+    return this.externalIdentifier;
+  }
+
+  public void setExternalIdentifier(String externalIdentifier) {
+    this.externalIdentifier = externalIdentifier;
+  }
+
+  /**
+   * The label of the user.
+   */
+  public LabelUser getLabelUser() {
+    return this.labelUser;
+  }
+
+  public void setLabelUser(LabelUser labelUser) {
+    this.labelUser = labelUser;
+  }
+
+  /**
+   * The label of the monetary account.
+   */
+  public LabelMonetaryAccount getLabelMonetaryAccount() {
+    return this.labelMonetaryAccount;
+  }
+
+  public void setLabelMonetaryAccount(LabelMonetaryAccount labelMonetaryAccount) {
+    this.labelMonetaryAccount = labelMonetaryAccount;
+  }
+
+  /**
+   * The label of the counter monetary account.
+   */
+  public LabelMonetaryAccount getCounterLabelMonetaryAccount() {
+    return this.counterLabelMonetaryAccount;
+  }
+
+  public void setCounterLabelMonetaryAccount(LabelMonetaryAccount counterLabelMonetaryAccount) {
+    this.counterLabelMonetaryAccount = counterLabelMonetaryAccount;
+  }
+
+  /**
+   * The id of the event of transaction.
+   */
+  public Integer getEventId() {
+    return this.eventId;
+  }
+
+  public void setEventId(Integer eventId) {
+    this.eventId = eventId;
+  }
+
+  /**
+   */
+  public boolean isAllFieldNull() {
+    if (this.status != null) {
+      return false;
+    }
+
+    if (this.statusDescription != null) {
+      return false;
+    }
+
+    if (this.statusDescriptionTranslated != null) {
+      return false;
+    }
+
+    if (this.amountBilling != null) {
+      return false;
+    }
+
+    if (this.amountBillingOriginal != null) {
+      return false;
+    }
+
+    if (this.isin != null) {
+      return false;
+    }
+
+    if (this.externalIdentifier != null) {
+      return false;
+    }
+
+    if (this.labelUser != null) {
+      return false;
+    }
+
+    if (this.labelMonetaryAccount != null) {
+      return false;
+    }
+
+    if (this.counterLabelMonetaryAccount != null) {
+      return false;
+    }
+
+    if (this.eventId != null) {
+      return false;
+    }
+
+    return true;
+  }
+
+  /**
+   */
+  public static GinmonTransaction fromJsonReader(JsonReader reader) {
+    return fromJsonReader(GinmonTransaction.class, reader);
+  }
+
+}

src/main/java/com/bunq/sdk/model/generated/endpoint/PaymentAutoAllocateDefinition.java

@@ -36,7 +36,6 @@ public class PaymentAutoAllocateDefinition extends BunqModel {
   public static final String FIELD_DESCRIPTION = "description";
   public static final String FIELD_AMOUNT = "amount";
   public static final String FIELD_FRACTION = "fraction";
-  public static final String FIELD_GINMON_COST_DISCLOSURE_ID = "ginmon_cost_disclosure_id";
 
   /**
    * Object type.
@@ -127,44 +126,32 @@ public class PaymentAutoAllocateDefinition extends BunqModel {
   @SerializedName("fraction_field_for_request")
   private BigDecimal fractionFieldForRequest;
 
-  /**
-   * The id of the ginmon cost disclosure, if this definition is a scheduled order.
-   */
-  @Expose
-  @SerializedName("ginmon_cost_disclosure_id_field_for_request")
-  private String ginmonCostDisclosureIdFieldForRequest;
-
   public PaymentAutoAllocateDefinition() {
-  this(null, null, null, null, null, null);
+  this(null, null, null, null, null);
   }
 
   public PaymentAutoAllocateDefinition(String type) {
-  this(type, null, null, null, null, null);
+  this(type, null, null, null, null);
   }
 
   public PaymentAutoAllocateDefinition(String type, Pointer counterpartyAlias) {
-  this(type, counterpartyAlias, null, null, null, null);
+  this(type, counterpartyAlias, null, null, null);
   }
 
   public PaymentAutoAllocateDefinition(String type, Pointer counterpartyAlias, String description) {
-  this(type, counterpartyAlias, description, null, null, null);
+  this(type, counterpartyAlias, description, null, null);
   }
 
   public PaymentAutoAllocateDefinition(String type, Pointer counterpartyAlias, String description, Amount amount) {
-  this(type, counterpartyAlias, description, amount, null, null);
+  this(type, counterpartyAlias, description, amount, null);
   }
 
   public PaymentAutoAllocateDefinition(String type, Pointer counterpartyAlias, String description, Amount amount, BigDecimal fraction) {
-  this(type, counterpartyAlias, description, amount, fraction, null);
-  }
-
-  public PaymentAutoAllocateDefinition(String type, Pointer counterpartyAlias, String description, Amount amount, BigDecimal fraction, String ginmonCostDisclosureId) {
     this.typeFieldForRequest = type;
     this.counterpartyAliasFieldForRequest = counterpartyAlias;
     this.descriptionFieldForRequest = description;
     this.amountFieldForRequest = amount;
     this.fractionFieldForRequest = fraction;
-    this.ginmonCostDisclosureIdFieldForRequest = ginmonCostDisclosureId;
   }  /**
    */
   public static BunqResponse<List<PaymentAutoAllocateDefinition>> list(Integer paymentAutoAllocateId, Integer monetaryAccountId, Map<String, String> params, Map<String, String> customHeaders) {

src/main/java/com/bunq/sdk/model/generated/endpoint/PaymentAutoAllocateInstance.java

@@ -89,6 +89,13 @@ public class PaymentAutoAllocateInstance extends BunqModel {
   @SerializedName("payment_id")
   private Integer paymentId;
 
+  /**
+   * All Ginmon transaction orders executed with this instance.
+   */
+  @Expose
+  @SerializedName("all_ginmon_transaction_order")
+  private List<GinmonTransaction> allGinmonTransactionOrder;
+
   /**
    */
   public static BunqResponse<List<PaymentAutoAllocateInstance>> list(Integer paymentAutoAllocateId, Integer monetaryAccountId, Map<String, String> params, Map<String, String> customHeaders) {
@@ -231,6 +238,17 @@ public void setPaymentId(Integer paymentId) {
     this.paymentId = paymentId;
   }
 
+  /**
+   * All Ginmon transaction orders executed with this instance.
+   */
+  public List<GinmonTransaction> getAllGinmonTransactionOrder() {
+    return this.allGinmonTransactionOrder;
+  }
+
+  public void setAllGinmonTransactionOrder(List<GinmonTransaction> allGinmonTransactionOrder) {
+    this.allGinmonTransactionOrder = allGinmonTransactionOrder;
+  }
+
   /**
    */
   public boolean isAllFieldNull() {
@@ -266,6 +284,10 @@ public boolean isAllFieldNull() {
       return false;
     }
 
+    if (this.allGinmonTransactionOrder != null) {
+      return false;
+    }
+
     return true;
   }