Merge pull request #484 from GSA/nmb/5562-org-aliases

Add aliases field to Organization

Author: neilmb

app/forms.py

@@ -114,6 +114,11 @@ class OrganizationForm(FlaskForm):
         validators=[Optional()],
         default="",
     )
+    aliases = StringField(
+        "Organization aliases (comma-separated)",
+        validators=[Optional()],
+        default="",
+    )
 
     def __init__(self, *args, **kwargs):
         self.organization_id = kwargs.pop("organization_id", None)

app/routes.py

@@ -306,8 +306,13 @@ def remove_user(email):
     default="https://github.com/GSA/datagov-harvester/refs/heads/main/app/static/assets/img/placeholder-organization.png",
     help="Org Logo",
 )
+@click.option(
+    "--aliases",
+    default="",
+    help="Comma-separated list of organization aliases",
+)
 @click.option("--id", help="Org ID: should correspond to CKAN ORG ID")
-def cli_add_org(name, slug, logo, id):
+def cli_add_org(name, slug, logo, id, aliases):
     # let the web UI handle the validation, mostly for slug uniqueness
     form_data = MultiDict(
         {
@@ -316,6 +321,7 @@ def cli_add_org(name, slug, logo, id):
             "logo": logo,
             "description": "",
             "organization_type": "",
+            "aliases": aliases,
         }
     )
 
@@ -327,13 +333,7 @@ def cli_add_org(name, slug, logo, id):
                 click.echo(f" - {field}: {error}")
         return
 
-    org_contract = {
-        "name": form.name.data,
-        "slug": form.slug.data or None,
-        "logo": form.logo.data,
-        "description": form.description.data or None,
-        "organization_type": form.organization_type.data or None,
-    }
+    org_contract = make_new_org_contract(form)
     if id:
         org_contract["id"] = id
 
@@ -480,6 +480,7 @@ def make_new_org_contract(form):
         "logo": form.logo.data,
         "description": form.description.data or None,
         "organization_type": form.organization_type.data or None,
+        "aliases": [alias.strip() for alias in (form.aliases.data or "").split(",")],
     }
 
 
@@ -505,13 +506,7 @@ def add_organization():
     else:
         form = OrganizationForm(db_interface=db)
         if form.validate_on_submit():
-            new_org = {
-                "name": form.name.data,
-                "slug": form.slug.data,
-                "logo": form.logo.data,
-                "description": form.description.data or None,
-                "organization_type": form.organization_type.data or None,
-            }
+            new_org = make_new_org_contract(form)
             org = db.add_organization(new_org)
             if org:
                 flash(f"Added new organization with ID: {org.id}")

database/models.py

@@ -45,6 +45,7 @@ class Organization(db.Model):
             create_constraint=True,
         )
     )
+    aliases = db.Column(db.ARRAY(db.String))
     sources = db.relationship(
         "HarvestSource",
         backref=backref("org", lazy="joined"),

migrations/versions/1c80316df048_add_organization_aliases.py

@@ -0,0 +1,32 @@
+"""Add organization aliases
+
+Revision ID: 1c80316df048
+Revises: c69d6790efff
+Create Date: 2025-11-14 19:13:05.929225
+
+"""
+
+import sqlalchemy as sa
+from alembic import op
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = "1c80316df048"
+down_revision = "c69d6790efff"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("organization", schema=None) as batch_op:
+        batch_op.add_column(sa.Column("aliases", sa.ARRAY(sa.String()), nullable=True))
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("organization", schema=None) as batch_op:
+        batch_op.drop_column("aliases")
+    # ### end Alembic commands ###

tests/integration/app/test_forms.py

@@ -21,6 +21,26 @@ def test_add_organization_strips_string_fields(self, app, client, interface):
         assert org.description == "A sample description"
         assert org.slug == "test-slug"
 
+    def test_add_organization_aliases(self, app, client, interface):
+        app.config.update({"WTF_CSRF_ENABLED": False})
+        with client.session_transaction() as sess:
+            sess["user"] = "[email protected]"
+
+        data = {
+            "name": "Test Org",
+            "logo": "https://example.com/logo.png  ",
+            "description": "description  ",
+            "slug": "test",
+            "aliases": "first, second",
+        }
+        res = client.post("/organization/add", data=data)
+
+        assert res.status_code == 302
+        orgs = interface.get_all_organizations()
+        org = orgs[0]
+        assert len(org.aliases) == 2
+        assert not org.aliases[-1].startswith(" ")
+
     def test_add_organization_duplicate_slug_validation(self, app, client, interface):
         app.config.update({"WTF_CSRF_ENABLED": False})
         with client.session_transaction() as sess:

tests/playwright/test_organization.py

@@ -30,6 +30,8 @@ def test_config_table_properties(self, upage):
                 "fixture-org",
                 "organization_type:",
                 "Federal Government",
+                "aliases:",
+                "None",
                 "id:",
                 "d925f84d-955b-4cb7-812f-dcfd6681a18f",
             ]