Skip to content

Restore gender filtering for SecAgent draws #265

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

Closed
PANDAJSR wants to merge 1 commit into from
Closed

Restore gender filtering for SecAgent draws #265

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
12 changes: 7 additions & 5 deletions SecRandom/Services/SecAgent/SecAgentHttpHostedService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,24 +188,25 @@ private async Task<JsonObject> DrawStudentsAsync(JsonObject arguments, Cancellat

var requestedCount = Math.Clamp(arguments["count"]?.GetValue<int>() ?? 1, 1, 100);
if (mode == "flash") requestedCount = 1;
var gender = StringArgument(arguments, "gender");
var includeTags = StringArray(arguments, "include_tags");
var excludeTags = StringArray(arguments, "exclude_tags");
var includeIds = StringArray(arguments, "include_ids");
var includeNames = StringArray(arguments, "include_names");
var listName = profileService.CurrentStudentList?.Name ?? string.Empty;
var temporaryCounts = temporaryRecordService.GetStudentCounts(listName, string.Empty, string.Empty);
var temporaryCounts = temporaryRecordService.GetStudentCounts(listName, gender, string.Empty);

var result = await InvokeAuthorizedAsync(SecurityOperation.QuickDrawStart, () =>
{
var draw = drawEngine.DrawStudent(requestedCount, student => Matches(student, includeTags, excludeTags, includeIds, includeNames)
var draw = drawEngine.DrawStudent(requestedCount, student => Matches(student, gender, includeTags, excludeTags, includeIds, includeNames)
&& !HasReachedTemporaryLimit(student, temporaryCounts), DrawSettingsType.QuickDraw, linkageDrawCoordinator.GetCourseName());
if (!draw.IsSuccess || draw.Result.Count == 0)
return Task.FromResult(draw);

profileService.RecordStudentHistory(draw.Result, DateTime.Now, requestedCount,
drawMethod: (int)configHandler.Data.QuickDrawSettings.DrawType,
courseName: linkageDrawCoordinator.GetCourseName());
temporaryRecordService.RecordStudents(listName, string.Empty, string.Empty, draw.Result);
temporaryRecordService.RecordStudents(listName, gender, string.Empty, draw.Result);
if (mode == "flash")
notificationService.QueueStudents(NotificationSettingsType.QuickDraw, linkageDrawCoordinator.GetCourseName(), draw.Result);
return Task.FromResult(draw);
Expand Down Expand Up @@ -242,11 +243,12 @@ private bool HasReachedTemporaryLimit(Student student, IReadOnlyDictionary<strin
return threshold > 0 && temporaryCounts.GetValueOrDefault(ProfileRecordIdentity.EnsureRecordId(student)) >= threshold;
}

private static bool Matches(Student student, IReadOnlyCollection<string> includeTags, IReadOnlyCollection<string> excludeTags,
private static bool Matches(Student student, string gender, IReadOnlyCollection<string> includeTags, IReadOnlyCollection<string> excludeTags,
IReadOnlyCollection<string> includeIds, IReadOnlyCollection<string> includeNames)
{
var tags = student.Tags.Split([',', ';', ' '], StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
return includeTags.All(tag => tags.Contains(tag, StringComparer.OrdinalIgnoreCase))
return (string.IsNullOrWhiteSpace(gender) || string.Equals(student.Gender, gender, StringComparison.OrdinalIgnoreCase))
&& includeTags.All(tag => tags.Contains(tag, StringComparer.OrdinalIgnoreCase))
&& excludeTags.All(tag => !tags.Contains(tag, StringComparer.OrdinalIgnoreCase))
&& (includeIds.Count == 0 || includeIds.Contains(student.Id, StringComparer.OrdinalIgnoreCase))
&& (includeNames.Count == 0 || includeNames.Contains(student.Name, StringComparer.OrdinalIgnoreCase));
Expand Down
Loading