Skip to content

Commit 611da3d

Browse files
Toastbrot236Toastbrot236
committed
Add "Lower" to some disallowance primary key names for clarity
1 parent 4836307 commit 611da3d

7 files changed

Lines changed: 78 additions & 28 deletions

File tree

‎Refresh.Database/GameDatabaseContext.Registration.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -221,13 +221,13 @@ public void RemoveEmailVerificationCode(EmailVerificationCode code)
221221
public bool IsUserDisallowed(string username)
222222
{
223223
string lowercaseUsername = username.ToLower();
224-
return this.DisallowedUsers.Any(u => u.Username == lowercaseUsername);
224+
return this.DisallowedUsers.Any(u => u.UsernameLower == lowercaseUsername);
225225
}
226226

227227
public DisallowedUser? GetDisallowedUserInfo(string username)
228228
{
229229
string lowercaseUsername = username.ToLower();
230-
return this.DisallowedUsers.FirstOrDefault(d => d.Username == lowercaseUsername);
230+
return this.DisallowedUsers.FirstOrDefault(d => d.UsernameLower == lowercaseUsername);
231231
}
232232

233233
public DatabaseList<DisallowedUser> GetDisallowedUsers(int skip, int count)
@@ -241,7 +241,7 @@ public DatabaseList<DisallowedUser> GetDisallowedUsers(int skip, int count)
241241

242242
DisallowedUser disallowed = new()
243243
{
244-
Username = lowercaseUsername,
244+
UsernameLower = lowercaseUsername,
245245
Reason = reason,
246246
DisallowedAt = this._time.Now,
247247
};
@@ -267,13 +267,13 @@ public bool ReallowUser(string username)
267267
public bool IsEmailAddressDisallowed(string emailAddress)
268268
{
269269
string emailAddressLower = emailAddress.ToLowerInvariant();
270-
return this.DisallowedEmailAddresses.Any(u => u.Address == emailAddressLower);
270+
return this.DisallowedEmailAddresses.Any(u => u.AddressLower == emailAddressLower);
271271
}
272272

273273
public DisallowedEmailAddress? GetDisallowedEmailAddressInfo(string emailAddress)
274274
{
275275
string emailAddressLower = emailAddress.ToLowerInvariant();
276-
return this.DisallowedEmailAddresses.FirstOrDefault(d => d.Address == emailAddressLower);
276+
return this.DisallowedEmailAddresses.FirstOrDefault(d => d.AddressLower == emailAddressLower);
277277
}
278278

279279
public DatabaseList<DisallowedEmailAddress> GetDisallowedEmailAddresses(int skip, int count)
@@ -287,7 +287,7 @@ public DatabaseList<DisallowedEmailAddress> GetDisallowedEmailAddresses(int skip
287287

288288
DisallowedEmailAddress disallowed = new()
289289
{
290-
Address = emailAddressLower,
290+
AddressLower = emailAddressLower,
291291
Reason = reason,
292292
DisallowedAt = this._time.Now,
293293
};
@@ -316,13 +316,13 @@ private string GetLowercaseEmailDomainFromAddress(string emailAddress)
316316
public bool IsEmailDomainDisallowed(string emailAddress)
317317
{
318318
string emailDomainLower = this.GetLowercaseEmailDomainFromAddress(emailAddress);
319-
return this.DisallowedEmailDomains.Any(u => u.Domain == emailDomainLower);
319+
return this.DisallowedEmailDomains.Any(u => u.DomainLower == emailDomainLower);
320320
}
321321

322322
public DisallowedEmailDomain? GetDisallowedEmailDomainInfo(string emailAddress)
323323
{
324324
string emailDomainLower = this.GetLowercaseEmailDomainFromAddress(emailAddress);
325-
return this.DisallowedEmailDomains.FirstOrDefault(d => d.Domain == emailDomainLower);
325+
return this.DisallowedEmailDomains.FirstOrDefault(d => d.DomainLower == emailDomainLower);
326326
}
327327

328328
public DatabaseList<DisallowedEmailDomain> GetDisallowedEmailDomains(int skip, int count)
@@ -336,7 +336,7 @@ public DatabaseList<DisallowedEmailDomain> GetDisallowedEmailDomains(int skip, i
336336

337337
DisallowedEmailDomain disallowed = new()
338338
{
339-
Domain = emailDomainLower,
339+
DomainLower = emailDomainLower,
340340
Reason = reason,
341341
DisallowedAt = this._time.Now,
342342
};

‎Refresh.Database/Migrations/20260606101615_RenameDisallowancePKsForClarity.cs‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
using Microsoft.EntityFrameworkCore.Infrastructure;
2+
using Microsoft.EntityFrameworkCore.Migrations;
3+
4+
#nullable disable
5+
6+
namespace Refresh.Database.Migrations
7+
{
8+
/// <inheritdoc />
9+
[DbContext(typeof(GameDatabaseContext))]
10+
[Migration("20260606101615_RenameDisallowancePKsForClarity")]
11+
public partial class RenameDisallowancePKsForClarity : Migration
12+
{
13+
/// <inheritdoc />
14+
protected override void Up(MigrationBuilder migrationBuilder)
15+
{
16+
migrationBuilder.RenameColumn(
17+
name: "Username",
18+
table: "DisallowedUsers",
19+
newName: "UsernameLower");
20+
21+
migrationBuilder.RenameColumn(
22+
name: "Domain",
23+
table: "DisallowedEmailDomains",
24+
newName: "DomainLower");
25+
26+
migrationBuilder.RenameColumn(
27+
name: "Address",
28+
table: "DisallowedEmailAddresses",
29+
newName: "AddressLower");
30+
}
31+
32+
/// <inheritdoc />
33+
protected override void Down(MigrationBuilder migrationBuilder)
34+
{
35+
migrationBuilder.RenameColumn(
36+
name: "UsernameLower",
37+
table: "DisallowedUsers",
38+
newName: "Username");
39+
40+
migrationBuilder.RenameColumn(
41+
name: "DomainLower",
42+
table: "DisallowedEmailDomains",
43+
newName: "Domain");
44+
45+
migrationBuilder.RenameColumn(
46+
name: "AddressLower",
47+
table: "DisallowedEmailAddresses",
48+
newName: "Address");
49+
}
50+
}
51+
}

‎Refresh.Database/Migrations/GameDatabaseContextModelSnapshot.cs‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1532,7 +1532,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
15321532

15331533
modelBuilder.Entity("Refresh.Database.Models.Users.DisallowedEmailAddress", b =>
15341534
{
1535-
b.Property<string>("Address")
1535+
b.Property<string>("AddressLower")
15361536
.HasColumnType("text");
15371537

15381538
b.Property<DateTimeOffset>("DisallowedAt")
@@ -1541,14 +1541,14 @@ protected override void BuildModel(ModelBuilder modelBuilder)
15411541
b.Property<string>("Reason")
15421542
.HasColumnType("text");
15431543

1544-
b.HasKey("Address");
1544+
b.HasKey("AddressLower");
15451545

15461546
b.ToTable("DisallowedEmailAddresses");
15471547
});
15481548

15491549
modelBuilder.Entity("Refresh.Database.Models.Users.DisallowedEmailDomain", b =>
15501550
{
1551-
b.Property<string>("Domain")
1551+
b.Property<string>("DomainLower")
15521552
.HasColumnType("text");
15531553

15541554
b.Property<DateTimeOffset>("DisallowedAt")
@@ -1557,14 +1557,14 @@ protected override void BuildModel(ModelBuilder modelBuilder)
15571557
b.Property<string>("Reason")
15581558
.HasColumnType("text");
15591559

1560-
b.HasKey("Domain");
1560+
b.HasKey("DomainLower");
15611561

15621562
b.ToTable("DisallowedEmailDomains");
15631563
});
15641564

15651565
modelBuilder.Entity("Refresh.Database.Models.Users.DisallowedUser", b =>
15661566
{
1567-
b.Property<string>("Username")
1567+
b.Property<string>("UsernameLower")
15681568
.HasColumnType("text");
15691569

15701570
b.Property<DateTimeOffset>("DisallowedAt")
@@ -1573,7 +1573,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
15731573
b.Property<string>("Reason")
15741574
.HasColumnType("text");
15751575

1576-
b.HasKey("Username");
1576+
b.HasKey("UsernameLower");
15771577

15781578
b.ToTable("DisallowedUsers");
15791579
});
@@ -1605,7 +1605,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)
16051605
b.Property<DateTimeOffset>("ExpiryDate")
16061606
.HasColumnType("timestamp with time zone");
16071607

1608-
// EF badly wanted to move this below ExpiryDate fsr
16091608
b.Property<int>("UploadCount")
16101609
.HasColumnType("integer");
16111610

‎Refresh.Database/Models/Users/DisallowedEmailAddress.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ public partial class DisallowedEmailAddress
88
/// Lower-case email address to allow case-insensitive lookup.
99
/// </summary>
1010
[Key]
11-
public string Address { get; set; }
11+
public string AddressLower { get; set; }
1212
public string Reason { get; set; }
1313
public DateTimeOffset DisallowedAt { get; set; }
1414
}

‎Refresh.Database/Models/Users/DisallowedEmailDomain.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ public partial class DisallowedEmailDomain
88
/// Lower-case email domain to allow case-insensitive lookup.
99
/// </summary>
1010
[Key]
11-
public string Domain { get; set; }
11+
public string DomainLower { get; set; }
1212
public string Reason { get; set; }
1313
public DateTimeOffset DisallowedAt { get; set; }
1414
}

‎Refresh.Database/Models/Users/DisallowedUser.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ public partial class DisallowedUser
88
/// Lower-case username to allow case-insensitive lookup.
99
/// </summary>
1010
[Key]
11-
public string Username { get; set; }
11+
public string UsernameLower { get; set; }
1212
public string Reason { get; set; }
1313
public DateTimeOffset DisallowedAt { get; set; }
1414
}

‎RefreshTests.GameServer/Tests/Users/UserDisallowanceTests.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ public void CannotRegisterAccountWithDisallowedEmailAddressCaseInsensitively(str
2424

2525
// Disallow
2626
(DisallowedEmailAddress disallowanceReturn, bool success) = context.Database.DisallowEmailAddress(emailAddress, disallowReason);
27-
Assert.That(disallowanceReturn.Address, Is.EqualTo(emailAddressLower));
27+
Assert.That(disallowanceReturn.AddressLower, Is.EqualTo(emailAddressLower));
2828
Assert.That(disallowanceReturn.Reason, Is.EqualTo(disallowReason));
2929
Assert.That(success, Is.True);
3030
context.Database.Refresh();
3131

3232
// Try to disallow again
3333
(disallowanceReturn, success) = context.Database.DisallowEmailAddress(emailAddress, disallowReason);
34-
Assert.That(disallowanceReturn.Address, Is.EqualTo(emailAddressLower));
34+
Assert.That(disallowanceReturn.AddressLower, Is.EqualTo(emailAddressLower));
3535
Assert.That(disallowanceReturn.Reason, Is.EqualTo(disallowReason));
3636
Assert.That(success, Is.False);
3737
context.Database.Refresh();
@@ -40,7 +40,7 @@ public void CannotRegisterAccountWithDisallowedEmailAddressCaseInsensitively(str
4040
Assert.That(context.Database.IsEmailAddressDisallowed(emailAddress), Is.True);
4141
DisallowedEmailAddress? disallowed = context.Database.GetDisallowedEmailAddressInfo(emailAddress);
4242
Assert.That(disallowed, Is.Not.Null);
43-
Assert.That(disallowed!.Address, Is.EqualTo(emailAddressLower));
43+
Assert.That(disallowed!.AddressLower, Is.EqualTo(emailAddressLower));
4444
Assert.That(disallowed!.Reason, Is.EqualTo(disallowReason));
4545

4646
// Try to register
@@ -90,14 +90,14 @@ public void CannotRegisterAccountsWithDisallowedEmailDomainCaseInsensitively(str
9090

9191
// Disallow
9292
(DisallowedEmailDomain disallowanceReturn, bool success) = context.Database.DisallowEmailDomain(addressToBlockWith, disallowReason);
93-
Assert.That(disallowanceReturn.Domain, Is.EqualTo(domain));
93+
Assert.That(disallowanceReturn.DomainLower, Is.EqualTo(domain));
9494
Assert.That(disallowanceReturn.Reason, Is.EqualTo(disallowReason));
9595
Assert.That(success, Is.True);
9696
context.Database.Refresh();
9797

9898
// Try to disallow again
9999
(disallowanceReturn, success) = context.Database.DisallowEmailDomain(addressToBlockWith, disallowReason);
100-
Assert.That(disallowanceReturn.Domain, Is.EqualTo(domain));
100+
Assert.That(disallowanceReturn.DomainLower, Is.EqualTo(domain));
101101
Assert.That(disallowanceReturn.Reason, Is.EqualTo(disallowReason));
102102
Assert.That(success, Is.False);
103103
context.Database.Refresh();
@@ -107,7 +107,7 @@ public void CannotRegisterAccountsWithDisallowedEmailDomainCaseInsensitively(str
107107
Assert.That(context.Database.IsEmailDomainDisallowed(domain), Is.True);
108108
DisallowedEmailDomain? disallowed = context.Database.GetDisallowedEmailDomainInfo(addressToBlockWith);
109109
Assert.That(disallowed, Is.Not.Null);
110-
Assert.That(disallowed!.Domain, Is.EqualTo(domain));
110+
Assert.That(disallowed!.DomainLower, Is.EqualTo(domain));
111111
Assert.That(disallowed!.Reason, Is.EqualTo(disallowReason));
112112

113113
// Attempt 1 (block)
@@ -200,14 +200,14 @@ public void CannotRegisterAccountWithDisallowedUsernameCaseInsensitively(string
200200

201201
// Disallow
202202
(DisallowedUser disallowanceReturn, bool success) = context.Database.DisallowUser(username, disallowReason);
203-
Assert.That(disallowanceReturn.Username, Is.EqualTo(usernameLower));
203+
Assert.That(disallowanceReturn.UsernameLower, Is.EqualTo(usernameLower));
204204
Assert.That(disallowanceReturn.Reason, Is.EqualTo(disallowReason));
205205
Assert.That(success, Is.True);
206206
context.Database.Refresh();
207207

208208
// Try to disallow again
209209
(disallowanceReturn, success) = context.Database.DisallowUser(username, disallowReason);
210-
Assert.That(disallowanceReturn.Username, Is.EqualTo(usernameLower));
210+
Assert.That(disallowanceReturn.UsernameLower, Is.EqualTo(usernameLower));
211211
Assert.That(disallowanceReturn.Reason, Is.EqualTo(disallowReason));
212212
Assert.That(success, Is.False);
213213
context.Database.Refresh();
@@ -216,7 +216,7 @@ public void CannotRegisterAccountWithDisallowedUsernameCaseInsensitively(string
216216
Assert.That(context.Database.IsUserDisallowed(username), Is.True);
217217
DisallowedUser? disallowed = context.Database.GetDisallowedUserInfo(username);
218218
Assert.That(disallowed, Is.Not.Null);
219-
Assert.That(disallowed!.Username, Is.EqualTo(usernameLower));
219+
Assert.That(disallowed!.UsernameLower, Is.EqualTo(usernameLower));
220220
Assert.That(disallowed!.Reason, Is.EqualTo(disallowReason));
221221

222222
// Try to register

0 commit comments

Comments
 (0)