diff --git a/Server/SQL/DeckUnitInfo.cs b/Server/SQL/DeckUnitInfo.cs index efbac11..0dd3ed9 100644 --- a/Server/SQL/DeckUnitInfo.cs +++ b/Server/SQL/DeckUnitInfo.cs @@ -16,5 +16,10 @@ namespace Server.SQL public class DeckUnitInfoSQL : SQL { public override DbSet table { get; set; } + + public override List SelectUid(int user_id) + { + return table.Where(data => data.user_id == user_id).ToList(); + } } } diff --git a/Server/SQL/Equipment.cs b/Server/SQL/Equipment.cs index bbe439e..8ceddb0 100644 --- a/Server/SQL/Equipment.cs +++ b/Server/SQL/Equipment.cs @@ -10,9 +10,9 @@ namespace Server.SQL public class Equipment { public int id { get; set; } - public string user_id { get; set; } - public string equip_unit { get; set; } - public string rand_stats { get; set; } + public int user_id { get; set; } + public int equip_unit { get; set; } + public int rand_stats { get; set; } } public class EquipmentrSQL : SQL @@ -23,5 +23,10 @@ namespace Server.SQL { table.Update(equipment); } + + public override List SelectUid(int user_id) + { + return table.Where(data => data.user_id == user_id).ToList(); + } } } diff --git a/Server/SQL/LeaderInfo.cs b/Server/SQL/LeaderInfo.cs index c102661..5fa9517 100644 --- a/Server/SQL/LeaderInfo.cs +++ b/Server/SQL/LeaderInfo.cs @@ -25,5 +25,10 @@ namespace Server.SQL public class LeaderInfoSQL : SQL { public override DbSet table { get; set; } + + public override List SelectUid(int user_id) + { + return table.Where(data => data.user_id == user_id).ToList(); + } } } diff --git a/Server/SQL/SQL.cs b/Server/SQL/SQL.cs index 9e8023b..72d5def 100644 --- a/Server/SQL/SQL.cs +++ b/Server/SQL/SQL.cs @@ -49,6 +49,8 @@ namespace Server.SQL return table.ToList(); } + public abstract List SelectUid(int user_id); + // Select 예시 // 각자 상황에 맞게 작성해서 사용할것 //public DynamicData GetDataByName(string name) diff --git a/Server/SQL/User.cs b/Server/SQL/User.cs index 117e0d1..9fd5291 100644 --- a/Server/SQL/User.cs +++ b/Server/SQL/User.cs @@ -33,5 +33,15 @@ namespace Server.SQL { table.Update(user); } + + /// + /// uesr은 사용하지 않음. + /// + /// + /// + public override List SelectUid(int user_id) + { + return null; + } } } diff --git a/Server/Service/AddUser.cs b/Server/Service/AddUser.cs deleted file mode 100644 index 00728cf..0000000 --- a/Server/Service/AddUser.cs +++ /dev/null @@ -1,44 +0,0 @@ -using Server.System; -using Newtonsoft.Json; - -namespace Server.Service -{ - public class AddUser : AbstractService - { - private AddUserReq req; - public override string Process() - { - return makeResp(); - } - - public override Protocol ProtocolValue() => Protocol.AddUser; - - public override Req Requst(string json) - { - req = JsonConvert.DeserializeObject(json); - return req; - } - - private string makeResp() - { - AddUserResp resp = new AddUserResp(); - resp.status = 200; - return resp.ToJson(); - } - - - } - - public class AddUserReq : Req - { - public override bool IsReceivedAllField() - { - return true; - } - } - - public class AddUserResp : Resp - { - - } -} diff --git a/Server/Service/Login.cs b/Server/Service/Login.cs index 984e383..2e05211 100644 --- a/Server/Service/Login.cs +++ b/Server/Service/Login.cs @@ -24,10 +24,8 @@ namespace Server.Service //게스트 로그인은 허용하지 않고 무조건 구글로그인 혹은 마스토돈 로그인만 가능하게 처리하기 user = userSql.SelectMail(req.mail); - //현재 닉네임을 설정하는 곳이 없기에 임시 작업 if (user != null) { - user.nickname = ""; deckUnitInfoList = deckUnitInfoSQL.Select(); leaderInfoList = leaderInfoSQL.Select(); } @@ -37,12 +35,9 @@ namespace Server.Service //기존 유저 로그인 user = userSql.SelectUuid(req.uuid); - //현재 닉네임을 설정하는 곳이 없기에 임시 작업 - user.nickname = ""; - - deckUnitInfoList = deckUnitInfoSQL.Select(); - leaderInfoList = leaderInfoSQL.Select(); - equipmentList = equipmentrSQL.Select(); + deckUnitInfoList = deckUnitInfoSQL.SelectUid(user.id); + leaderInfoList = leaderInfoSQL.SelectUid(user.id); + equipmentList = equipmentrSQL.SelectUid(user.id); } if(user == null) {