Merge pull request #38 from Global-Tags/development

fix: Include gift expiration date in return value of ApiHandler#redeemGiftCode

Author: RappyTV

src/main/java/com/rappytv/globaltags/wrapper/http/ApiHandler.java

@@ -690,21 +690,21 @@ public void createGiftCode(@NotNull String name, @NotNull String role, int maxUs
      * @param code     The gift code to redeem
      * @param consumer The action to be executed on response.
      */
-    public void redeemGiftCode(@NotNull String code, @NotNull Consumer<ApiResponse<String>> consumer) {
+    public void redeemGiftCode(@NotNull String code, @NotNull Consumer<ApiResponse<GiftCodeRedeemSchema>> consumer) {
         Objects.requireNonNull(code);
         Objects.requireNonNull(consumer);
         new ApiRequest<>(
                 this.api,
                 "POST",
                 Routes.redeemGiftCode(code),
                 emptyBody,
-                MessageSchema.class
+                GiftCodeRedeemSchema.class
         ).sendRequestAsync((response) -> {
             if (!response.isSuccessful()) {
                 consumer.accept(new ApiResponse<>(false, null, response.getError()));
                 return;
             }
-            consumer.accept(new ApiResponse<>(true, response.getData().message, null));
+            consumer.accept(new ApiResponse<>(true, response.getData(), null));
         });
     }
 

src/main/java/com/rappytv/globaltags/wrapper/http/schemas/GiftCodeRedeemSchema.java

@@ -0,0 +1,34 @@
+package com.rappytv.globaltags.wrapper.http.schemas;
+
+import com.google.gson.annotations.SerializedName;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Date;
+
+public class GiftCodeRedeemSchema extends MessageSchema {
+
+    @SerializedName("expires_at")
+    private final Date expiresAt;
+
+    /**
+     * @param expiresAt When the gift expires
+     */
+    public GiftCodeRedeemSchema(@NotNull Date expiresAt) {
+        this.expiresAt = expiresAt;
+    }
+
+    /**
+     * @return the gift expiration date
+     */
+    @NotNull
+    public Date getCode() {
+        return this.expiresAt;
+    }
+
+    @Override
+    public String toString() {
+        return "GiftCodeRedeemSchema{" +
+                "expiresAt=" + this.expiresAt +
+                '}';
+    }
+}