v3.3.0 (#10)

altJake · web-flow · commit 7a296a43cc97 · 2019-10-01T14:48:43.000+02:00
- Add `ReferralRejectionReason` object and integration response properties
- Add users emails notifications subscriptions
- Remove stale `usedAt` and `locked` properties from Webhooks and Attributes
diff --git a/README.md b/README.md
@@ -39,7 +39,7 @@ Add this dependency to your project's POM:
 <dependency>
   <groupId>one.talon</groupId>
   <artifactId>talon-one-client</artifactId>
-  <version>3.2.3</version>
+  <version>3.3.0</version>
   <scope>compile</scope>
 </dependency>
 ```
@@ -49,7 +49,7 @@ Add this dependency to your project's POM:
 Add this dependency to your project's build file:
 
 ```groovy
-compile "one.talon:talon-one-client:3.2.3"
+compile "one.talon:talon-one-client:3.3.0"
 ```
 
 ### Others
@@ -62,7 +62,7 @@ mvn clean package
 
 Then manually install the following JARs:
 
-* `target/talon-one-client-3.2.3.jar`
+* `target/talon-one-client-3.3.0.jar`
 * `target/lib/*.jar`
 
 ## Getting Started
@@ -378,7 +378,9 @@ Class | Method | HTTP request | Description
  - [NewTemplateDef](docs/NewTemplateDef.md)
  - [NewUser](docs/NewUser.md)
  - [NewWebhook](docs/NewWebhook.md)
+ - [Notification](docs/Notification.md)
  - [Referral](docs/Referral.md)
+ - [ReferralRejectionReason](docs/ReferralRejectionReason.md)
  - [Role](docs/Role.md)
  - [RoleAssign](docs/RoleAssign.md)
  - [RoleMembership](docs/RoleMembership.md)
diff --git a/build.gradle b/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'idea'
 apply plugin: 'eclipse'
 
 group = 'one.talon'
-version = '3.2.3'
+version = '3.3.0'
 
 buildscript {
     repositories {
diff --git a/build.sbt b/build.sbt
@@ -2,7 +2,7 @@ lazy val root = (project in file(".")).
   settings(
     organization := "one.talon",
     name := "talon-one-client",
-    version := "3.2.3",
+    version := "3.3.0",
     scalaVersion := "2.11.4",
     scalacOptions ++= Seq("-feature"),
     javacOptions in compile ++= Seq("-Xlint:deprecation"),
diff --git a/docs/ApplicationSession.md b/docs/ApplicationSession.md
@@ -10,10 +10,11 @@ Name | Type | Description | Notes
 **profileId** | **Integer** | The globally unique Talon.One ID of the customer that created this entity. |  [optional]
 **integrationId** | **String** | The ID used for this entity in the application system. | 
 **coupon** | **String** | Any coupon code entered. | 
-**referral** | **String** | Any referal code entered. | 
+**referral** | **String** | Any referral code entered. | 
 **state** | [**StateEnum**](#StateEnum) | Indicating if the customer session is in progress (\&quot;open\&quot;), \&quot;closed\&quot;, or \&quot;cancelled\&quot;. | 
 **cartItems** | [**List&lt;CartItem&gt;**](CartItem.md) | Serialized JSON representation. | 
 **discounts** | [**Map&lt;String, BigDecimal&gt;**](BigDecimal.md) | A map of labelled discount values, in the same currency as the session. | 
+**total** | [**BigDecimal**](BigDecimal.md) | The total sum of the session before any discounts applied. |  [optional]
 **attributes** | [**Object**](.md) | Arbitrary properties associated with this item |  [optional]
 
 
diff --git a/docs/Attribute.md b/docs/Attribute.md
@@ -15,8 +15,6 @@ Name | Type | Description | Notes
 **description** | **String** | A description of this attribute. | 
 **suggestions** | **List&lt;String&gt;** | A list of suggestions for the attribute. | 
 **editable** | **Boolean** | Whether or not this attribute can be edited. | 
-**locked** | **Boolean** | Indicates whether this attribute is in use. If in use only title can be changed and other operations are prohibited. | 
-**usedAt** | **List&lt;String&gt;** | array of rulesets where the attribute is used | 
 
 
 <a name="EntityEnum"></a>
diff --git a/docs/CouponRejectionReason.md b/docs/CouponRejectionReason.md
@@ -15,13 +15,15 @@ Name | Value
 ---- | -----
 COUPONNOTFOUND | &quot;CouponNotFound&quot;
 COUPONPARTOFNOTRUNNINGCAMPAIGN | &quot;CouponPartOfNotRunningCampaign&quot;
+COUPONVALIDCONDITIONMISSING | &quot;CouponValidConditionMissing&quot;
 COUPONLIMITREACHED | &quot;CouponLimitReached&quot;
 CAMPAIGNLIMITREACHED | &quot;CampaignLimitReached&quot;
 PROFILELIMITREACHED | &quot;ProfileLimitReached&quot;
 COUPONRECIPIENTDOESNOTMATCH | &quot;CouponRecipientDoesNotMatch&quot;
 COUPONEXPIRED | &quot;CouponExpired&quot;
 COUPONSTARTDATEINFUTURE | &quot;CouponStartDateInFuture&quot;
 COUPONREJECTEDBYCONDITION | &quot;CouponRejectedByCondition&quot;
+EFFECTCOULDNOTBEAPPLIED | &quot;EffectCouldNotBeApplied&quot;
 
 
 
diff --git a/docs/ErrorSource.md b/docs/ErrorSource.md
@@ -7,6 +7,7 @@ Name | Type | Description | Notes
 **pointer** | **String** | Pointer to the path in the payload that caused this error. |  [optional]
 **parameter** | **String** | Query parameter that caused this error. |  [optional]
 **line** | **String** | Line number in uploaded multipart file that caused this error. &#39;N/A&#39; if unknown. |  [optional]
+**resource** | **String** | Pointer to the resource that caused this error |  [optional]
 
 
 
diff --git a/docs/Meta.md b/docs/Meta.md
@@ -7,6 +7,7 @@ Name | Type | Description | Notes
 **campaigns** | [**Object**](.md) | Maps each evaluated campaign ID to a key-value list of that campaigns attributes. Campaigns without attributes will be omitted. |  [optional]
 **coupons** | [**Object**](.md) | Maps the coupon value to a key-value list of that coupons attributes. |  [optional]
 **couponRejectionReason** | [**CouponRejectionReason**](CouponRejectionReason.md) |  |  [optional]
+**referralRejectionReason** | [**ReferralRejectionReason**](ReferralRejectionReason.md) |  |  [optional]
 **warnings** | [**Object**](.md) |  |  [optional]
 
 
diff --git a/docs/Notification.md b/docs/Notification.md
@@ -0,0 +1,12 @@
+
+# Notification
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**id** | **Integer** | id of the notification | 
+**name** | **String** | name of the notification | 
+**description** | **String** | description of the notification | 
+
+
+
diff --git a/docs/ReferralRejectionReason.md b/docs/ReferralRejectionReason.md
@@ -0,0 +1,30 @@
+
+# ReferralRejectionReason
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**campaignId** | **Integer** |  | 
+**referralId** | **Integer** |  | 
+**reason** | [**ReasonEnum**](#ReasonEnum) |  | 
+
+
+<a name="ReasonEnum"></a>
+## Enum: ReasonEnum
+Name | Value
+---- | -----
+REFERRALNOTFOUND | &quot;ReferralNotFound&quot;
+REFERRALRECIPIENTIDSAMEASADVOCATE | &quot;ReferralRecipientIdSameAsAdvocate&quot;
+REFERRALPARTOFNOTRUNNINGCAMPAIGN | &quot;ReferralPartOfNotRunningCampaign&quot;
+REFERRALVALIDCONDITIONMISSING | &quot;ReferralValidConditionMissing&quot;
+REFERRALLIMITREACHED | &quot;ReferralLimitReached&quot;
+CAMPAIGNLIMITREACHED | &quot;CampaignLimitReached&quot;
+PROFILELIMITREACHED | &quot;ProfileLimitReached&quot;
+REFERRALRECIPIENTDOESNOTMATCH | &quot;ReferralRecipientDoesNotMatch&quot;
+REFERRALEXPIRED | &quot;ReferralExpired&quot;
+REFERRALSTARTDATEINFUTURE | &quot;ReferralStartDateInFuture&quot;
+REFERRALREJECTEDBYCONDITION | &quot;ReferralRejectedByCondition&quot;
+EFFECTCOULDNOTBEAPPLIED | &quot;EffectCouldNotBeApplied&quot;
+
+
+
diff --git a/docs/UpdateUser.md b/docs/UpdateUser.md
@@ -13,6 +13,7 @@ Name | Type | Description | Notes
 **releaseUpdate** | **Boolean** | Update the user via email |  [optional]
 **latestFeature** | **String** | The latest feature you&#39;ve been notified. |  [optional]
 **roles** | **List&lt;Integer&gt;** | Update |  [optional]
+**applicationNotificationSubscriptions** | [**Object**](.md) |  |  [optional]
 
 
 <a name="StateEnum"></a>
diff --git a/docs/User.md b/docs/User.md
@@ -16,6 +16,7 @@ Name | Type | Description | Notes
 **releaseUpdate** | **Boolean** | Update the user via email | 
 **latestFeature** | **String** | Latest feature the user has been notified. |  [optional]
 **roles** | **List&lt;Integer&gt;** | Contains a list of all roles a user is a memeber of |  [optional]
+**applicationNotificationSubscriptions** | [**Object**](.md) |  |  [optional]
 
 
 <a name="StateEnum"></a>
diff --git a/docs/Webhook.md b/docs/Webhook.md
@@ -15,7 +15,6 @@ Name | Type | Description | Notes
 **payload** | **String** | API payload (supports templating using parameters) for this webhook |  [optional]
 **params** | [**List&lt;TemplateArgDef&gt;**](TemplateArgDef.md) | Array of template argument definitions | 
 **enabled** | **Boolean** | Enables or disables webhook from showing in rule builder | 
-**usedAt** | **List&lt;String&gt;** | array of rulesets where webhook is used | 
 
 
 <a name="VerbEnum"></a>
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <artifactId>talon-one-client</artifactId>
     <packaging>jar</packaging>
     <name>talon-one-client</name>
-    <version>3.2.3</version>
+    <version>3.3.0</version>
     <url>https://github.com/talon-one/maven-artefacts</url>
     <description>Talon.One unified JAVA SDK. It allows for programatic access to the integration and management API with their respective authentication strategies</description>
     <scm>
diff --git a/src/main/java/one/talon/ApiClient.java b/src/main/java/one/talon/ApiClient.java
@@ -137,7 +137,7 @@ private void init() {
         json = new JSON();
 
         // Set default User-Agent.
-        setUserAgent("OpenAPI-Generator/3.2.3/java");
+        setUserAgent("OpenAPI-Generator/3.3.0/java");
 
         authentications = new HashMap<String, Authentication>();
     }
diff --git a/src/main/java/one/talon/model/ApplicationSession.java b/src/main/java/one/talon/model/ApplicationSession.java
@@ -126,6 +126,10 @@ public StateEnum read(final JsonReader jsonReader) throws IOException {
   @SerializedName(SERIALIZED_NAME_DISCOUNTS)
   private Map<String, BigDecimal> discounts = new HashMap<String, BigDecimal>();
 
+  public static final String SERIALIZED_NAME_TOTAL = "total";
+  @SerializedName(SERIALIZED_NAME_TOTAL)
+  private BigDecimal total;
+
   public static final String SERIALIZED_NAME_ATTRIBUTES = "attributes";
   @SerializedName(SERIALIZED_NAME_ATTRIBUTES)
   private Object attributes = null;
@@ -244,10 +248,10 @@ public ApplicationSession referral(String referral) {
   }
 
    /**
-   * Any referal code entered.
+   * Any referral code entered.
    * @return referral
   **/
-  @ApiModelProperty(required = true, value = "Any referal code entered.")
+  @ApiModelProperty(required = true, value = "Any referral code entered.")
   public String getReferral() {
     return referral;
   }
@@ -320,6 +324,24 @@ public void setDiscounts(Map<String, BigDecimal> discounts) {
     this.discounts = discounts;
   }
 
+  public ApplicationSession total(BigDecimal total) {
+    this.total = total;
+    return this;
+  }
+
+   /**
+   * The total sum of the session before any discounts applied.
+   * @return total
+  **/
+  @ApiModelProperty(value = "The total sum of the session before any discounts applied.")
+  public BigDecimal getTotal() {
+    return total;
+  }
+
+  public void setTotal(BigDecimal total) {
+    this.total = total;
+  }
+
   public ApplicationSession attributes(Object attributes) {
     this.attributes = attributes;
     return this;
@@ -358,12 +380,13 @@ public boolean equals(java.lang.Object o) {
         Objects.equals(this.state, applicationSession.state) &&
         Objects.equals(this.cartItems, applicationSession.cartItems) &&
         Objects.equals(this.discounts, applicationSession.discounts) &&
+        Objects.equals(this.total, applicationSession.total) &&
         Objects.equals(this.attributes, applicationSession.attributes);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, created, applicationId, profileId, integrationId, coupon, referral, state, cartItems, discounts, attributes);
+    return Objects.hash(id, created, applicationId, profileId, integrationId, coupon, referral, state, cartItems, discounts, total, attributes);
   }
 
 
@@ -382,6 +405,7 @@ public String toString() {
     sb.append("    state: ").append(toIndentedString(state)).append("\n");
     sb.append("    cartItems: ").append(toIndentedString(cartItems)).append("\n");
     sb.append("    discounts: ").append(toIndentedString(discounts)).append("\n");
+    sb.append("    total: ").append(toIndentedString(total)).append("\n");
     sb.append("    attributes: ").append(toIndentedString(attributes)).append("\n");
     sb.append("}");
     return sb.toString();
diff --git a/src/main/java/one/talon/model/Attribute.java b/src/main/java/one/talon/model/Attribute.java
@@ -197,14 +197,6 @@ public TypeEnum read(final JsonReader jsonReader) throws IOException {
   @SerializedName(SERIALIZED_NAME_EDITABLE)
   private Boolean editable;
 
-  public static final String SERIALIZED_NAME_LOCKED = "locked";
-  @SerializedName(SERIALIZED_NAME_LOCKED)
-  private Boolean locked = false;
-
-  public static final String SERIALIZED_NAME_USED_AT = "usedAt";
-  @SerializedName(SERIALIZED_NAME_USED_AT)
-  private List<String> usedAt = new ArrayList<String>();
-
   public Attribute id(Integer id) {
     this.id = id;
     return this;
@@ -408,47 +400,6 @@ public void setEditable(Boolean editable) {
     this.editable = editable;
   }
 
-  public Attribute locked(Boolean locked) {
-    this.locked = locked;
-    return this;
-  }
-
-   /**
-   * Indicates whether this attribute is in use. If in use only title can be changed and other operations are prohibited.
-   * @return locked
-  **/
-  @ApiModelProperty(required = true, value = "Indicates whether this attribute is in use. If in use only title can be changed and other operations are prohibited.")
-  public Boolean getLocked() {
-    return locked;
-  }
-
-  public void setLocked(Boolean locked) {
-    this.locked = locked;
-  }
-
-  public Attribute usedAt(List<String> usedAt) {
-    this.usedAt = usedAt;
-    return this;
-  }
-
-  public Attribute addUsedAtItem(String usedAtItem) {
-    this.usedAt.add(usedAtItem);
-    return this;
-  }
-
-   /**
-   * array of rulesets where the attribute is used
-   * @return usedAt
-  **/
-  @ApiModelProperty(required = true, value = "array of rulesets where the attribute is used")
-  public List<String> getUsedAt() {
-    return usedAt;
-  }
-
-  public void setUsedAt(List<String> usedAt) {
-    this.usedAt = usedAt;
-  }
-
 
   @Override
   public boolean equals(java.lang.Object o) {
@@ -469,14 +420,12 @@ public boolean equals(java.lang.Object o) {
         Objects.equals(this.type, attribute.type) &&
         Objects.equals(this.description, attribute.description) &&
         Objects.equals(this.suggestions, attribute.suggestions) &&
-        Objects.equals(this.editable, attribute.editable) &&
-        Objects.equals(this.locked, attribute.locked) &&
-        Objects.equals(this.usedAt, attribute.usedAt);
+        Objects.equals(this.editable, attribute.editable);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, created, accountId, entity, eventType, name, title, type, description, suggestions, editable, locked, usedAt);
+    return Objects.hash(id, created, accountId, entity, eventType, name, title, type, description, suggestions, editable);
   }
 
 
@@ -496,8 +445,6 @@ public String toString() {
     sb.append("    description: ").append(toIndentedString(description)).append("\n");
     sb.append("    suggestions: ").append(toIndentedString(suggestions)).append("\n");
     sb.append("    editable: ").append(toIndentedString(editable)).append("\n");
-    sb.append("    locked: ").append(toIndentedString(locked)).append("\n");
-    sb.append("    usedAt: ").append(toIndentedString(usedAt)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/src/main/java/one/talon/model/CouponRejectionReason.java b/src/main/java/one/talon/model/CouponRejectionReason.java
@@ -47,6 +47,8 @@ public enum ReasonEnum {
     
     COUPONPARTOFNOTRUNNINGCAMPAIGN("CouponPartOfNotRunningCampaign"),
     
+    COUPONVALIDCONDITIONMISSING("CouponValidConditionMissing"),
+    
     COUPONLIMITREACHED("CouponLimitReached"),
     
     CAMPAIGNLIMITREACHED("CampaignLimitReached"),
@@ -59,7 +61,9 @@ public enum ReasonEnum {
     
     COUPONSTARTDATEINFUTURE("CouponStartDateInFuture"),
     
-    COUPONREJECTEDBYCONDITION("CouponRejectedByCondition");
+    COUPONREJECTEDBYCONDITION("CouponRejectedByCondition"),
+    
+    EFFECTCOULDNOTBEAPPLIED("EffectCouldNotBeApplied");
 
     private String value;
 
diff --git a/src/main/java/one/talon/model/ErrorSource.java b/src/main/java/one/talon/model/ErrorSource.java
diff --git a/src/main/java/one/talon/model/Meta.java b/src/main/java/one/talon/model/Meta.java
diff --git a/src/main/java/one/talon/model/Notification.java b/src/main/java/one/talon/model/Notification.java
diff --git a/src/main/java/one/talon/model/ReferralRejectionReason.java b/src/main/java/one/talon/model/ReferralRejectionReason.java
diff --git a/src/main/java/one/talon/model/UpdateUser.java b/src/main/java/one/talon/model/UpdateUser.java
diff --git a/src/main/java/one/talon/model/User.java b/src/main/java/one/talon/model/User.java
diff --git a/src/main/java/one/talon/model/Webhook.java b/src/main/java/one/talon/model/Webhook.java
