Created an is_finalized column for maps

Author: davenquinn

cli/macrostrat/cli/database/migrations/map_sources/01-maps-sources.sql

@@ -1,7 +1,10 @@
 ALTER TABLE maps.sources ADD COLUMN IF NOT EXISTS raster_url text;
+ALTER TABLE maps.sources ADD COLUMN IF NOT EXISTS scale_denominator integer;
+ALTER TABLE maps.sources ADD COLUMN IF NOT EXISTS is_finalized boolean DEFAULT false;
 
 DROP VIEW IF EXISTS macrostrat_api.sources_metadata CASCADE;
 DROP VIEW IF EXISTS maps.sources_metadata CASCADE;
+DROP VIEW IF EXISTS macrostrat_api.sources CASCADE;
 
 CREATE OR REPLACE VIEW maps.sources_metadata AS
 SELECT
@@ -22,16 +25,9 @@ SELECT
     new_priority priority,
     status_code,
     raster_url,
-    CASE
-       WHEN psi.source_id IS NULL THEN false
-       ELSE true
-    END AS is_mapped
+    scale_denominator,
+    is_finalized
 FROM maps.sources AS s
-LEFT JOIN (
-    SELECT
-        DISTINCT(polygons.source_id)
-    FROM maps.polygons
-) psi ON s.source_id = psi.source_id
 ORDER BY source_id DESC;
 
 COMMENT ON VIEW maps.sources_metadata IS 'Convenience view for maps.sources with only metadata fields';
@@ -62,7 +58,9 @@ SELECT
     i.comments,
     i.created_on,
     i.completed_on,
-    i.map_id
+    i.map_id,
+    s.is_finalized,
+    s.scale_denominator
 FROM maps.sources_metadata s
 JOIN maps_metadata.ingest_process i
   ON i.source_id = s.source_id;
@@ -86,5 +84,7 @@ SELECT
     s.priority,
     s.status_code,
     s.raster_url,
-    s.web_geom envelope
+    s.web_geom envelope,
+    s.is_finalized,
+    s.scale_denominator
 FROM maps.sources s;

cli/macrostrat/cli/database/migrations/map_sources/__init__.py

@@ -1,4 +1,5 @@
 from macrostrat.core.migrations import Migration, view_exists
+from macrostrat.core.migrations import has_columns
 
 
 class MapsSourcesMetadataMigration(Migration):
@@ -15,4 +16,5 @@ class MapsSourcesMetadataMigration(Migration):
         view_exists(
             "macrostrat_api", "sources_metadata", "sources_ingestion", "sources"
         ),
+        has_columns("maps", "sources", "is_finalized", "scale_denominator"),
     ]

core/macrostrat/core/migrations/__init__.py

@@ -149,7 +149,7 @@ def apply(self, database: Database) -> ApplicationStatus:
         in the same directory as the class definition."""
         if len(self.fixtures) == 0:
             # Automatically load fixtures from the same directory as the migration
-            sql_dir = inspect.getfile(inspect.getfile(self.__class__)).parent
+            sql_dir = Path(inspect.getfile(self.__class__)).parent
             database.run_fixtures(sql_dir, output_mode=self.output_mode)
             return
 

map-integration/macrostrat/map_integration/utils/_database.py

@@ -4,15 +4,15 @@
 def table_exists(db: Database, table_name: str, schema: str = "public") -> bool:
     """Check if a table exists in a PostgreSQL database."""
     sql = """SELECT EXISTS (
-        SELECT FROM information_schema.tables 
+        SELECT FROM information_schema.tables
         WHERE table_schema = :schema
           AND table_name = :table_name
     );"""
 
     return db.run_query(sql, dict(schema=schema, table_name=table_name)).scalar()
 
 
-def column_exists(db, table_name, column_name, schema="public"):
+def column_exists(db: Database, table_name, column_name, schema="public"):
     res = db.run_query(
         """
         SELECT count(*) FROM information_schema.columns c