Skip to content

LITE-32775: Adding queued status to reports #38

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

LITE-32775: Adding queued status to reports #38

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
5 changes: 2 additions & 3 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
needs: [tests]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up Python 3.10.1
Expand All @@ -57,9 +57,8 @@ jobs:
run: |
sed -i 's/\/home\/runner\/work\/connect-reports\/connect-reports\//\/github\/workspace\//g' coverage.xml
- name: SonarCloud Scan
uses: SonarSource/sonarcloud-github-action@master
uses: SonarSource/sonarqube-scan-action@v6
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
- name: SonarQube Quality Gate check
uses: sonarsource/sonarqube-quality-gate-action@master
Expand Down
8 changes: 8 additions & 0 deletions reports.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,10 @@
"value": "failed",
"label": "Failed"
},
{
"value": "queued",
"label": "Queued"
},
{
"value": "scheduled",
"label": "Scheduled"
Expand Down Expand Up @@ -237,6 +241,10 @@
"value": "pending",
"label": "Pending"
},
{
"value": "queued",
"label": "Queued"
},
{
"value": "approved",
"label": "Approved"
Expand Down
2 changes: 1 addition & 1 deletion reports/fulfillment_requests/entrypoint.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def generate(


def _get_requests(client, parameters):
all_status = ['tiers_setup', 'inquiring', 'pending', 'approved', 'failed']
all_status = ['tiers_setup', 'inquiring', 'pending', 'queued', 'approved', 'failed']

query = R()
query &= R().created.ge(parameters['date']['after'])
Expand Down
2 changes: 1 addition & 1 deletion reports/fulfillment_requests_line_item/entrypoint.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def generate(


def _get_requests(client, parameters):
all_types = ['tiers_setup', 'inquiring', 'pending', 'approved', 'failed']
all_types = ['tiers_setup', 'inquiring', 'pending', 'queued', 'approved', 'failed']

query = R()
query &= R().created.ge(parameters['date']['after'])
Expand Down
6 changes: 3 additions & 3 deletions tests/test_fulfillment_requests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def test_generate(progress, client_factory, response_factory, ff_request):
responses.append(
response_factory(
query='and(ge(created,2020-12-01T00:00:00),le(created,2021-01-01T00:00:00),in(status,'
'(tiers_setup,inquiring,pending,approved,failed)))',
'(tiers_setup,inquiring,pending,queued,approved,failed)))',
value=[ff_request],
),
)
Expand Down Expand Up @@ -121,7 +121,7 @@ def test_generate_csv_renderer(progress, client_factory, response_factory, ff_re
responses.append(
response_factory(
query='and(ge(created,2020-12-01T00:00:00),le(created,2021-01-01T00:00:00),in(status,'
'(tiers_setup,inquiring,pending,approved,failed)))',
'(tiers_setup,inquiring,pending,queued,approved,failed)))',
value=[ff_request],
),
)
Expand All @@ -146,7 +146,7 @@ def test_generate_json_renderer(progress, client_factory, response_factory, ff_r
responses.append(
response_factory(
query='and(ge(created,2020-12-01T00:00:00),le(created,2021-01-01T00:00:00),in(status,'
'(tiers_setup,inquiring,pending,approved,failed)))',
'(tiers_setup,inquiring,pending,queued,approved,failed)))',
value=[ff_request],
),
)
Expand Down
6 changes: 3 additions & 3 deletions tests/test_fulfillment_requests_line_item.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def test_generate(progress, client_factory, response_factory, ff_request):
responses.append(
response_factory(
query='and(ge(created,2020-12-01T00:00:00),le(created,2021-01-01T00:00:00),in(status,'
'(tiers_setup,inquiring,pending,approved,failed)))',
'(tiers_setup,inquiring,pending,queued,approved,failed)))',
value=[ff_request],
),
)
Expand Down Expand Up @@ -121,7 +121,7 @@ def test_generate_csv_renderer(progress, client_factory, response_factory, ff_re
responses.append(
response_factory(
query='and(ge(created,2020-12-01T00:00:00),le(created,2021-01-01T00:00:00),in(status,'
'(tiers_setup,inquiring,pending,approved,failed)))',
'(tiers_setup,inquiring,pending,queued,approved,failed)))',
value=[ff_request],
),
)
Expand All @@ -146,7 +146,7 @@ def test_generate_json_renderer(progress, client_factory, response_factory, ff_r
responses.append(
response_factory(
query='and(ge(created,2020-12-01T00:00:00),le(created,2021-01-01T00:00:00),in(status,'
'(tiers_setup,inquiring,pending,approved,failed)))',
'(tiers_setup,inquiring,pending,queued,approved,failed)))',
value=[ff_request],
),
)
Expand Down
Loading