Move models out of JsonDb

This commit is contained in:
Mikhail Tyukin
2025-07-21 16:47:45 -04:00
parent f217be263a
commit 6310916920
101 changed files with 800 additions and 881 deletions

View File

@@ -8,7 +8,7 @@ namespace EpinelPS.LobbyServer.LobbyUser
protected override async Task HandleAsync()
{
ReqAcquireUserTitle req = await ReadData<ReqAcquireUserTitle>();
Database.User user = GetUser();
User user = GetUser();
ResAcquireUserTitle response = new();

View File

@@ -36,7 +36,7 @@ namespace EpinelPS.LobbyServer.LobbyUser
response.Currency.Add(new NetUserCurrencyData() { Type = (int)item.Key, Value = item.Value });
}
foreach (Database.Character item in user.Characters)
foreach (CharacterModel item in user.Characters)
{
response.Character.Add(new NetUserCharacterData() { Default = new() { Csn = item.Csn, Skill1Lv = item.Skill1Lvl, Skill2Lv = item.Skill2Lvl, CostumeId = item.CostumeId, Lv = user.GetCharacterLevel(item.Csn, item.Level), Grade = item.Grade, Tid = item.Tid, UltiSkillLv = item.UltimateLevel}, IsSynchro = user.GetSynchro(item.Csn) });
}
@@ -49,10 +49,10 @@ namespace EpinelPS.LobbyServer.LobbyUser
// Add squad data if there are characters
if (user.Characters.Count > 0)
{
List<Database.Character> highestLevelCharacters = [.. user.Characters.OrderByDescending(x => x.Level).Take(5)];
List<CharacterModel> highestLevelCharacters = [.. user.Characters.OrderByDescending(x => x.Level).Take(5)];
response.SynchroLv = user.GetSynchroLevel();
foreach (Database.Character? item in highestLevelCharacters)
foreach (CharacterModel? item in highestLevelCharacters)
{
response.SynchroStandardCharacters.Add(item.Csn);
}

View File

@@ -8,14 +8,14 @@ namespace EpinelPS.LobbyServer.LobbyUser
protected override async Task HandleAsync()
{
ReqGetContentsOpenData req = await ReadData<ReqGetContentsOpenData>();
Database.User user = GetUser();
User user = GetUser();
// this request returns a list of "special" stages that mark when something is unlocked, ex: the shop or interception
List<int> specialStages = [6003003, 6002008, 6002016, 6005003, 6003021, 6011018, 6007021, 6004018, 6005013, 6003009, 6003012, 6009017, 6016039, 6001004, 6000003, 6000001, 6002001, 6004023, 6005026, 6020050, 6006004, 6006023,6022049];
ResGetContentsOpenData response = new();
foreach (Database.FieldInfoNew field in user.FieldInfoNew.Values)
foreach (FieldInfoNew field in user.FieldInfoNew.Values)
{
foreach (int stage in field.CompletedStages)
{

View File

@@ -8,7 +8,7 @@ namespace EpinelPS.LobbyServer.LobbyUser
protected override async Task HandleAsync()
{
ReqGetFieldTalkList req = await ReadData<ReqGetFieldTalkList>();
Database.User user = GetUser();
User user = GetUser();
ResGetFieldTalkList response = new();
// TODO

View File

@@ -8,7 +8,7 @@ namespace EpinelPS.LobbyServer.LobbyUser
protected override async Task HandleAsync()
{
ReqGetScenarioList req = await ReadData<ReqGetScenarioList>();
Database.User user = GetUser();
User user = GetUser();
// todo what are bookmark scenarios?

View File

@@ -8,8 +8,8 @@ namespace EpinelPS.LobbyServer.LobbyUser
protected override async Task HandleAsync()
{
ReqGetProfileData req = await ReadData<ReqGetProfileData>();
Database.User callingUser = GetUser();
Database.User? user = GetUser((ulong)req.TargetUsn);
User callingUser = GetUser();
User? user = GetUser((ulong)req.TargetUsn);
ResGetProfileData response = new();
if (user != null)
@@ -28,7 +28,7 @@ namespace EpinelPS.LobbyServer.LobbyUser
for (int i = 0; i < user.RepresentationTeamDataNew.Length; i++)
{
long csn = user.RepresentationTeamDataNew[i];
Database.Character? c = user.GetCharacterBySerialNumber(csn);
CharacterModel? c = user.GetCharacterBySerialNumber(csn);
if (c != null)
{

View File

@@ -13,7 +13,7 @@ namespace EpinelPS.LobbyServer.LobbyUser
ResExistScenario response = new();
Database.User user = GetUser();
User user = GetUser();
foreach (string? item in req.ScenarioGroupIds)
{

View File

@@ -9,7 +9,7 @@ namespace EpinelPS.LobbyServer.LobbyUser
{
ReqGetWallpaper req = await ReadData<ReqGetWallpaper>();
ResGetWallpaper response = new();
Database.User user = GetUser();
User user = GetUser();
response.WallpaperList.AddRange(user.WallpaperList);

View File

@@ -1,5 +1,4 @@
using EpinelPS.Utils;
using EpinelPS.Data; // For GameData access
namespace EpinelPS.LobbyServer.LobbyUser
{
@@ -10,7 +9,7 @@ namespace EpinelPS.LobbyServer.LobbyUser
{
ReqRecordNoticeLog req = await ReadData<ReqRecordNoticeLog>();
ResRecordNoticeLog r = new();
Database.User user = GetUser();
User user = GetUser();
// TODO

View File

@@ -8,7 +8,7 @@ namespace EpinelPS.LobbyServer.LobbyUser
protected override async Task HandleAsync()
{
ReqUnMarkUserTitleBadge req = await ReadData<ReqUnMarkUserTitleBadge>();
Database.User user = GetUser();
User user = GetUser();
ResUnMarkUserTitleBadge response = new();