Skip to content

feat: upserting twitch user records #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 4, 2025
Merged

feat: upserting twitch user records #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/Nullinside.Api.TwitchBot.Tests/ChatRules/BestCheapViewersTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ public class BestCheapViewersTests : AChatRuleUnitTestBase<BestCheapViewers> {
[TestCase("Chea̓p viewers on streamboo. com (remove the space) @ND80DOGe")]
[TestCase("Bestͮ vie͐wers ̷on cutt.ly/EeK6Anda")]
[TestCase("Bestͮ vie͐wers ̷on viewerszone.online")]
[TestCase("Best viěw\u0310e\u0329rs \u0333o\u032bno\u034en streamboo .com ( remove the space ) @WSZ7tPNI")]
public async Task TestKnownStrings(string badString) {
var rule = new BestCheapViewers();
var botProxy = new Mock<ITwitchApiProxy>();
Expand Down
4 changes: 2 additions & 2 deletions src/Nullinside.Api.TwitchBot.Tests/Nullinside.Api.TwitchBot.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.11" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.11" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.13" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.13" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1"/>
<PackageReference Include="Moq" Version="4.20.72"/>
<PackageReference Include="NUnit" Version="4.2.2"/>
Expand Down
38 changes: 14 additions & 24 deletions src/Nullinside.Api.TwitchBot/Model/NullinsideContextExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,30 +161,20 @@ private static async Task<int> UpdateOAuthInDatabase(this INullinsideContext db,
/// <param name="stoppingToken">The stopping token.</param>
public static async Task SaveTwitchBans(this INullinsideContext db, string channelId,
IEnumerable<(string Id, string Username)> bannedUsers, string reason, CancellationToken stoppingToken = new()) {
List<string> banUserIds = bannedUsers.Select(b => b.Id).ToHashSet().ToList();
HashSet<string?> existingUsers = db.TwitchUser
.AsNoTracking()
.Where(u => null != u.TwitchId && banUserIds.Contains(u.TwitchId))
.Select(u => u.TwitchId)
.ToHashSet();

List<TwitchUser> nonExistantUsers = banUserIds
.Where(u => !existingUsers.Contains(u))
.Select(c => new TwitchUser {
TwitchId = c,
TwitchUsername = bannedUsers.FirstOrDefault(u => string.Equals(u.Id, c)).Username
})
.ToList();

db.TwitchUser.UpdateRange(nonExistantUsers);
db.TwitchBan
.AddRange(banUserIds
.Select(i => new TwitchBan {
ChannelId = channelId,
BannedUserTwitchId = i,
Reason = reason,
Timestamp = DateTime.UtcNow
}));
await db.TwitchUser.UpsertRange(
bannedUsers.Select(c => new TwitchUser { TwitchId = c.Id, TwitchUsername = c.Username })
.ToList()
)
.On(v => new { v.TwitchId })
.RunAsync(stoppingToken);

db.TwitchBan.AddRange(
bannedUsers.Select(i => new TwitchBan {
ChannelId = channelId,
BannedUserTwitchId = i.Id,
Reason = reason,
Timestamp = DateTime.UtcNow
}));
await db.SaveChangesAsync(stoppingToken);
}
}
5 changes: 3 additions & 2 deletions src/Nullinside.Api.TwitchBot/Nullinside.Api.TwitchBot.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="FlexLabs.EntityFrameworkCore.Upsert" Version="8.1.2" />
<PackageReference Include="log4net.Ext.Json" Version="2.0.10.1"/>
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.11" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.11">
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.13" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.13">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
2 changes: 1 addition & 1 deletion src/nullinside-api
Open in desktop
Submodule nullinside-api updated 4 files
+1 −1 src/Nullinside.Api.Common.AspNetCore/Nullinside.Api.Common.AspNetCore.csproj
+2 −2 src/Nullinside.Api.Model/Nullinside.Api.Model.csproj
+2 −2 src/Nullinside.Api.Tests/Nullinside.Api.Tests.csproj
+1 −1 src/Nullinside.Api/Nullinside.Api.csproj