Skip to content
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

Unavailable overrides manual override #130

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Unavailable overrides manual override #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c1b9a8
Rototron: Reconfigure how unavailable and manual overrides react
wolfsage Aug 22, 2020
49b2553
'assign rotor': Allow /force to override unavailability
wolfsage Aug 22, 2020
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
41 changes: 38 additions & 3 deletions lib/Synergy/Reactor/Rototron.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,19 +116,21 @@ after register_with_hub => sub ($self, @) {
};

sub handle_manual_assignment ($self, $event) {
my ($username, $rotor_name, $from, $to);
my ($username, $rotor_name, $from, $to, $force);

my $ymd_re = qr{ [0-9]{4} - [0-9]{2} - [0-9]{2} }x;
if ($event->text =~ /^assign rotor (\S+) to (\S+) on ($ymd_re)\z/) {
if ($event->text =~ /^assign rotor (\S+) to (\S+) on ($ymd_re) (\/f(?:orce))?\z/) {
$rotor_name = $1;
$username = $2;
$from = parse_date_for_user($3, $event->from_user);
$to = parse_date_for_user($3, $event->from_user);
} elsif ($event->text =~ /^assign rotor (\S+) to (\S+) from ($ymd_re) to ($ymd_re)\z/) {
$force = $4;
} elsif ($event->text =~ /^assign rotor (\S+) to (\S+) from ($ymd_re) to ($ymd_re) (\/f(?:orce))?\z/) {
$rotor_name = $1;
$username = $2;
$from = parse_date_for_user($3, $event->from_user);
$to = parse_date_for_user($4, $event->from_user);
$force = $5;
} else {
return;
}
Expand Down Expand Up @@ -161,6 +163,39 @@ sub handle_manual_assignment ($self, $event) {
$assign_to = $target->username;
}

my (@okay, @errors);

for my $date (@dates) {
if ($force) {
# Remove any 'unavailable on' overrides
$self->availability_checker->set_user_available_on(
$assign_to,
$date,
);
} else {
my $debug = [];
if ($self->availability_checker->user_is_available_on($assign_to, $date, $debug)) {
push @okay, $date;
} else {
push @errors, @$debug;
}
}
}

@dates = @okay;

unless (@dates) {
$event->reply("$username was not available for any of those dates:\n" . join("\n", @errors));
$event->reply("retry with /force at the end to override");

return;
}

if (@errors) {
$event->reply("$username was not available for these dates:\n" . join("\n", @errors));
$event->reply("retry with /force at the end to override");
}

$self->availability_checker->update_manual_assignments({
$rotor_name => { map {; $_->ymd => $assign_to } @dates },
});
Expand Down
60 changes: 48 additions & 12 deletions lib/Synergy/Rototron.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,14 +457,24 @@ package Synergy::Rototron::Rotor {

if (my $username = $self->manual_assignment_for($rotor, $day)) {
my ($user) = grep {; $_->{username} eq $username } $self->_full_staff->@*;
return $user if $user;

$Logger->log([
"no user named %s, but that name is assigned for %s on %s",
$username,
$rotor->name,
$day->ymd,
]);

if ($user && $self->user_is_blocked_on($user->{username}, $day)) {
$Logger->log([
"user %s manually assigned but they are marked unavailable for %s on %s, skipping",
$user->{username},
$rotor->name,
$day->ymd,
]);
} elsif ($user) {
return $user;
} else {
$Logger->log([
"no user named %s, but that name is assigned for %s on %s",
$username,
$rotor->name,
$day->ymd,
]);
}
}

my $weekn = _week_of_date($day);
Expand Down Expand Up @@ -665,24 +675,50 @@ package Synergy::Rototron::AvailabilityChecker {
return;
}

sub user_is_available_on ($self, $username, $dt) {
sub user_is_available_on ($self, $username, $dt, $debug = []) {
my $ymd = $dt->ymd;

unless ($self->user_typically_works_on($username, $dt)) {
push @$debug, "$username does not work on " . $dt->ymd;
return 0;
}

if ($self->user_has_leave_on($username, $dt)) {
push @$debug, "$username has leave scheduled on " . $dt->ymd;
return 0;
}

if ($self->user_is_blocked_on($username, $dt)) {
push @$debug, "$username is marked unavailable on " . $dt->ymd;
return 0;
}

return 1;
}

sub user_typically_works_on ($self, $username, $dt) {
if (my $user = $self->user_directory->user_named($username)) {
return 0 unless $user->hours_for_dow($dt->day_of_week);
return 1 if $user->hours_for_dow($dt->day_of_week);
}

return 0;
}

sub user_has_leave_on ($self, $username, $dt) {
my $leave = $self->_leave_days;
return 0 if $leave->{$username}{$dt->ymd};

return 1 if $leave->{$username}{$dt->ymd};
}

sub user_is_blocked_on ($self, $username, $dt) {
my ($count) = $self->_dbh->selectrow_array(
q{SELECT COUNT(*) FROM blocked_days WHERE username = ? AND date = ?},
undef,
$username,
$dt->ymd,
);

return $count == 0;
return $count ? 1 : 0;
}

sub set_user_unavailable_on ($self, $username, $dt, $reason = undef) {
Expand Down