From 601ded68ac4f4497025a35ec456f68dc4ba31146 Mon Sep 17 00:00:00 2001 From: Erin <121973038+erinysong@users.noreply.github.com> Date: Tue, 19 Mar 2024 15:19:44 -0700 Subject: [PATCH] Fix lint errors --- src/registrar/admin.py | 4 ++-- src/registrar/migrations/0077_federalagency.py | 2 ++ src/registrar/models/federal_agency.py | 10 +++++----- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/registrar/admin.py b/src/registrar/admin.py index ac1591584..9916027e6 100644 --- a/src/registrar/admin.py +++ b/src/registrar/admin.py @@ -15,8 +15,7 @@ from django.contrib.contenttypes.models import ContentType from django.urls import reverse from dateutil.relativedelta import relativedelta # type: ignore from epplibwrapper.errors import ErrorCode, RegistryError -from registrar.models import Contact, Domain, DomainRequest, DraftDomain, User, Website, FederalAgency -from registrar.utility import csv_export +from registrar.models import Contact, Domain, DomainRequest, DraftDomain, User, Website from registrar.utility.errors import FSMApplicationError, FSMErrorCodes from registrar.views.utility.mixins import OrderableFieldsMixin from django.contrib.admin.views.main import ORDER_VAR @@ -1789,6 +1788,7 @@ class VerifiedByStaffAdmin(ListHeaderAdmin): obj.requestor = request.user if request.user.is_authenticated else None super().save_model(request, obj, form, change) + class FederalAgencyAdmin(ListHeaderAdmin): list_display = ["agency"] search_fields = ["agency"] diff --git a/src/registrar/migrations/0077_federalagency.py b/src/registrar/migrations/0077_federalagency.py index 06c4e932d..0b3be0f70 100644 --- a/src/registrar/migrations/0077_federalagency.py +++ b/src/registrar/migrations/0077_federalagency.py @@ -6,10 +6,12 @@ from django.db import migrations, models from registrar.models import FederalAgency from typing import Any + # For linting: RunPython expects a function reference. def create_federal_agencies(apps, schema_editor) -> Any: FederalAgency.create_federal_agencies(apps, schema_editor) + class Migration(migrations.Migration): dependencies = [ diff --git a/src/registrar/models/federal_agency.py b/src/registrar/models/federal_agency.py index fc20a0c29..5ccd69b50 100644 --- a/src/registrar/models/federal_agency.py +++ b/src/registrar/models/federal_agency.py @@ -10,7 +10,7 @@ class FederalAgency(TimeStampedModel): class Meta: verbose_name = "Federal agency" verbose_name_plural = "Federal agencies" - + agency = models.CharField( null=True, blank=True, @@ -18,12 +18,12 @@ class FederalAgency(TimeStampedModel): ) def __str__(self) -> str: - return self.agency + return f"{self.agency}" # TODO: Update parameters to put in def create_federal_agencies(apps, schema_editor): """This method gets run from a data migration.""" - + # Hard to pass self to these methods as the calls from migrations # are only expecting apps and schema_editor, so we'll just define # apps, schema_editor in the local scope instead @@ -213,10 +213,10 @@ class FederalAgency(TimeStampedModel): "Woodrow Wilson International Center for Scholars", "World War I Centennial Commission", ] - + FederalAgency = apps.get_model("registrar", "FederalAgency") logger.info("Creating federal agency table.") - + try: for agency in AGENCIES: federal_agencies_list, _ = FederalAgency.objects.get_or_create(