Skip to content

Make labels optional. #17

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make labels optional. #17

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
18 changes: 8 additions & 10 deletions src/IssueInProgressDaysLabeler.Model/Github/GithubClientAdapter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,26 +28,24 @@ public async Task<IReadOnlyCollection<IssueUpdateWithNumber>> GetIssuesToUpdate(
{
var allIssues = new List<Issue>(capacity: 100);

foreach (var label in labels)
var issueRequest = new RepositoryIssueRequest
{
var issueRequest = new RepositoryIssueRequest
{
Since = since,
State = ItemStateFilter.All
};
Since = since,
State = ItemStateFilter.All
};

foreach (var label in labels)
Copy link
Owner

@ChipoDeil ChipoDeil Dec 7, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Не будет работать с несколькими лейблами. Он будет добавлять в лист каждый раз по лейблу, и фильтровать задачи где есть только набор лейблов, вместо одного

Copy link
Author

@GureevLeonid GureevLeonid Dec 7, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, thanks, i will fix it

issueRequest.Labels.Add(label);

var issues = await ApiHelpers.ExecuteWithRetryAndDelay(() => _gitHubClient
var issues = await ApiHelpers.ExecuteWithRetryAndDelay(() => _gitHubClient
.Issue
.GetAllForRepository(
_repositoryOwner,
_repositoryName,
issueRequest),
retryCount: 3);
retryCount: 3);

allIssues.AddRange(issues);
}
allIssues.AddRange(issues);

return allIssues
// TODO: make api call to filter assignees (now github api is not ready)
Expand Down
48 changes: 24 additions & 24 deletions src/IssueInProgressDaysLabeler.Model/Settings/Options.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,33 +2,33 @@

namespace IssueInProgressDaysLabeler.Model.Settings
{
public class Options
{
[Option("github-repository", Required = true, HelpText = "Repository to increment days in and owner")]
public virtual string GithubRepositoryName { get; set; } = default!;
public class Options
{
[Option("github-repository", Required = true, HelpText = "Repository to increment days in and owner")]
public virtual string GithubRepositoryName { get; set; } = default!;

[Option("days-mode", Required = true, HelpText = "Enum: EveryDay, EveryDayExceptWeekend, RussianCalendar")]
public virtual string DaysMode { get; set; } = default!;
[Option("days-mode", Required = true, HelpText = "Enum: EveryDay, EveryDayExceptWeekend, RussianCalendar")]
public virtual string DaysMode { get; set; } = default!;

[Option("labels", Required = true, HelpText = "Suitable labels for issue days incrementation")]
public virtual string Labels { get; set; } = default!;
[Option("labels", Required = false, HelpText = "Suitable labels for issue days incrementation (all issues by default)")]
public virtual string? Labels { get; set; }

[Option("since-days",
Required = false,
HelpText = "Only issues updated during this last number of days are processed (none restriction by default)")]
public virtual string DaysSince { get; set; } = default!;
[Option("since-days",
Required = false,
HelpText = "Only issues updated during this last number of days are processed (none restriction by default)")]
public virtual string DaysSince { get; set; } = default!;

[Option("auto-cleanup",
Required = false,
HelpText = "Cleanup labels from issues in closed state (false by default)")]
public virtual string AutoCleanup { get; set; } = default!;
[Option("auto-cleanup",
Required = false,
HelpText = "Cleanup labels from issues in closed state (false by default)")]
public virtual string AutoCleanup { get; set; } = default!;

[Option("github-token", Required = true, HelpText = "Github secret token")]
public virtual string GithubToken { get; set; } = default!;
[Option("github-token", Required = true, HelpText = "Github secret token")]
public virtual string GithubToken { get; set; } = default!;

[Option("label-to-increment",
Required = true,
HelpText = @"Label that will be added to issue, for example ""In progress: {0} days"", placeholder is required")]
public virtual string LabelToIncrement { get; set; } = default!;
}
}
[Option("label-to-increment",
Required = true,
HelpText = @"Label that will be added to issue, for example ""In progress: {0} days"", placeholder is required")]
public virtual string LabelToIncrement { get; set; } = default!;
}
}
9 changes: 4 additions & 5 deletions src/IssueInProgressDaysLabeler.Model/Settings/SettingsParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,14 @@ public SettingsParser(ILogger<SettingsParser> logger)
? default(DateTimeOffset?)
: DateTimeOffset.UtcNow - TimeSpan.FromDays(int.Parse(options.DaysSince));

var labels = JsonConvert.DeserializeObject<string[]>(options.Labels);

if (labels == null)
throw new InvalidOperationException("labels can not be deserialized");
var labels = options.Labels == null
? Array.Empty<string>()
: JsonConvert.DeserializeObject<string[]>(options.Labels);

return new(
owner,
repository,
labels,
labels!,
options.GithubToken,
Enum.Parse<DaysMode>(options.DaysMode),
options.LabelToIncrement,
Expand Down