From c33e0240f6fcca8abc5e15064fa761005e0f4a56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=8C=90=EB=8F=8C?= Date: Sun, 3 Dec 2023 17:37:40 +0900 Subject: [PATCH] =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EC=8B=9C?= =?UTF-8?q?=EC=8A=A4=ED=85=9C=20=EC=88=98=EC=A0=95=20=EB=B0=8F=20=EC=97=90?= =?UTF-8?q?=EB=9F=AC=20=EB=B0=98=ED=99=98=EA=B0=92=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Server/Service/Login.cs | 95 ++++++++++++++++++++++++++++++++--------- Server/System/Error.cs | 4 +- 2 files changed, 78 insertions(+), 21 deletions(-) diff --git a/Server/Service/Login.cs b/Server/Service/Login.cs index 866a1d1..3eaf146 100644 --- a/Server/Service/Login.cs +++ b/Server/Service/Login.cs @@ -10,9 +10,12 @@ namespace Server.Service public override string Process() { UserSQL userSql = new UserSQL(); + DeckUnitInfoSQL deckUnitInfoSQL = new DeckUnitInfoSQL(); + LeaderInfoSQL leaderInfoSQL = new LeaderInfoSQL(); User user; + List deckUnitInfoList = null; + List leaderInfoList = null; Console.WriteLine(req.uuid); - bool isNewUser = false; if (req.uuid == "") { //최초 메일 로그인 @@ -23,6 +26,8 @@ namespace Server.Service if (user != null) { user.nickname = ""; + deckUnitInfoList = deckUnitInfoSQL.Select(); + leaderInfoList = leaderInfoSQL.Select(); } } else @@ -32,39 +37,87 @@ namespace Server.Service //현재 닉네임을 설정하는 곳이 없기에 임시 작업 user.nickname = ""; + + deckUnitInfoList = deckUnitInfoSQL.Select(); + leaderInfoList = leaderInfoSQL.Select(); } if(user == null) { - #region 신규유저 생성 if (req.mail == "") { - throw new RuntimeException("not User", Error.nodata); + throw new RuntimeException("Not User", Error.nodata); } - isNewUser = true; + #region 신규유저 생성 user = new User(); user.mail = req.mail; user.uuid = Guid.NewGuid().ToString(); user.nickname = ""; + userSql.Insert(user); //저장하고 유닛의 id를 얻어오기 위함. #endregion - #region 신규 덱, 초기 유닛 지급 + #region 초기 유닛 지급 + deckUnitInfoList = new List(); + DeckUnitInfo deckUnitInfo; + deckUnitInfo = new DeckUnitInfo(); + deckUnitInfo.user_id = user.id; + deckUnitInfo.unit_id = 100001; + deckUnitInfoList.Add(deckUnitInfo); + deckUnitInfo = new DeckUnitInfo(); + deckUnitInfo.user_id = user.id; + deckUnitInfo.unit_id = 100002; + deckUnitInfoList.Add(deckUnitInfo); + deckUnitInfo = new DeckUnitInfo(); + deckUnitInfo.user_id = user.id; + deckUnitInfo.unit_id = 100003; + deckUnitInfoList.Add(deckUnitInfo); + deckUnitInfo = new DeckUnitInfo(); + deckUnitInfo.user_id = user.id; + deckUnitInfo.unit_id = 100004; + deckUnitInfoList.Add(deckUnitInfo); + deckUnitInfo = new DeckUnitInfo(); + deckUnitInfo.user_id = user.id; + deckUnitInfo.unit_id = 100005; + deckUnitInfoList.Add(deckUnitInfo); + deckUnitInfo = new DeckUnitInfo(); + deckUnitInfo.user_id = user.id; + deckUnitInfo.unit_id = 100006; + deckUnitInfoList.Add(deckUnitInfo); + deckUnitInfo = new DeckUnitInfo(); + deckUnitInfo.user_id = user.id; + deckUnitInfo.unit_id = 100007; + deckUnitInfoList.Add(deckUnitInfo); + deckUnitInfo = new DeckUnitInfo(); + deckUnitInfo.user_id = user.id; + deckUnitInfo.unit_id = 100008; + deckUnitInfoList.Add(deckUnitInfo); + deckUnitInfo = new DeckUnitInfo(); + deckUnitInfo.user_id = user.id; + deckUnitInfo.unit_id = 100009; + deckUnitInfoList.Add(deckUnitInfo); + deckUnitInfoSQL.Insert(deckUnitInfoList); + #endregion + #region 신규 덱 추가 + leaderInfoList = new List(); + LeaderInfo leaderInfo; + leaderInfo = new LeaderInfo(); + leaderInfo.user_id= user.id; + leaderInfo.leader_id = 1; + leaderInfo.deck_unit0_id = deckUnitInfoList[0].id; + leaderInfo.deck_unit1_id = deckUnitInfoList[1].id; + leaderInfo.deck_unit2_id = deckUnitInfoList[2].id; + leaderInfo.deck_unit3_id = deckUnitInfoList[3].id; + leaderInfo.deck_unit4_id = deckUnitInfoList[4].id; + leaderInfo.deck_unit5_id = deckUnitInfoList[5].id; + leaderInfo.deck_unit6_id = deckUnitInfoList[6].id; + leaderInfo.deck_unit7_id = deckUnitInfoList[7].id; + leaderInfo.deck_unit8_id = deckUnitInfoList[8].id; + leaderInfoList.Add(leaderInfo); + leaderInfoSQL.Insert(leaderInfoList); #endregion } - SaveQurry(userSql, user, isNewUser); - return makeResp(user); - } - public void SaveQurry(UserSQL userSql, User user, bool isNewUser) - { - if (isNewUser) - { - userSql.Insert(user); - } - else - { - userSql.Update(user); - } + return makeResp(user, deckUnitInfoList, leaderInfoList); } public override Protocol ProtocolValue() => Protocol.Login; @@ -75,11 +128,13 @@ namespace Server.Service return req; } - private string makeResp(User user) + private string makeResp(User user, List deck_unit, List leader) { LoginResp resp = new LoginResp(); resp.nickname = user.nickname; resp.uuid = user.uuid; + resp.deck_unit = deck_unit; + resp.leader = leader; resp.status = 200; return resp.ToJson(); } @@ -103,5 +158,7 @@ namespace Server.Service { public string uuid; public string nickname; + public List deck_unit; + public List leader; } } diff --git a/Server/System/Error.cs b/Server/System/Error.cs index 70078f9..58941b3 100644 --- a/Server/System/Error.cs +++ b/Server/System/Error.cs @@ -6,12 +6,12 @@ public ErrorResp(RuntimeException ex) { this.status = (int)ex.status; - this.message = ex.Message; + this.message = "error : " + ex.Message; } public ErrorResp() { this.status = -1; - this.message = "Unknown Error"; + this.message = "error : Unknown Error"; } }