Skip to content

Commit 57499db

Browse files
akodeliaAgostina
authored andcommitted
LITE-32775: Adding queued status to reports
1 parent b408690 commit 57499db

File tree

6 files changed

+18
-11
lines changed

6 files changed

+18
-11
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
needs: [tests]
3939
runs-on: ubuntu-latest
4040
steps:
41-
- uses: actions/checkout@v2
41+
- uses: actions/checkout@v4
4242
with:
4343
fetch-depth: 0
4444
- name: Set up Python 3.10.1
@@ -57,9 +57,8 @@ jobs:
5757
run: |
5858
sed -i 's/\/home\/runner\/work\/connect-reports\/connect-reports\//\/github\/workspace\//g' coverage.xml
5959
- name: SonarCloud Scan
60-
uses: SonarSource/sonarcloud-github-action@master
60+
uses: SonarSource/sonarqube-scan-action@v6
6161
env:
62-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6362
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
6463
- name: SonarQube Quality Gate check
6564
uses: sonarsource/sonarqube-quality-gate-action@master

reports.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,10 @@
117117
"value": "failed",
118118
"label": "Failed"
119119
},
120+
{
121+
"value": "queued",
122+
"label": "Queued"
123+
},
120124
{
121125
"value": "scheduled",
122126
"label": "Scheduled"
@@ -237,6 +241,10 @@
237241
"value": "pending",
238242
"label": "Pending"
239243
},
244+
{
245+
"value": "queued",
246+
"label": "Queued"
247+
},
240248
{
241249
"value": "approved",
242250
"label": "Approved"

reports/fulfillment_requests/entrypoint.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def generate(
5252

5353

5454
def _get_requests(client, parameters):
55-
all_status = ['tiers_setup', 'inquiring', 'pending', 'approved', 'failed']
55+
all_status = ['tiers_setup', 'inquiring', 'pending', 'queued', 'approved', 'failed']
5656

5757
query = R()
5858
query &= R().created.ge(parameters['date']['after'])

reports/fulfillment_requests_line_item/entrypoint.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def generate(
5353

5454

5555
def _get_requests(client, parameters):
56-
all_types = ['tiers_setup', 'inquiring', 'pending', 'approved', 'failed']
56+
all_types = ['tiers_setup', 'inquiring', 'pending', 'queued', 'approved', 'failed']
5757

5858
query = R()
5959
query &= R().created.ge(parameters['date']['after'])

tests/test_fulfillment_requests.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def test_generate(progress, client_factory, response_factory, ff_request):
4747
responses.append(
4848
response_factory(
4949
query='and(ge(created,2020-12-01T00:00:00),le(created,2021-01-01T00:00:00),in(status,'
50-
'(tiers_setup,inquiring,pending,approved,failed)))',
50+
'(tiers_setup,inquiring,pending,queued,approved,failed)))',
5151
value=[ff_request],
5252
),
5353
)
@@ -121,7 +121,7 @@ def test_generate_csv_renderer(progress, client_factory, response_factory, ff_re
121121
responses.append(
122122
response_factory(
123123
query='and(ge(created,2020-12-01T00:00:00),le(created,2021-01-01T00:00:00),in(status,'
124-
'(tiers_setup,inquiring,pending,approved,failed)))',
124+
'(tiers_setup,inquiring,pending,queued,approved,failed)))',
125125
value=[ff_request],
126126
),
127127
)
@@ -146,7 +146,7 @@ def test_generate_json_renderer(progress, client_factory, response_factory, ff_r
146146
responses.append(
147147
response_factory(
148148
query='and(ge(created,2020-12-01T00:00:00),le(created,2021-01-01T00:00:00),in(status,'
149-
'(tiers_setup,inquiring,pending,approved,failed)))',
149+
'(tiers_setup,inquiring,pending,queued,approved,failed)))',
150150
value=[ff_request],
151151
),
152152
)

tests/test_fulfillment_requests_line_item.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def test_generate(progress, client_factory, response_factory, ff_request):
4747
responses.append(
4848
response_factory(
4949
query='and(ge(created,2020-12-01T00:00:00),le(created,2021-01-01T00:00:00),in(status,'
50-
'(tiers_setup,inquiring,pending,approved,failed)))',
50+
'(tiers_setup,inquiring,pending,queued,approved,failed)))',
5151
value=[ff_request],
5252
),
5353
)
@@ -121,7 +121,7 @@ def test_generate_csv_renderer(progress, client_factory, response_factory, ff_re
121121
responses.append(
122122
response_factory(
123123
query='and(ge(created,2020-12-01T00:00:00),le(created,2021-01-01T00:00:00),in(status,'
124-
'(tiers_setup,inquiring,pending,approved,failed)))',
124+
'(tiers_setup,inquiring,pending,queued,approved,failed)))',
125125
value=[ff_request],
126126
),
127127
)
@@ -146,7 +146,7 @@ def test_generate_json_renderer(progress, client_factory, response_factory, ff_r
146146
responses.append(
147147
response_factory(
148148
query='and(ge(created,2020-12-01T00:00:00),le(created,2021-01-01T00:00:00),in(status,'
149-
'(tiers_setup,inquiring,pending,approved,failed)))',
149+
'(tiers_setup,inquiring,pending,queued,approved,failed)))',
150150
value=[ff_request],
151151
),
152152
)

0 commit comments

Comments
 (0)