chore: add indexes to speed up SQL query used to display search results

client/src/lib/repositories/datasetFilters.ts

@@ -17,7 +17,7 @@ export const getDatasetFiltersInfo: GetDatasetFiltersInfo = async ({
   const urlBase = `${getApiUrl()}/datasets/filters`;
 
   const url = organizationSiret
-    ? `${urlBase}?organization_siret=${organizationSiret}`
+    ? `${urlBase}/?organization_siret=${organizationSiret}`
     : `${urlBase}/`;
 
   const request = new Request(url, {

server/infrastructure/catalog_records/models.py

@@ -23,9 +23,7 @@ class CatalogRecordModel(Base):
         DateTime(timezone=True), server_default=func.clock_timestamp(), nullable=False
     )
     organization_siret: Siret = Column(
-        CHAR(14),
-        ForeignKey("catalog.organization_siret"),
-        nullable=False,
+        CHAR(14), ForeignKey("catalog.organization_siret"), nullable=False, index=True
     )
 
     catalog: "CatalogModel" = relationship(

server/infrastructure/dataformats/models.py

@@ -13,7 +13,7 @@
 dataset_dataformat = Table(
     "dataset_dataformat",
     mapper_registry.metadata,
-    Column("dataset_id", ForeignKey("dataset.id"), primary_key=True),
+    Column("dataset_id", ForeignKey("dataset.id"), primary_key=True, index=True),
     Column("dataformat_id", ForeignKey("dataformat.id"), primary_key=True),
 )
 

server/infrastructure/datasets/models.py

@@ -24,6 +24,7 @@ class DatasetModel(Base):
     catalog_record_id: uuid.UUID = Column(
         UUID(as_uuid=True),
         ForeignKey("catalog_record.id", ondelete="CASCADE"),
+        index=True,
         nullable=False,
     )
     catalog_record: "CatalogRecordModel" = relationship(
@@ -33,19 +34,21 @@ class DatasetModel(Base):
         uselist=False,
     )
 
-    title = Column(String, nullable=False)
-    description = Column(String, nullable=False)
-    service = Column(String, nullable=False)
-    geographical_coverage = Column(String, nullable=False)
+    title = Column(String, nullable=False, index=True)
+    description = Column(String, nullable=False, index=True)
+    service = Column(String, nullable=False, index=True)
+    geographical_coverage = Column(String, nullable=False, index=True)
     formats: List[DataFormatModel] = relationship(
         "DataFormatModel",
         back_populates="datasets",
         secondary=dataset_dataformat,
     )
-    technical_source = Column(String)
-    producer_email = Column(String, nullable=True)
+    technical_source = Column(String, index=True)
+    producer_email = Column(String, nullable=True, index=True)
     contact_emails = Column(ARRAY(String), server_default="{}", nullable=False)
-    update_frequency = Column(Enum(UpdateFrequency, enum="update_frequency_enum"))
+    update_frequency = Column(
+        Enum(UpdateFrequency, enum="update_frequency_enum"), index=True
+    )
     publication_restriction = Column(
         Enum(PublicationRestriction, enum="publication_restriction_enum")
     )

server/infrastructure/extra_fields/models.py

@@ -53,7 +53,7 @@ class ExtraFieldValueModel(Base):
     __tablename__ = "extra_field_value"
 
     dataset_id: ID = Column(
-        UUID(as_uuid=True), ForeignKey("dataset.id"), primary_key=True
+        UUID(as_uuid=True), ForeignKey("dataset.id"), primary_key=True, index=True
     )
     dataset: "DatasetModel" = relationship(
         "DatasetModel", back_populates="extra_field_values"

server/migrations/versions/2023-03-08_c5bc235fa223_create_indexes_dataset.py

@@ -0,0 +1,93 @@
+"""create_indexes_dataset
+
+Revision ID: c5bc235fa223
+Revises: 32e52b06b66c
+Create Date: 2023-03-08 17:01:56.079340
+
+"""
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "c5bc235fa223"
+down_revision = "32e52b06b66c"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_index(
+        op.f("ix_dataset_catalog_record_id"),
+        "dataset",
+        ["catalog_record_id"],
+        unique=False,
+    )
+    op.create_index(
+        op.f("ix_dataset_dataformat_dataset_id"),
+        "dataset_dataformat",
+        ["dataset_id"],
+        unique=False,
+    )
+    op.create_index(
+        op.f("ix_extra_field_value_dataset_id"),
+        "extra_field_value",
+        ["dataset_id"],
+        unique=False,
+    )
+    op.create_index(
+        op.f("ix_dataset_description"), "dataset", ["description"], unique=False
+    )
+    op.create_index(
+        op.f("ix_dataset_geographical_coverage"),
+        "dataset",
+        ["geographical_coverage"],
+        unique=False,
+    )
+    op.create_index(
+        op.f("ix_dataset_producer_email"), "dataset", ["producer_email"], unique=False
+    )
+    op.create_index(op.f("ix_dataset_service"), "dataset", ["service"], unique=False)
+    op.create_index(
+        op.f("ix_dataset_technical_source"),
+        "dataset",
+        ["technical_source"],
+        unique=False,
+    )
+    op.create_index(op.f("ix_dataset_title"), "dataset", ["title"], unique=False)
+    op.create_index(
+        op.f("ix_dataset_update_frequency"),
+        "dataset",
+        ["update_frequency"],
+        unique=False,
+    )
+
+    op.create_index(
+        op.f("ix_catalog_record_organization_siret"),
+        "catalog_record",
+        ["organization_siret"],
+        unique=False,
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_index(
+        op.f("ix_extra_field_value_dataset_id"), table_name="extra_field_value"
+    )
+    op.drop_index(
+        op.f("ix_dataset_dataformat_dataset_id"), table_name="dataset_dataformat"
+    )
+    op.drop_index(op.f("ix_dataset_catalog_record_id"), table_name="dataset")
+    op.drop_index(op.f("ix_dataset_update_frequency"), table_name="dataset")
+    op.drop_index(op.f("ix_dataset_title"), table_name="dataset")
+    op.drop_index(op.f("ix_dataset_technical_source"), table_name="dataset")
+    op.drop_index(op.f("ix_dataset_service"), table_name="dataset")
+    op.drop_index(op.f("ix_dataset_producer_email"), table_name="dataset")
+    op.drop_index(op.f("ix_dataset_license"), table_name="dataset")
+    op.drop_index(op.f("ix_dataset_geographical_coverage"), table_name="dataset")
+    op.drop_index(op.f("ix_dataset_description"), table_name="dataset")
+    op.drop_index(
+        op.f("ix_catalog_record_organization_siret"), table_name="catalog_record"
+    )
+    # ### end Alembic commands ###