Skip to content

Commit b4df061

Browse files
committed
move some common logic into an extension method
1 parent 307eeea commit b4df061

File tree

3 files changed

+13
-16
lines changed

3 files changed

+13
-16
lines changed

TASVideos.Data/Entity/User.cs

+11
Original file line numberDiff line numberDiff line change
@@ -221,4 +221,15 @@ public static IQueryable<User> ThatAreNotBanned(this IQueryable<User> query)
221221
=> query.Where(u => !u.BannedUntil.HasValue || u.BannedUntil < DateTime.UtcNow);
222222

223223
public static bool IsBanned(this User user) => user.BannedUntil.HasValue && user.BannedUntil > DateTime.UtcNow;
224+
225+
public static IQueryable<SubmissionAuthor> ToSubmissionAuthors(this IQueryable<User> query, int submissionId, IList<string> authors)
226+
=> query
227+
.ForUsers(authors)
228+
.Select(u => new SubmissionAuthor
229+
{
230+
SubmissionId = submissionId,
231+
UserId = u.Id,
232+
Author = u,
233+
Ordinal = authors.IndexOf(u.UserName)
234+
});
224235
}

TASVideos/Pages/Submissions/Edit.cshtml.cs

+1-8
Original file line numberDiff line numberDiff line change
@@ -312,14 +312,7 @@ public async Task<IActionResult> OnPost()
312312

313313
submission.SubmissionAuthors.Clear();
314314
submission.SubmissionAuthors.AddRange(await db.Users
315-
.ForUsers(Submission.Authors)
316-
.Select(u => new SubmissionAuthor
317-
{
318-
SubmissionId = submission.Id,
319-
UserId = u.Id,
320-
Author = u,
321-
Ordinal = Submission.Authors.IndexOf(u.UserName)
322-
})
315+
.ToSubmissionAuthors(submission.Id, Submission.Authors)
323316
.ToListAsync());
324317

325318
submission.GenerateTitle();

TASVideos/Pages/Submissions/Submit.cshtml.cs

+1-8
Original file line numberDiff line numberDiff line change
@@ -152,14 +152,7 @@ await wikiPages.Add(new WikiCreateRequest
152152
});
153153

154154
db.SubmissionAuthors.AddRange(await db.Users
155-
.ForUsers(Authors)
156-
.Select(u => new SubmissionAuthor
157-
{
158-
SubmissionId = submission.Id,
159-
UserId = u.Id,
160-
Author = u,
161-
Ordinal = Authors.IndexOf(u.UserName)
162-
})
155+
.ToSubmissionAuthors(submission.Id, Authors)
163156
.ToListAsync());
164157

165158
submission.GenerateTitle();

0 commit comments

Comments
 (0)