zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-07-03 09:43:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

move agency function to be inside Federal Agency model

Browse source
This commit is contained in:
CocoByte 2024-06-18 11:56:19 -06:00
parent 42efc73722
commit 732cf2379b
No known key found for this signature in database
GPG key ID: BBFAA2526384C97F
3 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/registrar/migrations/0103_portfolio_domaininformation_portfolio_and_more.py
View file

@ -1,9 +1,9 @@
# Generated by Django 4.2.10 on 2024-06-18 03:19 # Generated by Django 4.2.10 on 2024-06-18 17:55
from django.conf import settings from django.conf import settings
from django.db import migrations, models from django.db import migrations, models
import django.db.models.deletion import django.db.models.deletion
import registrar.models.portfolio import registrar.models.federal_agency
class Migration(migrations.Migration): class Migration(migrations.Migration):
@ -136,7 +136,7 @@ class Migration(migrations.Migration):
( (
"federal_agency", "federal_agency",
models.ForeignKey( models.ForeignKey(
default=registrar.models.portfolio.get_default_federal_agency, default=registrar.models.federal_agency.FederalAgency.get_non_federal_agency,
help_text="Associated federal agency", help_text="Associated federal agency",
on_delete=django.db.models.deletion.PROTECT, on_delete=django.db.models.deletion.PROTECT,
to="registrar.federalagency", to="registrar.federalagency",

5
src/registrar/models/federal_agency.py
View file

@ -230,3 +230,8 @@ class FederalAgency(TimeStampedModel):
FederalAgency.objects.bulk_create(agencies) FederalAgency.objects.bulk_create(agencies)
except Exception as e: except Exception as e:
logger.error(f"Error creating federal agencies: {e}") logger.error(f"Error creating federal agencies: {e}")
@classmethod
def get_non_federal_agency(cls):
"""Returns the non-federal agency."""
return FederalAgency.objects.filter(agency="Non-Federal Agency").first()

8
src/registrar/models/portfolio.py
View file

@ -6,9 +6,9 @@ from registrar.models.federal_agency import FederalAgency
from .utility.time_stamped_model import TimeStampedModel from .utility.time_stamped_model import TimeStampedModel
def get_default_federal_agency(): # def get_default_federal_agency():
"""returns non-federal agency""" # """returns non-federal agency"""
return FederalAgency.objects.filter(agency="Non-Federal Agency").first() # return FederalAgency.objects.filter(agency="Non-Federal Agency").first()
class Portfolio(TimeStampedModel): class Portfolio(TimeStampedModel):
@ -35,7 +35,7 @@ class Portfolio(TimeStampedModel):
on_delete=models.PROTECT, on_delete=models.PROTECT,
help_text="Associated federal agency", help_text="Associated federal agency",
unique=False, unique=False,
default=get_default_federal_agency, default=FederalAgency.get_non_federal_agency,
) )
organization_type = models.CharField( organization_type = models.CharField(