Merge pull request #89 from ecmwf-projects/COPDS-1241-views

2 views for multiportal usage

alembic/versions/fe3054fbc892_add_views_for_multisite.py

@@ -0,0 +1,35 @@
+"""add views for multisite.
+
+Revision ID: fe3054fbc892
+Revises: ccdb8e308d41
+Create Date: 2023-08-10 12:57:35.547938
+
+"""
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "fe3054fbc892"
+down_revision = "ccdb8e308d41"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    sql1 = """
+    CREATE VIEW c3s_resources AS
+    SELECT * FROM resources
+    WHERE portal = 'c3s'
+    """
+    op.execute(sql1)
+    sql2 = """
+    CREATE VIEW cams_resources AS
+    SELECT * FROM resources
+    WHERE portal = 'cams'
+    """
+    op.execute(sql2)
+
+
+def downgrade() -> None:
+    op.execute("DROP VIEW c3s_resources")
+    op.execute("DROP VIEW cams_resources")

cads_catalogue/database.py

@@ -278,6 +278,23 @@ class Licence(BaseModel):
     )
 
 
+# create views
+c3s_view_stmt = sa.select(Resource).filter_by(portal="c3s")
+cams_view_stmt = sa.select(Resource).filter_by(portal="cams")
+
+
+class C3SView(BaseModel):
+    """C3S resources view."""
+
+    __table__ = sqlalchemy_utils.create_view("c3s_resources", c3s_view_stmt, metadata)  # type: ignore
+
+
+class CAMSView(BaseModel):
+    """CAMS resources view."""
+
+    __table__ = sqlalchemy_utils.create_view("cams_resources", cams_view_stmt, metadata)  # type: ignore
+
+
 def ensure_session_obj(session_obj: sa.orm.sessionmaker | None) -> sa.orm.sessionmaker:
     """If `session_obj` is None, create a new session object.
 

tests/test_02_database.py

@@ -18,7 +18,9 @@ def test_init_database(postgresql: Connection[str]) -> None:
         "SELECT table_name FROM information_schema.tables WHERE table_schema='public'"
     )
     expected_tables_at_beginning: set[str] = set()
-    expected_tables_complete = set(database.metadata.tables).union({"alembic_version"})
+    expected_tables_complete = set(database.metadata.tables).union(
+        {"alembic_version", "c3s_resources", "cams_resources"}
+    )
     assert set(conn.execute(query).scalars()) == expected_tables_at_beginning  # type: ignore
 
     database.init_database(connection_string, force=True)

tests/test_90_entry_points.py

@@ -46,7 +46,7 @@ def test_init_db(postgresql: Connection[str]) -> None:
 
     assert result.exit_code == 0
     assert set(conn.execute(query).scalars()) == set(database.metadata.tables).union(
-        {"alembic_version"}
+        {"alembic_version", "c3s_resources", "cams_resources"}
     )