Merge pull request #105 from UW-Macrostrat/saved_locations

Saved locations

Author: amyfromandi

.idea/macrostrat.iml

@@ -1,4 +1,4 @@
-/* SQL script that
+/* sql script that
   - alters the MariaDB tables by adding a new column for geom -> text data,
   - sets the datatype of the new column data to WKT format,
   - drops the old geometry column,

.idea/misc.xml

@@ -61,7 +61,7 @@ def _log_command(url: URL, cmd: list[str]):
 
 
 async def _restore_mariadb(engine: Engine, *args, **kwargs):
-    """Load MariaDB dump (GZipped SQL file) into a database, using centrally managed credentials,
+    """Load MariaDB dump (GZipped sql file) into a database, using centrally managed credentials,
     a Docker containerized `mariadb` client, and a streaming approach."""
     overwrite = kwargs.pop("overwrite", False)
     create = kwargs.pop("create", overwrite)

cli/macrostrat/__init__.py

@@ -0,0 +1,22 @@
+from psycopg2.sql import Identifier
+
+from macrostrat.core.migrations import Migration, exists
+from macrostrat.database import Database
+
+
+class UserSavedLocationsMigration(Migration):
+    name = "user-saved-locations"
+    subsystem = "user_features"
+    description = """
+    Create user-saved-locations db schema, permissions, and views.
+    """
+
+    # depends_on = ["baseline", "macrostrat-mariadb"]
+
+    preconditions = [exists("macrostrat_auth", "user")]
+
+    postconditions = [
+        exists(
+            "user_features", "user_locations, location_tags, location_tags_intersect"
+        ),
+    ]

cli/macrostrat/cli/database/mariadb/postgresql_migration/pgloader-pre-script.sql

@@ -0,0 +1,17 @@
+CREATE OR REPLACE VIEW macrostrat_api.user_locations AS
+SELECT *
+FROM user_features.user_locations;
+
+
+CREATE OR REPLACE VIEW macrostrat_api.location_tags AS
+SELECT *
+FROM user_features.location_tags;
+
+--this will change from web_anon to an authorized user once that workflow has been implemented.
+--web_anon is used for testing only right now.
+GRANT SELECT, INSERT, UPDATE, DELETE ON macrostrat_api.user_locations TO web_anon;
+GRANT SELECT, INSERT, UPDATE, DELETE ON macrostrat_api.location_tags TO web_anon;
+
+
+NOTIFY pgrst, 'reload schema';
+

cli/macrostrat/cli/database/mariadb/restore.py

@@ -0,0 +1,56 @@
+CREATE SCHEMA user_features;
+CREATE EXTENSION IF NOT EXISTS postgis;
+--changed map_layers from enum to array in order to save multiple layers at a time
+create table user_features.user_locations
+(
+    id              serial primary key,
+    user_id         integer not null constraint fk_user references macrostrat_auth."user" on delete cascade,
+    name            varchar(120) not null,
+    description     text,
+    point           public.geometry(POINT, 4326),
+    zoom            numeric,
+    meters_from_point   numeric,
+    elevation       numeric,
+    azimuth         numeric,
+    pitch           numeric,
+    map_layers      text [],
+    created_at      timestamp default now() not null,
+    updated_at      timestamp default now() not null
+);
+
+
+create table user_features.location_tags
+(
+    id          serial PRIMARY KEY,
+    name        varchar(120) not NULL,
+    description text,
+    color       varchar(30)
+);
+
+--intersection table for ids joins with the location_tags table
+--remove category and add NULL user_ids
+create table user_features.location_tags_intersect (
+    tag_id      integer constraint fk_tag_id references user_features."location_tags" on delete cascade,
+    user_id     integer constraint fk_user_id references macrostrat_auth."user" on delete cascade,
+    location_id integer not null constraint fk_location_id references user_features."user_locations" on delete cascade,
+    PRIMARY KEY (tag_id, user_id, location_id)
+);
+
+
+alter table user_features.user_locations owner to "macrostrat-admin";
+alter table user_features.location_tags owner to "macrostrat-admin";
+alter table user_features.location_tags_intersect owner to "macrostrat-admin";
+
+grant insert, select, update on user_locations to web_anon;
+grant insert, select, update on location_tags to web_anon;
+
+grant delete, insert, select, update on user_locations to web_user;
+grant delete, insert, select, update on location_tags to web_user;
+
+
+
+
+
+
+
+

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

@@ -196,6 +196,9 @@ ON c.id = cr.col_id
 LEFT JOIN macrostrat.refs r
 ON cr.ref_id = r.id;
 
+
+
+
 CREATE OR REPLACE VIEW macrostrat_api.strat_names_meta AS
 SELECT * FROM macrostrat.strat_names_meta;
 

cli/macrostrat/cli/database/migrations/user_features/update_user_locations.sql

@@ -1,4 +1,4 @@
-/** SQL run during a mostly manual conversion of the knowledge graph database (2024-09-11)
+/** sql run during a mostly manual conversion of the knowledge graph database (2024-09-11)
   *  to use an overall simpler schema. Major changes include:
   *  - Using integer ids instead of UUIDs
   *  - Using an extensible, foreign-keyed table for entity and relationship types (instead of a custom enum)