Skip to content
This repository was archived by the owner on Apr 13, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
54 changes: 25 additions & 29 deletions src/git_portfolio/github_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class AbstractGithubService(abc.ABC):
def list_issues_from_repo(
self,
github_repo: str,
request: il.IssueListValidRequest | il.IssueListInvalidRequest,
request: il.IssueListValidRequest,
) -> list[i.Issue]:
"""Return list of issues from one repository."""
raise NotImplementedError # pragma: no cover
Expand Down Expand Up @@ -134,43 +134,39 @@ def create_issue_from_repo(self, github_repo: str, issue: i.Issue) -> str:
def list_issues_from_repo(
self,
github_repo: str,
request: il.IssueListValidRequest | il.IssueListInvalidRequest,
request: il.IssueListValidRequest,
) -> list[i.Issue]:
"""Return list of issues from one repository."""
if isinstance(request, il.IssueListValidRequest):
repo = self._get_repo(github_repo)

domain_issues = []
if not request.filters:
issues = list(repo.issues())
for issue in issues:
labels = {label.name for label in issue.labels()}
domain_issues.append(
i.Issue(issue.number, issue.title, issue.body, labels)
)
return issues

obj = request.filters.get("obj__eq")
state = request.filters.get("state__eq")
title_query = request.filters.get("title__contains")
issues = list(repo.issues(state=state))

if obj == "issue":
issues = [issue for issue in issues if issue.pull_request_urls is None]
elif obj == "pull request":
issues = [issue for issue in issues if issue.pull_request_urls]

if title_query:
issues = [issue for issue in issues if title_query in issue.title]
repo = self._get_repo(github_repo)

domain_issues = []
if not request.filters:
issues = list(repo.issues())
for issue in issues:
labels = {label.name for label in issue.labels()}
domain_issues.append(
i.Issue(issue.number, issue.title, issue.body, labels)
)
return issues

obj = request.filters.get("obj__eq")
state = request.filters.get("state__eq")
title_query = request.filters.get("title__contains")
issues = list(repo.issues(state=state))

if obj == "issue":
issues = [issue for issue in issues if issue.pull_request_urls is None]
elif obj == "pull request":
issues = [issue for issue in issues if issue.pull_request_urls]

if title_query:
issues = [issue for issue in issues if title_query in issue.title]

for issue in issues:
labels = {label.name for label in issue.labels()}
domain_issues.append(i.Issue(issue.number, issue.title, issue.body, labels))

return domain_issues
return []
return domain_issues

def close_issues_from_repo(
self, github_repo: str, domain_issues: list[i.Issue]
Expand Down
2 changes: 1 addition & 1 deletion src/git_portfolio/use_cases/git.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def execute(
if popen.returncode == 0:
if stdout:
stdout_str = stdout.decode("utf-8")
output += f"{stdout_str}\n"
output += f"{stdout_str}"
else:
output += f"{command} successful.\n"
responses.append(res.ResponseSuccess(output))
Expand Down
12 changes: 0 additions & 12 deletions tests/test_github_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -379,18 +379,6 @@ def test_list_issues_from_repo_obj_filter(
assert response[0].title == DOMAIN_ISSUES[3].title


def test_list_issues_from_repo_invalid_request(
domain_gh_conn_settings: list[cs.GhConnectionSettings],
mock_github3_login: MockerFixture,
) -> None:
"""It returns empty result."""
response = gs.GithubService(domain_gh_conn_settings[0]).list_issues_from_repo(
REPO, il.IssueListInvalidRequest()
)

assert response == []


def test_list_issues_from_repo_no_filter_request(
mocker: MockerFixture,
domain_gh_conn_settings: list[cs.GhConnectionSettings],
Expand Down
2 changes: 1 addition & 1 deletion tests/use_cases/test_git.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def test_execute_success(mock_popen: MockerFixture) -> None:

assert len(responses) == 2
assert isinstance(responses[0], res.ResponseSuccess)
assert responses[0].value == f"{REPO_NAME}: some output\n"
assert responses[0].value == f"{REPO_NAME}: some output"


def test_execute_success_no_output(mock_popen: MockerFixture) -> None:
Expand Down