Add subtitle and funding_link fields to projects (#640)

* Add subtitle and funding_link fields to projects

* Make alternate name case sensitive (#641)

* Make alternate name case sensitive

* Add migration for alternate name case sensitivity

Author: PGijsbers

alembic/alembic/versions/1d53330411fa_project_funding_link_and_subtitle.py

@@ -0,0 +1,37 @@
+"""Add funding link and subtitle fields to Project
+
+Revision ID: 1d53330411fa
+Revises: 19f12fe539c7
+Create Date: 2025-10-29 08:04:04.437011
+
+"""
+
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy import Column, String
+
+# revision identifiers, used by Alembic.
+revision: str = "1d53330411fa"
+down_revision: Union[str, None] = "19f12fe539c7"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    for field in ["funding_link", "subtitle"]:
+        op.add_column(
+            table_name="project",
+            column=Column(
+                name=field,
+                type_=String(length=1800),
+                default=None,
+                nullable=True,
+            ),
+        )
+
+
+def downgrade() -> None:
+    for field in ["funding_link", "subtitle"]:
+        op.drop_column("project", field)

alembic/alembic/versions/79b2dda7e3be_case_sensitive_alternate_name.py

@@ -0,0 +1,37 @@
+"""Make alternate name case sensitive
+
+Revision ID: 79b2dda7e3be
+Revises: 1d53330411fa
+Create Date: 2025-10-29 08:14:27.873149
+
+"""
+
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy import String
+
+# revision identifiers, used by Alembic.
+revision: str = "79b2dda7e3be"
+down_revision: Union[str, None] = "1d53330411fa"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    op.execute("ALTER TABLE alternate_name DROP CONSTRAINT AlternateName_name_lowercase")
+    op.drop_index(index_name="ix_alternate_name_name", table_name="alternate_name")
+    op.alter_column(
+        table_name="alternate_name",
+        column_name="name",
+        nullable=True,
+        existing_nullable=True,
+        default=None,
+        existing_server_default=None,
+        type_=String(length=1800),
+    )
+
+
+def downgrade() -> None:
+    pass

src/database/model/ai_resource/alternate_name.py

@@ -1,5 +1,14 @@
-from database.model.named_relation import NamedRelation
+from sqlalchemy import Column, String
+from sqlmodel import Field, SQLModel
 
+from database.model.field_length import LONG
 
-class AlternateName(NamedRelation, table=True):  # type: ignore [call-arg]
+
+class AlternateName(SQLModel, table=True):  # type: ignore [call-arg]
     __tablename__ = "alternate_name"
+
+    identifier: int = Field(default=None, primary_key=True)
+    name: str = Field(
+        sa_column=Column(String(length=LONG)),
+        description="The term or text",
+    )

src/database/model/ai_resource/resource.py

@@ -119,7 +119,7 @@ class RelationshipConfig(AIoDConcept.RelationshipConfig):
             description="An alias for the item, commonly used for the resource instead of the "
             "name.",
             _serializer=AttributeSerializer("name"),
-            deserializer=FindByNameDeserializerList(AlternateName),
+            deserializer=FindByNameDeserializerList(AlternateName, case_sensitive=True),
             example=["alias 1", "alias 2"],
             default_factory_pydantic=list,
             on_delete_trigger_orphan_deletion=lambda: [

src/database/model/named_relation.py

@@ -3,7 +3,7 @@
 
 from pydantic import create_model
 from sqlalchemy import CheckConstraint, Column, String
-from sqlalchemy.orm import declared_attr, backref
+from sqlalchemy.orm import declared_attr
 from sqlmodel import SQLModel, Field, Relationship
 
 from database.model.field_length import NORMAL, LONG

src/database/model/project/project.py

@@ -13,7 +13,7 @@
     AttributeSerializer,
     FindByIdentifierDeserializerList,
 )
-from database.model.field_length import IDENTIFIER_LENGTH
+from database.model.field_length import IDENTIFIER_LENGTH, LONG
 from database.model.resource_read_and_create import resource_read, resource_create
 from versioning import Version, VersionedResource, VersionedResourceCollection, schema_transform
 
@@ -34,6 +34,28 @@ class ProjectBase(AIResourceBase):
         schema_extra={"example": 1000000},
         default=None,
     )
+    subtitle: str | None = Field(
+        description="A subtitle or tagline for the project",
+        schema_extra={
+            "examples": [
+                "Development and Deployment of the European AI-on-demand Platform",
+                "Bringing AI Planning to the European AI On-Demand Platform",
+            ]
+        },
+        default=None,
+        max_length=LONG,
+    )
+    funding_link: str | None = Field(
+        description=(
+            "Link with information about the funding, e.g., "
+            "to the project's EU Funding & Tenders portal page."
+        ),
+        schema_extra={
+            "example": "https://cordis.europa.eu/programme/id/HORIZON_HORIZON-CL4-2021-HUMAN-01-02/en"  # noqa: E501
+        },
+        default=None,
+        max_length=LONG,
+    )
 
 
 class Project(ProjectBase, AIResource, table=True):  # type: ignore [call-arg]

src/database/model/serializers.py

@@ -168,6 +168,7 @@ class FindByNameDeserializerList(DeSerializer[NamedRelation]):
     """Deserialization of NamedRelations: uniquely identified by their name."""
 
     clazz: type[NamedRelation]
+    case_sensitive: bool = False
 
     def deserialize(
         self, session: Session, name: list[str] | None, user: KeycloakUser | None = None
@@ -176,10 +177,14 @@ def deserialize(
             return []
         if not isinstance(name, list):
             raise ValueError("Expected a list. Do you need to use FindByNameDeserializer instead?")
-        names = {n.casefold() for n in name}
+        names = {n if self.case_sensitive else n.casefold() for n in name}
         query = select(self.clazz).where(self.clazz.name.in_(names))  # type: ignore[attr-defined]
         existing = list(session.scalars(query).all())
-        names_not_found = names - {e.name.casefold() for e in existing}
+        if self.case_sensitive:
+            # The query above is not case sensitive (MySQL default), so we filter exact matches
+            existing = [e for e in existing if e.name in names]
+        existing_names = {e.name if self.case_sensitive else e.name.casefold() for e in existing}
+        names_not_found = names - existing_names
         enforced_taxonomy = issubclass(self.clazz, Taxonomy) and (
             user is None or not user.is_connector
         )

src/tests/routers/resource_routers/test_router_project.py

@@ -40,6 +40,10 @@ def test_happy_path(
     body["coordinator"] = organisation.identifier
     body["produced"] = [dataset.identifier]
     body["used"] = [publication.identifier]
+    funding_link = "https://foo.bar"
+    subtitle = "Foo: Bar"
+    body["funding_link"] = funding_link
+    body["subtitle"] = subtitle
 
     response = client.post("/projects", json=body, headers={"Authorization": "Fake token"})
     assert response.status_code == 200, response.json()
@@ -57,6 +61,8 @@ def test_happy_path(
     assert response_json["coordinator"] == organisation.identifier
     assert response_json["produced"] == [dataset.identifier]
     assert response_json["used"] == [publication.identifier]
+    assert response_json["funding_link"] == funding_link
+    assert response_json["subtitle"] == subtitle
 
     # Cleanup, so that all resources can be deleted in the teardown
     body["funder"] = []