Skip to content

Commit 1be454e

Browse files
WeylonSantanaWeylonSantana
committed
merging user/player tryfetch
1 parent 343597a commit 1be454e

File tree

4 files changed

+42
-53
lines changed

4 files changed

+42
-53
lines changed

‎Intersect.Server.Core/Database/PlayerData/User.cs‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -547,20 +547,15 @@ public static bool TryFetch(LookupKey lookupKey, [NotNullWhen(true)] out User? u
547547
return false;
548548
}
549549

550-
return lookupKey.HasId ? Fetch(lookupKey.Id, out user, out client) : Fetch(lookupKey.Name, out user, out client);
551-
}
552-
553-
private static bool Fetch(Guid userId, [NotNullWhen(true)] out User? user, out Client? client)
554-
{
555-
client = Globals.Clients.Find(queryClient => userId == queryClient?.User?.Id);
556-
user = client?.User ?? FindById(userId);
557-
return user != default;
558-
}
550+
if (lookupKey.HasId)
551+
{
552+
client = Globals.Clients.Find(queryClient => lookupKey.Id == queryClient?.User?.Id);
553+
user = client?.User ?? FindById(lookupKey.Id);
554+
return user != default;
555+
}
559556

560-
private static bool Fetch(string userName, [NotNullWhen(true)] out User? user, out Client? client)
561-
{
562-
client = Globals.Clients.Find(queryClient => Entity.CompareName(userName, queryClient?.User?.Name));
563-
user = client?.User ?? Find(userName);
557+
client = Globals.Clients.Find(queryClient => Entity.CompareName(lookupKey.Name, queryClient?.User?.Name));
558+
user = client?.User ?? Find(lookupKey.Name);
564559
return user != default;
565560
}
566561

‎Intersect.Server.Core/Entities/Player.Database.cs‎

Lines changed: 15 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,13 @@ public partial class Player
3939

4040
#region Lookup
4141

42-
public static bool TryFetch(LookupKey lookupKey, [NotNullWhen(true)] out Client? client)
43-
{
44-
return TryFetch(lookupKey, out client, out _);
45-
}
42+
public static bool TryFetch(
43+
LookupKey lookupKey,
44+
out Player? player,
45+
bool loadRelationships = false,
46+
bool loadBags = false
47+
)
48+
=> TryFetch(lookupKey, out _, out player, loadRelationships, loadBags);
4649

4750
public static bool TryFetch(
4851
LookupKey lookupKey,
@@ -59,24 +62,15 @@ public static bool TryFetch(
5962
return false;
6063
}
6164

62-
// HasName checks if null or empty
63-
// ReSharper disable once AssignNullToNotNullAttribute
64-
return lookupKey.HasId
65-
? Fetch(lookupKey.Id, out client, out player)
66-
: Fetch(lookupKey.Name, out client, out player, loadRelationships: loadRelationships, loadBags: loadBags);
67-
}
68-
69-
private static bool Fetch(string playerName, [NotNullWhen(true)] out Client? client, out Player? player, bool loadRelationships = false, bool loadBags = false)
70-
{
71-
client = Globals.Clients.Find(queryClient => CompareName(playerName, queryClient?.Entity?.Name));
72-
player = client?.Entity ?? Find(playerName, loadRelationships: loadRelationships, loadBags: loadBags);
73-
return player != default;
74-
}
65+
if (lookupKey.HasId)
66+
{
67+
client = Globals.Clients.Find(queryClient => lookupKey.Id == queryClient?.Entity?.Id);
68+
player = client?.Entity ?? Find(lookupKey.Id);
69+
return player != default;
70+
}
7571

76-
private static bool Fetch(Guid playerId, [NotNullWhen(true)] out Client? client, out Player? player)
77-
{
78-
client = Globals.Clients.Find(queryClient => playerId == queryClient?.Entity?.Id);
79-
player = client?.Entity ?? Find(playerId);
72+
client = Globals.Clients.Find(queryClient => CompareName(lookupKey.Name, queryClient?.Entity?.Name));
73+
player = client?.Entity ?? Find(lookupKey.Name, loadRelationships: loadRelationships, loadBags: loadBags);
8074
return player != default;
8175
}
8276

‎Intersect.Server/Web/RestApi/Routes/V1/GuildController.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ public IActionResult Kick(Guid guildId, LookupKey lookupKey)
161161
return NotFound($@"Guild does not exist with id {guildId}.");
162162
}
163163

164-
if (!Player.TryFetch(lookupKey, out var _, out var player))
164+
if (!Player.TryFetch(lookupKey, out var player))
165165
{
166166
return NotFound($@"Player not found with lookup key {lookupKey}.");
167167
}
@@ -202,7 +202,7 @@ public IActionResult SetRank(Guid guildId, LookupKey lookupKey, [FromBody] Guild
202202
return NotFound($@"Guild does not exist with id {guildId}.");
203203
}
204204

205-
if (!Player.TryFetch(lookupKey, out var _, out var player))
205+
if (!Player.TryFetch(lookupKey, out var player))
206206
{
207207
return NotFound($@"Player not found with lookup key {lookupKey}.");
208208
}
@@ -238,7 +238,7 @@ public IActionResult Transfer(Guid guildId, LookupKey lookupKey)
238238
return NotFound($@"No guild found with id {guildId}");
239239
}
240240

241-
if (!Player.TryFetch(lookupKey, out var _, out var player))
241+
if (!Player.TryFetch(lookupKey, out var player))
242242
{
243243
return BadRequest($@"Player not found with lookup key {lookupKey}.");
244244
}

‎Intersect.Server/Web/RestApi/Routes/V1/PlayerController.cs‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ public IActionResult LookupPlayer(LookupKey lookupKey)
171171
return BadRequest(lookupKey.IsIdInvalid ? @"Invalid player id." : @"Invalid player name.");
172172
}
173173

174-
if (!Player.TryFetch(lookupKey, out var _, out var player, loadRelationships: true, loadBags: true))
174+
if (!Player.TryFetch(lookupKey, out var player, loadRelationships: true, loadBags: true))
175175
{
176176
return NotFound($@"No player found for lookup key '{lookupKey}'");
177177
}
@@ -237,7 +237,7 @@ public IActionResult ChangeName(LookupKey lookupKey, [FromBody] NameChangePayloa
237237
return BadRequest($@"Name already taken.");
238238
}
239239

240-
if (!Player.TryFetch(lookupKey, out var _, out var player))
240+
if (!Player.TryFetch(lookupKey, out var player))
241241
{
242242
return NotFound($@"No player found for lookup key '{lookupKey}'");
243243
}
@@ -277,7 +277,7 @@ public IActionResult PlayerClassSet(LookupKey lookupKey, [FromBody] IdPayload ch
277277
return BadRequest($@"Invalid class id {change.Id}.");
278278
}
279279

280-
if (!Player.TryFetch(lookupKey, out var _, out var player))
280+
if (!Player.TryFetch(lookupKey, out var player))
281281
{
282282
return NotFound($@"No player found for lookup key '{lookupKey}'");
283283
}
@@ -310,7 +310,7 @@ public IActionResult PlayerLevelSet(LookupKey lookupKey, [FromBody] LevelChangeR
310310
return BadRequest(lookupKey.IsIdInvalid ? @"Invalid player id." : @"Invalid player name.");
311311
}
312312

313-
if (!Player.TryFetch(lookupKey, out var _, out var player))
313+
if (!Player.TryFetch(lookupKey, out var player))
314314
{
315315
return NotFound($@"No player found for lookup key '{lookupKey}'");
316316
}
@@ -339,7 +339,7 @@ public IActionResult PlayerLevelSet(LookupKey lookupKey, [FromBody] LevelChangeR
339339
[ProducesResponseType(typeof(ItemListResponse), (int)HttpStatusCode.OK, ContentTypes.Json)]
340340
public IActionResult ItemsList(LookupKey lookupKey)
341341
{
342-
if (!Player.TryFetch(lookupKey, out var _, out var player))
342+
if (!Player.TryFetch(lookupKey, out var player))
343343
{
344344
return NotFound($@"No player found for lookup key '{lookupKey}'");
345345
}
@@ -358,7 +358,7 @@ public IActionResult ItemsListBank(LookupKey lookupKey)
358358
return BadRequest(lookupKey.IsIdInvalid ? @"Invalid player id." : @"Invalid player name.");
359359
}
360360

361-
if (!Player.TryFetch(lookupKey, out var _, out var player))
361+
if (!Player.TryFetch(lookupKey, out var player))
362362
{
363363
return NotFound($@"No player found for lookup key '{lookupKey}'");
364364
}
@@ -396,7 +396,7 @@ public IActionResult ItemsListInventory(LookupKey lookupKey)
396396
return BadRequest(lookupKey.IsIdInvalid ? @"Invalid player id." : @"Invalid player name.");
397397
}
398398

399-
if (!Player.TryFetch(lookupKey, out var _, out var player))
399+
if (!Player.TryFetch(lookupKey, out var player))
400400
{
401401
return NotFound($@"No player found for lookup key '{lookupKey}'");
402402
}
@@ -426,7 +426,7 @@ public IActionResult ItemsGive(LookupKey lookupKey, [FromBody] ItemInfoRequestBo
426426
return BadRequest("Cannot give 0, or a negative amount of an item.");
427427
}
428428

429-
if (!Player.TryFetch(lookupKey, out var _, out var player))
429+
if (!Player.TryFetch(lookupKey, out var player))
430430
{
431431
return NotFound($@"No player found for lookup key '{lookupKey}'");
432432
}
@@ -470,7 +470,7 @@ public IActionResult ItemsTake(LookupKey lookupKey, [FromBody] ItemInfoRequestBo
470470
return BadRequest("Cannot take 0, or a negative amount of an item.");
471471
}
472472

473-
if (!Player.TryFetch(lookupKey, out var _, out var player))
473+
if (!Player.TryFetch(lookupKey, out var player))
474474
{
475475
return NotFound($@"No player found for lookup key '{lookupKey}'");
476476
}
@@ -504,7 +504,7 @@ public IActionResult SpellsList(LookupKey lookupKey)
504504
return BadRequest(lookupKey.IsIdInvalid ? @"Invalid player id." : @"Invalid player name.");
505505
}
506506

507-
if (!Player.TryFetch(lookupKey, out var _, out var player))
507+
if (!Player.TryFetch(lookupKey, out var player))
508508
{
509509
return NotFound($@"No player found for lookup key '{lookupKey}'");
510510
}
@@ -529,7 +529,7 @@ public IActionResult SpellsTeach(LookupKey lookupKey, [FromBody] IdPayload spell
529529
return BadRequest(@"Invalid spell id.");
530530
}
531531

532-
if (!Player.TryFetch(lookupKey, out var _, out var player))
532+
if (!Player.TryFetch(lookupKey, out var player))
533533
{
534534
return NotFound($@"No player found for lookup key '{lookupKey}'");
535535
}
@@ -565,7 +565,7 @@ public IActionResult SpellsTake(LookupKey lookupKey, [FromBody] IdPayload spell)
565565
return BadRequest(@"Invalid spell id.");
566566
}
567567

568-
if (!Player.TryFetch(lookupKey, out var _, out var player))
568+
if (!Player.TryFetch(lookupKey, out var player))
569569
{
570570
return NotFound($@"No player found for lookup key '{lookupKey}'");
571571
}
@@ -599,7 +599,7 @@ public IActionResult PlayerVariablesList(LookupKey lookupKey)
599599
return BadRequest(lookupKey.IsIdInvalid ? @"Invalid id." : @"Invalid name.");
600600
}
601601

602-
if (!Player.TryFetch(lookupKey, out var _, out var player))
602+
if (!Player.TryFetch(lookupKey, out var player))
603603
{
604604
return NotFound($@"No player found for lookup key '{lookupKey}'");
605605
}
@@ -618,7 +618,7 @@ public IActionResult PlayerVariableGet(LookupKey lookupKey, Guid variableId)
618618
return BadRequest(lookupKey.IsIdInvalid ? @"Invalid id." : @"Invalid name.");
619619
}
620620

621-
if (!Player.TryFetch(lookupKey, out var _, out var player))
621+
if (!Player.TryFetch(lookupKey, out var player))
622622
{
623623
return NotFound($@"No player found for lookup key '{lookupKey}'");
624624
}
@@ -643,7 +643,7 @@ public IActionResult PlayerVariableValueGet(LookupKey lookupKey, Guid variableId
643643
return BadRequest(lookupKey.IsIdInvalid ? @"Invalid id." : @"Invalid name.");
644644
}
645645

646-
if (!Player.TryFetch(lookupKey, out var _, out var player))
646+
if (!Player.TryFetch(lookupKey, out var player))
647647
{
648648
return NotFound($@"No player found for lookup key '{lookupKey}'");
649649
}
@@ -671,7 +671,7 @@ public IActionResult PlayerVariableSet(LookupKey lookupKey, Guid variableId, [Fr
671671
return BadRequest(lookupKey.IsIdInvalid ? @"Invalid id." : @"Invalid name.");
672672
}
673673

674-
if (!Player.TryFetch(lookupKey, out var _, out var player))
674+
if (!Player.TryFetch(lookupKey, out var player))
675675
{
676676
return NotFound($@"No player found for lookup key '{lookupKey}'");
677677
}

0 commit comments

Comments
 (0)