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

Support associating release notes with one or more countries #827

Merged
merged 2 commits into from
Nov 28, 2023
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
10 changes: 9 additions & 1 deletion nucleus/rna/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class Meta:

class NoteAdmin(admin.ModelAdmin):
form = NoteAdminForm
filter_horizontal = ["releases"]
filter_horizontal = ["releases", "relevant_countries"]
list_display = ("id", "bug", "tag", "note", "created")
list_display_links = ("id",)
list_filter = ("tag", "is_known_issue", "releases__product", "releases__version", "progressive_rollout")
Expand Down Expand Up @@ -148,5 +148,13 @@ def set_to_private(self, request, queryset):
obj.save()


class CountryAdmin(admin.ModelAdmin):
search_fields = ("name", "code")

class Meta:
model = models.Country


admin.site.register(models.Country, CountryAdmin)
admin.site.register(models.Note, NoteAdmin)
admin.site.register(models.Release, ReleaseAdmin)
28 changes: 28 additions & 0 deletions nucleus/rna/migrations/0008_add_country_model.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# Generated by Django 3.2.23 on 2023-11-23 13:24

from django.db import migrations, models

import django_extensions.db.fields


class Migration(migrations.Migration):
dependencies = [
("rna", "0007_release_reviewed_by_release_manager"),
]

operations = [
migrations.CreateModel(
name="Country",
fields=[
("id", models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")),
("created", django_extensions.db.fields.CreationDateTimeField(auto_now_add=True)),
("modified", models.DateTimeField(blank=True, db_index=True, editable=False)),
("name", models.CharField(max_length=128)),
("code", models.CharField(help_text="3166-1-alpha-2 code", max_length=2)),
],
),
migrations.AddConstraint(
model_name="country",
constraint=models.UniqueConstraint(fields=("name", "code"), name="unique_country_name_for_code"),
),
]
279 changes: 279 additions & 0 deletions nucleus/rna/migrations/0009_data_bootstrap_countries_and_codes.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,279 @@
# Generated by Django 3.2.23 on 2023-11-23 13:24

from django.db import migrations
from django.utils.timezone import now

iso_3166_1_alpha_2_country_codes = (
# Source https://datahub.io/core/country-list
# Public domain license: https://opendatacommons.org/licenses/pddl/
("Afghanistan", "AF"),
("Åland Islands", "AX"),
("Albania", "AL"),
("Algeria", "DZ"),
("American Samoa", "AS"),
("Andorra", "AD"),
("Angola", "AO"),
("Anguilla", "AI"),
("Antarctica", "AQ"),
("Antigua and Barbuda", "AG"),
("Argentina", "AR"),
("Armenia", "AM"),
("Aruba", "AW"),
("Australia", "AU"),
("Austria", "AT"),
("Azerbaijan", "AZ"),
("Bahamas", "BS"),
("Bahrain", "BH"),
("Bangladesh", "BD"),
("Barbados", "BB"),
("Belarus", "BY"),
("Belgium", "BE"),
("Belize", "BZ"),
("Benin", "BJ"),
("Bermuda", "BM"),
("Bhutan", "BT"),
("Bolivia, Plurinational State of", "BO"),
("Bonaire, Sint Eustatius and Saba", "BQ"),
("Bosnia and Herzegovina", "BA"),
("Botswana", "BW"),
("Bouvet Island", "BV"),
("Brazil", "BR"),
("British Indian Ocean Territory", "IO"),
("Brunei Darussalam", "BN"),
("Bulgaria", "BG"),
("Burkina Faso", "BF"),
("Burundi", "BI"),
("Cambodia", "KH"),
("Cameroon", "CM"),
("Canada", "CA"),
("Cape Verde", "CV"),
("Cayman Islands", "KY"),
("Central African Republic", "CF"),
("Chad", "TD"),
("Chile", "CL"),
("China", "CN"),
("Christmas Island", "CX"),
("Cocos (Keeling) Islands", "CC"),
("Colombia", "CO"),
("Comoros", "KM"),
("Congo", "CG"),
("Congo, the Democratic Republic of the", "CD"),
("Cook Islands", "CK"),
("Costa Rica", "CR"),
("Côte d'Ivoire", "CI"),
("Croatia", "HR"),
("Cuba", "CU"),
("Curaçao", "CW"),
("Cyprus", "CY"),
("Czech Republic", "CZ"),
("Denmark", "DK"),
("Djibouti", "DJ"),
("Dominica", "DM"),
("Dominican Republic", "DO"),
("Ecuador", "EC"),
("Egypt", "EG"),
("El Salvador", "SV"),
("Equatorial Guinea", "GQ"),
("Eritrea", "ER"),
("Estonia", "EE"),
("Ethiopia", "ET"),
("Falkland Islands (Malvinas)", "FK"),
("Faroe Islands", "FO"),
("Fiji", "FJ"),
("Finland", "FI"),
("France", "FR"),
("French Guiana", "GF"),
("French Polynesia", "PF"),
("French Southern Territories", "TF"),
("Gabon", "GA"),
("Gambia", "GM"),
("Georgia", "GE"),
("Germany", "DE"),
("Ghana", "GH"),
("Gibraltar", "GI"),
("Greece", "GR"),
("Greenland", "GL"),
("Grenada", "GD"),
("Guadeloupe", "GP"),
("Guam", "GU"),
("Guatemala", "GT"),
("Guernsey", "GG"),
("Guinea", "GN"),
("Guinea-Bissau", "GW"),
("Guyana", "GY"),
("Haiti", "HT"),
("Heard Island and McDonald Islands", "HM"),
("Holy See (Vatican City State)", "VA"),
("Honduras", "HN"),
("Hong Kong", "HK"),
("Hungary", "HU"),
("Iceland", "IS"),
("India", "IN"),
("Indonesia", "ID"),
("Iran, Islamic Republic of", "IR"),
("Iraq", "IQ"),
("Ireland", "IE"),
("Isle of Man", "IM"),
("Israel", "IL"),
("Italy", "IT"),
("Jamaica", "JM"),
("Japan", "JP"),
("Jersey", "JE"),
("Jordan", "JO"),
("Kazakhstan", "KZ"),
("Kenya", "KE"),
("Kiribati", "KI"),
("Korea, Democratic People's Republic of", "KP"),
("Korea, Republic of", "KR"),
("Kuwait", "KW"),
("Kyrgyzstan", "KG"),
("Lao People's Democratic Republic", "LA"),
("Latvia", "LV"),
("Lebanon", "LB"),
("Lesotho", "LS"),
("Liberia", "LR"),
("Libya", "LY"),
("Liechtenstein", "LI"),
("Lithuania", "LT"),
("Luxembourg", "LU"),
("Macao", "MO"),
("Macedonia, the Former Yugoslav Republic of", "MK"),
("Madagascar", "MG"),
("Malawi", "MW"),
("Malaysia", "MY"),
("Maldives", "MV"),
("Mali", "ML"),
("Malta", "MT"),
("Marshall Islands", "MH"),
("Martinique", "MQ"),
("Mauritania", "MR"),
("Mauritius", "MU"),
("Mayotte", "YT"),
("Mexico", "MX"),
("Micronesia, Federated States of", "FM"),
("Moldova, Republic of", "MD"),
("Monaco", "MC"),
("Mongolia", "MN"),
("Montenegro", "ME"),
("Montserrat", "MS"),
("Morocco", "MA"),
("Mozambique", "MZ"),
("Myanmar", "MM"),
("Namibia", "NA"),
("Nauru", "NR"),
("Nepal", "NP"),
("Netherlands", "NL"),
("New Caledonia", "NC"),
("New Zealand", "NZ"),
("Nicaragua", "NI"),
("Niger", "NE"),
("Nigeria", "NG"),
("Niue", "NU"),
("Norfolk Island", "NF"),
("Northern Mariana Islands", "MP"),
("Norway", "NO"),
("Oman", "OM"),
("Pakistan", "PK"),
("Palau", "PW"),
("Palestine, State of", "PS"),
("Panama", "PA"),
("Papua New Guinea", "PG"),
("Paraguay", "PY"),
("Peru", "PE"),
("Philippines", "PH"),
("Pitcairn", "PN"),
("Poland", "PL"),
("Portugal", "PT"),
("Puerto Rico", "PR"),
("Qatar", "QA"),
("Réunion", "RE"),
("Romania", "RO"),
("Russian Federation", "RU"),
("Rwanda", "RW"),
("Saint Barthélemy", "BL"),
("Saint Helena, Ascension and Tristan da Cunha", "SH"),
("Saint Kitts and Nevis", "KN"),
("Saint Lucia", "LC"),
("Saint Martin (French part)", "MF"),
("Saint Pierre and Miquelon", "PM"),
("Saint Vincent and the Grenadines", "VC"),
("Samoa", "WS"),
("San Marino", "SM"),
("Sao Tome and Principe", "ST"),
("Saudi Arabia", "SA"),
("Senegal", "SN"),
("Serbia", "RS"),
("Seychelles", "SC"),
("Sierra Leone", "SL"),
("Singapore", "SG"),
("Sint Maarten (Dutch part)", "SX"),
("Slovakia", "SK"),
("Slovenia", "SI"),
("Solomon Islands", "SB"),
("Somalia", "SO"),
("South Africa", "ZA"),
("South Georgia and the South Sandwich Islands", "GS"),
("South Sudan", "SS"),
("Spain", "ES"),
("Sri Lanka", "LK"),
("Sudan", "SD"),
("Suriname", "SR"),
("Svalbard and Jan Mayen", "SJ"),
("Swaziland", "SZ"),
("Sweden", "SE"),
("Switzerland", "CH"),
("Syrian Arab Republic", "SY"),
("Taiwan, Province of China", "TW"),
("Tajikistan", "TJ"),
("Tanzania, United Republic of", "TZ"),
("Thailand", "TH"),
("Timor-Leste", "TL"),
("Togo", "TG"),
("Tokelau", "TK"),
("Tonga", "TO"),
("Trinidad and Tobago", "TT"),
("Tunisia", "TN"),
("Turkey", "TR"),
("Turkmenistan", "TM"),
("Turks and Caicos Islands", "TC"),
("Tuvalu", "TV"),
("Uganda", "UG"),
("Ukraine", "UA"),
("United Arab Emirates", "AE"),
("United Kingdom", "GB"),
("United States", "US"),
("United States Minor Outlying Islands", "UM"),
("Uruguay", "UY"),
("Uzbekistan", "UZ"),
("Vanuatu", "VU"),
("Venezuela, Bolivarian Republic of", "VE"),
("Viet Nam", "VN"),
("Virgin Islands, British", "VG"),
("Virgin Islands, U.S.", "VI"),
("Wallis and Futuna", "WF"),
("Western Sahara", "EH"),
("Yemen", "YE"),
("Zambia", "ZM"),
("Zimbabwe", "ZW"),
)


def forwards(apps, schema_editor):
Country = apps.get_model("rna.Country")
for name, code in iso_3166_1_alpha_2_country_codes:
Country.objects.create(name=name, code=code, modified=now())


def backwards(apps, schema_editor):
Country = apps.get_model("rna.Country")
Country.objects.all().delete()


class Migration(migrations.Migration):
dependencies = [
("rna", "0008_add_country_model"),
]

operations = [
migrations.RunPython(forwards, backwards),
]
25 changes: 25 additions & 0 deletions nucleus/rna/migrations/0010_note_only_applies_to_countries.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Generated by Django 3.2.23 on 2023-11-23 13:33

from django.db import migrations, models


class Migration(migrations.Migration):
dependencies = [
("rna", "0009_data_bootstrap_countries_and_codes"),
]

operations = [
migrations.AddField(
model_name="note",
name="relevant_countries",
field=models.ManyToManyField(
blank=True,
help_text=(
"Select the countries where this Note applies, as part of a "
"progressive rollout. This info will only be shown on the Release "
"page if 'Progressive rollout', above, is ticked."
),
to="rna.Country",
),
),
]
16 changes: 16 additions & 0 deletions nucleus/rna/migrations/0011_alter_country_options.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Generated by Django 3.2.23 on 2023-11-23 13:38

from django.db import migrations


class Migration(migrations.Migration):
dependencies = [
("rna", "0010_note_only_applies_to_countries"),
]

operations = [
migrations.AlterModelOptions(
name="country",
options={"ordering": ["name"], "verbose_name_plural": "Countries"},
),
]
Loading