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.

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

Sprint 60 - Spring break 2 #818

Merged
merged 47 commits into from
Jun 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
5ddf52d
Upgrading postgres to 16 (#737)
Santino-Trade Mar 22, 2024
db0bd02
TSS-1612: Prepare s3 client for migration (#751)
abarolo Mar 25, 2024
1da5978
Merge branch 'master' into rc/paas-migration
abarolo Mar 26, 2024
a8192c8
TSS-1615: Pingdom healthcheck (#752)
abarolo Mar 26, 2024
5c8b0d4
chore: add .copilot directory with files required for image building
Mar 28, 2024
955af38
TSS-1416: Xray & ASIM logging (#755)
abarolo Apr 2, 2024
61fbb9e
chore: force pipeline build
Mar 28, 2024
88f288e
chore: update packeto builder version
Mar 28, 2024
849cded
TSS-1615: celery config (#768)
abarolo Apr 3, 2024
4b454ea
TSS-1615: celery config (#768)
abarolo Apr 3, 2024
cfa3534
Merge master
ferozerub Apr 3, 2024
d7153e7
Merge branch 'rc-paas-migration' of github.com:uktrade/market-access-…
ferozerub Apr 3, 2024
623bfd7
Merge branch 'master' into rc-paas-migration
ferozerub Apr 5, 2024
0654f10
Add sample trace rate for APM
emileswarts Apr 22, 2024
51cceb6
Revert IAM roles to access public buckets
emileswarts Apr 24, 2024
5b6562e
remove unused import
emileswarts Apr 24, 2024
ae7c2bc
Update S3 client for documents
yusufsheiqh Apr 25, 2024
a8b9434
Trigger deploy
emileswarts May 1, 2024
ae30d51
Restore boto session config when on DBT Platform
emileswarts May 1, 2024
9353dcb
Debug download url for av scan
emileswarts May 1, 2024
74bbe61
Add more debug to see where this is failing
emileswarts May 2, 2024
f84d92f
Trigger deploy
emileswarts May 2, 2024
b23f7f1
Remove debugging
emileswarts May 2, 2024
ec561ba
Merge branch 'master' into rc-paas-migration
May 7, 2024
3f1ddee
chore: update poetry.lock and requirements files
May 7, 2024
776d0c5
Merge branch 'master' into rc-paas-migration
ferozerub May 17, 2024
18ec5bc
tss-1802: check history exists in publish flow (#797)
abarolo May 21, 2024
75c687f
update (#798)
abarolo May 21, 2024
8c84578
Increase gunicorn worker timeout (#799)
abarolo May 23, 2024
951bba7
Upgrade gevent (#800)
abarolo May 23, 2024
890dd32
Reduce worker connection count (#801)
abarolo May 24, 2024
af68c3e
(TEST) revert Procfile + remove temp file creation for s3 upload
May 24, 2024
842906d
Use in memory data upload to s3 (#802)
abarolo May 28, 2024
cb9aeec
PAAS Migration branch cleanup (#803)
abarolo May 29, 2024
49eaf4e
Merge branch 'master' into rc-paas-migration
May 29, 2024
441c5f3
Elastic APM is a boolean
emileswarts Jun 7, 2024
b6edeb8
Trigger deploy
emileswarts Jun 10, 2024
dfb5258
Trigger deploy
emileswarts Jun 10, 2024
ff66f38
trigger deploy
Jun 11, 2024
8523991
Merge branch 'master' into develop
ferozerub Jun 11, 2024
a5151ac
Merge branch 'rc-paas-migration' into develop
ferozerub Jun 11, 2024
0d93f38
Merge branch 'master' into develop
ferozerub Jun 18, 2024
9f5d9e1
tss-1747: Add Publisher and Approver as TeamMembers to barrier flow (…
abarolo Jun 18, 2024
fc667d2
TSS/1522: adding market distorting practices tag (#812)
EPedley Jun 19, 2024
dcf8326
tss-1874: Re-instate is top 100 priority in barrier downloads (#817)
abarolo Jun 25, 2024
1ef329f
TSS/1904: Updating Dependabots (#814)
EPedley Jun 25, 2024
a81bca1
Merge branch 'master' into develop
ferozerub Jun 25, 2024
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
1 change: 1 addition & 0 deletions api/barrier_downloads/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"summary": "Summary",
"link": "Link",
"status": "Status",
"is_top_priority": "Is Top 100 Priority",
"is_resolved_top_priority": "Is Resolved Top Priority",
"priority_level": "Priority",
"overseas_region": "Overseas Region",
Expand Down
4 changes: 4 additions & 0 deletions api/barrier_downloads/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ class CsvDownloadSerializer(serializers.Serializer):
modified_on = serializers.DateTimeField(format="%Y-%m-%d", allow_null=True)
tags = serializers.SerializerMethodField()
trade_direction = serializers.CharField(source="get_trade_direction_display")
is_top_priority = serializers.SerializerMethodField()
is_resolved_top_priority = serializers.SerializerMethodField()
government_organisations = serializers.SerializerMethodField()
progress_update_status = serializers.SerializerMethodField()
Expand All @@ -83,6 +84,9 @@ class CsvDownloadSerializer(serializers.Serializer):
valuation_assessment_explanation = serializers.SerializerMethodField()
commercial_value = serializers.IntegerField()

def get_is_top_priority(self, obj):
return obj.is_top_priority

def get_is_resolved_top_priority(self, obj):
return obj.top_priority_status == TOP_PRIORITY_BARRIER_STATUS.RESOLVED

Expand Down
Loading