mirror of https://github.com/hykilpikonna/AquaDX
[F] Remove redundant fields in GetUserMap, LoginBonus, UserExtend, UserData
parent
73d05e7cbf
commit
17123fec35
|
@ -1,47 +0,0 @@
|
||||||
package icu.samnyan.aqua.sega.maimai2.handler;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
|
||||||
import icu.samnyan.aqua.sega.maimai2.model.Mai2UserDataRepo;
|
|
||||||
import icu.samnyan.aqua.sega.general.BaseHandler;
|
|
||||||
import icu.samnyan.aqua.sega.maimai2.model.userdata.Mai2UserDetail;
|
|
||||||
import icu.samnyan.aqua.sega.util.jackson.BasicMapper;
|
|
||||||
import org.slf4j.Logger;
|
|
||||||
import org.slf4j.LoggerFactory;
|
|
||||||
import org.springframework.stereotype.Component;
|
|
||||||
|
|
||||||
import java.util.LinkedHashMap;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author samnyan (privateamusement@protonmail.com)
|
|
||||||
*/
|
|
||||||
@Component("Maimai2GetUserDataHandler")
|
|
||||||
public class GetUserDataHandler implements BaseHandler {
|
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(GetUserDataHandler.class);
|
|
||||||
|
|
||||||
private final BasicMapper mapper;
|
|
||||||
|
|
||||||
private final Mai2UserDataRepo userDataRepository;
|
|
||||||
|
|
||||||
public GetUserDataHandler(BasicMapper mapper, Mai2UserDataRepo userDataRepository) {
|
|
||||||
this.mapper = mapper;
|
|
||||||
this.userDataRepository = userDataRepository;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String handle(Map<String, Object> request) throws JsonProcessingException {
|
|
||||||
long userId = ((Number) request.get("userId")).longValue();
|
|
||||||
|
|
||||||
Mai2UserDetail userData = userDataRepository.findByCardExtId(userId).orElseThrow();
|
|
||||||
|
|
||||||
Map<String, Object> resultMap = new LinkedHashMap<>();
|
|
||||||
resultMap.put("userId", userId);
|
|
||||||
resultMap.put("userData", userData);
|
|
||||||
resultMap.put("banState", userData.getBanState());
|
|
||||||
|
|
||||||
String json = mapper.write(resultMap);
|
|
||||||
logger.info("Response: " + json);
|
|
||||||
return json;
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -0,0 +1,35 @@
|
||||||
|
package icu.samnyan.aqua.sega.maimai2.handler
|
||||||
|
|
||||||
|
import ext.invoke
|
||||||
|
import ext.minus
|
||||||
|
import ext.toJson
|
||||||
|
import icu.samnyan.aqua.sega.general.BaseHandler
|
||||||
|
import icu.samnyan.aqua.sega.maimai2.model.Mai2Repos
|
||||||
|
import org.slf4j.Logger
|
||||||
|
import org.slf4j.LoggerFactory
|
||||||
|
import org.springframework.stereotype.Component
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author samnyan (privateamusement@protonmail.com)
|
||||||
|
*/
|
||||||
|
@Component("Maimai2GetUserDataHandler")
|
||||||
|
class GetUserDataHandler(val repos: Mai2Repos) : BaseHandler {
|
||||||
|
override fun handle(request: Map<String, Any>): String {
|
||||||
|
val userId = (request["userId"] as Number).toLong()
|
||||||
|
|
||||||
|
val userData = repos.userData.findByCardExtId(userId)() ?: (404 - "User Data Not Found")
|
||||||
|
val resultMap = mapOf(
|
||||||
|
"userId" to userId,
|
||||||
|
"userData" to userData,
|
||||||
|
"banState" to userData.banState
|
||||||
|
)
|
||||||
|
|
||||||
|
val json = resultMap.toJson()
|
||||||
|
logger.info("Response: $json")
|
||||||
|
return json
|
||||||
|
}
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
private val logger = LoggerFactory.getLogger(GetUserDataHandler::class.java)
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,46 +0,0 @@
|
||||||
package icu.samnyan.aqua.sega.maimai2.handler;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
|
||||||
import icu.samnyan.aqua.sega.maimai2.model.Mai2UserExtendRepo;
|
|
||||||
import icu.samnyan.aqua.sega.general.BaseHandler;
|
|
||||||
import icu.samnyan.aqua.sega.maimai2.model.userdata.Mai2UserExtend;
|
|
||||||
import icu.samnyan.aqua.sega.util.jackson.BasicMapper;
|
|
||||||
import org.slf4j.Logger;
|
|
||||||
import org.slf4j.LoggerFactory;
|
|
||||||
import org.springframework.stereotype.Component;
|
|
||||||
|
|
||||||
import java.util.LinkedHashMap;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author samnyan (privateamusement@protonmail.com)
|
|
||||||
*/
|
|
||||||
@Component("Maimai2GetUserExtendHandler")
|
|
||||||
public class GetUserExtendHandler implements BaseHandler {
|
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(GetUserExtendHandler.class);
|
|
||||||
|
|
||||||
private final BasicMapper mapper;
|
|
||||||
|
|
||||||
private final Mai2UserExtendRepo userExtendRepository;
|
|
||||||
|
|
||||||
public GetUserExtendHandler(BasicMapper mapper, Mai2UserExtendRepo userExtendRepository) {
|
|
||||||
this.mapper = mapper;
|
|
||||||
this.userExtendRepository = userExtendRepository;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String handle(Map<String, Object> request) throws JsonProcessingException {
|
|
||||||
long userId = ((Number) request.get("userId")).longValue();
|
|
||||||
|
|
||||||
Mai2UserExtend userExtend = userExtendRepository.findSingleByUser_Card_ExtId(userId).orElseThrow();
|
|
||||||
|
|
||||||
Map<String, Object> resultMap = new LinkedHashMap<>();
|
|
||||||
resultMap.put("userId", userId);
|
|
||||||
resultMap.put("userExtend", userExtend);
|
|
||||||
|
|
||||||
String json = mapper.write(resultMap);
|
|
||||||
logger.info("Response: " + json);
|
|
||||||
return json;
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -0,0 +1,33 @@
|
||||||
|
package icu.samnyan.aqua.sega.maimai2.handler
|
||||||
|
|
||||||
|
import ext.invoke
|
||||||
|
import ext.minus
|
||||||
|
import ext.toJson
|
||||||
|
import icu.samnyan.aqua.sega.general.BaseHandler
|
||||||
|
import icu.samnyan.aqua.sega.maimai2.model.Mai2Repos
|
||||||
|
import org.slf4j.LoggerFactory
|
||||||
|
import org.springframework.stereotype.Component
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author samnyan (privateamusement@protonmail.com)
|
||||||
|
*/
|
||||||
|
@Component("Maimai2GetUserExtendHandler")
|
||||||
|
class GetUserExtendHandler(val repos: Mai2Repos) : BaseHandler {
|
||||||
|
override fun handle(request: Map<String, Any>): Any {
|
||||||
|
val userId = (request["userId"] as Number).toLong()
|
||||||
|
|
||||||
|
val userExtend = repos.userExtend.findSingleByUser_Card_ExtId(userId)() ?: (404 - "User Extend Not Found")
|
||||||
|
val resultMap = mapOf(
|
||||||
|
"userId" to userId,
|
||||||
|
"userExtend" to userExtend
|
||||||
|
)
|
||||||
|
|
||||||
|
val json = resultMap.toJson()
|
||||||
|
logger.info("Response: $json")
|
||||||
|
return json
|
||||||
|
}
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
val logger = LoggerFactory.getLogger(GetUserExtendHandler::class.java)
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,55 +0,0 @@
|
||||||
package icu.samnyan.aqua.sega.maimai2.handler;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
|
||||||
import icu.samnyan.aqua.sega.maimai2.model.Mai2UserLoginBonusRepo;
|
|
||||||
import icu.samnyan.aqua.sega.general.BaseHandler;
|
|
||||||
import icu.samnyan.aqua.sega.maimai2.model.userdata.Mai2UserLoginBonus;
|
|
||||||
import icu.samnyan.aqua.sega.util.jackson.BasicMapper;
|
|
||||||
import org.slf4j.Logger;
|
|
||||||
import org.slf4j.LoggerFactory;
|
|
||||||
import org.springframework.data.domain.Page;
|
|
||||||
import org.springframework.data.domain.PageRequest;
|
|
||||||
import org.springframework.stereotype.Component;
|
|
||||||
|
|
||||||
import java.util.LinkedHashMap;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author samnyan (privateamusement@protonmail.com)
|
|
||||||
*/
|
|
||||||
@Component("Maimai2GetUserLoginBonusHandler")
|
|
||||||
public class GetUserLoginBonusHandler implements BaseHandler {
|
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(GetUserLoginBonusHandler.class);
|
|
||||||
|
|
||||||
private final BasicMapper mapper;
|
|
||||||
|
|
||||||
private final Mai2UserLoginBonusRepo userLoginBonusRepository;
|
|
||||||
|
|
||||||
public GetUserLoginBonusHandler(BasicMapper mapper, Mai2UserLoginBonusRepo userLoginBonusRepository) {
|
|
||||||
this.mapper = mapper;
|
|
||||||
this.userLoginBonusRepository = userLoginBonusRepository;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String handle(Map<String, Object> request) throws JsonProcessingException {
|
|
||||||
long userId = ((Number) request.get("userId")).longValue();
|
|
||||||
int nextIndexVal = ((Number) request.get("nextIndex")).intValue();
|
|
||||||
int maxCount = ((Number) request.get("maxCount")).intValue();
|
|
||||||
|
|
||||||
int pageNum = nextIndexVal / maxCount;
|
|
||||||
|
|
||||||
Page<Mai2UserLoginBonus> dbPage = userLoginBonusRepository.findByUser_Card_ExtId(userId, PageRequest.of(pageNum, maxCount));
|
|
||||||
|
|
||||||
long currentIndex = maxCount * pageNum + dbPage.getNumberOfElements();
|
|
||||||
|
|
||||||
Map<String, Object> resultMap = new LinkedHashMap<>();
|
|
||||||
resultMap.put("userId", userId);
|
|
||||||
resultMap.put("nextIndex", dbPage.getNumberOfElements() < maxCount ? 0 : currentIndex);
|
|
||||||
resultMap.put("userLoginBonusList", dbPage.getContent());
|
|
||||||
|
|
||||||
String json = mapper.write(resultMap);
|
|
||||||
logger.info("Response: " + json);
|
|
||||||
return json;
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -0,0 +1,32 @@
|
||||||
|
package icu.samnyan.aqua.sega.maimai2.handler
|
||||||
|
|
||||||
|
import ext.toJson
|
||||||
|
import icu.samnyan.aqua.sega.general.BaseHandler
|
||||||
|
import icu.samnyan.aqua.sega.maimai2.model.Mai2Repos
|
||||||
|
import org.slf4j.Logger
|
||||||
|
import org.slf4j.LoggerFactory
|
||||||
|
import org.springframework.stereotype.Component
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author samnyan (privateamusement@protonmail.com)
|
||||||
|
*/
|
||||||
|
@Component("Maimai2GetUserLoginBonusHandler")
|
||||||
|
class GetUserLoginBonusHandler(val repos: Mai2Repos) : BaseHandler {
|
||||||
|
override fun handle(request: Map<String, Any>): String {
|
||||||
|
val userId = (request["userId"] as Number).toLong()
|
||||||
|
|
||||||
|
val resultMap = mapOf(
|
||||||
|
"userId" to userId,
|
||||||
|
"nextIndex" to 0,
|
||||||
|
"userLoginBonusList" to repos.userLoginBonus.findByUser_Card_ExtId(userId)
|
||||||
|
)
|
||||||
|
|
||||||
|
val json = resultMap.toJson()
|
||||||
|
logger.info("Response: $json")
|
||||||
|
return json
|
||||||
|
}
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
private val logger = LoggerFactory.getLogger(GetUserLoginBonusHandler::class.java)
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,55 +0,0 @@
|
||||||
package icu.samnyan.aqua.sega.maimai2.handler;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
|
||||||
import icu.samnyan.aqua.sega.maimai2.model.Mai2UserMapRepo;
|
|
||||||
import icu.samnyan.aqua.sega.general.BaseHandler;
|
|
||||||
import icu.samnyan.aqua.sega.maimai2.model.userdata.Mai2UserMap;
|
|
||||||
import icu.samnyan.aqua.sega.util.jackson.BasicMapper;
|
|
||||||
import org.slf4j.Logger;
|
|
||||||
import org.slf4j.LoggerFactory;
|
|
||||||
import org.springframework.data.domain.Page;
|
|
||||||
import org.springframework.data.domain.PageRequest;
|
|
||||||
import org.springframework.stereotype.Component;
|
|
||||||
|
|
||||||
import java.util.LinkedHashMap;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author samnyan (privateamusement@protonmail.com)
|
|
||||||
*/
|
|
||||||
@Component("Maimai2GetUserMapHandler")
|
|
||||||
public class GetUserMapHandler implements BaseHandler {
|
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(GetUserMapHandler.class);
|
|
||||||
|
|
||||||
private final BasicMapper mapper;
|
|
||||||
|
|
||||||
private final Mai2UserMapRepo userMapRepository;
|
|
||||||
|
|
||||||
public GetUserMapHandler(BasicMapper mapper, Mai2UserMapRepo userMapRepository) {
|
|
||||||
this.mapper = mapper;
|
|
||||||
this.userMapRepository = userMapRepository;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String handle(Map<String, Object> request) throws JsonProcessingException {
|
|
||||||
long userId = ((Number) request.get("userId")).longValue();
|
|
||||||
int nextIndexVal = ((Number) request.get("nextIndex")).intValue();
|
|
||||||
int maxCount = ((Number) request.get("maxCount")).intValue();
|
|
||||||
|
|
||||||
int pageNum = nextIndexVal / maxCount;
|
|
||||||
|
|
||||||
Page<Mai2UserMap> dbPage = userMapRepository.findByUser_Card_ExtId(userId, PageRequest.of(pageNum, maxCount));
|
|
||||||
|
|
||||||
long currentIndex = maxCount * pageNum + dbPage.getNumberOfElements();
|
|
||||||
|
|
||||||
Map<String, Object> resultMap = new LinkedHashMap<>();
|
|
||||||
resultMap.put("userId", userId);
|
|
||||||
resultMap.put("nextIndex", dbPage.getNumberOfElements() < maxCount ? 0 : currentIndex);
|
|
||||||
resultMap.put("userMapList", dbPage.getContent());
|
|
||||||
|
|
||||||
String json = mapper.write(resultMap);
|
|
||||||
logger.info("Response: " + json);
|
|
||||||
return json;
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -0,0 +1,31 @@
|
||||||
|
package icu.samnyan.aqua.sega.maimai2.handler
|
||||||
|
|
||||||
|
import ext.toJson
|
||||||
|
import icu.samnyan.aqua.sega.general.BaseHandler
|
||||||
|
import icu.samnyan.aqua.sega.maimai2.model.Mai2Repos
|
||||||
|
import org.slf4j.LoggerFactory
|
||||||
|
import org.springframework.stereotype.Component
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author samnyan (privateamusement@protonmail.com)
|
||||||
|
*/
|
||||||
|
@Component("Maimai2GetUserMapHandler")
|
||||||
|
class GetUserMapHandler(val repos: Mai2Repos) : BaseHandler {
|
||||||
|
override fun handle(request: Map<String, Any>): String {
|
||||||
|
val userId = (request["userId"] as Number).toLong()
|
||||||
|
|
||||||
|
val resultMap = mapOf(
|
||||||
|
"userId" to userId,
|
||||||
|
"nextIndex" to 0,
|
||||||
|
"userMapList" to repos.userMap.findByUser_Card_ExtId(userId)
|
||||||
|
)
|
||||||
|
|
||||||
|
val json = resultMap.toJson()
|
||||||
|
logger.info("Response: $json")
|
||||||
|
return json
|
||||||
|
}
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
private val logger = LoggerFactory.getLogger(GetUserMapHandler::class.java)
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue