[ongeki] Add experimental Bright Memory support

src/main/java/icu/samnyan/aqua/sega/ongeki/controller/OngekiController.java

@@ -32,6 +32,7 @@ public class OngekiController {
     private final GetUserBpBaseHandler getUserBpBaseHandler;
     private final GetUserCardHandler getUserCardHandler;
     private final GetUserChapterHandler getUserChapterHandler;
+    private final GetUserMemoryChapterHandler getUserMemoryChapterHandler;
     private final GetUserCharacterHandler getUserCharacterHandler;
     private final GetUserDataHandler getUserDataHandler;
     private final GetUserDeckByKeyHandler getUserDeckByKeyHandler;
@@ -59,9 +60,12 @@ public class OngekiController {
     private final GetUserTrainingRoomByKeyHandler getUserTrainingRoomByKeyHandler;
     private final GetUserKopHandler getUserKopHandler;
     private final UpsertUserAllHandler upsertUserAllHandler;
+    private final GetClientBookkeepingHandler getClientBookkeepingHandler;
+    private final GetClientTestmodeHandler getClientTestmodeHandler;
+    private final GetGameMusicReleaseStateHandler getGameMusicReleaseStateHandler;
 
     @Autowired
-    public OngekiController(GetGameEventHandler getGameEventHandler, GetGameIdlistHandler getGameIdlistHandler, GetGameMessageHandler getGameMessageHandler, GetGamePointHandler getGamePointHandler, GetGamePresentHandler getGamePresentHandler, GetGameRankingHandler getGameRankingHandler, GetGameRewardHandler getGameRewardHandler, GetGameSettingHandler getGameSettingHandler, GetUserActivityHandler getUserActivityHandler, GetUserBossHandler getUserBossHandler, GetUserBpBaseHandler getUserBpBaseHandler, GetUserCardHandler getUserCardHandler, GetUserChapterHandler getUserChapterHandler, GetUserCharacterHandler getUserCharacterHandler, GetUserDataHandler getUserDataHandler, GetUserDeckByKeyHandler getUserDeckByKeyHandler, GetUserEventPointHandler getUserEventPointHandler, GetUserEventRankingHandler getUserEventRankingHandler, GetUserItemHandler getUserItemHandler, GetUserLoginBonusHandler getUserLoginBonusHandler, GetUserMissionPointHandler getUserMissionPointHandler, GetUserMusicHandler getUserMusicHandler, GetUserMusicItemHandler getUserMusicItemHandler, GetUserOptionHandler getUserOptionHandler, GetUserPreviewHandler getUserPreviewHandler, GetUserRatinglogListHandler getUserRatinglogListHandler, GetUserRecentRatingHandler getUserRecentRatingHandler, GetUserRegionHandler getUserRegionHandler, GetUserRivalHandler getUserRivalHandler, GetUserRivalMusicHandler getUserRivalMusicHandler, GetUserScenarioHandler getUserScenarioHandler, GetUserStoryHandler getUserStoryHandler, GetUserTechCountHandler getUserTechCountHandler, GetUserTrainingRoomByKeyHandler getUserTrainingRoomByKeyHandler, UpsertUserAllHandler upsertUserAllHandler, GetGameTechMusicHandler getGameTechMusicHandler, GetUserTechEventHandler getUserTechEventHandler, GetUserTechEventRankingHandler getUserTechEventRankingHandler, GetUserEventMusicHandler getUserEventMusicHandler, GetUserTradeItemHandler getUserTradeItemHandler, GetUserKopHandler getUserKopHandler) {
+    public OngekiController(GetGameEventHandler getGameEventHandler, GetGameIdlistHandler getGameIdlistHandler, GetGameMessageHandler getGameMessageHandler, GetGamePointHandler getGamePointHandler, GetGamePresentHandler getGamePresentHandler, GetGameRankingHandler getGameRankingHandler, GetGameRewardHandler getGameRewardHandler, GetGameSettingHandler getGameSettingHandler, GetUserActivityHandler getUserActivityHandler, GetUserBossHandler getUserBossHandler, GetUserBpBaseHandler getUserBpBaseHandler, GetUserCardHandler getUserCardHandler, GetUserChapterHandler getUserChapterHandler, GetUserCharacterHandler getUserCharacterHandler, GetUserDataHandler getUserDataHandler, GetUserDeckByKeyHandler getUserDeckByKeyHandler, GetUserEventPointHandler getUserEventPointHandler, GetUserEventRankingHandler getUserEventRankingHandler, GetUserItemHandler getUserItemHandler, GetUserLoginBonusHandler getUserLoginBonusHandler, GetUserMissionPointHandler getUserMissionPointHandler, GetUserMusicHandler getUserMusicHandler, GetUserMusicItemHandler getUserMusicItemHandler, GetUserOptionHandler getUserOptionHandler, GetUserPreviewHandler getUserPreviewHandler, GetUserRatinglogListHandler getUserRatinglogListHandler, GetUserRecentRatingHandler getUserRecentRatingHandler, GetUserRegionHandler getUserRegionHandler, GetUserRivalHandler getUserRivalHandler, GetUserRivalMusicHandler getUserRivalMusicHandler, GetUserScenarioHandler getUserScenarioHandler, GetUserStoryHandler getUserStoryHandler, GetUserTechCountHandler getUserTechCountHandler, GetUserTrainingRoomByKeyHandler getUserTrainingRoomByKeyHandler, UpsertUserAllHandler upsertUserAllHandler, GetGameTechMusicHandler getGameTechMusicHandler, GetUserTechEventHandler getUserTechEventHandler, GetUserTechEventRankingHandler getUserTechEventRankingHandler, GetUserEventMusicHandler getUserEventMusicHandler, GetUserTradeItemHandler getUserTradeItemHandler, GetUserKopHandler getUserKopHandler, GetClientBookkeepingHandler getClientBookkeepingHandler, GetClientTestmodeHandler getClientTestmodeHandler, GetGameMusicReleaseStateHandler getGameMusicReleaseStateHandler, GetUserMemoryChapterHandler getUserMemoryChapterHandler) {
         this.getGameEventHandler = getGameEventHandler;
         this.getGameIdlistHandler = getGameIdlistHandler;
         this.getGameMessageHandler = getGameMessageHandler;
@@ -75,6 +79,7 @@ public class OngekiController {
         this.getUserBpBaseHandler = getUserBpBaseHandler;
         this.getUserCardHandler = getUserCardHandler;
         this.getUserChapterHandler = getUserChapterHandler;
+        this.getUserMemoryChapterHandler = getUserMemoryChapterHandler;
         this.getUserCharacterHandler = getUserCharacterHandler;
         this.getUserDataHandler = getUserDataHandler;
         this.getUserDeckByKeyHandler = getUserDeckByKeyHandler;
@@ -103,6 +108,9 @@ public class OngekiController {
         this.getUserEventMusicHandler = getUserEventMusicHandler;
         this.getUserTradeItemHandler = getUserTradeItemHandler;
         this.getUserKopHandler = getUserKopHandler;
+        this.getClientBookkeepingHandler = getClientBookkeepingHandler;
+        this.getClientTestmodeHandler = getClientTestmodeHandler;
+        this.getGameMusicReleaseStateHandler = getGameMusicReleaseStateHandler;
     }
 
     @PostMapping("ExtendLockTimeApi")
@@ -150,6 +158,11 @@ public class OngekiController {
         return getGameTechMusicHandler.handle(request);
     }
 
+    @PostMapping("GetGameMusicReleaseStateApi")
+    public String GetGameMusicReleaseState(@ModelAttribute Map<String, Object> request) throws JsonProcessingException {
+        return getGameMusicReleaseStateHandler.handle(request);
+    }
+
     @PostMapping("GetUserTechEventApi")
     public String getUserTechEvent(@ModelAttribute Map<String, Object> request) throws JsonProcessingException {
         return getUserTechEventHandler.handle(request);
@@ -200,6 +213,11 @@ public class OngekiController {
         return getUserChapterHandler.handle(request);
     }
 
+    @PostMapping("GetUserMemoryChapterApi")
+    public String getUserMemoryChapter(@ModelAttribute Map<String, Object> request) throws JsonProcessingException {
+        return getUserMemoryChapterHandler.handle(request);
+    }
+
     @PostMapping("GetUserCharacterApi")
     public String getUserCharacter(@ModelAttribute Map<String, Object> request) throws JsonProcessingException {
         return getUserCharacterHandler.handle(request);
@@ -323,10 +341,25 @@ public class OngekiController {
     }
 
     @PostMapping("GetUserKopApi")
-    public String getUserKopApi(@ModelAttribute Map<String, Object> request) throws JsonProcessingException {
+    public String getUserKop(@ModelAttribute Map<String, Object> request) throws JsonProcessingException {
         return getUserKopHandler.handle(request);
     }
 
+    @PostMapping("GetClientBookkeepingApi")
+    public String getClientBookkeeping(@ModelAttribute Map<String, Object> request) throws JsonProcessingException {
+        return getClientBookkeepingHandler.handle(request);
+    }
+
+    @PostMapping("GetClientTestmodeApi")
+    public String getClientTestmode(@ModelAttribute Map<String, Object> request) throws JsonProcessingException {
+        return getClientTestmodeHandler.handle(request);
+    }
+
+    @PostMapping("RegisterPromotionCardApi")
+    public String registerPromotionCard(@ModelAttribute Map<String, Object> request) {
+        return "{\"returnCode\":1,\"apiName\":\"registerPromotionCard\"}";
+    }
+
     @PostMapping("UpsertClientBookkeepingApi")
     public String upsertClientBookkeeping(@ModelAttribute Map<String, Object> request) {
         return "{\"returnCode\":1},\"apiName\":\"upsertClientBookkeeping\"";

src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserMemoryChapterRepository.java

@@ -0,0 +1,24 @@
+package icu.samnyan.aqua.sega.ongeki.dao.userdata;
+
+import icu.samnyan.aqua.sega.ongeki.model.userdata.UserMemoryChapter;
+import icu.samnyan.aqua.sega.ongeki.model.userdata.UserData;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * @author samnyan (privateamusement@protonmail.com)
+ */
+@Repository("OngekiUserMemoryChapterRepository")
+public interface UserMemoryChapterRepository extends JpaRepository<UserMemoryChapter, Long> {
+
+    List<UserMemoryChapter> findByUser_Card_ExtId(long userId);
+
+    Optional<UserMemoryChapter> findByUserAndChapterId(UserData userData, int chapterId);
+
+    @Transactional
+    void deleteByUser(UserData user);
+}

src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetClientBookkeepingHandler.java

@@ -0,0 +1,46 @@
+package icu.samnyan.aqua.sega.ongeki.handler.impl;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+
+import icu.samnyan.aqua.sega.ongeki.dao.userdata.UserKopRepository;
+import icu.samnyan.aqua.sega.ongeki.handler.BaseHandler;
+import icu.samnyan.aqua.sega.util.jackson.BasicMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author samnyan (privateamusement@protonmail.com)
+ */
+@Component("OngekiGetClientBookkeepingHandler")
+public class GetClientBookkeepingHandler implements BaseHandler {
+
+    private static final Logger logger = LoggerFactory.getLogger(GetClientBookkeepingHandler.class);
+
+    private final BasicMapper mapper;
+
+    @Autowired
+    public GetClientBookkeepingHandler(BasicMapper mapper, UserKopRepository userKopRepository) {
+        this.mapper = mapper;
+    }
+
+    @Override
+    public String handle(Map<String, Object> request) throws JsonProcessingException {
+        long placeId = ((Number) request.get("placeId")).longValue();
+
+        Map<String, Object> resultMap = new LinkedHashMap<>();
+        resultMap.put("placeId", placeId);
+        resultMap.put("length", 0);
+        resultMap.put("clientBookkeepingList", List.of());
+
+        String json = mapper.write(resultMap);
+
+        logger.info("Response: " + json);
+        return json;
+    }
+}

src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetClientTestmodeHandler.java

@@ -0,0 +1,46 @@
+package icu.samnyan.aqua.sega.ongeki.handler.impl;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+
+import icu.samnyan.aqua.sega.ongeki.dao.userdata.UserKopRepository;
+import icu.samnyan.aqua.sega.ongeki.handler.BaseHandler;
+import icu.samnyan.aqua.sega.util.jackson.BasicMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author samnyan (privateamusement@protonmail.com)
+ */
+@Component("OngekiGetClientTestmodeHandler")
+public class GetClientTestmodeHandler implements BaseHandler {
+
+    private static final Logger logger = LoggerFactory.getLogger(GetClientTestmodeHandler.class);
+
+    private final BasicMapper mapper;
+
+    @Autowired
+    public GetClientTestmodeHandler(BasicMapper mapper, UserKopRepository userKopRepository) {
+        this.mapper = mapper;
+    }
+
+    @Override
+    public String handle(Map<String, Object> request) throws JsonProcessingException {
+        long placeId = ((Number) request.get("placeId")).longValue();
+
+        Map<String, Object> resultMap = new LinkedHashMap<>();
+        resultMap.put("placeId", placeId);
+        resultMap.put("length", 0);
+        resultMap.put("clientTestmodeList", List.of());
+
+        String json = mapper.write(resultMap);
+
+        logger.info("Response: " + json);
+        return json;
+    }
+}

src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetGameMusicReleaseStateHandler.java

@@ -0,0 +1,45 @@
+package icu.samnyan.aqua.sega.ongeki.handler.impl;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+
+import icu.samnyan.aqua.sega.ongeki.dao.userdata.UserKopRepository;
+import icu.samnyan.aqua.sega.ongeki.handler.BaseHandler;
+import icu.samnyan.aqua.sega.util.jackson.BasicMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * @author samnyan (privateamusement@protonmail.com)
+ */
+@Component("OngekiGetGameMusicReleaseStateHandler")
+public class GetGameMusicReleaseStateHandler implements BaseHandler {
+
+    private static final Logger logger = LoggerFactory.getLogger(GetGameMusicReleaseStateHandler.class);
+
+    private final BasicMapper mapper;
+
+    @Autowired
+    public GetGameMusicReleaseStateHandler(BasicMapper mapper, UserKopRepository userKopRepository) {
+        this.mapper = mapper;
+    }
+
+    @Override
+    public String handle(Map<String, Object> request) throws JsonProcessingException {
+
+        // TODO: Find out what this does
+
+        Map<String, Object> resultMap = new LinkedHashMap<>();
+        resultMap.put("techScore", 0);
+        resultMap.put("cardNum", 0);
+
+        String json = mapper.write(resultMap);
+
+        logger.info("Response: " + json);
+        return json;
+    }
+}

src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetGameSettingHandler.java

@@ -43,6 +43,7 @@ public class GetGameSettingHandler implements BaseHandler {
 
         GameSetting gameSetting = new GameSetting(
                 "1.05.00",
+                "", //TODO dynamic
                 false,
                 10,
                 start.getPropertyValue(),

src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserMemoryChapterHandler.java

@@ -0,0 +1,51 @@
+package icu.samnyan.aqua.sega.ongeki.handler.impl;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import icu.samnyan.aqua.sega.ongeki.dao.userdata.UserMemoryChapterRepository;
+import icu.samnyan.aqua.sega.ongeki.handler.BaseHandler;
+import icu.samnyan.aqua.sega.ongeki.model.userdata.UserMemoryChapter;
+import icu.samnyan.aqua.sega.util.jackson.BasicMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author samnyan (privateamusement@protonmail.com)
+ */
+@Component("OngekiGetUserMemoryChapterHandler")
+public class GetUserMemoryChapterHandler implements BaseHandler {
+
+    private static final Logger logger = LoggerFactory.getLogger(GetUserMemoryChapterHandler.class);
+
+    private final BasicMapper mapper;
+
+    private final UserMemoryChapterRepository userMemoryChapterRepository;
+
+    @Autowired
+    public GetUserMemoryChapterHandler(BasicMapper mapper, UserMemoryChapterRepository userMemoryChapterRepository) {
+        this.mapper = mapper;
+        this.userMemoryChapterRepository = userMemoryChapterRepository;
+    }
+
+
+    @Override
+    public String handle(Map<String, Object> request) throws JsonProcessingException {
+        long userId = ((Number) request.get("userId")).longValue();
+
+        List<UserMemoryChapter> MemoryChapterList = userMemoryChapterRepository.findByUser_Card_ExtId(userId);
+        Map<String, Object> resultMap = new LinkedHashMap<>();
+        resultMap.put("userId", userId);
+        resultMap.put("length", MemoryChapterList.size());
+        resultMap.put("userMemoryChapterList", MemoryChapterList);
+
+        String json = mapper.write(resultMap);
+
+        logger.info("Response: " + json);
+        return json;
+    }
+}

src/main/java/icu/samnyan/aqua/sega/ongeki/model/request/UpsertUserAll.java

@@ -61,6 +61,8 @@ public class UpsertUserAll implements Serializable {
 
     private List<UserChapter> userChapterList;
 
+    private List<UserMemoryChapter> userMemoryChapterList;
+
     private List<UserItem> userItemList;
 
     private List<UserMusicItem> userMusicItemList;
@@ -110,6 +112,9 @@ public class UpsertUserAll implements Serializable {
     @JsonProperty("isNewChapterList")
     private String isNewChapterList;
 
+    @JsonProperty("isNewMemoryChapterList")
+    private String isNewMemoryChapterList;
+
     @JsonProperty("isNewItemList")
     private String isNewItemList;
 

src/main/java/icu/samnyan/aqua/sega/ongeki/model/response/GetUserPreviewResp.java

@@ -35,7 +35,7 @@ public class GetUserPreviewResp {
     private int headphone = 0;
     private int banStatus = 0;
     @JsonProperty("isWarningConfirmed")
-    private boolean isWarningConfirmed = true;
+    private boolean isWarningConfirmed = false;
     private int lastEmoneyBrand = 0;
     private int lastEmoneyCredit = 0;
 }

src/main/java/icu/samnyan/aqua/sega/ongeki/model/response/data/GameSetting.java

@@ -14,6 +14,7 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 public class GameSetting {
     private String dataVersion;
+    private String onlineDataVersion;
     @JsonProperty("isMaintenance")
     private boolean isMaintenance;
     private int requestInterval;

src/main/java/icu/samnyan/aqua/sega/ongeki/model/userdata/UserData.java

@@ -66,6 +66,9 @@ public class UserData implements Serializable {
 
     private int overDamageBattlePoint;
 
+    @JsonProperty("isDialogWatchedSuggestMemory")
+    private boolean isDialogWatchedSuggestMemory;
+
     private int nameplateId;
 
     private int trophyId;
@@ -74,6 +77,8 @@ public class UserData implements Serializable {
 
     private int characterId;
 
+    private int characterVoiceNo;
+
     private int tabSetting;
 
     private int tabSortSetting;

src/main/java/icu/samnyan/aqua/sega/ongeki/model/userdata/UserMemoryChapter.java

@@ -0,0 +1,63 @@
+package icu.samnyan.aqua.sega.ongeki.model.userdata;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @author samnyan (privateamusement@protonmail.com)
+ */
+@Entity(name = "OngekiUserMemoryChapter")
+@Table(name = "ongeki_user_memory_chapter")
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class UserMemoryChapter implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @JsonIgnore
+    private long id;
+
+    @JsonIgnore
+    @ManyToOne
+    @JoinColumn(name = "user_id")
+    private UserData user;
+
+    private int chapterId;
+
+    private int jewelCount;
+
+    private int lastPlayMusicCategory;
+
+    private int lastPlayMusicId;
+
+    private int lastPlayMusicLevel;
+
+    @JsonProperty("isDialogWatched")
+    private boolean isDialogWatched;
+
+    @JsonProperty("isStoryWatched")
+    private boolean isStoryWatched;
+
+    @JsonProperty("isBossWatched")
+    private boolean isBossWatched;
+
+    @JsonProperty("isClear")
+    private boolean isClear;
+
+    private int gaugeId;
+
+    private int gauseNum;
+
+    public UserMemoryChapter(UserData userData) {
+        this.user = userData;
+    }
+}

src/main/java/icu/samnyan/aqua/sega/ongeki/model/userdata/UserOption.java

@@ -42,7 +42,7 @@ public class UserOption implements Serializable {
 
     private int abort;
 
-    public int stealthField;
+    private int stealthField;
 
     private int tapSound;
 
@@ -72,7 +72,7 @@ public class UserOption implements Serializable {
 
     private int colorLaneBright;
 
-    public int colorWallBright;
+    private int colorWallBright;
 
     private int colorLane;
 

src/main/java/icu/samnyan/aqua/sega/ongeki/model/userdata/UserPlaylog.java

@@ -105,6 +105,8 @@ public class UserPlaylog implements Serializable {
 
     private int battleScoreRank;
 
+    private int platinumScore;
+
     private int maxCombo;
 
     private int judgeMiss;