Skip to content

Added ZZZ Global support #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tomwmth wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added ZZZ Global support #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 23 additions & 3 deletions src/main/java/com/zvyap/hoyoapi/APIEnvironment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,15 @@ public enum APIEnvironment {
.dailyCheckInApiEndpoint("https://sg-public-api.hoyolab.com/event/luna/os")
.dailyCheckInActId("e202202281857121")
.gameBiz("nxx_global")
.build(),
GameAPIConstant.builder()
.gameType(GameType.ZENLESS_ZONE_ZERO)
.name("Zenless Zone Zero")
.apiUrl("https://sg-act-nap-api.hoyolab.com")
.dailyCheckInApiEndpoint("https://sg-act-nap-api.hoyolab.com/event/luna/zzz/os")
.dailyCheckInActId("e202406031448091")
.gameBiz("nap_global")
.build()),
//Zenless Zone Zero id - 8

CHINA(AccountAPIConstant.builder()
.userGameRoleEndpoint("https://api-takumi.mihoyo.com/binding/api/getUserGameRolesByLtoken")
Expand Down Expand Up @@ -81,28 +88,39 @@ public enum APIEnvironment {
.dailyCheckInApiEndpoint("https://api-takumi.mihoyo.com/event/luna")
.dailyCheckInActId("e202202251749321")
.gameBiz("nxx_cn")
.build(),
// TODO: implement urls
GameAPIConstant.builder()
.gameType(GameType.ZENLESS_ZONE_ZERO)
.name("绝区零")
.apiUrl("")
.dailyCheckInApiEndpoint("")
.dailyCheckInActId("")
.gameBiz("nap_cn")
.build());

private final AccountAPIConstant accountAPIConstant;
public final GameAPIConstant GENSHIN;
public final GameAPIConstant HONKAI_IMPACT_3RD;
public final GameAPIConstant HONKAI_STAR_RAIL;
public final GameAPIConstant TEARS_OF_THEMIS;
public final GameAPIConstant ZENLESS_ZONE_ZERO;

APIEnvironment(AccountAPIConstant accountAPIConstant, GameAPIConstant GENSHIN, GameAPIConstant HONKAI_IMPACT_3RD, GameAPIConstant HONKAI_STAR_RAIL, GameAPIConstant TEARS_OF_THEMIS) {
APIEnvironment(AccountAPIConstant accountAPIConstant, GameAPIConstant GENSHIN, GameAPIConstant HONKAI_IMPACT_3RD, GameAPIConstant HONKAI_STAR_RAIL, GameAPIConstant TEARS_OF_THEMIS, GameAPIConstant ZENLESS_ZONE_ZERO) {
this.accountAPIConstant = accountAPIConstant;
this.GENSHIN = GENSHIN;
this.HONKAI_IMPACT_3RD = HONKAI_IMPACT_3RD;
this.HONKAI_STAR_RAIL = HONKAI_STAR_RAIL;
this.TEARS_OF_THEMIS = TEARS_OF_THEMIS;
this.ZENLESS_ZONE_ZERO = ZENLESS_ZONE_ZERO;
}

public AccountAPIConstant getAccountAPIConstant() {
return accountAPIConstant;
}

public GameAPIConstant[] getAllAPIConstant() {
return new GameAPIConstant[] {GENSHIN, HONKAI_IMPACT_3RD, HONKAI_STAR_RAIL, TEARS_OF_THEMIS};
return new GameAPIConstant[] {GENSHIN, HONKAI_IMPACT_3RD, HONKAI_STAR_RAIL, TEARS_OF_THEMIS, ZENLESS_ZONE_ZERO};
}

public GameAPIConstant getAPIConstant(GameType gameType) {
Expand All @@ -115,6 +133,8 @@ public GameAPIConstant getAPIConstant(GameType gameType) {
return HONKAI_STAR_RAIL;
case TEARS_OF_THEMIS:
return TEARS_OF_THEMIS;
case ZENLESS_ZONE_ZERO:
return ZENLESS_ZONE_ZERO;
default:
throw new HoyoverseAPIMissingException("GameAPIConstant");
}
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/com/zvyap/hoyoapi/GameType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ public enum GameType {
HONKAI_IMPACT_3RD(1),
HONKAI_STAR_RAIL(6),
TEARS_OF_THEMIS(4),
ZENLESS_ZONE_ZERO(8); //unimplemented yet
/** Not implemented on {@link APIEnvironment#CHINA} yet. */
ZENLESS_ZONE_ZERO(8);

private final int gameId;

Expand Down
1 change: 1 addition & 0 deletions src/test/java/com/zvyap/hoyoapi/test/APITest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ public void getGameRolesTest() {
TestUtils.notNullAndPrint(api.getGameRoles(token, GameType.HONKAI_IMPACT_3RD));
TestUtils.notNullAndPrint(api.getGameRoles(token, GameType.HONKAI_STAR_RAIL));
TestUtils.notNullAndPrint(api.getGameRoles(token, GameType.TEARS_OF_THEMIS));
TestUtils.notNullAndPrint(api.getGameRoles(token, GameType.ZENLESS_ZONE_ZERO));
}

@Test
Expand Down
7 changes: 7 additions & 0 deletions src/test/java/com/zvyap/hoyoapi/test/TestConstant.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ public class TestConstant {
public static final boolean HONKAI_TEST = true;
public static final boolean HSR_TEST = true;
public static final boolean TOT_TEST = true;
public static final boolean ZZZ_TEST = true;

public static final String GLOBAL_TOKEN = System.getenv("GLOBAL_TOKEN");
public static final String GLOBAL_TOKEN_ID = System.getenv("GLOBAL_TOKEN_ID");
Expand All @@ -19,6 +20,8 @@ public class TestConstant {
public static final String HSR_TOKEN_ID = System.getenv("HSR_TOKEN_ID") == null ? GLOBAL_TOKEN_ID : System.getenv("HSR_TOKEN_ID");
public static final String TOT_TOKEN = System.getenv("TOT_TOKEN") == null ? GLOBAL_TOKEN : System.getenv("TOT_TOKEN");
public static final String TOT_TOKEN_ID = System.getenv("TOT_TOKEN_ID") == null ? GLOBAL_TOKEN_ID : System.getenv("TOT_TOKEN_ID");
public static final String ZZZ_TOKEN = System.getenv("ZZZ_TOKEN") == null ? GLOBAL_TOKEN : System.getenv("ZZZ_TOKEN");
public static final String ZZZ_TOKEN_ID = System.getenv("ZZZ_TOKEN_ID") == null ? GLOBAL_TOKEN_ID : System.getenv("ZZZ_TOKEN_ID");

public static boolean isGenshinEnabled() {
return GENSHIN_TEST && GENSHIN_TOKEN != null && GENSHIN_TOKEN_ID != null;
Expand All @@ -36,6 +39,10 @@ public static boolean isToTEnabled() {
return TOT_TEST && TOT_TOKEN != null && TOT_TOKEN_ID != null;
}

public static boolean isZZZEnabled() {
return ZZZ_TEST && ZZZ_TOKEN != null && ZZZ_TOKEN_ID != null;
}

public static boolean isMainTestEnabled() {
return GLOBAL_TEST && GLOBAL_TOKEN != null && GLOBAL_TOKEN_ID != null;
}
Expand Down
47 changes: 47 additions & 0 deletions src/test/java/com/zvyap/hoyoapi/test/feature/ZenlessZoneZeroDailyCheckInTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
package com.zvyap.hoyoapi.test.feature;

import com.zvyap.hoyoapi.APIEnvironment;
import com.zvyap.hoyoapi.GameType;
import com.zvyap.hoyoapi.HoyoToken;
import com.zvyap.hoyoapi.HoyoverseAPI;
import com.zvyap.hoyoapi.feature.daily.DailyCheckInFeature;
import com.zvyap.hoyoapi.test.TestConstant;
import com.zvyap.hoyoapi.test.TestUtils;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.condition.EnabledIf;

@TestInstance(TestInstance.Lifecycle.PER_CLASS)
@EnabledIf("com.zvyap.hoyoapi.test.TestConstant#isZZZEnabled")
public class ZenlessZoneZeroDailyCheckInTest {

private HoyoverseAPI osAPI = new HoyoverseAPI(APIEnvironment.OVERSEA);
private HoyoToken token = HoyoToken.of(TestConstant.ZZZ_TOKEN_ID, TestConstant.ZZZ_TOKEN);

@Test
public void osZenlessZoneZeroDailyCheckInGetRewardTest() {
var response = new DailyCheckInFeature(osAPI).getAllReward(GameType.ZENLESS_ZONE_ZERO);
Assertions.assertNotNull(response);

TestUtils.notNullAndPrint(response);
}

@Test
public void osZenlessZoneZeroDailyCheckInGetDailyInfoTest() {
var response = new DailyCheckInFeature(osAPI).getDailyInfo(GameType.ZENLESS_ZONE_ZERO, token);
Assertions.assertNotNull(response);

TestUtils.notNullAndPrint(response);
}

@Test
@Disabled
public void osZenlessZoneZeroDailyCheckInSignDailyTest() {
var response = new DailyCheckInFeature(osAPI).signDaily(GameType.ZENLESS_ZONE_ZERO, token);
Assertions.assertNotNull(response);

TestUtils.notNullAndPrint(response);
}
}