Added new Stats endpoints

thoo0224 · thoo0224 · commit f9f952c68908 · 2020-05-19T15:31:07.000+02:00
diff --git a/src/main/java/com/thoo/api/FortniteAPI.java b/src/main/java/com/thoo/api/FortniteAPI.java
@@ -14,4 +14,6 @@ public interface FortniteAPI {
 
     NewsEndpoint getNewsEndpoint();
 
+    StatsEndpoint getStatsEndpoint();
+
 }
diff --git a/src/main/java/com/thoo/api/FortniteAPIImpl.java b/src/main/java/com/thoo/api/FortniteAPIImpl.java
@@ -6,13 +6,14 @@
 
 public final class FortniteAPIImpl implements FortniteAPI {
 
-    private String apiKey;
+    private final String apiKey;
 
-    private AESEndpoint aesEndpoint;
-    private CreatorCodeEndpoint creatorCodeEndpoint;
-    private CosmeticEndpoint cosmeticEndpoint;
-    private ShopEndpoint shopEndpoint;
-    private NewsEndpoint newsEndpoint;
+    private final AESEndpoint aesEndpoint;
+    private final CreatorCodeEndpoint creatorCodeEndpoint;
+    private final CosmeticEndpoint cosmeticEndpoint;
+    private final ShopEndpoint shopEndpoint;
+    private final NewsEndpoint newsEndpoint;
+    private final StatsEndpoint statsEndpoint;
 
     public FortniteAPIImpl(String apiKey, Language defaultLanguage){
         this.apiKey = apiKey;
@@ -22,6 +23,7 @@ public FortniteAPIImpl(String apiKey, Language defaultLanguage){
         this.cosmeticEndpoint = new CosmeticEndpoint(defaultLanguage);
         this.shopEndpoint = new ShopEndpoint(defaultLanguage);
         this.newsEndpoint = new NewsEndpoint(defaultLanguage);
+        this.statsEndpoint = new StatsEndpoint(defaultLanguage);
     }
 
     public String getApiKey() {
@@ -53,4 +55,9 @@ public NewsEndpoint getNewsEndpoint() {
         return newsEndpoint;
     }
 
+    @Override
+    public StatsEndpoint getStatsEndpoint() {
+        return statsEndpoint;
+    }
+
 }
diff --git a/src/main/java/com/thoo/api/endpoints/AESEndpoint.java b/src/main/java/com/thoo/api/endpoints/AESEndpoint.java
@@ -1,6 +1,6 @@
 package com.thoo.api.endpoints;
 
-import com.thoo.api.model.AESKeyFormat;
+import com.thoo.api.enums.AESKeyFormat;
 import com.thoo.api.model.AESModel;
 import com.thoo.api.model.BaseModel;
 import com.thoo.api.objects.FortniteResponse;
diff --git a/src/main/java/com/thoo/api/endpoints/StatsEndpoint.java b/src/main/java/com/thoo/api/endpoints/StatsEndpoint.java
@@ -0,0 +1,22 @@
+package com.thoo.api.endpoints;
+
+import com.thoo.api.enums.Language;
+import com.thoo.api.objects.StatsSearcher;
+import com.thoo.api.objects.StatsSearcherId;
+import com.thoo.api.services.StatsService;
+
+public final class StatsEndpoint extends Endpoint<StatsService> {
+
+    public StatsEndpoint(Language defaultLanguage) {
+        super(StatsService.class, defaultLanguage);
+    }
+
+    public StatsSearcher getStats(String name){
+        return new StatsSearcher(name, service);
+    }
+
+    public StatsSearcherId getStatsByID(String accountId){
+        return new StatsSearcherId(accountId, service);
+    }
+
+}
diff --git a/src/main/java/com/thoo/api/enums/AESKeyFormat.java b/src/main/java/com/thoo/api/enums/AESKeyFormat.java
@@ -1,4 +1,4 @@
-package com.thoo.api.model;
+package com.thoo.api.enums;
 
 public enum AESKeyFormat {
 
diff --git a/src/main/java/com/thoo/api/enums/ImageType.java b/src/main/java/com/thoo/api/enums/ImageType.java
@@ -0,0 +1,17 @@
+package com.thoo.api.enums;
+
+public enum ImageType {
+
+    ALL("all"),
+    KEYBOARD_MOUSE("keyboardMouse"),
+    GAMEPAD("gamepad"),
+    TOUCH("touch"),
+    NONE("none");
+
+    public String code;
+
+    ImageType(String code){
+        this.code = code;
+    }
+
+}
diff --git a/src/main/java/com/thoo/api/enums/TimeWindow.java b/src/main/java/com/thoo/api/enums/TimeWindow.java
@@ -0,0 +1,8 @@
+package com.thoo.api.enums;
+
+public enum TimeWindow {
+
+    SEASON,
+    LIFETIME
+
+}
diff --git a/src/main/java/com/thoo/api/model/Account.java b/src/main/java/com/thoo/api/model/Account.java
@@ -0,0 +1,8 @@
+package com.thoo.api.model;
+
+public final class Account {
+
+    public String id;
+    public String name;
+
+}
diff --git a/src/main/java/com/thoo/api/model/AccountType.java b/src/main/java/com/thoo/api/model/AccountType.java
@@ -0,0 +1,15 @@
+package com.thoo.api.model;
+
+public enum AccountType {
+
+    PC("epic"),
+    PSN("psn"),
+    XBOX("xb1");
+
+    public String code;
+
+    AccountType(String code) {
+        this.code = code;
+    }
+
+}
diff --git a/src/main/java/com/thoo/api/model/AllStats.java b/src/main/java/com/thoo/api/model/AllStats.java
@@ -0,0 +1,10 @@
+package com.thoo.api.model;
+
+public final class AllStats {
+
+    public PlatformStats all;
+    public PlatformStats keyboardMouse;
+    public PlatformStats gamepad;
+    public PlatformStats touch;
+
+}
diff --git a/src/main/java/com/thoo/api/model/BaseModel.java b/src/main/java/com/thoo/api/model/BaseModel.java
@@ -2,7 +2,7 @@
 
 public final class BaseModel<T> {
 
-    public int code;
+    public int status;
     public T data;
 
 }
diff --git a/src/main/java/com/thoo/api/model/BattlePass.java b/src/main/java/com/thoo/api/model/BattlePass.java
@@ -0,0 +1,8 @@
+package com.thoo.api.model;
+
+public final class BattlePass {
+
+    public int level;
+    public int progress;
+
+}
diff --git a/src/main/java/com/thoo/api/model/BrShopCombined.java b/src/main/java/com/thoo/api/model/BrShopCombined.java
@@ -4,7 +4,7 @@
 
 import java.util.Date;
 
-public class BrShopCombined {
+public final class BrShopCombined {
 
     public String hash;
     public Date date;
diff --git a/src/main/java/com/thoo/api/model/PlatformStats.java b/src/main/java/com/thoo/api/model/PlatformStats.java
@@ -0,0 +1,12 @@
+package com.thoo.api.model;
+
+public final class PlatformStats {
+
+    public Stats overall;
+    public Stats solo;
+    public Stats duo;
+    public Stats trio;
+    public Stats squad;
+    public Stats ltm;
+
+}
diff --git a/src/main/java/com/thoo/api/model/Stats.java b/src/main/java/com/thoo/api/model/Stats.java
@@ -0,0 +1,28 @@
+package com.thoo.api.model;
+
+import java.util.Date;
+
+public final class Stats {
+
+    public long score;
+    public double scorePerMin;
+    public double scorePerMatch;
+    public long wins;
+    public long top3;
+    public long top5;
+    public long top6;
+    public long top10;
+    public long top12;
+    public long top25;
+    public long kills;
+    public double killsPerMin;
+    public double killsPerMatch;
+    public long deaths;
+    public double kd;
+    public long matches;
+    public double winRate;
+    public long minutesPlayed;
+    public long playersOutlived;
+    public Date lastModified;
+
+}
diff --git a/src/main/java/com/thoo/api/model/StatsModel.java b/src/main/java/com/thoo/api/model/StatsModel.java
@@ -0,0 +1,10 @@
+package com.thoo.api.model;
+
+public final class StatsModel {
+
+    public Account account;
+    public BattlePass battlePass;
+    public String image;
+    public AllStats stats;
+
+}
diff --git a/src/main/java/com/thoo/api/objects/StatsSearcher.java b/src/main/java/com/thoo/api/objects/StatsSearcher.java
@@ -0,0 +1,47 @@
+package com.thoo.api.objects;
+
+import com.thoo.api.model.AccountType;
+import com.thoo.api.enums.ImageType;
+import com.thoo.api.enums.TimeWindow;
+import com.thoo.api.model.BaseModel;
+import com.thoo.api.model.StatsModel;
+import com.thoo.api.services.StatsService;
+import com.thoo.api.utils.HttpUtils;
+import org.jetbrains.annotations.NotNull;
+
+public class StatsSearcher {
+
+    protected StatsService service;
+    protected AccountType accountType = AccountType.PC;
+    protected TimeWindow timeWindow = TimeWindow.LIFETIME;
+    protected ImageType imageType = ImageType.NONE;
+    protected String name;
+
+    public StatsSearcher(String name , StatsService service){
+        this.service = service;
+        this.name = name;
+    }
+
+    public StatsSearcher(){}
+
+    public StatsSearcher setAccountType(@NotNull AccountType accountType){
+        this.accountType = accountType;
+        return this;
+    }
+
+    public StatsSearcher setTimeWindow(@NotNull TimeWindow timeWindow){
+        this.timeWindow = timeWindow;
+        return this;
+    }
+
+
+    public StatsSearcher setImageType(@NotNull ImageType imageType){
+        this.imageType = imageType;
+        return this;
+    }
+
+    public FortniteResponse<BaseModel<StatsModel>> send() {
+        return HttpUtils.parse(service.stats(name, accountType.code, timeWindow.toString().toLowerCase(), imageType.code));
+    }
+
+}
diff --git a/src/main/java/com/thoo/api/objects/StatsSearcherId.java b/src/main/java/com/thoo/api/objects/StatsSearcherId.java
@@ -0,0 +1,28 @@
+package com.thoo.api.objects;
+
+import com.thoo.api.model.BaseModel;
+import com.thoo.api.model.StatsModel;
+import com.thoo.api.services.StatsService;
+import com.thoo.api.utils.HttpUtils;
+import org.jetbrains.annotations.NotNull;
+
+public class StatsSearcherId extends StatsSearcher {
+
+    private String accountId;
+
+    public StatsSearcherId(String accountId, StatsService service) {
+        this.accountId = accountId;
+        this.service = service;
+    }
+
+    public StatsSearcher setId(@NotNull String accountId){
+        this.accountId = accountId;
+        return this;
+    }
+
+    @Override
+    public FortniteResponse<BaseModel<StatsModel>> send() {
+        return HttpUtils.parse(service.stats(accountId, name, accountType.code, timeWindow.toString().toLowerCase(), imageType.code));
+    }
+
+}
diff --git a/src/main/java/com/thoo/api/services/StatsService.java b/src/main/java/com/thoo/api/services/StatsService.java
@@ -0,0 +1,18 @@
+package com.thoo.api.services;
+
+import com.thoo.api.model.BaseModel;
+import com.thoo.api.model.StatsModel;
+import retrofit2.Call;
+import retrofit2.http.GET;
+import retrofit2.http.Path;
+import retrofit2.http.Query;
+
+public interface StatsService {
+
+    @GET("/v1/stats/br/v2")
+    Call<BaseModel<StatsModel>> stats(@Query("name") String name, @Query("accountType") String accountType, @Query("timeWindow") String timeWindow, @Query("image") String image);
+
+    @GET("/v1/stats/br/v2/{accountId}")
+    Call<BaseModel<StatsModel>> stats(@Path("accountId") String accountId, @Query("name") String name, @Query("accountType") String accountType, @Query("timeWindow") String timeWindow, @Query("image") String image);
+
+}
diff --git a/src/main/java/example/Example.java b/src/main/java/example/Example.java
@@ -2,7 +2,13 @@
 
 import com.thoo.api.FortniteAPI;
 import com.thoo.api.FortniteAPIBuilder;
+import com.thoo.api.enums.ImageType;
 import com.thoo.api.enums.Language;
+import com.thoo.api.enums.TimeWindow;
+import com.thoo.api.model.AccountType;
+import com.thoo.api.model.BaseModel;
+import com.thoo.api.model.StatsModel;
+import com.thoo.api.objects.FortniteResponse;
 
 public final class Example {
 
@@ -13,7 +19,11 @@ private void main() {
     }
 
     private void init() {
-        this.api = new FortniteAPIBuilder().setKey("").setDefaultLanguage(Language.AR).build();
+        this.api = new FortniteAPIBuilder().setKey("").setDefaultLanguage(Language.EN).build();
+        FortniteResponse<BaseModel<StatsModel>> response = api.getStatsEndpoint().getStatsByID("")
+            .setImageType(ImageType.ALL).setAccountType(AccountType.PC).setTimeWindow(TimeWindow.LIFETIME).send();
+        StatsModel model = response.getModel().data;
+        System.out.println(model.battlePass.level);
     }
 
     public static void main(String[] args) {
diff --git a/target/classes/com/thoo/api/FortniteAPI.class b/target/classes/com/thoo/api/FortniteAPI.class
diff --git a/target/classes/com/thoo/api/FortniteAPIImpl.class b/target/classes/com/thoo/api/FortniteAPIImpl.class
diff --git a/target/classes/com/thoo/api/endpoints/AESEndpoint.class b/target/classes/com/thoo/api/endpoints/AESEndpoint.class
diff --git a/target/classes/com/thoo/api/model/BaseModel.class b/target/classes/com/thoo/api/model/BaseModel.class
diff --git a/target/classes/com/thoo/api/utils/HttpUtils$FortniteInterceptor.class b/target/classes/com/thoo/api/utils/HttpUtils$FortniteInterceptor.class
diff --git a/target/classes/example/Example.class b/target/classes/example/Example.class

Original file line number	Diff line number	Diff line change
`@@ -14,4 +14,6 @@ public interface FortniteAPI {`
`14`	`14`
`15`	`15`	`NewsEndpoint getNewsEndpoint();`
`16`	`16`
	`17`	`+ StatsEndpoint getStatsEndpoint();`
	`18`	`+`
`17`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.thoo.api.model;`
	`1`	`+package com.thoo.api.enums;`
`2`	`2`
`3`	`3`	`public enum AESKeyFormat {`
`4`	`4`