Update get_item in sqlalchemy backend (#275)

* query by item and collection id

* add get item test

* add parameters

* run pre-commit

* Alter items table to have primary key on both id and collection_id

* run pre-commit

* run pre-commit

* Update CHANGES

Co-authored-by: Robin Wilson <[email protected]>
Co-authored-by: Rob Emanuele <[email protected]>

Author: 3 people

CHANGES.md

@@ -11,6 +11,8 @@
 
 ### Changed
 
+* Update get_item in sqlalchemy backend to allow for querying for items with same ids but in different collections. ([#275](https://github.com/stac-utils/stac-fastapi/pull/275))
+
 ### Fixed
 
 ## [2.1.1]

stac_fastapi/sqlalchemy/alembic/versions/821aa04011e8_change_pri_key_for_item.py

@@ -0,0 +1,24 @@
+"""Change pri key for Item
+
+Revision ID: 821aa04011e8
+Revises: 407037cb1636
+Create Date: 2021-10-11 12:10:34.148098
+
+"""
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "821aa04011e8"
+down_revision = "407037cb1636"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    op.drop_constraint("items_pkey", "items", schema="data")
+    op.create_primary_key("items_pkey", "items", ["id", "collection_id"], schema="data")
+
+
+def downgrade():
+    op.drop_constraint("items_pkey", "items", schema="data")
+    op.create_primary_key("items_pkey", "items", ["id"], schema="data")

stac_fastapi/sqlalchemy/stac_fastapi/sqlalchemy/core.py

@@ -174,7 +174,12 @@ def get_item(self, item_id: str, collection_id: str, **kwargs) -> Item:
         """Get item by id."""
         base_url = str(kwargs["request"].base_url)
         with self.session.reader.context_session() as session:
-            item = self._lookup_id(item_id, self.item_table, session)
+            db_query = session.query(self.item_table)
+            db_query = db_query.filter(self.item_table.collection_id == collection_id)
+            db_query = db_query.filter(self.item_table.id == item_id)
+            item = db_query.first()
+            if not item:
+                raise NotFoundError(f"{self.item_table.__name__} {id} not found")
             return self.item_serializer.db_to_stac(item, base_url=base_url)
 
     def get_search(

stac_fastapi/sqlalchemy/stac_fastapi/sqlalchemy/models/database.py

@@ -69,7 +69,7 @@ class Item(BaseModel):  # type:ignore
     properties = sa.Column(JSONB)
     assets = sa.Column(JSONB)
     collection_id = sa.Column(
-        sa.VARCHAR(1024), sa.ForeignKey(Collection.id), nullable=False
+        sa.VARCHAR(1024), sa.ForeignKey(Collection.id), nullable=False, primary_key=True
     )
     parent_collection = sa.orm.relationship("Collection", back_populates="children")
     datetime = sa.Column(sa.TIMESTAMP(timezone=True), nullable=False)

stac_fastapi/sqlalchemy/tests/clients/test_postgres.py

@@ -85,6 +85,26 @@ def test_get_collection(
     assert coll["id"] == data["id"]
 
 
+def test_get_item(
+    postgres_core: CoreCrudClient,
+    postgres_transactions: TransactionsClient,
+    load_test_data: Callable,
+):
+    collection_data = load_test_data("test_collection.json")
+    postgres_transactions.create_collection(
+        collection_data, request=MockStarletteRequest
+    )
+    data = load_test_data("test_item.json")
+    postgres_transactions.create_item(data, request=MockStarletteRequest)
+    coll = postgres_core.get_item(
+        item_id=data["id"],
+        collection_id=data["collection"],
+        request=MockStarletteRequest,
+    )
+    assert coll["id"] == data["id"]
+    assert coll["collection"] == data["collection"]
+
+
 def test_get_collection_items(
     postgres_core: CoreCrudClient,
     postgres_transactions: TransactionsClient,