From 3f308330e5727619a34a7e060cb2980f7a601160 Mon Sep 17 00:00:00 2001
From: David Phan <hungthui27@outlook.com>
Date: Tue, 7 May 2024 12:05:41 -0700
Subject: [PATCH 01/28] Create new schema with login info tables

---
 conf/evolutions/default/225.sql | 58 +++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 conf/evolutions/default/225.sql

diff --git a/conf/evolutions/default/225.sql b/conf/evolutions/default/225.sql
new file mode 100644
index 0000000000..21f8fdcff2
--- /dev/null
+++ b/conf/evolutions/default/225.sql
@@ -0,0 +1,58 @@
+# --- !Ups
+-- Create Login Schema to unify login systems.
+CREATE SCHEMA IF NOT EXISTS sidewalk_login;
+ALTER SCHEMA sidewalk_login OWNER TO sidewalk;
+
+-- TABLE: user_password_info
+CREATE TABLE sidewalk_login.user_password_info (
+    user_password_info_id SERIAL NOT NULL,
+    login_info_id bigint NOT NULL,
+    password VARCHAR(254) NOT NULL,
+    salt VARCHAR(254),
+    hasher VARCHAR(254) NOT NULL,
+    PRIMARY KEY (user_password_info_id)
+);
+ALTER TABLE sidewalk_login.user_password_info OWNER TO sidewalk;
+GRANT ALL ON TABLE sidewalk_login.user_password_info TO sidewalk;
+GRANT ALL ON TABLE sidewalk_login.user_password_info TO postgres;
+
+-- TABLE: login_info
+CREATE TABLE sidewalk_login.login_info(
+    login_info_id bigint SERIAL NOT NULL,
+    provider_id VARCHAR(254),
+    provider_key VARCHAR(254),
+    PRIMARY KEY (login_info_id)
+);
+ALTER TABLE sidewalk_login.login_info OWNER TO sidewalk;
+GRANT ALL ON TABLE sidewalk_login.login_info TO sidewalk;
+GRANT ALL ON TABLE sidewalk_login.login_info TO postgres;
+
+-- TABLE: user_login_info
+CREATE TABLE sidewalk_login.user_login_info(
+    user_login_info_id SERIAL NOT NULL,
+    login_info_id bigint NOT NULL,
+    user_id VARCHAR(254) NOT NULL,
+    PRIMARY KEY (user_login_info_id)
+);
+CREATE INDEX user_login_info_login_info_id_idx ON sidewalk_login.user_login_info USING btree(login_info_id);
+CREATE INDEX user_login_info_user_id_idx ON sidewalk_login.user_login_info USING btree(user_id);
+ALTER TABLE sidewalk_login.user_login_info OWNER TO sidewalk;
+GRANT ALL ON TABLE sidewalk_login.user_login_info TO sidewalk;
+GRANT ALL ON TABLE sidewalk_login.user_login_info TO postgres;
+
+-- TABLE: sidewalk_user
+CREATE TABLE sidewalk_login.sidewalk_user(
+    user_id TEXT[] UNIQUE NOT NULL,
+    username TEXT[] UNIQUE NOT NULL,
+    email TEXT[] NOT NULL,
+    PRIMARY KEY (user_id)
+);
+CREATE INDEX user_id_idx ON sidewalk_login.sidewalk_user USING btree(user_id);
+CREATE INDEX username_idx ON sidewalk_login.sidewalk_user USING btree(username);
+CREATE INDEX email_idx ON sidewalk_login.sidewalk_user USING btree(email);
+ALTER TABLE sidewalk_login.sidewalk_user OWNER TO sidewalk;
+GRANT ALL ON TABLE sidewalk_login.sidewalk_user TO sidewalk;
+GRANT ALL ON TABLE sidewalk_login.sidewalk_user TO postgres;
+
+# --- !Downs
+DROP SCHEMA IF EXISTS sidewalk_login CASCADE;

From 9999808e80d7d8dccfd14c23dbcc8e63fbbdc5fe Mon Sep 17 00:00:00 2001
From: David Phan <hungthui27@outlook.com>
Date: Mon, 3 Jun 2024 11:05:21 -0700
Subject: [PATCH 02/28] New login schema generated, foreign key errors occuring

---
 .../daos/slick/DBTableDefinitions.scala       |  8 +--
 conf/evolutions/default/225.sql               | 61 +++-------------
 conf/evolutions/default/226.sql               | 72 +++++++++++++++++++
 conf/evolutions/default/227.sql               | 17 +++++
 conf/evolutions/default/228.sql               | 37 ++++++++++
 5 files changed, 139 insertions(+), 56 deletions(-)
 create mode 100644 conf/evolutions/default/226.sql
 create mode 100644 conf/evolutions/default/227.sql
 create mode 100644 conf/evolutions/default/228.sql

diff --git a/app/models/daos/slick/DBTableDefinitions.scala b/app/models/daos/slick/DBTableDefinitions.scala
index 8c197b83bf..42e6d47465 100644
--- a/app/models/daos/slick/DBTableDefinitions.scala
+++ b/app/models/daos/slick/DBTableDefinitions.scala
@@ -8,7 +8,7 @@ object DBTableDefinitions {
 
   case class DBUser (userId: String, username: String, email: String )
 
-  class UserTable(tag: Tag) extends Table[DBUser](tag, "sidewalk_user") {
+  class UserTable(tag: Tag) extends Table[DBUser](tag, Some("sidewalk_login"), "sidewalk_user") {
     def userId = column[String]("user_id", O.PrimaryKey)
     def username = column[String]("username")
     def email = column[String]("email")
@@ -17,7 +17,7 @@ object DBTableDefinitions {
 
   case class DBLoginInfo (id: Option[Long], providerID: String, providerKey: String )
 
-  class LoginInfos(tag: Tag) extends Table[DBLoginInfo](tag, "login_info") {
+  class LoginInfos(tag: Tag) extends Table[DBLoginInfo](tag, Some("sidewalk_login"), "login_info") {
     def loginInfoId = column[Long]("login_info_id", O.PrimaryKey, O.AutoInc)
     def providerID = column[String]("provider_id")
     def providerKey = column[String]("provider_key")
@@ -26,7 +26,7 @@ object DBTableDefinitions {
 
   case class DBUserLoginInfo (userID: String, loginInfoId: Long)
 
-  class UserLoginInfoTable(tag: Tag) extends Table[DBUserLoginInfo](tag, "user_login_info") {
+  class UserLoginInfoTable(tag: Tag) extends Table[DBUserLoginInfo](tag, Some("sidewalk_login"), "user_login_info") {
     def userID = column[String]("user_id", O.NotNull)
     def loginInfoId = column[Long]("login_info_id", O.NotNull)
     def * = (userID, loginInfoId) <> (DBUserLoginInfo.tupled, DBUserLoginInfo.unapply)
@@ -34,7 +34,7 @@ object DBTableDefinitions {
 
   case class DBPasswordInfo (hasher: String, password: String, salt: Option[String], loginInfoId: Long)
 
-  class PasswordInfoTable(tag: Tag) extends Table[DBPasswordInfo](tag, "user_password_info") {
+  class PasswordInfoTable(tag: Tag) extends Table[DBPasswordInfo](tag, Some("sidewalk_login"), "user_password_info") {
     def hasher = column[String]("hasher")
     def password = column[String]("password")
     def salt = column[Option[String]]("salt")
diff --git a/conf/evolutions/default/225.sql b/conf/evolutions/default/225.sql
index 21f8fdcff2..6c2e8584c9 100644
--- a/conf/evolutions/default/225.sql
+++ b/conf/evolutions/default/225.sql
@@ -1,58 +1,15 @@
-# --- !Ups
+-- Create new schema
+-- Create tables/indexes in new schema
+-- Grant access to all tables/indexes
+-- Update sequences for pkeys of all new tables
+-- Apply foreign keys to sidewalk_user table
+
 -- Create Login Schema to unify login systems.
+
+# --- !Ups
 CREATE SCHEMA IF NOT EXISTS sidewalk_login;
 ALTER SCHEMA sidewalk_login OWNER TO sidewalk;
 
--- TABLE: user_password_info
-CREATE TABLE sidewalk_login.user_password_info (
-    user_password_info_id SERIAL NOT NULL,
-    login_info_id bigint NOT NULL,
-    password VARCHAR(254) NOT NULL,
-    salt VARCHAR(254),
-    hasher VARCHAR(254) NOT NULL,
-    PRIMARY KEY (user_password_info_id)
-);
-ALTER TABLE sidewalk_login.user_password_info OWNER TO sidewalk;
-GRANT ALL ON TABLE sidewalk_login.user_password_info TO sidewalk;
-GRANT ALL ON TABLE sidewalk_login.user_password_info TO postgres;
-
--- TABLE: login_info
-CREATE TABLE sidewalk_login.login_info(
-    login_info_id bigint SERIAL NOT NULL,
-    provider_id VARCHAR(254),
-    provider_key VARCHAR(254),
-    PRIMARY KEY (login_info_id)
-);
-ALTER TABLE sidewalk_login.login_info OWNER TO sidewalk;
-GRANT ALL ON TABLE sidewalk_login.login_info TO sidewalk;
-GRANT ALL ON TABLE sidewalk_login.login_info TO postgres;
-
--- TABLE: user_login_info
-CREATE TABLE sidewalk_login.user_login_info(
-    user_login_info_id SERIAL NOT NULL,
-    login_info_id bigint NOT NULL,
-    user_id VARCHAR(254) NOT NULL,
-    PRIMARY KEY (user_login_info_id)
-);
-CREATE INDEX user_login_info_login_info_id_idx ON sidewalk_login.user_login_info USING btree(login_info_id);
-CREATE INDEX user_login_info_user_id_idx ON sidewalk_login.user_login_info USING btree(user_id);
-ALTER TABLE sidewalk_login.user_login_info OWNER TO sidewalk;
-GRANT ALL ON TABLE sidewalk_login.user_login_info TO sidewalk;
-GRANT ALL ON TABLE sidewalk_login.user_login_info TO postgres;
-
--- TABLE: sidewalk_user
-CREATE TABLE sidewalk_login.sidewalk_user(
-    user_id TEXT[] UNIQUE NOT NULL,
-    username TEXT[] UNIQUE NOT NULL,
-    email TEXT[] NOT NULL,
-    PRIMARY KEY (user_id)
-);
-CREATE INDEX user_id_idx ON sidewalk_login.sidewalk_user USING btree(user_id);
-CREATE INDEX username_idx ON sidewalk_login.sidewalk_user USING btree(username);
-CREATE INDEX email_idx ON sidewalk_login.sidewalk_user USING btree(email);
-ALTER TABLE sidewalk_login.sidewalk_user OWNER TO sidewalk;
-GRANT ALL ON TABLE sidewalk_login.sidewalk_user TO sidewalk;
-GRANT ALL ON TABLE sidewalk_login.sidewalk_user TO postgres;
-
 # --- !Downs
 DROP SCHEMA IF EXISTS sidewalk_login CASCADE;
+
diff --git a/conf/evolutions/default/226.sql b/conf/evolutions/default/226.sql
new file mode 100644
index 0000000000..d7ad316fd6
--- /dev/null
+++ b/conf/evolutions/default/226.sql
@@ -0,0 +1,72 @@
+-- Create tables and indexes for login tables and grant "sidewalk" user access
+
+# --- !Ups
+
+-- TABLE: user_password_info
+CREATE TABLE sidewalk_login.user_password_info (
+    user_password_info_id SERIAL NOT NULL,
+    login_info_id bigint NOT NULL,
+    password VARCHAR(254) NOT NULL,
+    salt VARCHAR(254),
+    hasher VARCHAR(254) NOT NULL,
+    PRIMARY KEY (user_password_info_id)
+);
+ALTER TABLE sidewalk_login.user_password_info OWNER TO sidewalk;
+GRANT ALL ON TABLE sidewalk_login.user_password_info TO sidewalk;
+GRANT ALL ON TABLE sidewalk_login.user_password_info TO postgres;
+
+-- TABLE: login_info
+CREATE TABLE sidewalk_login.login_info(
+    login_info_id BIGSERIAL NOT NULL,
+    provider_id VARCHAR(254),
+    provider_key VARCHAR(254),
+    PRIMARY KEY (login_info_id)
+);
+ALTER TABLE sidewalk_login.login_info OWNER TO sidewalk;
+GRANT ALL ON TABLE sidewalk_login.login_info TO sidewalk;
+GRANT ALL ON TABLE sidewalk_login.login_info TO postgres;
+
+-- TABLE: user_login_info
+CREATE TABLE sidewalk_login.user_login_info(
+    user_login_info_id SERIAL NOT NULL,
+    login_info_id bigint NOT NULL,
+    user_id VARCHAR(254) NOT NULL,
+    PRIMARY KEY (user_login_info_id)
+);
+CREATE INDEX user_login_info_login_info_id_idx ON sidewalk_login.user_login_info USING btree(login_info_id);
+CREATE INDEX user_login_info_user_id_idx ON sidewalk_login.user_login_info USING btree(user_id);
+ALTER TABLE sidewalk_login.user_login_info OWNER TO sidewalk;
+GRANT ALL ON TABLE sidewalk_login.user_login_info TO sidewalk;
+GRANT ALL ON TABLE sidewalk_login.user_login_info TO postgres;
+
+-- TABLE: sidewalk_user
+CREATE TABLE sidewalk_login.sidewalk_user(
+    user_id TEXT UNIQUE NOT NULL,
+    username TEXT UNIQUE NOT NULL,
+    email TEXT NOT NULL,
+    PRIMARY KEY (user_id)
+);
+CREATE INDEX user_id_idx ON sidewalk_login.sidewalk_user USING btree(user_id);
+CREATE INDEX username_idx ON sidewalk_login.sidewalk_user USING btree(username);
+CREATE INDEX email_idx ON sidewalk_login.sidewalk_user USING btree(email);
+ALTER TABLE sidewalk_login.sidewalk_user OWNER TO sidewalk;
+GRANT ALL ON TABLE sidewalk_login.sidewalk_user TO sidewalk;
+GRANT ALL ON TABLE sidewalk_login.sidewalk_user TO postgres;
+
+# --- !Downs
+-- TABLE: user_password_info
+DROP TABLE IF EXISTS sidewalk_login.user_password_info;
+
+-- TABLE: login_info
+DROP TABLE IF EXISTS sidewalk_login.login_info;
+
+-- TABLE: user_login_info
+DROP TABLE IF EXISTS sidewalk_login.user_login_info;
+DROP INDEX IF EXISTS user_login_info_login_info_id_idx;
+DROP INDEX IF EXISTS user_login_info_user_id_idx;
+
+-- TABLE: sidewalk_user
+DROP TABLE IF EXISTS sidewalk_login.sidewalk_user;
+DROP INDEX IF EXISTS user_id_idx;
+DROP INDEX IF EXISTS username_idx;
+DROP INDEX IF EXISTS email_idx;
diff --git a/conf/evolutions/default/227.sql b/conf/evolutions/default/227.sql
new file mode 100644
index 0000000000..fc729dddf7
--- /dev/null
+++ b/conf/evolutions/default/227.sql
@@ -0,0 +1,17 @@
+-- Move data from city schemas to new login data schema
+-- TODO: Copy login data from ALL cities to login schema
+-- TODO: Among duplicates across cities, keep data from most recently logged in user.
+-- TODO: Update pkey sequence to the end of the data's sequence
+
+-- Copy all login info from Pittsburgh into the new sidewalk_login schema
+INSERT INTO sidewalk_login.sidewalk_user(user_id, username, email)
+SELECT user_id, username, email FROM sidewalk_pittsburgh.sidewalk_user;
+
+INSERT INTO sidewalk_login.login_info(login_info_id, provider_id, provider_key)
+SELECT login_info_id, provider_id, provider_key FROM sidewalk_pittsburgh.login_info;
+
+INSERT INTO sidewalk_login.user_login_info(user_login_info_id, user_id, login_info_id)
+SELECT user_login_info_id, user_id, login_info_id FROM sidewalk_pittsburgh.user_login_info;
+
+INSERT INTO sidewalk_login.user_password_info (user_password_info_id, login_info_id, "password", salt, hasher)
+SELECT user_password_info_id, login_info_id, "password", salt, hasher FROM sidewalk_pittsburgh.user_password_info;
diff --git a/conf/evolutions/default/228.sql b/conf/evolutions/default/228.sql
new file mode 100644
index 0000000000..8417c760ef
--- /dev/null
+++ b/conf/evolutions/default/228.sql
@@ -0,0 +1,37 @@
+-- Add foreign key constraints from city schemas to login schema
+
+# --- !Ups
+
+-- Pittsburgh
+ALTER TABLE sidewalk_pittsburgh.audit_task DROP CONSTRAINT IF EXISTS audit_task_user_id_fkey;
+ALTER TABLE sidewalk_pittsburgh.audit_task ADD CONSTRAINT audit_task_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
+ALTER TABLE sidewalk_pittsburgh.gallery_task_environment DROP CONSTRAINT IF EXISTS gallery_task_environment_user_id_fkey;
+ALTER TABLE sidewalk_pittsburgh.gallery_task_environment ADD CONSTRAINT gallery_task_environment_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
+ALTER TABLE sidewalk_pittsburgh.gallery_task_interaction DROP CONSTRAINT IF EXISTS gallery_task_interaction_user_id_fkey;
+ALTER TABLE sidewalk_pittsburgh.gallery_task_interaction ADD CONSTRAINT gallery_task_interaction_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
+ALTER TABLE sidewalk_pittsburgh.label_history DROP CONSTRAINT IF EXISTS label_history_edited_by_fkey;
+ALTER TABLE sidewalk_pittsburgh.label_history ADD CONSTRAINT label_history_edited_by_fkey FOREIGN KEY (edited_by) REFERENCES sidewalk_login.sidewalk_user(user_id);
+ALTER TABLE sidewalk_pittsburgh.label_validation DROP CONSTRAINT IF EXISTS label_validation_user_id_fkey;
+ALTER TABLE sidewalk_pittsburgh.label_validation ADD CONSTRAINT label_validation_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
+ALTER TABLE sidewalk_pittsburgh.mission DROP CONSTRAINT IF EXISTS mission_user_id_fkey;
+ALTER TABLE sidewalk_pittsburgh.mission ADD CONSTRAINT mission_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
+ALTER TABLE sidewalk_pittsburgh.route DROP CONSTRAINT IF EXISTS route_user_id_fkey;
+ALTER TABLE sidewalk_pittsburgh.route ADD CONSTRAINT route_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
+ALTER TABLE sidewalk_pittsburgh.user_clustering_session DROP CONSTRAINT IF EXISTS user_clustering_session_user_id_fkey;
+ALTER TABLE sidewalk_pittsburgh.user_clustering_session ADD CONSTRAINT user_clustering_session_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
+ALTER TABLE sidewalk_pittsburgh.user_org DROP CONSTRAINT IF EXISTS user_org_user_id_fkey;
+ALTER TABLE sidewalk_pittsburgh.user_org ADD CONSTRAINT user_org_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
+ALTER TABLE sidewalk_pittsburgh.user_route DROP CONSTRAINT IF EXISTS user_route_user_id_fkey;
+ALTER TABLE sidewalk_pittsburgh.user_route ADD CONSTRAINT user_route_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
+ALTER TABLE sidewalk_pittsburgh.user_stat DROP CONSTRAINT IF EXISTS user_stat_user_id_fkey;
+ALTER TABLE sidewalk_pittsburgh.user_stat ADD CONSTRAINT user_stat_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
+ALTER TABLE sidewalk_pittsburgh.user_survey_option_submission DROP CONSTRAINT IF EXISTS user_survey_option_submission_user_id_fkey;
+ALTER TABLE sidewalk_pittsburgh.user_survey_option_submission ADD CONSTRAINT user_survey_option_submission_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
+ALTER TABLE sidewalk_pittsburgh.user_survey_text_submission DROP CONSTRAINT IF EXISTS user_survey_text_submission_user_id_fkey;
+ALTER TABLE sidewalk_pittsburgh.user_survey_text_submission ADD CONSTRAINT user_survey_text_submission_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
+ALTER TABLE sidewalk_pittsburgh.validation_task_comment DROP CONSTRAINT IF EXISTS validation_task_comment_user_id_fkey;
+ALTER TABLE sidewalk_pittsburgh.validation_task_comment ADD CONSTRAINT validation_task_comment_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
+ALTER TABLE sidewalk_pittsburgh.webpage_activity DROP CONSTRAINT IF EXISTS webpage_activity_user_id_fkey;
+ALTER TABLE sidewalk_pittsburgh.webpage_activity ADD CONSTRAINT webpage_activity_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
+
+# --- !Downs

From c7f70c39369b1f8fd3563a3fd971a328292500b6 Mon Sep 17 00:00:00 2001
From: Mikey Saugstad <michaelssaugstad@gmail.com>
Date: Mon, 23 Sep 2024 13:39:45 -0700
Subject: [PATCH 03/28] moves evolutions file to make merge easier

---
 conf/evolutions/default/{225.sql => 249.sql} | 0
 conf/evolutions/default/{226.sql => 250.sql} | 0
 conf/evolutions/default/{227.sql => 251.sql} | 0
 conf/evolutions/default/{228.sql => 252.sql} | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 rename conf/evolutions/default/{225.sql => 249.sql} (100%)
 rename conf/evolutions/default/{226.sql => 250.sql} (100%)
 rename conf/evolutions/default/{227.sql => 251.sql} (100%)
 rename conf/evolutions/default/{228.sql => 252.sql} (100%)

diff --git a/conf/evolutions/default/225.sql b/conf/evolutions/default/249.sql
similarity index 100%
rename from conf/evolutions/default/225.sql
rename to conf/evolutions/default/249.sql
diff --git a/conf/evolutions/default/226.sql b/conf/evolutions/default/250.sql
similarity index 100%
rename from conf/evolutions/default/226.sql
rename to conf/evolutions/default/250.sql
diff --git a/conf/evolutions/default/227.sql b/conf/evolutions/default/251.sql
similarity index 100%
rename from conf/evolutions/default/227.sql
rename to conf/evolutions/default/251.sql
diff --git a/conf/evolutions/default/228.sql b/conf/evolutions/default/252.sql
similarity index 100%
rename from conf/evolutions/default/228.sql
rename to conf/evolutions/default/252.sql

From 4cb912d634161010f4b7a2ee687897a16117e923 Mon Sep 17 00:00:00 2001
From: Mikey Saugstad <michaelssaugstad@gmail.com>
Date: Mon, 23 Sep 2024 13:58:33 -0700
Subject: [PATCH 04/28] cleans up evolutions for unified login

---
 conf/evolutions/default/250.sql | 45 ++++++++---------
 conf/evolutions/default/251.sql | 19 ++++---
 conf/evolutions/default/252.sql | 90 ++++++++++++++++++++++-----------
 3 files changed, 95 insertions(+), 59 deletions(-)

diff --git a/conf/evolutions/default/250.sql b/conf/evolutions/default/250.sql
index d7ad316fd6..b4e5c9b92d 100644
--- a/conf/evolutions/default/250.sql
+++ b/conf/evolutions/default/250.sql
@@ -1,9 +1,8 @@
--- Create tables and indexes for login tables and grant "sidewalk" user access
+-- Create tables and indexes for login tables and grant "sidewalk" user access.
 
 # --- !Ups
-
 -- TABLE: user_password_info
-CREATE TABLE sidewalk_login.user_password_info (
+CREATE TABLE IF NOT EXISTS sidewalk_login.user_password_info (
     user_password_info_id SERIAL NOT NULL,
     login_info_id bigint NOT NULL,
     password VARCHAR(254) NOT NULL,
@@ -16,7 +15,7 @@ GRANT ALL ON TABLE sidewalk_login.user_password_info TO sidewalk;
 GRANT ALL ON TABLE sidewalk_login.user_password_info TO postgres;
 
 -- TABLE: login_info
-CREATE TABLE sidewalk_login.login_info(
+CREATE TABLE IF NOT EXISTS sidewalk_login.login_info(
     login_info_id BIGSERIAL NOT NULL,
     provider_id VARCHAR(254),
     provider_key VARCHAR(254),
@@ -27,46 +26,46 @@ GRANT ALL ON TABLE sidewalk_login.login_info TO sidewalk;
 GRANT ALL ON TABLE sidewalk_login.login_info TO postgres;
 
 -- TABLE: user_login_info
-CREATE TABLE sidewalk_login.user_login_info(
+CREATE TABLE IF NOT EXISTS sidewalk_login.user_login_info(
     user_login_info_id SERIAL NOT NULL,
     login_info_id bigint NOT NULL,
     user_id VARCHAR(254) NOT NULL,
     PRIMARY KEY (user_login_info_id)
 );
-CREATE INDEX user_login_info_login_info_id_idx ON sidewalk_login.user_login_info USING btree(login_info_id);
-CREATE INDEX user_login_info_user_id_idx ON sidewalk_login.user_login_info USING btree(user_id);
+CREATE INDEX IF NOT EXISTS user_login_info_login_info_id_idx ON sidewalk_login.user_login_info USING btree(login_info_id);
+CREATE INDEX IF NOT EXISTS user_login_info_user_id_idx ON sidewalk_login.user_login_info USING btree(user_id);
 ALTER TABLE sidewalk_login.user_login_info OWNER TO sidewalk;
 GRANT ALL ON TABLE sidewalk_login.user_login_info TO sidewalk;
 GRANT ALL ON TABLE sidewalk_login.user_login_info TO postgres;
 
 -- TABLE: sidewalk_user
-CREATE TABLE sidewalk_login.sidewalk_user(
+CREATE TABLE IF NOT EXISTS sidewalk_login.sidewalk_user(
     user_id TEXT UNIQUE NOT NULL,
     username TEXT UNIQUE NOT NULL,
     email TEXT NOT NULL,
     PRIMARY KEY (user_id)
 );
-CREATE INDEX user_id_idx ON sidewalk_login.sidewalk_user USING btree(user_id);
-CREATE INDEX username_idx ON sidewalk_login.sidewalk_user USING btree(username);
-CREATE INDEX email_idx ON sidewalk_login.sidewalk_user USING btree(email);
+CREATE INDEX IF NOT EXISTS user_id_idx ON sidewalk_login.sidewalk_user USING btree(user_id);
+CREATE INDEX IF NOT EXISTS username_idx ON sidewalk_login.sidewalk_user USING btree(username);
+CREATE INDEX IF NOT EXISTS email_idx ON sidewalk_login.sidewalk_user USING btree(email);
 ALTER TABLE sidewalk_login.sidewalk_user OWNER TO sidewalk;
 GRANT ALL ON TABLE sidewalk_login.sidewalk_user TO sidewalk;
 GRANT ALL ON TABLE sidewalk_login.sidewalk_user TO postgres;
 
 # --- !Downs
--- TABLE: user_password_info
-DROP TABLE IF EXISTS sidewalk_login.user_password_info;
-
--- TABLE: login_info
-DROP TABLE IF EXISTS sidewalk_login.login_info;
+-- TABLE: sidewalk_user
+DROP INDEX IF EXISTS email_idx;
+DROP INDEX IF EXISTS username_idx;
+DROP INDEX IF EXISTS user_id_idx;
+DROP TABLE IF EXISTS sidewalk_login.sidewalk_user;
 
 -- TABLE: user_login_info
-DROP TABLE IF EXISTS sidewalk_login.user_login_info;
-DROP INDEX IF EXISTS user_login_info_login_info_id_idx;
 DROP INDEX IF EXISTS user_login_info_user_id_idx;
+DROP INDEX IF EXISTS user_login_info_login_info_id_idx;
+DROP TABLE IF EXISTS sidewalk_login.user_login_info;
 
--- TABLE: sidewalk_user
-DROP TABLE IF EXISTS sidewalk_login.sidewalk_user;
-DROP INDEX IF EXISTS user_id_idx;
-DROP INDEX IF EXISTS username_idx;
-DROP INDEX IF EXISTS email_idx;
+-- TABLE: login_info
+DROP TABLE IF EXISTS sidewalk_login.login_info;
+
+-- TABLE: user_password_info
+DROP TABLE IF EXISTS sidewalk_login.user_password_info;
diff --git a/conf/evolutions/default/251.sql b/conf/evolutions/default/251.sql
index fc729dddf7..00ec699d2f 100644
--- a/conf/evolutions/default/251.sql
+++ b/conf/evolutions/default/251.sql
@@ -1,17 +1,24 @@
--- Move data from city schemas to new login data schema
+-- Move data from city schemas to new login data schema.
 -- TODO: Copy login data from ALL cities to login schema
 -- TODO: Among duplicates across cities, keep data from most recently logged in user.
 -- TODO: Update pkey sequence to the end of the data's sequence
 
--- Copy all login info from Pittsburgh into the new sidewalk_login schema
+# --- !Ups
+-- Copy all login info from Seattle into the new sidewalk_login schema
 INSERT INTO sidewalk_login.sidewalk_user(user_id, username, email)
-SELECT user_id, username, email FROM sidewalk_pittsburgh.sidewalk_user;
+SELECT user_id, username, email FROM sidewalk_seattle.sidewalk_user;
 
 INSERT INTO sidewalk_login.login_info(login_info_id, provider_id, provider_key)
-SELECT login_info_id, provider_id, provider_key FROM sidewalk_pittsburgh.login_info;
+SELECT login_info_id, provider_id, provider_key FROM sidewalk_seattle.login_info;
 
 INSERT INTO sidewalk_login.user_login_info(user_login_info_id, user_id, login_info_id)
-SELECT user_login_info_id, user_id, login_info_id FROM sidewalk_pittsburgh.user_login_info;
+SELECT user_login_info_id, user_id, login_info_id FROM sidewalk_seattle.user_login_info;
 
 INSERT INTO sidewalk_login.user_password_info (user_password_info_id, login_info_id, "password", salt, hasher)
-SELECT user_password_info_id, login_info_id, "password", salt, hasher FROM sidewalk_pittsburgh.user_password_info;
+SELECT user_password_info_id, login_info_id, "password", salt, hasher FROM sidewalk_seattle.user_password_info;
+
+# --- !Downs
+TRUNCATE sidewalk_login.user_password_info;
+TRUNCATE sidewalk_login.user_login_info;
+TRUNCATE sidewalk_login.login_info;
+TRUNCATE sidewalk_login.sidewalk_user;
diff --git a/conf/evolutions/default/252.sql b/conf/evolutions/default/252.sql
index 8417c760ef..9e4728733c 100644
--- a/conf/evolutions/default/252.sql
+++ b/conf/evolutions/default/252.sql
@@ -3,35 +3,65 @@
 # --- !Ups
 
 -- Pittsburgh
-ALTER TABLE sidewalk_pittsburgh.audit_task DROP CONSTRAINT IF EXISTS audit_task_user_id_fkey;
-ALTER TABLE sidewalk_pittsburgh.audit_task ADD CONSTRAINT audit_task_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
-ALTER TABLE sidewalk_pittsburgh.gallery_task_environment DROP CONSTRAINT IF EXISTS gallery_task_environment_user_id_fkey;
-ALTER TABLE sidewalk_pittsburgh.gallery_task_environment ADD CONSTRAINT gallery_task_environment_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
-ALTER TABLE sidewalk_pittsburgh.gallery_task_interaction DROP CONSTRAINT IF EXISTS gallery_task_interaction_user_id_fkey;
-ALTER TABLE sidewalk_pittsburgh.gallery_task_interaction ADD CONSTRAINT gallery_task_interaction_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
-ALTER TABLE sidewalk_pittsburgh.label_history DROP CONSTRAINT IF EXISTS label_history_edited_by_fkey;
-ALTER TABLE sidewalk_pittsburgh.label_history ADD CONSTRAINT label_history_edited_by_fkey FOREIGN KEY (edited_by) REFERENCES sidewalk_login.sidewalk_user(user_id);
-ALTER TABLE sidewalk_pittsburgh.label_validation DROP CONSTRAINT IF EXISTS label_validation_user_id_fkey;
-ALTER TABLE sidewalk_pittsburgh.label_validation ADD CONSTRAINT label_validation_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
-ALTER TABLE sidewalk_pittsburgh.mission DROP CONSTRAINT IF EXISTS mission_user_id_fkey;
-ALTER TABLE sidewalk_pittsburgh.mission ADD CONSTRAINT mission_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
-ALTER TABLE sidewalk_pittsburgh.route DROP CONSTRAINT IF EXISTS route_user_id_fkey;
-ALTER TABLE sidewalk_pittsburgh.route ADD CONSTRAINT route_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
-ALTER TABLE sidewalk_pittsburgh.user_clustering_session DROP CONSTRAINT IF EXISTS user_clustering_session_user_id_fkey;
-ALTER TABLE sidewalk_pittsburgh.user_clustering_session ADD CONSTRAINT user_clustering_session_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
-ALTER TABLE sidewalk_pittsburgh.user_org DROP CONSTRAINT IF EXISTS user_org_user_id_fkey;
-ALTER TABLE sidewalk_pittsburgh.user_org ADD CONSTRAINT user_org_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
-ALTER TABLE sidewalk_pittsburgh.user_route DROP CONSTRAINT IF EXISTS user_route_user_id_fkey;
-ALTER TABLE sidewalk_pittsburgh.user_route ADD CONSTRAINT user_route_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
-ALTER TABLE sidewalk_pittsburgh.user_stat DROP CONSTRAINT IF EXISTS user_stat_user_id_fkey;
-ALTER TABLE sidewalk_pittsburgh.user_stat ADD CONSTRAINT user_stat_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
-ALTER TABLE sidewalk_pittsburgh.user_survey_option_submission DROP CONSTRAINT IF EXISTS user_survey_option_submission_user_id_fkey;
-ALTER TABLE sidewalk_pittsburgh.user_survey_option_submission ADD CONSTRAINT user_survey_option_submission_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
-ALTER TABLE sidewalk_pittsburgh.user_survey_text_submission DROP CONSTRAINT IF EXISTS user_survey_text_submission_user_id_fkey;
-ALTER TABLE sidewalk_pittsburgh.user_survey_text_submission ADD CONSTRAINT user_survey_text_submission_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
-ALTER TABLE sidewalk_pittsburgh.validation_task_comment DROP CONSTRAINT IF EXISTS validation_task_comment_user_id_fkey;
-ALTER TABLE sidewalk_pittsburgh.validation_task_comment ADD CONSTRAINT validation_task_comment_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
-ALTER TABLE sidewalk_pittsburgh.webpage_activity DROP CONSTRAINT IF EXISTS webpage_activity_user_id_fkey;
-ALTER TABLE sidewalk_pittsburgh.webpage_activity ADD CONSTRAINT webpage_activity_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
+ALTER TABLE sidewalk_seattle.audit_task DROP CONSTRAINT IF EXISTS audit_task_user_id_fkey;
+ALTER TABLE sidewalk_seattle.audit_task ADD CONSTRAINT audit_task_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
+ALTER TABLE sidewalk_seattle.gallery_task_environment DROP CONSTRAINT IF EXISTS gallery_task_environment_user_id_fkey;
+ALTER TABLE sidewalk_seattle.gallery_task_environment ADD CONSTRAINT gallery_task_environment_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
+ALTER TABLE sidewalk_seattle.gallery_task_interaction DROP CONSTRAINT IF EXISTS gallery_task_interaction_user_id_fkey;
+ALTER TABLE sidewalk_seattle.gallery_task_interaction ADD CONSTRAINT gallery_task_interaction_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
+ALTER TABLE sidewalk_seattle.label_history DROP CONSTRAINT IF EXISTS label_history_edited_by_fkey;
+ALTER TABLE sidewalk_seattle.label_history ADD CONSTRAINT label_history_edited_by_fkey FOREIGN KEY (edited_by) REFERENCES sidewalk_login.sidewalk_user(user_id);
+ALTER TABLE sidewalk_seattle.label_validation DROP CONSTRAINT IF EXISTS label_validation_user_id_fkey;
+ALTER TABLE sidewalk_seattle.label_validation ADD CONSTRAINT label_validation_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
+ALTER TABLE sidewalk_seattle.mission DROP CONSTRAINT IF EXISTS mission_user_id_fkey;
+ALTER TABLE sidewalk_seattle.mission ADD CONSTRAINT mission_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
+ALTER TABLE sidewalk_seattle.route DROP CONSTRAINT IF EXISTS route_user_id_fkey;
+ALTER TABLE sidewalk_seattle.route ADD CONSTRAINT route_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
+ALTER TABLE sidewalk_seattle.user_clustering_session DROP CONSTRAINT IF EXISTS user_clustering_session_user_id_fkey;
+ALTER TABLE sidewalk_seattle.user_clustering_session ADD CONSTRAINT user_clustering_session_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
+ALTER TABLE sidewalk_seattle.user_org DROP CONSTRAINT IF EXISTS user_org_user_id_fkey;
+ALTER TABLE sidewalk_seattle.user_org ADD CONSTRAINT user_org_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
+ALTER TABLE sidewalk_seattle.user_route DROP CONSTRAINT IF EXISTS user_route_user_id_fkey;
+ALTER TABLE sidewalk_seattle.user_route ADD CONSTRAINT user_route_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
+ALTER TABLE sidewalk_seattle.user_stat DROP CONSTRAINT IF EXISTS user_stat_user_id_fkey;
+ALTER TABLE sidewalk_seattle.user_stat ADD CONSTRAINT user_stat_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
+ALTER TABLE sidewalk_seattle.user_survey_option_submission DROP CONSTRAINT IF EXISTS user_survey_option_submission_user_id_fkey;
+ALTER TABLE sidewalk_seattle.user_survey_option_submission ADD CONSTRAINT user_survey_option_submission_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
+ALTER TABLE sidewalk_seattle.user_survey_text_submission DROP CONSTRAINT IF EXISTS user_survey_text_submission_user_id_fkey;
+ALTER TABLE sidewalk_seattle.user_survey_text_submission ADD CONSTRAINT user_survey_text_submission_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
+ALTER TABLE sidewalk_seattle.validation_task_comment DROP CONSTRAINT IF EXISTS validation_task_comment_user_id_fkey;
+ALTER TABLE sidewalk_seattle.validation_task_comment ADD CONSTRAINT validation_task_comment_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
+ALTER TABLE sidewalk_seattle.webpage_activity DROP CONSTRAINT IF EXISTS webpage_activity_user_id_fkey;
+ALTER TABLE sidewalk_seattle.webpage_activity ADD CONSTRAINT webpage_activity_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
 
 # --- !Downs
+ALTER TABLE sidewalk_seattle.webpage_activity DROP CONSTRAINT IF EXISTS webpage_activity_user_id_fkey;
+ALTER TABLE sidewalk_seattle.webpage_activity ADD CONSTRAINT webpage_activity_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_seattle.sidewalk_user(user_id);
+ALTER TABLE sidewalk_seattle.validation_task_comment DROP CONSTRAINT IF EXISTS validation_task_comment_user_id_fkey;
+ALTER TABLE sidewalk_seattle.validation_task_comment ADD CONSTRAINT validation_task_comment_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_seattle.sidewalk_user(user_id);
+ALTER TABLE sidewalk_seattle.user_survey_text_submission DROP CONSTRAINT IF EXISTS user_survey_text_submission_user_id_fkey;
+ALTER TABLE sidewalk_seattle.user_survey_text_submission ADD CONSTRAINT user_survey_text_submission_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_seattle.sidewalk_user(user_id);
+ALTER TABLE sidewalk_seattle.user_survey_option_submission DROP CONSTRAINT IF EXISTS user_survey_option_submission_user_id_fkey;
+ALTER TABLE sidewalk_seattle.user_survey_option_submission ADD CONSTRAINT user_survey_option_submission_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_seattle.sidewalk_user(user_id);
+ALTER TABLE sidewalk_seattle.user_stat DROP CONSTRAINT IF EXISTS user_stat_user_id_fkey;
+ALTER TABLE sidewalk_seattle.user_stat ADD CONSTRAINT user_stat_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_seattle.sidewalk_user(user_id);
+ALTER TABLE sidewalk_seattle.user_route DROP CONSTRAINT IF EXISTS user_route_user_id_fkey;
+ALTER TABLE sidewalk_seattle.user_route ADD CONSTRAINT user_route_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_seattle.sidewalk_user(user_id);
+ALTER TABLE sidewalk_seattle.user_org DROP CONSTRAINT IF EXISTS user_org_user_id_fkey;
+ALTER TABLE sidewalk_seattle.user_org ADD CONSTRAINT user_org_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_seattle.sidewalk_user(user_id);
+ALTER TABLE sidewalk_seattle.user_clustering_session DROP CONSTRAINT IF EXISTS user_clustering_session_user_id_fkey;
+ALTER TABLE sidewalk_seattle.user_clustering_session ADD CONSTRAINT user_clustering_session_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_seattle.sidewalk_user(user_id);
+ALTER TABLE sidewalk_seattle.route DROP CONSTRAINT IF EXISTS route_user_id_fkey;
+ALTER TABLE sidewalk_seattle.route ADD CONSTRAINT route_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_seattle.sidewalk_user(user_id);
+ALTER TABLE sidewalk_seattle.mission DROP CONSTRAINT IF EXISTS mission_user_id_fkey;
+ALTER TABLE sidewalk_seattle.mission ADD CONSTRAINT mission_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_seattle.sidewalk_user(user_id);
+ALTER TABLE sidewalk_seattle.label_validation DROP CONSTRAINT IF EXISTS label_validation_user_id_fkey;
+ALTER TABLE sidewalk_seattle.label_validation ADD CONSTRAINT label_validation_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_seattle.sidewalk_user(user_id);
+ALTER TABLE sidewalk_seattle.label_history DROP CONSTRAINT IF EXISTS label_history_edited_by_fkey;
+ALTER TABLE sidewalk_seattle.label_history ADD CONSTRAINT label_history_edited_by_fkey FOREIGN KEY (edited_by) REFERENCES sidewalk_seattle.sidewalk_user(user_id);
+ALTER TABLE sidewalk_seattle.gallery_task_interaction DROP CONSTRAINT IF EXISTS gallery_task_interaction_user_id_fkey;
+ALTER TABLE sidewalk_seattle.gallery_task_interaction ADD CONSTRAINT gallery_task_interaction_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_seattle.sidewalk_user(user_id);
+ALTER TABLE sidewalk_seattle.gallery_task_environment DROP CONSTRAINT IF EXISTS gallery_task_environment_user_id_fkey;
+ALTER TABLE sidewalk_seattle.gallery_task_environment ADD CONSTRAINT gallery_task_environment_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_seattle.sidewalk_user(user_id);
+ALTER TABLE sidewalk_seattle.audit_task DROP CONSTRAINT IF EXISTS audit_task_user_id_fkey;
+ALTER TABLE sidewalk_seattle.audit_task ADD CONSTRAINT audit_task_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_seattle.sidewalk_user(user_id);

From 7033fdf83f62f133c83f1bef83ac03c089e9238d Mon Sep 17 00:00:00 2001
From: Mikey Saugstad <michaelssaugstad@gmail.com>
Date: Mon, 23 Sep 2024 14:10:50 -0700
Subject: [PATCH 05/28] raw SQL now references new sidewalk_login schema

---
 app/models/daos/slick/UserDAOSlick.scala | 8 ++++----
 app/models/label/LabelTable.scala        | 2 +-
 app/models/user/UserStatTable.scala      | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/models/daos/slick/UserDAOSlick.scala b/app/models/daos/slick/UserDAOSlick.scala
index a7f1c8e9cc..01c37ae1ef 100644
--- a/app/models/daos/slick/UserDAOSlick.scala
+++ b/app/models/daos/slick/UserDAOSlick.scala
@@ -285,7 +285,7 @@ object UserDAOSlick {
     val countQuery = Q.query[String, Int](
       """SELECT COUNT(DISTINCT(label_validation.user_id))
         |FROM label_validation
-        |INNER JOIN sidewalk_user ON sidewalk_user.user_id = label_validation.user_id
+        |INNER JOIN sidewalk_login.sidewalk_user ON sidewalk_user.user_id = label_validation.user_id
         |INNER JOIN user_role ON sidewalk_user.user_id = user_role.user_id
         |INNER JOIN role ON user_role.role_id = role.role_id
         |WHERE (label_validation.end_timestamp AT TIME ZONE 'US/Pacific')::date = (NOW() AT TIME ZONE 'US/Pacific')::date
@@ -323,7 +323,7 @@ object UserDAOSlick {
     val countQuery = Q.query[String, Int](
       """SELECT COUNT(DISTINCT(label_validation.user_id))
         |FROM label_validation
-        |INNER JOIN sidewalk_user ON sidewalk_user.user_id = label_validation.user_id
+        |INNER JOIN sidewalk_login.sidewalk_user ON sidewalk_user.user_id = label_validation.user_id
         |INNER JOIN user_role ON sidewalk_user.user_id = user_role.user_id
         |INNER JOIN role ON user_role.role_id = role.role_id
         |WHERE (label_validation.end_timestamp AT TIME ZONE 'US/Pacific') > (NOW() AT TIME ZONE 'US/Pacific') - interval '168 hours'
@@ -397,7 +397,7 @@ object UserDAOSlick {
     val countQuery = Q.query[String, Int](
       """SELECT COUNT(DISTINCT(audit_task.user_id))
         |FROM audit_task
-        |INNER JOIN sidewalk_user ON sidewalk_user.user_id = audit_task.user_id
+        |INNER JOIN sidewalk_login.sidewalk_user ON sidewalk_user.user_id = audit_task.user_id
         |INNER JOIN user_role ON sidewalk_user.user_id = user_role.user_id
         |INNER JOIN role ON user_role.role_id = role.role_id
         |WHERE (audit_task.task_end AT TIME ZONE 'US/Pacific')::date = (NOW() AT TIME ZONE 'US/Pacific')::date
@@ -436,7 +436,7 @@ object UserDAOSlick {
     val countQuery = Q.query[String, Int](
       """SELECT COUNT(DISTINCT(audit_task.user_id))
         |FROM audit_task
-        |INNER JOIN sidewalk_user ON sidewalk_user.user_id = audit_task.user_id
+        |INNER JOIN sidewalk_login.sidewalk_user ON sidewalk_user.user_id = audit_task.user_id
         |INNER JOIN user_role ON sidewalk_user.user_id = user_role.user_id
         |INNER JOIN role ON user_role.role_id = role.role_id
         |WHERE (audit_task.task_end AT TIME ZONE 'US/Pacific') > (now() AT TIME ZONE 'US/Pacific') - interval '168 hours'
diff --git a/app/models/label/LabelTable.scala b/app/models/label/LabelTable.scala
index f24b19de4e..b1eaca9d4e 100644
--- a/app/models/label/LabelTable.scala
+++ b/app/models/label/LabelTable.scala
@@ -544,7 +544,7 @@ object LabelTable {
          |INNER JOIN gsv_data ON lb1.gsv_panorama_id = gsv_data.gsv_panorama_id
          |INNER JOIN audit_task AS at ON lb1.audit_task_id = at.audit_task_id
          |INNER JOIN street_edge_region AS ser ON lb1.street_edge_id = ser.street_edge_id
-         |INNER JOIN sidewalk_user AS u ON at.user_id = u.user_id
+         |INNER JOIN sidewalk_login.sidewalk_user AS u ON at.user_id = u.user_id
          |INNER JOIN label_point AS lp ON lb1.label_id = lp.label_id
          |INNER JOIN (
          |    SELECT lb.label_id,
diff --git a/app/models/user/UserStatTable.scala b/app/models/user/UserStatTable.scala
index 26c4365334..32ec5fb4cb 100644
--- a/app/models/user/UserStatTable.scala
+++ b/app/models/user/UserStatTable.scala
@@ -317,7 +317,7 @@ object UserStatTable {
       if (byOrg) {
         "INNER JOIN (SELECT org_id, org_name AS username FROM organization) \"usernames\" ON label_counts.org_id = usernames.org_id"
       } else {
-        "INNER JOIN (SELECT user_id, username FROM sidewalk_user) \"usernames\" ON label_counts.user_id = usernames.user_id"
+        "INNER JOIN (SELECT user_id, username FROM sidewalk_login.sidewalk_user) \"usernames\" ON label_counts.user_id = usernames.user_id"
       }
     }
     val statsQuery = Q.queryNA[(String, Int, Int, Float, Option[Float], Float)](
@@ -332,7 +332,7 @@ object UserStatTable {
         |            END AS score
         |FROM (
         |    SELECT $groupingCol, COUNT(label_id) AS label_count
-        |    FROM sidewalk_user
+        |    FROM sidewalk_login.sidewalk_user
         |    INNER JOIN user_role ON sidewalk_user.user_id = user_role.user_id
         |    INNER JOIN role ON user_role.role_id = role.role_id
         |    INNER JOIN user_stat ON sidewalk_user.user_id = user_stat.user_id
@@ -352,7 +352,7 @@ object UserStatTable {
         |INNER JOIN (
         |    SELECT $groupingCol, COUNT(mission_id) AS mission_count
         |    FROM mission
-        |    INNER JOIN sidewalk_user ON mission.user_id = sidewalk_user.user_id
+        |    INNER JOIN sidewalk_login.sidewalk_user ON mission.user_id = sidewalk_user.user_id
         |    $joinUserOrgTable
         |    WHERE (mission_end AT TIME ZONE 'US/Pacific') > $statStartTime
         |    GROUP BY $groupingCol
@@ -361,7 +361,7 @@ object UserStatTable {
         |    SELECT $groupingCol, COALESCE(SUM(ST_LENGTH(ST_TRANSFORM(geom, 26918))), 0) AS distance_meters
         |    FROM street_edge
         |    INNER JOIN audit_task ON street_edge.street_edge_id = audit_task.street_edge_id
-        |    INNER JOIN sidewalk_user ON audit_task.user_id = sidewalk_user.user_id
+        |    INNER JOIN sidewalk_login.sidewalk_user ON audit_task.user_id = sidewalk_user.user_id
         |    $joinUserOrgTable
         |    WHERE audit_task.completed
         |        AND (task_end AT TIME ZONE 'US/Pacific') > $statStartTime

From d8d9835cf8fd1bb6be098c6c9100fdeee7cf45a3 Mon Sep 17 00:00:00 2001
From: Mikey Saugstad <michaelssaugstad@gmail.com>
Date: Mon, 23 Sep 2024 14:22:00 -0700
Subject: [PATCH 06/28] primary key sequences now set correctly in
 sidewalk_login schema

---
 conf/evolutions/default/251.sql | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/conf/evolutions/default/251.sql b/conf/evolutions/default/251.sql
index 00ec699d2f..c5c5312bab 100644
--- a/conf/evolutions/default/251.sql
+++ b/conf/evolutions/default/251.sql
@@ -10,12 +10,15 @@ SELECT user_id, username, email FROM sidewalk_seattle.sidewalk_user;
 
 INSERT INTO sidewalk_login.login_info(login_info_id, provider_id, provider_key)
 SELECT login_info_id, provider_id, provider_key FROM sidewalk_seattle.login_info;
+SELECT setval('sidewalk_login.login_info_login_info_id_seq', (SELECT MAX(login_info_id) FROM sidewalk_login.login_info));
 
 INSERT INTO sidewalk_login.user_login_info(user_login_info_id, user_id, login_info_id)
 SELECT user_login_info_id, user_id, login_info_id FROM sidewalk_seattle.user_login_info;
+SELECT setval('sidewalk_login.user_login_info_user_login_info_id_seq', (SELECT MAX(user_login_info_id) FROM sidewalk_login.user_login_info));
 
 INSERT INTO sidewalk_login.user_password_info (user_password_info_id, login_info_id, "password", salt, hasher)
 SELECT user_password_info_id, login_info_id, "password", salt, hasher FROM sidewalk_seattle.user_password_info;
+SELECT setval('sidewalk_login.user_password_info_user_password_info_id_seq', (SELECT MAX(user_password_info_id) FROM sidewalk_login.user_password_info));
 
 # --- !Downs
 TRUNCATE sidewalk_login.user_password_info;

From 91ae8ca9c0510cfd3ff83f060d06bab9ccbdc8ac Mon Sep 17 00:00:00 2001
From: Mikey Saugstad <michaelssaugstad@gmail.com>
Date: Mon, 23 Sep 2024 16:05:43 -0700
Subject: [PATCH 07/28] restructures unified login evolutions to fix foreign
 key issues

---
 conf/evolutions/default/251.sql | 86 +++++++++++++++++++++++++++++++++
 conf/evolutions/default/252.sql | 67 -------------------------
 2 files changed, 86 insertions(+), 67 deletions(-)
 delete mode 100644 conf/evolutions/default/252.sql

diff --git a/conf/evolutions/default/251.sql b/conf/evolutions/default/251.sql
index c5c5312bab..82ac08b896 100644
--- a/conf/evolutions/default/251.sql
+++ b/conf/evolutions/default/251.sql
@@ -20,7 +20,93 @@ INSERT INTO sidewalk_login.user_password_info (user_password_info_id, login_info
 SELECT user_password_info_id, login_info_id, "password", salt, hasher FROM sidewalk_seattle.user_password_info;
 SELECT setval('sidewalk_login.user_password_info_user_password_info_id_seq', (SELECT MAX(user_password_info_id) FROM sidewalk_login.user_password_info));
 
+-- Move constraints over to the new schema.
+ALTER TABLE sidewalk_seattle.audit_task DROP CONSTRAINT IF EXISTS audit_task_user_id_fkey;
+ALTER TABLE sidewalk_seattle.audit_task ADD CONSTRAINT audit_task_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
+ALTER TABLE sidewalk_seattle.gallery_task_environment DROP CONSTRAINT IF EXISTS gallery_task_environment_user_id_fkey;
+ALTER TABLE sidewalk_seattle.gallery_task_environment ADD CONSTRAINT gallery_task_environment_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
+ALTER TABLE sidewalk_seattle.gallery_task_interaction DROP CONSTRAINT IF EXISTS gallery_task_interaction_user_id_fkey;
+ALTER TABLE sidewalk_seattle.gallery_task_interaction ADD CONSTRAINT gallery_task_interaction_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
+ALTER TABLE sidewalk_seattle.label_history DROP CONSTRAINT IF EXISTS label_history_edited_by_fkey;
+ALTER TABLE sidewalk_seattle.label_history ADD CONSTRAINT label_history_edited_by_fkey FOREIGN KEY (edited_by) REFERENCES sidewalk_login.sidewalk_user(user_id);
+ALTER TABLE sidewalk_seattle.label_validation DROP CONSTRAINT IF EXISTS label_validation_user_id_fkey;
+ALTER TABLE sidewalk_seattle.label_validation ADD CONSTRAINT label_validation_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
+ALTER TABLE sidewalk_seattle.mission DROP CONSTRAINT IF EXISTS mission_user_id_fkey;
+ALTER TABLE sidewalk_seattle.mission ADD CONSTRAINT mission_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
+ALTER TABLE sidewalk_seattle.route DROP CONSTRAINT IF EXISTS route_user_id_fkey;
+ALTER TABLE sidewalk_seattle.route ADD CONSTRAINT route_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
+ALTER TABLE sidewalk_seattle.user_clustering_session DROP CONSTRAINT IF EXISTS user_clustering_session_user_id_fkey;
+ALTER TABLE sidewalk_seattle.user_clustering_session ADD CONSTRAINT user_clustering_session_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
+ALTER TABLE sidewalk_seattle.user_org DROP CONSTRAINT IF EXISTS user_org_user_id_fkey;
+ALTER TABLE sidewalk_seattle.user_org ADD CONSTRAINT user_org_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
+ALTER TABLE sidewalk_seattle.user_route DROP CONSTRAINT IF EXISTS user_route_user_id_fkey;
+ALTER TABLE sidewalk_seattle.user_route ADD CONSTRAINT user_route_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
+ALTER TABLE sidewalk_seattle.user_stat DROP CONSTRAINT IF EXISTS user_stat_user_id_fkey;
+ALTER TABLE sidewalk_seattle.user_stat ADD CONSTRAINT user_stat_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
+ALTER TABLE sidewalk_seattle.user_survey_option_submission DROP CONSTRAINT IF EXISTS user_survey_option_submission_user_id_fkey;
+ALTER TABLE sidewalk_seattle.user_survey_option_submission ADD CONSTRAINT user_survey_option_submission_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
+ALTER TABLE sidewalk_seattle.user_survey_text_submission DROP CONSTRAINT IF EXISTS user_survey_text_submission_user_id_fkey;
+ALTER TABLE sidewalk_seattle.user_survey_text_submission ADD CONSTRAINT user_survey_text_submission_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
+ALTER TABLE sidewalk_seattle.validation_task_comment DROP CONSTRAINT IF EXISTS validation_task_comment_user_id_fkey;
+ALTER TABLE sidewalk_seattle.validation_task_comment ADD CONSTRAINT validation_task_comment_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
+ALTER TABLE sidewalk_seattle.webpage_activity DROP CONSTRAINT IF EXISTS webpage_activity_user_id_fkey;
+ALTER TABLE sidewalk_seattle.webpage_activity ADD CONSTRAINT webpage_activity_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
+
+TRUNCATE sidewalk_seattle.sidewalk_user;
+TRUNCATE sidewalk_seattle.login_info;
+TRUNCATE sidewalk_seattle.user_login_info;
+TRUNCATE sidewalk_seattle.user_password_info;
+
 # --- !Downs
+-- Copy all login info from sidewalk_login back into the Seattle schema.
+INSERT INTO sidewalk_seattle.sidewalk_user(user_id, username, email)
+SELECT user_id, username, email FROM sidewalk_login.sidewalk_user;
+
+INSERT INTO sidewalk_seattle.login_info(login_info_id, provider_id, provider_key)
+SELECT login_info_id, provider_id, provider_key FROM sidewalk_login.login_info;
+SELECT setval('sidewalk_seattle.logininfo_id_seq', (SELECT MAX(login_info_id) FROM sidewalk_seattle.login_info));
+
+INSERT INTO sidewalk_seattle.user_login_info(user_login_info_id, user_id, login_info_id)
+SELECT user_login_info_id, user_id, login_info_id FROM sidewalk_login.user_login_info;
+-- SELECT setval('sidewalk_seattle.user_login_info_user_login_info_id_seq', (SELECT MAX(user_login_info_id) FROM sidewalk_seattle.user_login_info));
+
+INSERT INTO sidewalk_seattle.user_password_info (user_password_info_id, login_info_id, "password", salt, hasher)
+SELECT user_password_info_id, login_info_id, "password", salt, hasher FROM sidewalk_login.user_password_info;
+-- SELECT setval('sidewalk_seattle.user_password_info_user_password_info_id_seq', (SELECT MAX(user_password_info_id) FROM sidewalk_seattle.user_password_info));
+
+-- Move the constraints back to the Seattle schema.
+ALTER TABLE sidewalk_seattle.webpage_activity DROP CONSTRAINT IF EXISTS webpage_activity_user_id_fkey;
+ALTER TABLE sidewalk_seattle.webpage_activity ADD CONSTRAINT webpage_activity_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_seattle.sidewalk_user(user_id);
+ALTER TABLE sidewalk_seattle.validation_task_comment DROP CONSTRAINT IF EXISTS validation_task_comment_user_id_fkey;
+ALTER TABLE sidewalk_seattle.validation_task_comment ADD CONSTRAINT validation_task_comment_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_seattle.sidewalk_user(user_id);
+ALTER TABLE sidewalk_seattle.user_survey_text_submission DROP CONSTRAINT IF EXISTS user_survey_text_submission_user_id_fkey;
+ALTER TABLE sidewalk_seattle.user_survey_text_submission ADD CONSTRAINT user_survey_text_submission_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_seattle.sidewalk_user(user_id);
+ALTER TABLE sidewalk_seattle.user_survey_option_submission DROP CONSTRAINT IF EXISTS user_survey_option_submission_user_id_fkey;
+ALTER TABLE sidewalk_seattle.user_survey_option_submission ADD CONSTRAINT user_survey_option_submission_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_seattle.sidewalk_user(user_id);
+ALTER TABLE sidewalk_seattle.user_stat DROP CONSTRAINT IF EXISTS user_stat_user_id_fkey;
+ALTER TABLE sidewalk_seattle.user_stat ADD CONSTRAINT user_stat_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_seattle.sidewalk_user(user_id);
+ALTER TABLE sidewalk_seattle.user_route DROP CONSTRAINT IF EXISTS user_route_user_id_fkey;
+ALTER TABLE sidewalk_seattle.user_route ADD CONSTRAINT user_route_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_seattle.sidewalk_user(user_id);
+ALTER TABLE sidewalk_seattle.user_org DROP CONSTRAINT IF EXISTS user_org_user_id_fkey;
+ALTER TABLE sidewalk_seattle.user_org ADD CONSTRAINT user_org_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_seattle.sidewalk_user(user_id);
+ALTER TABLE sidewalk_seattle.user_clustering_session DROP CONSTRAINT IF EXISTS user_clustering_session_user_id_fkey;
+ALTER TABLE sidewalk_seattle.user_clustering_session ADD CONSTRAINT user_clustering_session_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_seattle.sidewalk_user(user_id);
+ALTER TABLE sidewalk_seattle.route DROP CONSTRAINT IF EXISTS route_user_id_fkey;
+ALTER TABLE sidewalk_seattle.route ADD CONSTRAINT route_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_seattle.sidewalk_user(user_id);
+ALTER TABLE sidewalk_seattle.mission DROP CONSTRAINT IF EXISTS mission_user_id_fkey;
+ALTER TABLE sidewalk_seattle.mission ADD CONSTRAINT mission_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_seattle.sidewalk_user(user_id);
+ALTER TABLE sidewalk_seattle.label_validation DROP CONSTRAINT IF EXISTS label_validation_user_id_fkey;
+ALTER TABLE sidewalk_seattle.label_validation ADD CONSTRAINT label_validation_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_seattle.sidewalk_user(user_id);
+ALTER TABLE sidewalk_seattle.label_history DROP CONSTRAINT IF EXISTS label_history_edited_by_fkey;
+ALTER TABLE sidewalk_seattle.label_history ADD CONSTRAINT label_history_edited_by_fkey FOREIGN KEY (edited_by) REFERENCES sidewalk_seattle.sidewalk_user(user_id);
+ALTER TABLE sidewalk_seattle.gallery_task_interaction DROP CONSTRAINT IF EXISTS gallery_task_interaction_user_id_fkey;
+ALTER TABLE sidewalk_seattle.gallery_task_interaction ADD CONSTRAINT gallery_task_interaction_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_seattle.sidewalk_user(user_id);
+ALTER TABLE sidewalk_seattle.gallery_task_environment DROP CONSTRAINT IF EXISTS gallery_task_environment_user_id_fkey;
+ALTER TABLE sidewalk_seattle.gallery_task_environment ADD CONSTRAINT gallery_task_environment_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_seattle.sidewalk_user(user_id);
+ALTER TABLE sidewalk_seattle.audit_task DROP CONSTRAINT IF EXISTS audit_task_user_id_fkey;
+ALTER TABLE sidewalk_seattle.audit_task ADD CONSTRAINT audit_task_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_seattle.sidewalk_user(user_id);
+
+-- Truncate the tables in the sidewalk_login schema.
 TRUNCATE sidewalk_login.user_password_info;
 TRUNCATE sidewalk_login.user_login_info;
 TRUNCATE sidewalk_login.login_info;
diff --git a/conf/evolutions/default/252.sql b/conf/evolutions/default/252.sql
deleted file mode 100644
index 9e4728733c..0000000000
--- a/conf/evolutions/default/252.sql
+++ /dev/null
@@ -1,67 +0,0 @@
--- Add foreign key constraints from city schemas to login schema
-
-# --- !Ups
-
--- Pittsburgh
-ALTER TABLE sidewalk_seattle.audit_task DROP CONSTRAINT IF EXISTS audit_task_user_id_fkey;
-ALTER TABLE sidewalk_seattle.audit_task ADD CONSTRAINT audit_task_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
-ALTER TABLE sidewalk_seattle.gallery_task_environment DROP CONSTRAINT IF EXISTS gallery_task_environment_user_id_fkey;
-ALTER TABLE sidewalk_seattle.gallery_task_environment ADD CONSTRAINT gallery_task_environment_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
-ALTER TABLE sidewalk_seattle.gallery_task_interaction DROP CONSTRAINT IF EXISTS gallery_task_interaction_user_id_fkey;
-ALTER TABLE sidewalk_seattle.gallery_task_interaction ADD CONSTRAINT gallery_task_interaction_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
-ALTER TABLE sidewalk_seattle.label_history DROP CONSTRAINT IF EXISTS label_history_edited_by_fkey;
-ALTER TABLE sidewalk_seattle.label_history ADD CONSTRAINT label_history_edited_by_fkey FOREIGN KEY (edited_by) REFERENCES sidewalk_login.sidewalk_user(user_id);
-ALTER TABLE sidewalk_seattle.label_validation DROP CONSTRAINT IF EXISTS label_validation_user_id_fkey;
-ALTER TABLE sidewalk_seattle.label_validation ADD CONSTRAINT label_validation_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
-ALTER TABLE sidewalk_seattle.mission DROP CONSTRAINT IF EXISTS mission_user_id_fkey;
-ALTER TABLE sidewalk_seattle.mission ADD CONSTRAINT mission_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
-ALTER TABLE sidewalk_seattle.route DROP CONSTRAINT IF EXISTS route_user_id_fkey;
-ALTER TABLE sidewalk_seattle.route ADD CONSTRAINT route_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
-ALTER TABLE sidewalk_seattle.user_clustering_session DROP CONSTRAINT IF EXISTS user_clustering_session_user_id_fkey;
-ALTER TABLE sidewalk_seattle.user_clustering_session ADD CONSTRAINT user_clustering_session_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
-ALTER TABLE sidewalk_seattle.user_org DROP CONSTRAINT IF EXISTS user_org_user_id_fkey;
-ALTER TABLE sidewalk_seattle.user_org ADD CONSTRAINT user_org_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
-ALTER TABLE sidewalk_seattle.user_route DROP CONSTRAINT IF EXISTS user_route_user_id_fkey;
-ALTER TABLE sidewalk_seattle.user_route ADD CONSTRAINT user_route_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
-ALTER TABLE sidewalk_seattle.user_stat DROP CONSTRAINT IF EXISTS user_stat_user_id_fkey;
-ALTER TABLE sidewalk_seattle.user_stat ADD CONSTRAINT user_stat_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
-ALTER TABLE sidewalk_seattle.user_survey_option_submission DROP CONSTRAINT IF EXISTS user_survey_option_submission_user_id_fkey;
-ALTER TABLE sidewalk_seattle.user_survey_option_submission ADD CONSTRAINT user_survey_option_submission_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
-ALTER TABLE sidewalk_seattle.user_survey_text_submission DROP CONSTRAINT IF EXISTS user_survey_text_submission_user_id_fkey;
-ALTER TABLE sidewalk_seattle.user_survey_text_submission ADD CONSTRAINT user_survey_text_submission_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
-ALTER TABLE sidewalk_seattle.validation_task_comment DROP CONSTRAINT IF EXISTS validation_task_comment_user_id_fkey;
-ALTER TABLE sidewalk_seattle.validation_task_comment ADD CONSTRAINT validation_task_comment_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
-ALTER TABLE sidewalk_seattle.webpage_activity DROP CONSTRAINT IF EXISTS webpage_activity_user_id_fkey;
-ALTER TABLE sidewalk_seattle.webpage_activity ADD CONSTRAINT webpage_activity_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
-
-# --- !Downs
-ALTER TABLE sidewalk_seattle.webpage_activity DROP CONSTRAINT IF EXISTS webpage_activity_user_id_fkey;
-ALTER TABLE sidewalk_seattle.webpage_activity ADD CONSTRAINT webpage_activity_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_seattle.sidewalk_user(user_id);
-ALTER TABLE sidewalk_seattle.validation_task_comment DROP CONSTRAINT IF EXISTS validation_task_comment_user_id_fkey;
-ALTER TABLE sidewalk_seattle.validation_task_comment ADD CONSTRAINT validation_task_comment_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_seattle.sidewalk_user(user_id);
-ALTER TABLE sidewalk_seattle.user_survey_text_submission DROP CONSTRAINT IF EXISTS user_survey_text_submission_user_id_fkey;
-ALTER TABLE sidewalk_seattle.user_survey_text_submission ADD CONSTRAINT user_survey_text_submission_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_seattle.sidewalk_user(user_id);
-ALTER TABLE sidewalk_seattle.user_survey_option_submission DROP CONSTRAINT IF EXISTS user_survey_option_submission_user_id_fkey;
-ALTER TABLE sidewalk_seattle.user_survey_option_submission ADD CONSTRAINT user_survey_option_submission_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_seattle.sidewalk_user(user_id);
-ALTER TABLE sidewalk_seattle.user_stat DROP CONSTRAINT IF EXISTS user_stat_user_id_fkey;
-ALTER TABLE sidewalk_seattle.user_stat ADD CONSTRAINT user_stat_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_seattle.sidewalk_user(user_id);
-ALTER TABLE sidewalk_seattle.user_route DROP CONSTRAINT IF EXISTS user_route_user_id_fkey;
-ALTER TABLE sidewalk_seattle.user_route ADD CONSTRAINT user_route_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_seattle.sidewalk_user(user_id);
-ALTER TABLE sidewalk_seattle.user_org DROP CONSTRAINT IF EXISTS user_org_user_id_fkey;
-ALTER TABLE sidewalk_seattle.user_org ADD CONSTRAINT user_org_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_seattle.sidewalk_user(user_id);
-ALTER TABLE sidewalk_seattle.user_clustering_session DROP CONSTRAINT IF EXISTS user_clustering_session_user_id_fkey;
-ALTER TABLE sidewalk_seattle.user_clustering_session ADD CONSTRAINT user_clustering_session_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_seattle.sidewalk_user(user_id);
-ALTER TABLE sidewalk_seattle.route DROP CONSTRAINT IF EXISTS route_user_id_fkey;
-ALTER TABLE sidewalk_seattle.route ADD CONSTRAINT route_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_seattle.sidewalk_user(user_id);
-ALTER TABLE sidewalk_seattle.mission DROP CONSTRAINT IF EXISTS mission_user_id_fkey;
-ALTER TABLE sidewalk_seattle.mission ADD CONSTRAINT mission_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_seattle.sidewalk_user(user_id);
-ALTER TABLE sidewalk_seattle.label_validation DROP CONSTRAINT IF EXISTS label_validation_user_id_fkey;
-ALTER TABLE sidewalk_seattle.label_validation ADD CONSTRAINT label_validation_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_seattle.sidewalk_user(user_id);
-ALTER TABLE sidewalk_seattle.label_history DROP CONSTRAINT IF EXISTS label_history_edited_by_fkey;
-ALTER TABLE sidewalk_seattle.label_history ADD CONSTRAINT label_history_edited_by_fkey FOREIGN KEY (edited_by) REFERENCES sidewalk_seattle.sidewalk_user(user_id);
-ALTER TABLE sidewalk_seattle.gallery_task_interaction DROP CONSTRAINT IF EXISTS gallery_task_interaction_user_id_fkey;
-ALTER TABLE sidewalk_seattle.gallery_task_interaction ADD CONSTRAINT gallery_task_interaction_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_seattle.sidewalk_user(user_id);
-ALTER TABLE sidewalk_seattle.gallery_task_environment DROP CONSTRAINT IF EXISTS gallery_task_environment_user_id_fkey;
-ALTER TABLE sidewalk_seattle.gallery_task_environment ADD CONSTRAINT gallery_task_environment_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_seattle.sidewalk_user(user_id);
-ALTER TABLE sidewalk_seattle.audit_task DROP CONSTRAINT IF EXISTS audit_task_user_id_fkey;
-ALTER TABLE sidewalk_seattle.audit_task ADD CONSTRAINT audit_task_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_seattle.sidewalk_user(user_id);

From b8c8debe46054e80b0de88a974c513d1f4e5c588 Mon Sep 17 00:00:00 2001
From: Mikey Saugstad <michaelssaugstad@gmail.com>
Date: Thu, 3 Oct 2024 11:32:47 -0700
Subject: [PATCH 08/28] moves password resets to unified login schema

---
 app/models/daos/slick/DBTableDefinitions.scala |  2 +-
 app/utils/actor/AuthTokenCleanerActor.scala    |  1 +
 conf/evolutions/default/250.sql                | 13 +++++++++++++
 conf/evolutions/default/251.sql                |  2 ++
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/app/models/daos/slick/DBTableDefinitions.scala b/app/models/daos/slick/DBTableDefinitions.scala
index 42e6d47465..680abcd315 100644
--- a/app/models/daos/slick/DBTableDefinitions.scala
+++ b/app/models/daos/slick/DBTableDefinitions.scala
@@ -44,7 +44,7 @@ object DBTableDefinitions {
 
   case class DBAuthToken (id: Array[Byte], userID: String, expirationTimestamp: Timestamp)
 
-  class AuthTokenTable(tag: Tag) extends Table[DBAuthToken](tag, "auth_tokens") {
+  class AuthTokenTable(tag: Tag) extends Table[DBAuthToken](tag, Some("sidewalk_login"), "auth_tokens") {
     def id = column[Array[Byte]]("id")
     def userID = column[String]("user_id", O.PrimaryKey)
     def expirationTimestamp = column[Timestamp]("expiration_timestamp")
diff --git a/app/utils/actor/AuthTokenCleanerActor.scala b/app/utils/actor/AuthTokenCleanerActor.scala
index 3f89790ab4..15831170f8 100644
--- a/app/utils/actor/AuthTokenCleanerActor.scala
+++ b/app/utils/actor/AuthTokenCleanerActor.scala
@@ -38,6 +38,7 @@ class AuthTokenCleanerActor extends Actor {
     val durationToNextUpdate: FiniteDuration = FiniteDuration(millisUntilNextUpdate, MILLISECONDS)
 
     // Run auth token cleaner every 24 hours
+    // TODO this is being run in every city, even though all cities are pointing to the same table.
     cancellable = Some(
       context.system.scheduler.schedule(
         durationToNextUpdate,
diff --git a/conf/evolutions/default/250.sql b/conf/evolutions/default/250.sql
index b4e5c9b92d..6b88ed35c9 100644
--- a/conf/evolutions/default/250.sql
+++ b/conf/evolutions/default/250.sql
@@ -52,7 +52,20 @@ ALTER TABLE sidewalk_login.sidewalk_user OWNER TO sidewalk;
 GRANT ALL ON TABLE sidewalk_login.sidewalk_user TO sidewalk;
 GRANT ALL ON TABLE sidewalk_login.sidewalk_user TO postgres;
 
+-- TABLE: auth_tokens
+CREATE TABLE sidewalk_login.auth_tokens (
+    user_id character varying(254) NOT NULL,
+    id bytea NOT NULL,
+    expiration_timestamp TIMESTAMPTZ NOT NULL
+);
+ALTER TABLE sidewalk_login.auth_tokens OWNER TO sidewalk;
+GRANT ALL ON TABLE sidewalk_login.auth_tokens TO sidewalk;
+GRANT ALL ON TABLE sidewalk_login.auth_tokens TO postgres;
+
 # --- !Downs
+-- TABLE: auth_tokens
+DROP TABLE IF EXISTS sidewalk_login.auth_tokens;
+
 -- TABLE: sidewalk_user
 DROP INDEX IF EXISTS email_idx;
 DROP INDEX IF EXISTS username_idx;
diff --git a/conf/evolutions/default/251.sql b/conf/evolutions/default/251.sql
index 82ac08b896..247efb9a81 100644
--- a/conf/evolutions/default/251.sql
+++ b/conf/evolutions/default/251.sql
@@ -52,6 +52,7 @@ ALTER TABLE sidewalk_seattle.validation_task_comment ADD CONSTRAINT validation_t
 ALTER TABLE sidewalk_seattle.webpage_activity DROP CONSTRAINT IF EXISTS webpage_activity_user_id_fkey;
 ALTER TABLE sidewalk_seattle.webpage_activity ADD CONSTRAINT webpage_activity_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
 
+TRUNCATE sidewalk_seattle.auth_tokens;
 TRUNCATE sidewalk_seattle.sidewalk_user;
 TRUNCATE sidewalk_seattle.login_info;
 TRUNCATE sidewalk_seattle.user_login_info;
@@ -111,3 +112,4 @@ TRUNCATE sidewalk_login.user_password_info;
 TRUNCATE sidewalk_login.user_login_info;
 TRUNCATE sidewalk_login.login_info;
 TRUNCATE sidewalk_login.sidewalk_user;
+TRUNCATE sidewalk_login.auth_tokens;

From 414bcb936a64586f4ef9c4da548c4ff5bc2a9739 Mon Sep 17 00:00:00 2001
From: Mikey Saugstad <michaelssaugstad@gmail.com>
Date: Fri, 18 Oct 2024 13:21:54 -0700
Subject: [PATCH 09/28] removes unified login evolutions, queries will be
 manually run

---
 conf/evolutions/default/249.sql |  15 -----
 conf/evolutions/default/250.sql |  84 -----------------------
 conf/evolutions/default/251.sql | 115 --------------------------------
 3 files changed, 214 deletions(-)
 delete mode 100644 conf/evolutions/default/249.sql
 delete mode 100644 conf/evolutions/default/250.sql
 delete mode 100644 conf/evolutions/default/251.sql

diff --git a/conf/evolutions/default/249.sql b/conf/evolutions/default/249.sql
deleted file mode 100644
index 6c2e8584c9..0000000000
--- a/conf/evolutions/default/249.sql
+++ /dev/null
@@ -1,15 +0,0 @@
--- Create new schema
--- Create tables/indexes in new schema
--- Grant access to all tables/indexes
--- Update sequences for pkeys of all new tables
--- Apply foreign keys to sidewalk_user table
-
--- Create Login Schema to unify login systems.
-
-# --- !Ups
-CREATE SCHEMA IF NOT EXISTS sidewalk_login;
-ALTER SCHEMA sidewalk_login OWNER TO sidewalk;
-
-# --- !Downs
-DROP SCHEMA IF EXISTS sidewalk_login CASCADE;
-
diff --git a/conf/evolutions/default/250.sql b/conf/evolutions/default/250.sql
deleted file mode 100644
index 6b88ed35c9..0000000000
--- a/conf/evolutions/default/250.sql
+++ /dev/null
@@ -1,84 +0,0 @@
--- Create tables and indexes for login tables and grant "sidewalk" user access.
-
-# --- !Ups
--- TABLE: user_password_info
-CREATE TABLE IF NOT EXISTS sidewalk_login.user_password_info (
-    user_password_info_id SERIAL NOT NULL,
-    login_info_id bigint NOT NULL,
-    password VARCHAR(254) NOT NULL,
-    salt VARCHAR(254),
-    hasher VARCHAR(254) NOT NULL,
-    PRIMARY KEY (user_password_info_id)
-);
-ALTER TABLE sidewalk_login.user_password_info OWNER TO sidewalk;
-GRANT ALL ON TABLE sidewalk_login.user_password_info TO sidewalk;
-GRANT ALL ON TABLE sidewalk_login.user_password_info TO postgres;
-
--- TABLE: login_info
-CREATE TABLE IF NOT EXISTS sidewalk_login.login_info(
-    login_info_id BIGSERIAL NOT NULL,
-    provider_id VARCHAR(254),
-    provider_key VARCHAR(254),
-    PRIMARY KEY (login_info_id)
-);
-ALTER TABLE sidewalk_login.login_info OWNER TO sidewalk;
-GRANT ALL ON TABLE sidewalk_login.login_info TO sidewalk;
-GRANT ALL ON TABLE sidewalk_login.login_info TO postgres;
-
--- TABLE: user_login_info
-CREATE TABLE IF NOT EXISTS sidewalk_login.user_login_info(
-    user_login_info_id SERIAL NOT NULL,
-    login_info_id bigint NOT NULL,
-    user_id VARCHAR(254) NOT NULL,
-    PRIMARY KEY (user_login_info_id)
-);
-CREATE INDEX IF NOT EXISTS user_login_info_login_info_id_idx ON sidewalk_login.user_login_info USING btree(login_info_id);
-CREATE INDEX IF NOT EXISTS user_login_info_user_id_idx ON sidewalk_login.user_login_info USING btree(user_id);
-ALTER TABLE sidewalk_login.user_login_info OWNER TO sidewalk;
-GRANT ALL ON TABLE sidewalk_login.user_login_info TO sidewalk;
-GRANT ALL ON TABLE sidewalk_login.user_login_info TO postgres;
-
--- TABLE: sidewalk_user
-CREATE TABLE IF NOT EXISTS sidewalk_login.sidewalk_user(
-    user_id TEXT UNIQUE NOT NULL,
-    username TEXT UNIQUE NOT NULL,
-    email TEXT NOT NULL,
-    PRIMARY KEY (user_id)
-);
-CREATE INDEX IF NOT EXISTS user_id_idx ON sidewalk_login.sidewalk_user USING btree(user_id);
-CREATE INDEX IF NOT EXISTS username_idx ON sidewalk_login.sidewalk_user USING btree(username);
-CREATE INDEX IF NOT EXISTS email_idx ON sidewalk_login.sidewalk_user USING btree(email);
-ALTER TABLE sidewalk_login.sidewalk_user OWNER TO sidewalk;
-GRANT ALL ON TABLE sidewalk_login.sidewalk_user TO sidewalk;
-GRANT ALL ON TABLE sidewalk_login.sidewalk_user TO postgres;
-
--- TABLE: auth_tokens
-CREATE TABLE sidewalk_login.auth_tokens (
-    user_id character varying(254) NOT NULL,
-    id bytea NOT NULL,
-    expiration_timestamp TIMESTAMPTZ NOT NULL
-);
-ALTER TABLE sidewalk_login.auth_tokens OWNER TO sidewalk;
-GRANT ALL ON TABLE sidewalk_login.auth_tokens TO sidewalk;
-GRANT ALL ON TABLE sidewalk_login.auth_tokens TO postgres;
-
-# --- !Downs
--- TABLE: auth_tokens
-DROP TABLE IF EXISTS sidewalk_login.auth_tokens;
-
--- TABLE: sidewalk_user
-DROP INDEX IF EXISTS email_idx;
-DROP INDEX IF EXISTS username_idx;
-DROP INDEX IF EXISTS user_id_idx;
-DROP TABLE IF EXISTS sidewalk_login.sidewalk_user;
-
--- TABLE: user_login_info
-DROP INDEX IF EXISTS user_login_info_user_id_idx;
-DROP INDEX IF EXISTS user_login_info_login_info_id_idx;
-DROP TABLE IF EXISTS sidewalk_login.user_login_info;
-
--- TABLE: login_info
-DROP TABLE IF EXISTS sidewalk_login.login_info;
-
--- TABLE: user_password_info
-DROP TABLE IF EXISTS sidewalk_login.user_password_info;
diff --git a/conf/evolutions/default/251.sql b/conf/evolutions/default/251.sql
deleted file mode 100644
index 247efb9a81..0000000000
--- a/conf/evolutions/default/251.sql
+++ /dev/null
@@ -1,115 +0,0 @@
--- Move data from city schemas to new login data schema.
--- TODO: Copy login data from ALL cities to login schema
--- TODO: Among duplicates across cities, keep data from most recently logged in user.
--- TODO: Update pkey sequence to the end of the data's sequence
-
-# --- !Ups
--- Copy all login info from Seattle into the new sidewalk_login schema
-INSERT INTO sidewalk_login.sidewalk_user(user_id, username, email)
-SELECT user_id, username, email FROM sidewalk_seattle.sidewalk_user;
-
-INSERT INTO sidewalk_login.login_info(login_info_id, provider_id, provider_key)
-SELECT login_info_id, provider_id, provider_key FROM sidewalk_seattle.login_info;
-SELECT setval('sidewalk_login.login_info_login_info_id_seq', (SELECT MAX(login_info_id) FROM sidewalk_login.login_info));
-
-INSERT INTO sidewalk_login.user_login_info(user_login_info_id, user_id, login_info_id)
-SELECT user_login_info_id, user_id, login_info_id FROM sidewalk_seattle.user_login_info;
-SELECT setval('sidewalk_login.user_login_info_user_login_info_id_seq', (SELECT MAX(user_login_info_id) FROM sidewalk_login.user_login_info));
-
-INSERT INTO sidewalk_login.user_password_info (user_password_info_id, login_info_id, "password", salt, hasher)
-SELECT user_password_info_id, login_info_id, "password", salt, hasher FROM sidewalk_seattle.user_password_info;
-SELECT setval('sidewalk_login.user_password_info_user_password_info_id_seq', (SELECT MAX(user_password_info_id) FROM sidewalk_login.user_password_info));
-
--- Move constraints over to the new schema.
-ALTER TABLE sidewalk_seattle.audit_task DROP CONSTRAINT IF EXISTS audit_task_user_id_fkey;
-ALTER TABLE sidewalk_seattle.audit_task ADD CONSTRAINT audit_task_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
-ALTER TABLE sidewalk_seattle.gallery_task_environment DROP CONSTRAINT IF EXISTS gallery_task_environment_user_id_fkey;
-ALTER TABLE sidewalk_seattle.gallery_task_environment ADD CONSTRAINT gallery_task_environment_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
-ALTER TABLE sidewalk_seattle.gallery_task_interaction DROP CONSTRAINT IF EXISTS gallery_task_interaction_user_id_fkey;
-ALTER TABLE sidewalk_seattle.gallery_task_interaction ADD CONSTRAINT gallery_task_interaction_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
-ALTER TABLE sidewalk_seattle.label_history DROP CONSTRAINT IF EXISTS label_history_edited_by_fkey;
-ALTER TABLE sidewalk_seattle.label_history ADD CONSTRAINT label_history_edited_by_fkey FOREIGN KEY (edited_by) REFERENCES sidewalk_login.sidewalk_user(user_id);
-ALTER TABLE sidewalk_seattle.label_validation DROP CONSTRAINT IF EXISTS label_validation_user_id_fkey;
-ALTER TABLE sidewalk_seattle.label_validation ADD CONSTRAINT label_validation_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
-ALTER TABLE sidewalk_seattle.mission DROP CONSTRAINT IF EXISTS mission_user_id_fkey;
-ALTER TABLE sidewalk_seattle.mission ADD CONSTRAINT mission_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
-ALTER TABLE sidewalk_seattle.route DROP CONSTRAINT IF EXISTS route_user_id_fkey;
-ALTER TABLE sidewalk_seattle.route ADD CONSTRAINT route_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
-ALTER TABLE sidewalk_seattle.user_clustering_session DROP CONSTRAINT IF EXISTS user_clustering_session_user_id_fkey;
-ALTER TABLE sidewalk_seattle.user_clustering_session ADD CONSTRAINT user_clustering_session_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
-ALTER TABLE sidewalk_seattle.user_org DROP CONSTRAINT IF EXISTS user_org_user_id_fkey;
-ALTER TABLE sidewalk_seattle.user_org ADD CONSTRAINT user_org_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
-ALTER TABLE sidewalk_seattle.user_route DROP CONSTRAINT IF EXISTS user_route_user_id_fkey;
-ALTER TABLE sidewalk_seattle.user_route ADD CONSTRAINT user_route_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
-ALTER TABLE sidewalk_seattle.user_stat DROP CONSTRAINT IF EXISTS user_stat_user_id_fkey;
-ALTER TABLE sidewalk_seattle.user_stat ADD CONSTRAINT user_stat_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
-ALTER TABLE sidewalk_seattle.user_survey_option_submission DROP CONSTRAINT IF EXISTS user_survey_option_submission_user_id_fkey;
-ALTER TABLE sidewalk_seattle.user_survey_option_submission ADD CONSTRAINT user_survey_option_submission_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
-ALTER TABLE sidewalk_seattle.user_survey_text_submission DROP CONSTRAINT IF EXISTS user_survey_text_submission_user_id_fkey;
-ALTER TABLE sidewalk_seattle.user_survey_text_submission ADD CONSTRAINT user_survey_text_submission_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
-ALTER TABLE sidewalk_seattle.validation_task_comment DROP CONSTRAINT IF EXISTS validation_task_comment_user_id_fkey;
-ALTER TABLE sidewalk_seattle.validation_task_comment ADD CONSTRAINT validation_task_comment_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
-ALTER TABLE sidewalk_seattle.webpage_activity DROP CONSTRAINT IF EXISTS webpage_activity_user_id_fkey;
-ALTER TABLE sidewalk_seattle.webpage_activity ADD CONSTRAINT webpage_activity_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_login.sidewalk_user(user_id);
-
-TRUNCATE sidewalk_seattle.auth_tokens;
-TRUNCATE sidewalk_seattle.sidewalk_user;
-TRUNCATE sidewalk_seattle.login_info;
-TRUNCATE sidewalk_seattle.user_login_info;
-TRUNCATE sidewalk_seattle.user_password_info;
-
-# --- !Downs
--- Copy all login info from sidewalk_login back into the Seattle schema.
-INSERT INTO sidewalk_seattle.sidewalk_user(user_id, username, email)
-SELECT user_id, username, email FROM sidewalk_login.sidewalk_user;
-
-INSERT INTO sidewalk_seattle.login_info(login_info_id, provider_id, provider_key)
-SELECT login_info_id, provider_id, provider_key FROM sidewalk_login.login_info;
-SELECT setval('sidewalk_seattle.logininfo_id_seq', (SELECT MAX(login_info_id) FROM sidewalk_seattle.login_info));
-
-INSERT INTO sidewalk_seattle.user_login_info(user_login_info_id, user_id, login_info_id)
-SELECT user_login_info_id, user_id, login_info_id FROM sidewalk_login.user_login_info;
--- SELECT setval('sidewalk_seattle.user_login_info_user_login_info_id_seq', (SELECT MAX(user_login_info_id) FROM sidewalk_seattle.user_login_info));
-
-INSERT INTO sidewalk_seattle.user_password_info (user_password_info_id, login_info_id, "password", salt, hasher)
-SELECT user_password_info_id, login_info_id, "password", salt, hasher FROM sidewalk_login.user_password_info;
--- SELECT setval('sidewalk_seattle.user_password_info_user_password_info_id_seq', (SELECT MAX(user_password_info_id) FROM sidewalk_seattle.user_password_info));
-
--- Move the constraints back to the Seattle schema.
-ALTER TABLE sidewalk_seattle.webpage_activity DROP CONSTRAINT IF EXISTS webpage_activity_user_id_fkey;
-ALTER TABLE sidewalk_seattle.webpage_activity ADD CONSTRAINT webpage_activity_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_seattle.sidewalk_user(user_id);
-ALTER TABLE sidewalk_seattle.validation_task_comment DROP CONSTRAINT IF EXISTS validation_task_comment_user_id_fkey;
-ALTER TABLE sidewalk_seattle.validation_task_comment ADD CONSTRAINT validation_task_comment_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_seattle.sidewalk_user(user_id);
-ALTER TABLE sidewalk_seattle.user_survey_text_submission DROP CONSTRAINT IF EXISTS user_survey_text_submission_user_id_fkey;
-ALTER TABLE sidewalk_seattle.user_survey_text_submission ADD CONSTRAINT user_survey_text_submission_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_seattle.sidewalk_user(user_id);
-ALTER TABLE sidewalk_seattle.user_survey_option_submission DROP CONSTRAINT IF EXISTS user_survey_option_submission_user_id_fkey;
-ALTER TABLE sidewalk_seattle.user_survey_option_submission ADD CONSTRAINT user_survey_option_submission_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_seattle.sidewalk_user(user_id);
-ALTER TABLE sidewalk_seattle.user_stat DROP CONSTRAINT IF EXISTS user_stat_user_id_fkey;
-ALTER TABLE sidewalk_seattle.user_stat ADD CONSTRAINT user_stat_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_seattle.sidewalk_user(user_id);
-ALTER TABLE sidewalk_seattle.user_route DROP CONSTRAINT IF EXISTS user_route_user_id_fkey;
-ALTER TABLE sidewalk_seattle.user_route ADD CONSTRAINT user_route_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_seattle.sidewalk_user(user_id);
-ALTER TABLE sidewalk_seattle.user_org DROP CONSTRAINT IF EXISTS user_org_user_id_fkey;
-ALTER TABLE sidewalk_seattle.user_org ADD CONSTRAINT user_org_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_seattle.sidewalk_user(user_id);
-ALTER TABLE sidewalk_seattle.user_clustering_session DROP CONSTRAINT IF EXISTS user_clustering_session_user_id_fkey;
-ALTER TABLE sidewalk_seattle.user_clustering_session ADD CONSTRAINT user_clustering_session_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_seattle.sidewalk_user(user_id);
-ALTER TABLE sidewalk_seattle.route DROP CONSTRAINT IF EXISTS route_user_id_fkey;
-ALTER TABLE sidewalk_seattle.route ADD CONSTRAINT route_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_seattle.sidewalk_user(user_id);
-ALTER TABLE sidewalk_seattle.mission DROP CONSTRAINT IF EXISTS mission_user_id_fkey;
-ALTER TABLE sidewalk_seattle.mission ADD CONSTRAINT mission_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_seattle.sidewalk_user(user_id);
-ALTER TABLE sidewalk_seattle.label_validation DROP CONSTRAINT IF EXISTS label_validation_user_id_fkey;
-ALTER TABLE sidewalk_seattle.label_validation ADD CONSTRAINT label_validation_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_seattle.sidewalk_user(user_id);
-ALTER TABLE sidewalk_seattle.label_history DROP CONSTRAINT IF EXISTS label_history_edited_by_fkey;
-ALTER TABLE sidewalk_seattle.label_history ADD CONSTRAINT label_history_edited_by_fkey FOREIGN KEY (edited_by) REFERENCES sidewalk_seattle.sidewalk_user(user_id);
-ALTER TABLE sidewalk_seattle.gallery_task_interaction DROP CONSTRAINT IF EXISTS gallery_task_interaction_user_id_fkey;
-ALTER TABLE sidewalk_seattle.gallery_task_interaction ADD CONSTRAINT gallery_task_interaction_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_seattle.sidewalk_user(user_id);
-ALTER TABLE sidewalk_seattle.gallery_task_environment DROP CONSTRAINT IF EXISTS gallery_task_environment_user_id_fkey;
-ALTER TABLE sidewalk_seattle.gallery_task_environment ADD CONSTRAINT gallery_task_environment_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_seattle.sidewalk_user(user_id);
-ALTER TABLE sidewalk_seattle.audit_task DROP CONSTRAINT IF EXISTS audit_task_user_id_fkey;
-ALTER TABLE sidewalk_seattle.audit_task ADD CONSTRAINT audit_task_user_id_fkey FOREIGN KEY (user_id) REFERENCES sidewalk_seattle.sidewalk_user(user_id);
-
--- Truncate the tables in the sidewalk_login schema.
-TRUNCATE sidewalk_login.user_password_info;
-TRUNCATE sidewalk_login.user_login_info;
-TRUNCATE sidewalk_login.login_info;
-TRUNCATE sidewalk_login.sidewalk_user;
-TRUNCATE sidewalk_login.auth_tokens;

From 9361e24bd12209bb97f2ebad6b08d058b7960585 Mon Sep 17 00:00:00 2001
From: Mikey Saugstad <michaelssaugstad@gmail.com>
Date: Mon, 21 Oct 2024 15:48:55 -0700
Subject: [PATCH 10/28] LabelMap can now filter for labels along a route

---
 app/controllers/AdminController.scala       |  7 +++---
 app/controllers/ApplicationController.scala |  9 ++++---
 app/models/label/LabelTable.scala           | 23 ++++++++++++++----
 app/views/labelMap.scala.html               | 26 +++++++++++++--------
 conf/routes                                 |  6 ++---
 5 files changed, 48 insertions(+), 23 deletions(-)

diff --git a/app/controllers/AdminController.scala b/app/controllers/AdminController.scala
index 4e62bdccea..44305ae84d 100644
--- a/app/controllers/AdminController.scala
+++ b/app/controllers/AdminController.scala
@@ -108,7 +108,7 @@ class AdminController @Inject() (implicit val env: Environment[User, SessionAuth
    */
   def getAllLabels = UserAwareAction.async { implicit request =>
     if (isAdmin(request.identity)) {
-      val labels = LabelTable.selectLocationsAndSeveritiesOfLabels(List())
+      val labels = LabelTable.selectLocationsAndSeveritiesOfLabels(List(), List())
       val features: List[JsObject] = labels.par.map { label =>
         val point = geojson.Point(geojson.LatLng(label.lat.toDouble, label.lng.toDouble))
         val properties = Json.obj(
@@ -131,9 +131,10 @@ class AdminController @Inject() (implicit val env: Environment[User, SessionAuth
   /**
    * Get a list of all labels with metadata needed for /labelMap.
    */
-  def getAllLabelsForLabelMap(regions: Option[String]) = UserAwareAction.async { implicit request =>
+  def getAllLabelsForLabelMap(regions: Option[String], routes: Option[String]) = UserAwareAction.async { implicit request =>
     val regionIds: List[Int] = regions.map(parseIntegerList).getOrElse(List())
-    val labels: List[LabelLocationWithSeverity] = LabelTable.selectLocationsAndSeveritiesOfLabels(regionIds)
+    val routeIds: List[Int] = routes.map(parseIntegerList).getOrElse(List())
+    val labels: List[LabelLocationWithSeverity] = LabelTable.selectLocationsAndSeveritiesOfLabels(regionIds, routeIds)
     val features: List[JsObject] = labels.par.map { label =>
       val point: Point[LatLng] = geojson.Point(geojson.LatLng(label.lat.toDouble, label.lng.toDouble))
       val properties: JsObject = Json.obj(
diff --git a/app/controllers/ApplicationController.scala b/app/controllers/ApplicationController.scala
index 0db692d9e5..4b6f590789 100644
--- a/app/controllers/ApplicationController.scala
+++ b/app/controllers/ApplicationController.scala
@@ -348,10 +348,12 @@ class ApplicationController @Inject() (implicit val env: Environment[User, Sessi
   }
 
   /**
-   * Returns the labelmap page that contains a cool visualization.
+   * Returns the LabelMap page that contains a cool visualization.
    */
-  def labelMap(regions: Option[String]) = UserAwareAction.async { implicit request =>
+  def labelMap(regions: Option[String], routes: Option[String]) = UserAwareAction.async { implicit request =>
+    // TODO what do we do if the route doesn't exist?
     val regionIds: List[Int] = regions.map(parseIntegerList).getOrElse(List())
+    val routeIds: List[Int] = routes.map(parseIntegerList).getOrElse(List())
     request.identity match {
       case Some(user) =>
         val timestamp: Timestamp = new Timestamp(Instant.now.toEpochMilli)
@@ -359,8 +361,9 @@ class ApplicationController @Inject() (implicit val env: Environment[User, Sessi
 
         val activityStr: String = if (regions.isEmpty) "Visit_LabelMap" else s"Visit_LabelMap_Regions=$regions"
         WebpageActivityTable.save(WebpageActivity(0, user.userId.toString, ipAddress, activityStr, timestamp))
-        Future.successful(Ok(views.html.labelMap("Sidewalk - LabelMap", Some(user), regionIds)))
+        Future.successful(Ok(views.html.labelMap("Sidewalk - LabelMap", Some(user), regionIds, routeIds)))
       case None =>
+        // TODO include routeId query param in redirect for anon users.
         // UTF-8 codes needed to pass a URL that contains parameters: ? is %3F, & is %26
         val queryParams: String = regions.map(r => s"%3Fregions=$r").getOrElse("")
         Future.successful(Redirect("/anonSignUp?url=/labelmap" + queryParams))
diff --git a/app/models/label/LabelTable.scala b/app/models/label/LabelTable.scala
index f24b19de4e..1b4835bafb 100644
--- a/app/models/label/LabelTable.scala
+++ b/app/models/label/LabelTable.scala
@@ -13,7 +13,8 @@ import models.gsv.GSVDataTable
 import models.mission.{Mission, MissionTable}
 import models.region.RegionTable
 import models.attribute.ConfigTable
-import models.street.StreetEdgeRegionTable
+import models.route.RouteStreetTable
+import models.street.{StreetEdgeRegionTable, StreetEdgeTable}
 import models.user.{RoleTable, UserRoleTable, UserStatTable, VersionTable}
 import models.utils.MyPostgresDriver
 import models.utils.MyPostgresDriver.simple._
@@ -107,6 +108,7 @@ object LabelTable {
   val labelPoints = TableQuery[LabelPointTable]
   val labelValidations = TableQuery[LabelValidationTable]
   val missions = TableQuery[MissionTable]
+  val streets = TableQuery[StreetEdgeTable]
   val regions = TableQuery[RegionTable]
   val users = TableQuery[UserTable]
   val userRoles = TableQuery[UserRoleTable]
@@ -991,7 +993,7 @@ object LabelTable {
   /**
     * Returns all the submitted labels with their severities included. If provided, filter for only given regions.
     */
-  def selectLocationsAndSeveritiesOfLabels(regionIds: List[Int]): List[LabelLocationWithSeverity] = db.withSession { implicit session =>
+  def selectLocationsAndSeveritiesOfLabels(regionIds: List[Int], routeIds: List[Int]): List[LabelLocationWithSeverity] = db.withSession { implicit session =>
     val _labels = for {
       _l <- labels
       _lType <- labelTypes if _l.labelTypeId === _lType.labelTypeId
@@ -1002,12 +1004,25 @@ object LabelTable {
       if (_ser.regionId inSet regionIds) || regionIds.isEmpty
       if _lPoint.lat.isDefined && _lPoint.lng.isDefined // Make sure they are NOT NULL so we can safely use .get later.
     } yield (_l.labelId, _l.auditTaskId, _lType.labelType, _lPoint.lat, _lPoint.lng, _l.correct,
-      _l.agreeCount > 0 || _l.disagreeCount > 0 || _l.unsureCount > 0, _gsv.expired, _us.highQuality, _l.severity)
+      _l.agreeCount > 0 || _l.disagreeCount > 0 || _l.unsureCount > 0, _gsv.expired, _us.highQuality, _l.severity, _ser.streetEdgeId)
+
+    // Filter for labels along the given route. Distance experimentally set to 0.0005 degrees. Would like to switch to
+    // different SRID and use meters: https://github.com/ProjectSidewalk/SidewalkWebpage/issues/3655.
+    val _labelsNearRoute = if (routeIds.nonEmpty) {
+      for {
+        _rs <- RouteStreetTable.routeStreets if _rs.routeId inSet routeIds
+        _se <- streets if _rs.streetEdgeId === _se.streetEdgeId
+        _l <- _labels if _se.streetEdgeId === _l._11 ||
+          _se.geom.distance(makePoint(_l._5.asColumnOf[Double], _l._4.asColumnOf[Double]).setSRID(4326)) < 0.0005F
+      } yield _l
+    } else {
+      _labels
+    }
 
     // For some reason we couldn't use both `_l.agreeCount > 0` and `_lPoint.lat.get` in the yield without a runtime
     // error, which is why we couldn't use `.tupled` here. This was the error message:
     // SlickException: Expected an option type, found Float/REAL
-    _labels.list.map(l => LabelLocationWithSeverity(l._1, l._2, l._3, l._4.get, l._5.get, l._6, l._7, l._8, l._9, l._10))
+    _labelsNearRoute.list.map(l => LabelLocationWithSeverity(l._1, l._2, l._3, l._4.get, l._5.get, l._6, l._7, l._8, l._9, l._10))
   }
 
   /**
diff --git a/app/views/labelMap.scala.html b/app/views/labelMap.scala.html
index ea11956e1d..79b3cc0164 100644
--- a/app/views/labelMap.scala.html
+++ b/app/views/labelMap.scala.html
@@ -1,7 +1,7 @@
 @import models.user.User
 @import play.api.Play
 @import play.api.Play.current
-@(title: String, user: Option[User] = None, regionIds: List[Int])(implicit lang: Lang)
+@(title: String, user: Option[User] = None, regionIds: List[Int], routeIds: List[Int])(implicit lang: Lang)
 
 @cityId = @{Play.configuration.getString("city-id").get}
 
@@ -170,17 +170,23 @@
                 popupLabelViewer: AdminGSVLabelView(false, "LabelMap"),
                 differentiateExpiredLabels: true
             };
+            params.neighborhoodsURL = new URL('/neighborhoods', window.location.origin);
+            params.completionRatesURL = new URL('/adminapi/neighborhoodCompletionRate', window.location.origin);
+            params.streetsURL = new URL('/contribution/streets/all?filterLowQuality=true', window.location.origin);
+            params.labelsURL = new URL('/labels/all', window.location.origin);
+
             let regionsParam = '@{regionIds.mkString(",")}';
             if (regionsParam) {
-                params.neighborhoodsURL = `/neighborhoods?regions=${regionsParam}`;
-                params.completionRatesURL = `/adminapi/neighborhoodCompletionRate?regions=${regionsParam}`;
-                params.streetsURL = `/contribution/streets/all?filterLowQuality=true&regions=${regionsParam}`;
-                params.labelsURL = `/labels/all?regions=${regionsParam}`;
-            } else {
-                params.neighborhoodsURL = '/neighborhoods';
-                params.completionRatesURL = '/adminapi/neighborhoodCompletionRate';
-                params.streetsURL = '/contribution/streets/all?filterLowQuality=true';
-                params.labelsURL = '/labels/all';
+                params.neighborhoodsURL.searchParams.append('regions', regionsParam);
+                params.completionRatesURL.searchParams.append('regions', regionsParam);
+                params.streetsURL.searchParams.append('regions', regionsParam);
+                params.labelsURL.searchParams.append('regions', regionsParam);
+            }
+
+            let routesParam = '@{routeIds.mkString(",")}';
+            if (routesParam) {
+                params.streetsURL.searchParams.append('routes', routesParam);
+                params.labelsURL.searchParams.append('routes', routesParam);
             }
             // Show polling locations for Chicago, IL as part of a pilot.
             if ('@cityId' === 'chicago-il') {
diff --git a/conf/routes b/conf/routes
index b7a1d42bd7..da0474075f 100644
--- a/conf/routes
+++ b/conf/routes
@@ -11,8 +11,8 @@ GET     /developer                                           @controllers.Applic
 GET     /terms                                               @controllers.ApplicationController.terms
 GET     /demo                                                @controllers.ApplicationController.demo
 GET     /results                                             @controllers.ApplicationController.results
-GET     /labelMap                                            @controllers.ApplicationController.labelMap(regions: Option[String] ?= None)
-GET     /labelmap                                            @controllers.ApplicationController.labelMap(regions: Option[String] ?= None)
+GET     /labelMap                                            @controllers.ApplicationController.labelMap(regions: Option[String] ?= None, routes: Option[String] ?= None)
+GET     /labelmap                                            @controllers.ApplicationController.labelMap(regions: Option[String] ?= None, routes: Option[String] ?= None)
 GET     /gallery                                             @controllers.ApplicationController.gallery(labelType: String ?= "Assorted", neighborhoods: String ?= "", severities: String ?= "", tags: String ?= "", validationOptions: String ?= "correct,unvalidated")
 GET     /help                                                @controllers.ApplicationController.help
 GET     /labelingGuide                                       @controllers.ApplicationController.labelingGuide
@@ -88,7 +88,7 @@ PUT     /adminapi/setOrg                                     @controllers.AdminC
 PUT     /adminapi/setTaskFlagsBeforeDate                     @controllers.AdminController.setTaskFlagsBeforeDate
 PUT     /adminapi/setTaskFlag                                @controllers.AdminController.setTaskFlag
 
-GET     /labels/all                                          @controllers.AdminController.getAllLabelsForLabelMap(regions: Option[String] ?= None)
+GET     /labels/all                                          @controllers.AdminController.getAllLabelsForLabelMap(regions: Option[String] ?= None, routes: Option[String] ?= None)
 GET     /label/id/:labelId                                   @controllers.AdminController.getLabelData(labelId: Int)
 
 # Auditing tasks

From fb11aea39a5ae4cb4bda13f789ea64d27bff61a3 Mon Sep 17 00:00:00 2001
From: Mikey Saugstad <michaelssaugstad@gmail.com>
Date: Mon, 21 Oct 2024 16:01:16 -0700
Subject: [PATCH 11/28] streets can now be filtered by route in LabelMap

---
 app/controllers/UserProfileController.scala |  5 +++--
 app/models/audit/AuditTaskTable.scala       | 14 ++++++++++++--
 conf/routes                                 |  2 +-
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/app/controllers/UserProfileController.scala b/app/controllers/UserProfileController.scala
index 68bb36f06b..c37b5961f8 100644
--- a/app/controllers/UserProfileController.scala
+++ b/app/controllers/UserProfileController.scala
@@ -78,9 +78,10 @@ class UserProfileController @Inject() (implicit val env: Environment[User, Sessi
   /**
    * Get the list of all streets and whether they have been audited or not, regardless of user.
    */
-  def getAllStreets(filterLowQuality: Boolean, regions: Option[String]) = UserAwareAction.async { implicit request =>
+  def getAllStreets(filterLowQuality: Boolean, regions: Option[String], routes: Option[String]) = UserAwareAction.async { implicit request =>
     val regionIds: List[Int] = regions.map(parseIntegerList).getOrElse(List())
-    val streets: List[StreetEdgeWithAuditStatus] = AuditTaskTable.selectStreetsWithAuditStatus(filterLowQuality, regionIds)
+    val routeIds: List[Int] = routes.map(parseIntegerList).getOrElse(List())
+    val streets: List[StreetEdgeWithAuditStatus] = AuditTaskTable.selectStreetsWithAuditStatus(filterLowQuality, regionIds, routeIds)
     val features: List[JsObject] = streets.map { edge =>
       val coordinates: Array[Coordinate] = edge.geom.getCoordinates
       val latlngs: List[geojson.LatLng] = coordinates.map(coord => geojson.LatLng(coord.y, coord.x)).toList  // Map it to an immutable list
diff --git a/app/models/audit/AuditTaskTable.scala b/app/models/audit/AuditTaskTable.scala
index d98f87456f..43f7617d72 100644
--- a/app/models/audit/AuditTaskTable.scala
+++ b/app/models/audit/AuditTaskTable.scala
@@ -12,6 +12,7 @@ import models.label.{LabelTable, LabelTypeTable}
 import models.street.StreetEdgePriorityTable
 import models.user.{UserRoleTable, UserStatTable}
 import models.mission.{Mission, MissionTable}
+import models.route.RouteStreetTable
 import play.api.libs.json._
 import play.api.Play.current
 import play.extras.geojson
@@ -313,7 +314,7 @@ object AuditTaskTable {
   /**
     * Return all street edges and whether they have been audited or not. If provided, filter for only given regions.
     */
-  def selectStreetsWithAuditStatus(filterLowQuality: Boolean, regionIds: List[Int]): List[StreetEdgeWithAuditStatus] = db.withSession { implicit session =>
+  def selectStreetsWithAuditStatus(filterLowQuality: Boolean, regionIds: List[Int], routeIds: List[Int]): List[StreetEdgeWithAuditStatus] = db.withSession { implicit session =>
     // Optionally filter out data marked as low quality.
     val _filteredTasks = if (filterLowQuality) {
       for {
@@ -335,7 +336,16 @@ object AuditTaskTable {
       .leftJoin(_distinctCompleted).on(_._1.streetEdgeId === _)
       .map(s => (s._1._1.streetEdgeId, s._1._1.geom, s._1._2.regionId, s._1._1.wayType, !s._2.?.isEmpty))
 
-    streetsWithAuditedStatus.list.map(StreetEdgeWithAuditStatus.tupled)
+    // If routeIds are provided, filter out streets that are not part of the route.
+    val streetsWithAuditedStatusFiltered = if (routeIds.nonEmpty) {
+      RouteStreetTable.routeStreets.filter(_.routeId inSet routeIds)
+        .innerJoin(streetsWithAuditedStatus).on(_.streetEdgeId === _._1)
+        .map(_._2)
+    } else {
+      streetsWithAuditedStatus
+    }
+
+    streetsWithAuditedStatusFiltered.list.map(StreetEdgeWithAuditStatus.tupled)
   }
 
   /**
diff --git a/conf/routes b/conf/routes
index da0474075f..068732a758 100644
--- a/conf/routes
+++ b/conf/routes
@@ -137,7 +137,7 @@ GET     /neighborhoods                                       @controllers.Region
 # User status
 # /:username has to come last in the list. Otherwise it eats other urls.
 GET     /contribution/streets                                @controllers.UserProfileController.getAuditedStreets
-GET     /contribution/streets/all                            @controllers.UserProfileController.getAllStreets(filterLowQuality: Boolean ?= false, regions: Option[String] ?= None)
+GET     /contribution/streets/all                            @controllers.UserProfileController.getAllStreets(filterLowQuality: Boolean ?= false, regions: Option[String] ?= None, routes: Option[String] ?= None)
 GET     /contribution/auditCounts/all                        @controllers.UserProfileController.getAllAuditCounts
 GET     /dashboard                                           @controllers.UserProfileController.userProfile
 GET     /userapi/mistakes                                    @controllers.UserProfileController.getRecentMistakes(n: Int ?= 5)

From 45bdc96176c2e4f1ee9ae3e7487d57ac074df649 Mon Sep 17 00:00:00 2001
From: Mikey Saugstad <michaelssaugstad@gmail.com>
Date: Mon, 21 Oct 2024 17:21:38 -0700
Subject: [PATCH 12/28] adds link from RouteBuilder to view route in LabelMap

---
 app/views/routeBuilder.scala.html   | 1 +
 conf/messages.de                    | 1 +
 conf/messages.en                    | 1 +
 conf/messages.es                    | 1 +
 conf/messages.nl                    | 1 +
 conf/messages.zh-TW                 | 1 +
 public/javascripts/routeBuilder.js  | 8 ++++++++
 public/stylesheets/routeBuilder.css | 4 ++--
 8 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/app/views/routeBuilder.scala.html b/app/views/routeBuilder.scala.html
index 11a2aadfb0..69acf6b4ca 100644
--- a/app/views/routeBuilder.scala.html
+++ b/app/views/routeBuilder.scala.html
@@ -82,6 +82,7 @@
             </div>
             <div id="route-saved-buttons" class="flex-div-row">
                 <button type="button" id="explore-button" class="routebuilder-button  blue-button">@Messages("routebuilder.explore.route")</button>
+                <button type="button" id="view-in-labelmap-button" class="routebuilder-button white-button">@Messages("routebuilder.view.in.labelmap")</button>
                 <button type="button" id="build-new-route-button" class="routebuilder-button white-button">@Messages("routebuilder.build.another.route")</button>
             </div>
         </div>
diff --git a/conf/messages.de b/conf/messages.de
index ff235871db..25f73f71d6 100644
--- a/conf/messages.de
+++ b/conf/messages.de
@@ -388,6 +388,7 @@ routebuilder.delete.route = Route löschen
 routebuilder.saved.icon.alt = Ein grüner Kreis mit einem weißen Checkmark in der Mitte
 routebuilder.saved = Route gespeichert!
 routebuilder.explore.route = Erforschen Sie diese Route
+routebuilder.view.in.labelmap = In der Beschriftungskarte anzeigen
 routebuilder.build.another.route = Bauen Sie eine andere Route
 routebuilder.share.title = Speichern Sie diesen Link für den zukünftigen Zugriff:
 routebuilder.copy.link = Link kopieren
diff --git a/conf/messages.en b/conf/messages.en
index 1c987ba9ed..4ceb218d57 100644
--- a/conf/messages.en
+++ b/conf/messages.en
@@ -381,6 +381,7 @@ routebuilder.delete.route = Delete Route
 routebuilder.saved.icon.alt = A green circle with a white checkmark in the center
 routebuilder.saved = Route saved!
 routebuilder.explore.route = Explore This Route
+routebuilder.view.in.labelmap = View in Label Map
 routebuilder.build.another.route = Build Another Route
 routebuilder.share.title = Save this link for future access:
 routebuilder.copy.link = Copy Link
diff --git a/conf/messages.es b/conf/messages.es
index 52e836a8e3..79ed9079f0 100644
--- a/conf/messages.es
+++ b/conf/messages.es
@@ -391,6 +391,7 @@ routebuilder.delete.route = Eliminar ruta
 routebuilder.saved.icon.alt = Un círculo verde con una marca de verificación blanca en el centro
 routebuilder.saved = Ruta guardada!
 routebuilder.explore.route = Explore esta ruta
+routebuilder.view.in.labelmap = Ver en mapa de etiquetas
 routebuilder.build.another.route = Construir otra ruta
 routebuilder.share.title = Guarde este enlace para el acceso futuro:
 routebuilder.copy.link = Copiar link
diff --git a/conf/messages.nl b/conf/messages.nl
index 2b55e5a945..0d106065f6 100644
--- a/conf/messages.nl
+++ b/conf/messages.nl
@@ -383,6 +383,7 @@ routebuilder.delete.route = Verwijder route
 routebuilder.saved.icon.alt = Een groene cirkel met een wit vinkje in het midden
 routebuilder.saved = Route opgeslagen!
 routebuilder.explore.route = Verken deze route
+routebuilder.view.in.labelmap = Bekijk in Label Kaart
 routebuilder.build.another.route = Bouw een andere route
 routebuilder.share.title = Sla deze link op voor toekomstige toegang:
 routebuilder.copy.link = Kopieer link
diff --git a/conf/messages.zh-TW b/conf/messages.zh-TW
index cf0cc13168..d58a57a5bc 100644
--- a/conf/messages.zh-TW
+++ b/conf/messages.zh-TW
@@ -418,6 +418,7 @@ routebuilder.delete.route = 刪除路線
 routebuilder.saved.icon.alt = 一個有白色勾號在中心的綠色圓圈
 routebuilder.saved = 路線已儲存！
 routebuilder.explore.route = 探索此路線
+routebuilder.view.in.labelmap = 標記地圖中查看
 routebuilder.build.another.route = 設立另一條路線
 routebuilder.share.title = 儲存此連結供未來使用：
 routebuilder.copy.link = 複製連結
diff --git a/public/javascripts/routeBuilder.js b/public/javascripts/routeBuilder.js
index 76cf690679..22c1a62859 100644
--- a/public/javascripts/routeBuilder.js
+++ b/public/javascripts/routeBuilder.js
@@ -30,6 +30,7 @@ function RouteBuilder ($, mapParams) {
     let exploreButton = $('#explore-button');
     let linkTextEl = document.getElementById('share-route-link');
     let copyLinkButton = $('#copy-link-button');
+    let viewInLabelmapButton = $('#view-in-labelmap-button');
 
     // Add the click event for the clear route buttons.
     document.getElementById('cancel-button').addEventListener('click', clickCancelRoute);
@@ -693,6 +694,13 @@ function RouteBuilder ($, mapParams) {
                     logActivity(`RouteBuilder_Click=Copy_RouteId=${data.route_id}`);
                 });
 
+                // Update link for the 'View in LabelMap' button.
+                viewInLabelmapButton.off('click');
+                viewInLabelmapButton.click(function () {
+                    logActivity(`RouteBuilder_Click=LabelMap_RouteId=${data.route_id}`);
+                    window.open(`/labelMap?routes=${data.route_id}`, '_blank');
+                });
+
                 logActivity(`RouteBuilder_Click=SaveSuccess_RouteId=${data.route_id}`);
             })
             .catch((error) => {
diff --git a/public/stylesheets/routeBuilder.css b/public/stylesheets/routeBuilder.css
index 5f7031882f..20f22da2bc 100644
--- a/public/stylesheets/routeBuilder.css
+++ b/public/stylesheets/routeBuilder.css
@@ -26,9 +26,9 @@
 }
 
 .routebuilder-centered-overlay {
-    width: 520px;
+    width: 590px;
     top: calc(4% + 85px); /* 2% + navbar height + map margin-top */
-    left: calc(50% - 260px); /* 50% - width/2 */
+    left: calc(50% - 295px); /* 50% - width/2 */
 }
 
 .routebuilder-h1 {

From d82896e8921db34c53b50a3d839541f54f11d04e Mon Sep 17 00:00:00 2001
From: Mikey Saugstad <michaelssaugstad@gmail.com>
Date: Tue, 22 Oct 2024 12:16:10 -0700
Subject: [PATCH 13/28] fixes anon redirect URL for LabelMap when viewing a
 route

---
 app/controllers/ApplicationController.scala | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/controllers/ApplicationController.scala b/app/controllers/ApplicationController.scala
index 4b6f590789..d9813c953c 100644
--- a/app/controllers/ApplicationController.scala
+++ b/app/controllers/ApplicationController.scala
@@ -351,7 +351,6 @@ class ApplicationController @Inject() (implicit val env: Environment[User, Sessi
    * Returns the LabelMap page that contains a cool visualization.
    */
   def labelMap(regions: Option[String], routes: Option[String]) = UserAwareAction.async { implicit request =>
-    // TODO what do we do if the route doesn't exist?
     val regionIds: List[Int] = regions.map(parseIntegerList).getOrElse(List())
     val routeIds: List[Int] = routes.map(parseIntegerList).getOrElse(List())
     request.identity match {
@@ -363,9 +362,13 @@ class ApplicationController @Inject() (implicit val env: Environment[User, Sessi
         WebpageActivityTable.save(WebpageActivity(0, user.userId.toString, ipAddress, activityStr, timestamp))
         Future.successful(Ok(views.html.labelMap("Sidewalk - LabelMap", Some(user), regionIds, routeIds)))
       case None =>
-        // TODO include routeId query param in redirect for anon users.
         // UTF-8 codes needed to pass a URL that contains parameters: ? is %3F, & is %26
-        val queryParams: String = regions.map(r => s"%3Fregions=$r").getOrElse("")
+        val queryParams: String = (regionIds, routeIds) match {
+          case (Nil, Nil) => ""
+          case (r, Nil) => s"%3Fregions=${r.mkString(",")}"
+          case (Nil, r) => s"%3Froutes=${r.mkString(",")}"
+          case (r, s) => s"%3Fregions=${r.mkString(",")}%26routes=${s.mkString(",")}"
+        }
         Future.successful(Redirect("/anonSignUp?url=/labelmap" + queryParams))
     }
   }

From b6029b63d8731dd302abe163b48f0ec08bd560f3 Mon Sep 17 00:00:00 2001
From: Srihari Krishnaswamy <sriharik844@gmail.com>
Date: Wed, 23 Oct 2024 16:50:42 -0700
Subject: [PATCH 14/28] Addresses Street Edge data being slow to load in Admin
 template scala by moving it to new API endpoint

---
 app/controllers/AdminController.scala | 136 ++++++++++++++++++++++++++
 app/views/admin/index.scala.html      | 105 ++++++++++----------
 public/javascripts/Admin/src/Admin.js |  80 +++++++++++++++
 3 files changed, 269 insertions(+), 52 deletions(-)

diff --git a/app/controllers/AdminController.scala b/app/controllers/AdminController.scala
index 4e62bdccea..5071d461f4 100644
--- a/app/controllers/AdminController.scala
+++ b/app/controllers/AdminController.scala
@@ -669,4 +669,140 @@ class AdminController @Inject() (implicit val env: Environment[User, SessionAuth
       }
     )
   }
+
+  /**
+   * Gets street edge data for the coverage section of the admin page.
+   * @return
+   */
+  def getStreetEdgeData = UserAwareAction.async { implicit request =>
+    if (isAdmin(request.identity)) {
+      val auditedStreetDistanceOverTimeData = Json.obj(
+        "all_time" -> StreetEdgeTable.auditedStreetDistanceOverTime("all time"),
+        "today" -> StreetEdgeTable.auditedStreetDistanceOverTime("today"),
+        "week" -> StreetEdgeTable.auditedStreetDistanceOverTime("week")
+      )
+      
+      val auditedStreetsData = Json.obj(
+        "total_streets" -> StreetEdgeTable.countTotalStreets(),
+
+        "total_audited_streets" -> Json.obj(
+          "all_users" -> Json.obj(
+            "total" -> StreetEdgeTable.countAuditedStreets(),
+            "percentage" -> StreetEdgeTable.auditCompletionRate(1) * 100
+          ),
+          "high_quality" -> Json.obj(
+            "total" -> StreetEdgeTable.countAuditedStreets(1, "All", true),
+            "percentage" -> StreetEdgeTable.auditCompletionRate(1, "All", true) * 100
+          )
+        ),
+
+        "registered" -> Json.obj(
+          "all_users" -> Json.obj(
+            "total" -> StreetEdgeTable.countAuditedStreets(1, "Registered"),
+            "percentage" -> StreetEdgeTable.auditCompletionRate(1, "Registered") * 100
+          ),
+          "high_quality" -> Json.obj(
+            "total" -> StreetEdgeTable.countAuditedStreets(1, "Registered", true),
+            "percentage" -> StreetEdgeTable.auditCompletionRate(1, "Registered", true) * 100
+          )
+        ),
+
+        "anonymous" -> Json.obj(
+          "all_users" -> Json.obj(
+            "total" -> StreetEdgeTable.countAuditedStreets(1, "Anonymous"),
+            "percentage" -> StreetEdgeTable.auditCompletionRate(1, "Anonymous") * 100
+          ),
+          "high_quality" -> Json.obj(
+            "total" -> StreetEdgeTable.countAuditedStreets(1, "Anonymous", true),
+            "percentage" -> StreetEdgeTable.auditCompletionRate(1, "Anonymous", true) * 100
+          )
+        ),
+
+        "turker" -> Json.obj(
+          "all_users" -> Json.obj(
+            "total" -> StreetEdgeTable.countAuditedStreets(1, "Turker"),
+            "percentage" -> StreetEdgeTable.auditCompletionRate(1, "Turker") * 100
+          ),
+          "high_quality" -> Json.obj(
+            "total" -> StreetEdgeTable.countAuditedStreets(1, "Turker", true),
+            "percentage" -> StreetEdgeTable.auditCompletionRate(1, "Turker", true) * 100
+          )
+        ),
+
+        "researcher" -> Json.obj(
+          "all_users" -> Json.obj(
+            "total" -> StreetEdgeTable.countAuditedStreets(1, "Researcher"),
+            "percentage" -> StreetEdgeTable.auditCompletionRate(1, "Researcher") * 100
+          ),
+          "high_quality" -> Json.obj(
+            "total" -> StreetEdgeTable.countAuditedStreets(1, "Researcher", true),
+            "percentage" -> StreetEdgeTable.auditCompletionRate(1, "Researcher", true) * 100
+          )
+        )
+      )
+
+      val distanceData = Json.obj(
+        "total_distance" -> StreetEdgeTable.totalStreetDistance(),
+
+        "total_audited_streets" -> Json.obj(
+          "all_users" -> Json.obj(
+            "total" -> StreetEdgeTable.auditedStreetDistance(1),
+            "percentage" -> StreetEdgeTable.streetDistanceCompletionRate(1) * 100
+          ),
+          "high_quality" -> Json.obj(
+            "total" -> StreetEdgeTable.auditedStreetDistance(1, "All", true),
+            "percentage" -> StreetEdgeTable.streetDistanceCompletionRate(1, "All", true) * 100
+          )
+        ),
+
+        "registered" -> Json.obj(
+          "all_users" -> Json.obj(
+            "total" -> StreetEdgeTable.auditedStreetDistance(1, "Registered"),
+            "percentage" -> StreetEdgeTable.streetDistanceCompletionRate(1, "Registered") * 100
+          ),
+          "high_quality" -> Json.obj(
+            "total" -> StreetEdgeTable.auditedStreetDistance(1, "Registered", true),
+            "percentage" -> StreetEdgeTable.streetDistanceCompletionRate(1, "Registered", true) * 100
+          )
+        ),
+
+        "anonymous" -> Json.obj(
+          "all_users" -> Json.obj(
+            "total" -> StreetEdgeTable.auditedStreetDistance(1, "Anonymous"),
+            "percentage" -> StreetEdgeTable.streetDistanceCompletionRate(1, "Anonymous") * 100
+          ),
+          "high_quality" -> Json.obj(
+            "total" -> StreetEdgeTable.auditedStreetDistance(1, "Anonymous", true),
+            "percentage" -> StreetEdgeTable.streetDistanceCompletionRate(1, "Anonymous", true) * 100
+          )
+        ),
+
+        "turker" -> Json.obj(
+          "all_users" -> Json.obj(
+            "total" -> StreetEdgeTable.auditedStreetDistance(1, "Turker"),
+            "percentage" -> StreetEdgeTable.streetDistanceCompletionRate(1, "Turker") * 100
+          ),
+          "high_quality" -> Json.obj(
+            "total" -> StreetEdgeTable.auditedStreetDistance(1, "Turker", true),
+            "percentage" -> StreetEdgeTable.streetDistanceCompletionRate(1, "Turker", true) * 100
+          )
+        ),
+
+        "researcher" -> Json.obj(
+          "all_users" -> Json.obj(
+            "total" -> StreetEdgeTable.auditedStreetDistance(1, "Researcher"),
+            "percentage" -> StreetEdgeTable.streetDistanceCompletionRate(1, "Researcher") * 100
+          ),
+          "high_quality" -> Json.obj(
+            "total" -> StreetEdgeTable.auditedStreetDistance(1, "Researcher", true),
+            "percentage" -> StreetEdgeTable.streetDistanceCompletionRate(1, "Researcher", true) * 100
+          )
+        )
+      )
+      val data = Json.obj("audited_street_distance_over_time" -> auditedStreetDistanceOverTimeData, "audited_streets" -> auditedStreetsData, "distance" -> distanceData)
+      Future.successful(Ok(data))
+    } else {
+      Future.failed(new AuthenticationException("User is not an administrator"))
+    }
+  }
 }
diff --git a/app/views/admin/index.scala.html b/app/views/admin/index.scala.html
index 147de565e3..1b7fa0a6b9 100644
--- a/app/views/admin/index.scala.html
+++ b/app/views/admin/index.scala.html
@@ -8,10 +8,6 @@
 
 @import models.user.OrganizationTable
 @(title: String, user: Option[User] = None)(implicit lang: Lang)
-@convertDistance(distance: Float) = @{
-    if (Messages("measurement.system") == "metric") distance * 1.60934.toDouble
-    else distance.toDouble
-}
 @main(title) {
     @navbar(user, Some("/admin"))
     <style>
@@ -185,9 +181,9 @@ <h1>Activities</h1>
                                 </tr>
                                 <tr>
                                     <th>Audited Distance</th>
-                                    <th>@("%.1f".format(convertDistance(StreetEdgeTable.auditedStreetDistanceOverTime("all time")))) @Messages("dist.metric.abbr")</td>
-                                    <th>@("%.1f".format(convertDistance(StreetEdgeTable.auditedStreetDistanceOverTime("today")))) @Messages("dist.metric.abbr")</td>
-                                    <th>@("%.1f".format(convertDistance(StreetEdgeTable.auditedStreetDistanceOverTime("week")))) @Messages("dist.metric.abbr")</td>
+                                    <th><span class="Audited-distance" id="all-time"></span></th>
+                                    <th><span class="Audited-distance" id="today"></span></th>
+                                    <th><span class="Audited-distance" id="week"></span></th>
                                 </tr>
                                 <tr>
                                     <th>Total Validation Users</th>
@@ -263,82 +259,82 @@ <h1>Coverage</h1>
                                 </tr>
                                 <tr>
                                     <th>Audited Streets</th>
-                                    <td>@StreetEdgeTable.countAuditedStreets()
-                                        (@("%.0f".format(StreetEdgeTable.auditCompletionRate(1) * 100))%)</td>
-                                    <td>@StreetEdgeTable.countAuditedStreets(1, "All", true)
-                                        (@("%.0f".format(StreetEdgeTable.auditCompletionRate(1, "All", true) * 100))%)</td>
-                                    <td>@StreetEdgeTable.countTotalStreets()</td>
+                                    <td><span class="Coverage-audited-streets-totals" id="all-users-value"></span>
+                                        <span class="Coverage-audited-streets-totals" id="all-users-percentage"></span></td>
+                                    <td><span class="Coverage-audited-streets-totals" id="high-quality-value"></span>
+                                        <span class="Coverage-audited-streets-totals" id="high-quality-percentage"></span></td>
+                                    <td><span class="Coverage-audited-streets-totals" id="total-streets"></span></td>
                                 </tr>
                                 <tr style="font-size: 90%;">
                                     <td style="padding-left: 30px">Registered</td>
-                                    <td>@StreetEdgeTable.countAuditedStreets(1, "Registered")
-                                        (@("%.0f".format(StreetEdgeTable.auditCompletionRate(1, "Registered") * 100))%)</td>
-                                    <td>@StreetEdgeTable.countAuditedStreets(1, "Registered", true)
-                                        (@("%.0f".format(StreetEdgeTable.auditCompletionRate(1, "Registered", true) * 100))%)</td>
+                                    <td><span class="Coverage-audited-streets-registered" id="all-users-value"></span>
+                                        <span class="Coverage-audited-streets-registered" id="all-users-percentage"></span></td>
+                                    <td><span class="Coverage-audited-streets-registered" id="high-quality-value"></span>
+                                        <span class="Coverage-audited-streets-registered" id="high-quality-percentage"></span></td>
                                     <td></td>
                                 </tr>
                                 <tr style="font-size: 90%;">
                                     <td style="padding-left: 30px">Anonymous</td>
-                                    <td>@StreetEdgeTable.countAuditedStreets(1, "Anonymous")
-                                        (@("%.0f".format(StreetEdgeTable.auditCompletionRate(1, "Anonymous") * 100))%)</td>
-                                    <td>@StreetEdgeTable.countAuditedStreets(1, "Anonymous", true)
-                                        (@("%.0f".format(StreetEdgeTable.auditCompletionRate(1, "Anonymous", true) * 100))%)</td>
+                                    <td><span class="Coverage-audited-streets-anonymous" id="all-users-value"></span>
+                                        <span class="Coverage-audited-streets-anonymous" id="all-users-percentage"></span></td>
+                                    <td><span class="Coverage-audited-streets-anonymous" id="high-quality-value"></span>
+                                        <span class="Coverage-audited-streets-anonymous" id="high-quality-percentage"></span></td>
                                     <td></td>
                                 </tr>
                                 <tr style="font-size: 90%;">
                                     <td style="padding-left: 30px">Turker</td>
-                                    <td>@StreetEdgeTable.countAuditedStreets(1, "Turker")
-                                        (@("%.0f".format(StreetEdgeTable.auditCompletionRate(1, "Turker") * 100))%)</td>
-                                    <td>@StreetEdgeTable.countAuditedStreets(1, "Turker", true)
-                                        (@("%.0f".format(StreetEdgeTable.auditCompletionRate(1, "Turker", true) * 100))%)</td>
+                                    <td><span class="Coverage-audited-streets-turker" id="all-users-value"></span>
+                                        <span class="Coverage-audited-streets-turker" id="all-users-percentage"></span></td>
+                                    <td><span class="Coverage-audited-streets-turker" id="high-quality-value"></span>
+                                        <span class="Coverage-audited-streets-turker" id="high-quality-percentage"></span></td>
                                     <td></td>
                                 </tr>
                                 <tr style="font-size: 90%;">
                                     <td style="padding-left: 30px">Researcher</td>
-                                    <td>@StreetEdgeTable.countAuditedStreets(1, "Researcher")
-                                        (@("%.0f".format(StreetEdgeTable.auditCompletionRate(1, "Researcher") * 100))%)</td>
-                                    <td>@StreetEdgeTable.countAuditedStreets(1, "Researcher", true)
-                                        (@("%.0f".format(StreetEdgeTable.auditCompletionRate(1, "Researcher", true) * 100))%)</td>
+                                    <td><span class="Coverage-audited-streets-researcher" id="all-users-value"></span>
+                                        <span class="Coverage-audited-streets-researcher" id="all-users-percentage"></span></td>
+                                    <td><span class="Coverage-audited-streets-researcher" id="high-quality-value"></span>
+                                        <span class="Coverage-audited-streets-researcher" id="high-quality-percentage"></span></td>
                                     <td></td>
                                 </tr>
                                 <tr>
                                     <th>Distance</th>
-                                    <td>@("%.1f".format(convertDistance(StreetEdgeTable.auditedStreetDistance(1)))) @Messages("dist.metric.abbr")
-                                        (@("%.0f".format(StreetEdgeTable.streetDistanceCompletionRate(1) * 100))%)</td>
-                                    <td>@("%.1f".format(convertDistance(StreetEdgeTable.auditedStreetDistance(1, "All", true)))) @Messages("dist.metric.abbr")
-                                        (@("%.0f".format(StreetEdgeTable.streetDistanceCompletionRate(1, "All", true) * 100))%)</td>
-                                    <td>@("%.1f".format(convertDistance(StreetEdgeTable.totalStreetDistance()))) @Messages("dist.metric.abbr")</td>
+                                    <td><span class="Coverage-distance-totals" id="all-users-value"></span>
+                                        <span class="Coverage-distance-totals" id="all-users-percentage"></span></td>
+                                    <td><span class="Coverage-distance-totals" id="high-quality-value"></span> 
+                                        <span class="Coverage-distance-totals" id="high-quality-percentage"></span></td>
+                                    <td><span class="Coverage-distance-totals" id="total-distance"></span></td>
                                 </tr>
                                 <tr style="font-size: 90%;">
                                     <td style="padding-left: 30px">Registered</td>
-                                    <td>@("%.1f".format(convertDistance(StreetEdgeTable.auditedStreetDistance(1, "Registered")))) @Messages("dist.metric.abbr")
-                                        (@("%.0f".format(StreetEdgeTable.streetDistanceCompletionRate(1, "Registered") * 100))%)</td>
-                                    <td>@("%.1f".format(convertDistance(StreetEdgeTable.auditedStreetDistance(1, "Registered", true)))) @Messages("dist.metric.abbr")
-                                        (@("%.0f".format(StreetEdgeTable.streetDistanceCompletionRate(1, "Registered", true) * 100))%)</td>
+                                    <td><span class="Coverage-distance-registered" id="all-users-value"></span>
+                                        <span class="Coverage-distance-registered" id="all-users-percentage"></span></td>
+                                    <td><span class="Coverage-distance-registered" id="high-quality-value"></span>
+                                        <span class="Coverage-distance-registered" id="high-quality-percentage"></span></td>
                                     <td></td>
                                 </tr>
                                 <tr style="font-size: 90%;">
                                     <td style="padding-left: 30px">Anonymous</td>
-                                    <td>@("%.1f".format(convertDistance(StreetEdgeTable.auditedStreetDistance(1, "Anonymous")))) @Messages("dist.metric.abbr")
-                                        (@("%.0f".format(StreetEdgeTable.streetDistanceCompletionRate(1, "Anonymous") * 100))%)</td>
-                                    <td>@("%.1f".format(convertDistance(StreetEdgeTable.auditedStreetDistance(1, "Anonymous", true)))) @Messages("dist.metric.abbr")
-                                        (@("%.0f".format(StreetEdgeTable.streetDistanceCompletionRate(1, "Anonymous", true) * 100))%)</td>
+                                    <td><span class="Coverage-distance-anonymous" id="all-users-value"></span>
+                                        <span class="Coverage-distance-anonymous" id="all-users-percentage"></span></td>
+                                    <td><span class="Coverage-distance-anonymous" id="high-quality-value"></span>
+                                        <span class="Coverage-distance-anonymous" id="high-quality-percentage"></span></td>
                                     <td></td>
                                 </tr>
                                 <tr style="font-size: 90%;">
                                     <td style="padding-left: 30px">Turker</td>
-                                    <td>@("%.1f".format(convertDistance(StreetEdgeTable.auditedStreetDistance(1, "Turker")))) @Messages("dist.metric.abbr")
-                                        (@("%.0f".format(StreetEdgeTable.streetDistanceCompletionRate(1, "Turker") * 100))%)</td>
-                                    <td>@("%.1f".format(convertDistance(StreetEdgeTable.auditedStreetDistance(1, "Turker", true)))) @Messages("dist.metric.abbr")
-                                        (@("%.0f".format(StreetEdgeTable.streetDistanceCompletionRate(1, "Turker", true) * 100))%)</td>
+                                    <td><span class="Coverage-distance-turker" id="all-users-value"></span>
+                                        <span class="Coverage-distance-turker" id="all-users-percentage"></span></td>
+                                    <td><span class="Coverage-distance-turker" id="high-quality-value"></span>
+                                        <span class="Coverage-distance-turker" id="high-quality-percentage"></span></td>
                                     <td></td>
                                 </tr>
                                 <tr style="font-size: 90%;">
                                     <td style="padding-left: 30px">Researcher</td>
-                                    <td>@("%.1f".format(convertDistance(StreetEdgeTable.auditedStreetDistance(1, "Researcher")))) @Messages("dist.metric.abbr")
-                                        (@("%.0f".format(StreetEdgeTable.streetDistanceCompletionRate(1, "Researcher") * 100))%)</td>
-                                    <td>@("%.1f".format(convertDistance(StreetEdgeTable.auditedStreetDistance(1, "Researcher", true)))) @Messages("dist.metric.abbr")
-                                        (@("%.0f".format(StreetEdgeTable.streetDistanceCompletionRate(1, "Researcher", true) * 100))%)</td>
+                                    <td><span class="Coverage-distance-researcher" id="all-users-value"></span>
+                                        <span class="Coverage-distance-researcher" id="all-users-percentage"></span></td>
+                                    <td><span class="Coverage-distance-researcher" id="high-quality-value"></span>
+                                        <span class="Coverage-distance-researcher" id="high-quality-percentage"></span></td>
                                     <td></td>
                                 </tr>
                             </table>
@@ -950,6 +946,14 @@ <h1>Label Search</h1>
                 debug: false
             }, function(err, t) {
                 window.admin = Admin(_, $);
+                
+                // Load street edge data from the backend & make the loader finish after that data loads.
+                window.admin.loadStreetEdgeData().then(function() {
+                    $('.loader').fadeOut('slow');
+                }).catch(function(error) {
+                    console.error("Error loading street edge data:", error);
+                });
+
                 $('#comments-table').dataTable();
                 $('#label-table').dataTable();
                 $('#user-table').dataTable();
@@ -967,8 +971,5 @@ <h1>Label Search</h1>
             console.log("admin.mapData.lowQualityUsers = true;");
             console.log("filterLabelLayers('', admin.map, admin.mapData);");
         });
-        $(window).load(function() {
-            $('.loader').fadeOut('slow');
-        });
     </script>
 }
diff --git a/public/javascripts/Admin/src/Admin.js b/public/javascripts/Admin/src/Admin.js
index 25349e31a1..be001f1812 100644
--- a/public/javascripts/Admin/src/Admin.js
+++ b/public/javascripts/Admin/src/Admin.js
@@ -1150,6 +1150,85 @@ function Admin(_, $) {
         } )
     }
 
+    function convertDistance(distance) {
+        if(i18next.t('common:measurement-system') === "metric") {
+            return distance * 1.60934;
+        }
+        return distance;
+    }
+
+    function loadStreetEdgeData() {
+        return new Promise((resolve, reject) => {
+            $.getJSON("/adminapi/getStreetEdgeData", function (data) {
+                // Set Audited Streets section of the Street Edge Table.
+                $(".Coverage-audited-streets-totals#all-users-value").html(data.audited_streets.total_audited_streets.all_users.total);
+                $(".Coverage-audited-streets-totals#all-users-percentage").html(`(${Math.round(data.audited_streets.total_audited_streets.all_users.percentage)}%)`);
+                $(".Coverage-audited-streets-totals#high-quality-value").html(data.audited_streets.total_audited_streets.high_quality.total);
+                $(".Coverage-audited-streets-totals#high-quality-percentage").html(`(${Math.round(data.audited_streets.total_audited_streets.high_quality.percentage)}%)`);
+    
+                $(".Coverage-audited-streets-totals#total-streets").html(data.audited_streets.total_streets);
+
+                $(".Coverage-audited-streets-registered#all-users-value").html(data.audited_streets.registered.all_users.total);
+                $(".Coverage-audited-streets-registered#all-users-percentage").html(`(${Math.round(data.audited_streets.registered.all_users.percentage)}%)`);
+                $(".Coverage-audited-streets-registered#high-quality-value").html(data.audited_streets.registered.high_quality.total);
+                $(".Coverage-audited-streets-registered#high-quality-percentage").html(`(${Math.round(data.audited_streets.registered.high_quality.percentage)}%)`);
+    
+                $(".Coverage-audited-streets-anonymous#all-users-value").html(data.audited_streets.anonymous.all_users.total);
+                $(".Coverage-audited-streets-anonymous#all-users-percentage").html(`(${Math.round(data.audited_streets.anonymous.all_users.percentage)}%)`);
+                $(".Coverage-audited-streets-anonymous#high-quality-value").html(data.audited_streets.anonymous.high_quality.total);
+                $(".Coverage-audited-streets-anonymous#high-quality-percentage").html(`(${Math.round(data.audited_streets.anonymous.high_quality.percentage)}%)`);
+    
+                $(".Coverage-audited-streets-turker#all-users-value").html(data.audited_streets.turker.all_users.total);
+                $(".Coverage-audited-streets-turker#all-users-percentage").html(`(${Math.round(data.audited_streets.turker.all_users.percentage)}%)`);
+                $(".Coverage-audited-streets-turker#high-quality-value").html(data.audited_streets.turker.high_quality.total);
+                $(".Coverage-audited-streets-turker#high-quality-percentage").html(`(${Math.round(data.audited_streets.turker.high_quality.percentage)}%)`);
+    
+                $(".Coverage-audited-streets-researcher#all-users-value").html(data.audited_streets.researcher.all_users.total);
+                $(".Coverage-audited-streets-researcher#all-users-percentage").html(`(${Math.round(data.audited_streets.researcher.all_users.percentage)}%)`);
+                $(".Coverage-audited-streets-researcher#high-quality-value").html(data.audited_streets.researcher.high_quality.total);
+                $(".Coverage-audited-streets-researcher#high-quality-percentage").html(`(${Math.round(data.audited_streets.researcher.high_quality.percentage)}%)`);
+    
+                // Set Distance section of the Street Edge Table.
+                const distanceMetricAbbrev = i18next.t('common:unit-distance-abbreviation');
+
+                $(".Coverage-distance-totals#all-users-value").html(`${convertDistance(data.distance.total_audited_streets.all_users.total).toFixed(1)} ${distanceMetricAbbrev}`);
+                $(".Coverage-distance-totals#all-users-percentage").html(`(${Math.round(data.distance.total_audited_streets.all_users.percentage)}%)`);
+                $(".Coverage-distance-totals#high-quality-value").html(`${convertDistance(data.distance.total_audited_streets.high_quality.total).toFixed(1)} ${distanceMetricAbbrev}`);
+                $(".Coverage-distance-totals#high-quality-percentage").html(`(${Math.round(data.distance.total_audited_streets.high_quality.percentage)}%)`);
+    
+                $(".Coverage-distance-totals#total-distance").html(`${convertDistance(data.distance.total_distance).toFixed(1)} ${distanceMetricAbbrev}`);
+    
+                $(".Coverage-distance-registered#all-users-value").html(`${convertDistance(data.distance.registered.all_users.total).toFixed(1)} ${distanceMetricAbbrev}`);
+                $(".Coverage-distance-registered#all-users-percentage").html(`(${Math.round(data.distance.registered.all_users.percentage)}%)`);
+                $(".Coverage-distance-registered#high-quality-value").html(`${convertDistance(data.distance.registered.high_quality.total).toFixed(1)} ${distanceMetricAbbrev}`);
+                $(".Coverage-distance-registered#high-quality-percentage").html(`(${Math.round(data.distance.registered.high_quality.percentage)}%)`);
+    
+                $(".Coverage-distance-anonymous#all-users-value").html(`${convertDistance(data.distance.anonymous.all_users.total).toFixed(1)} ${distanceMetricAbbrev}`);
+                $(".Coverage-distance-anonymous#all-users-percentage").html(`(${Math.round(data.distance.anonymous.all_users.percentage)}%)`);
+                $(".Coverage-distance-anonymous#high-quality-value").html(`${convertDistance(data.distance.anonymous.high_quality.total).toFixed(1)} ${distanceMetricAbbrev}`);
+                $(".Coverage-distance-anonymous#high-quality-percentage").html(`(${Math.round(data.distance.anonymous.high_quality.percentage)}%)`);
+    
+                $(".Coverage-distance-turker#all-users-value").html(`${convertDistance(data.distance.turker.all_users.total).toFixed(1)} ${distanceMetricAbbrev}`);
+                $(".Coverage-distance-turker#all-users-percentage").html(`(${Math.round(data.distance.turker.all_users.percentage)}%)`);
+                $(".Coverage-distance-turker#high-quality-value").html(`${convertDistance(data.distance.turker.high_quality.total).toFixed(1)} ${distanceMetricAbbrev}`);
+                $(".Coverage-distance-turker#high-quality-percentage").html(`(${Math.round(data.distance.turker.high_quality.percentage)}%)`);
+    
+                $(".Coverage-distance-researcher#all-users-value").html(`${convertDistance(data.distance.researcher.all_users.total).toFixed(1)} ${distanceMetricAbbrev}`);
+                $(".Coverage-distance-researcher#all-users-percentage").html(`(${Math.round(data.distance.researcher.all_users.percentage)}%)`);
+                $(".Coverage-distance-researcher#high-quality-value").html(`${convertDistance(data.distance.researcher.high_quality.total).toFixed(1)} ${distanceMetricAbbrev}`);
+                $(".Coverage-distance-researcher#high-quality-percentage").html(`(${Math.round(data.distance.researcher.high_quality.percentage)}%)`);
+    
+                // Set the audited distance fields.
+                $(".Audited-distance#all-time").html(`${convertDistance(data.audited_street_distance_over_time.all_time).toFixed(1)} ${distanceMetricAbbrev}`);
+                $(".Audited-distance#today").html(`${convertDistance(data.audited_street_distance_over_time.today).toFixed(1)} ${distanceMetricAbbrev}`);
+                $(".Audited-distance#week").html(`${convertDistance(data.audited_street_distance_over_time.week).toFixed(1)} ${distanceMetricAbbrev}`);
+
+                resolve();
+            })
+        });
+    }
+    
+
     initializeLabelTable();
     initializeAdminGSVLabelView();
     initializeAdminLabelSearch();
@@ -1157,6 +1236,7 @@ function Admin(_, $) {
     initializeAdminGSVCommentWindow();
     
     self.clearPlayCache = clearPlayCache;
+    self.loadStreetEdgeData = loadStreetEdgeData;
 
     $('.change-role').on('click', changeRole);
     $('.change-org').on('click', changeOrg);

From 3362dde438924da8518a1a3434c72399f42177b6 Mon Sep 17 00:00:00 2001
From: Srihari Krishnaswamy <sriharik844@gmail.com>
Date: Wed, 23 Oct 2024 16:52:55 -0700
Subject: [PATCH 15/28] Fix Street Edge data getter route comment in
 AdminController

---
 app/controllers/AdminController.scala | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/controllers/AdminController.scala b/app/controllers/AdminController.scala
index 5071d461f4..b1829760c9 100644
--- a/app/controllers/AdminController.scala
+++ b/app/controllers/AdminController.scala
@@ -672,7 +672,6 @@ class AdminController @Inject() (implicit val env: Environment[User, SessionAuth
 
   /**
    * Gets street edge data for the coverage section of the admin page.
-   * @return
    */
   def getStreetEdgeData = UserAwareAction.async { implicit request =>
     if (isAdmin(request.identity)) {

From 3fc134a269522e95bd4f1203b35f7c21b51cd76f Mon Sep 17 00:00:00 2001
From: Mikey Saugstad <michaelssaugstad@gmail.com>
Date: Fri, 25 Oct 2024 12:21:09 -0700
Subject: [PATCH 16/28] moves user_role table to unified_login schema

---
 app/controllers/AdminController.scala    |  4 ++--
 app/models/daos/slick/UserDAOSlick.scala | 16 ++++++++--------
 app/models/label/LabelTable.scala        |  4 ++--
 app/models/user/RoleTable.scala          |  2 +-
 app/models/user/UserRoleTable.scala      |  2 +-
 app/models/user/UserStatTable.scala      |  8 ++++----
 app/views/admin/index.scala.html         |  8 ++++----
 public/javascripts/Admin/src/Admin.js    |  4 ++--
 public/stylesheets/admin.css             |  6 +-----
 9 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/app/controllers/AdminController.scala b/app/controllers/AdminController.scala
index 4e62bdccea..6ea95cbf1b 100644
--- a/app/controllers/AdminController.scala
+++ b/app/controllers/AdminController.scala
@@ -574,9 +574,9 @@ class AdminController @Inject() (implicit val env: Environment[User, SessionAuth
           if (currentOrg.nonEmpty) {
             UserOrgTable.remove(userId, currentOrg.get)
           }
-          val confirmedOrgId: Int = UserOrgTable.save(userId, newOrgId)
+          val rowsUpdated: Int = UserOrgTable.save(userId, newOrgId)
 
-          if (confirmedOrgId == newOrgId) {
+          if (rowsUpdated > 0) {
             Future.successful(Ok(Json.obj("user_id" -> userId, "org_id" -> newOrgId)))
           } else {
             Future.successful(BadRequest("Error saving org"))
diff --git a/app/models/daos/slick/UserDAOSlick.scala b/app/models/daos/slick/UserDAOSlick.scala
index 01c37ae1ef..3bfef46530 100644
--- a/app/models/daos/slick/UserDAOSlick.scala
+++ b/app/models/daos/slick/UserDAOSlick.scala
@@ -286,8 +286,8 @@ object UserDAOSlick {
       """SELECT COUNT(DISTINCT(label_validation.user_id))
         |FROM label_validation
         |INNER JOIN sidewalk_login.sidewalk_user ON sidewalk_user.user_id = label_validation.user_id
-        |INNER JOIN user_role ON sidewalk_user.user_id = user_role.user_id
-        |INNER JOIN role ON user_role.role_id = role.role_id
+        |INNER JOIN sidewalk_login.user_role ON sidewalk_user.user_id = user_role.user_id
+        |INNER JOIN sidewalk_login.role ON user_role.role_id = role.role_id
         |WHERE (label_validation.end_timestamp AT TIME ZONE 'US/Pacific')::date = (NOW() AT TIME ZONE 'US/Pacific')::date
         |    AND sidewalk_user.username <> 'anonymous'
         |    AND role.role = ?""".stripMargin
@@ -324,8 +324,8 @@ object UserDAOSlick {
       """SELECT COUNT(DISTINCT(label_validation.user_id))
         |FROM label_validation
         |INNER JOIN sidewalk_login.sidewalk_user ON sidewalk_user.user_id = label_validation.user_id
-        |INNER JOIN user_role ON sidewalk_user.user_id = user_role.user_id
-        |INNER JOIN role ON user_role.role_id = role.role_id
+        |INNER JOIN sidewalk_login.user_role ON sidewalk_user.user_id = user_role.user_id
+        |INNER JOIN sidewalk_login.role ON user_role.role_id = role.role_id
         |WHERE (label_validation.end_timestamp AT TIME ZONE 'US/Pacific') > (NOW() AT TIME ZONE 'US/Pacific') - interval '168 hours'
         |    AND sidewalk_user.username <> 'anonymous'
         |    AND role.role = ?""".stripMargin
@@ -398,8 +398,8 @@ object UserDAOSlick {
       """SELECT COUNT(DISTINCT(audit_task.user_id))
         |FROM audit_task
         |INNER JOIN sidewalk_login.sidewalk_user ON sidewalk_user.user_id = audit_task.user_id
-        |INNER JOIN user_role ON sidewalk_user.user_id = user_role.user_id
-        |INNER JOIN role ON user_role.role_id = role.role_id
+        |INNER JOIN sidewalk_login.user_role ON sidewalk_user.user_id = user_role.user_id
+        |INNER JOIN sidewalk_login.role ON user_role.role_id = role.role_id
         |WHERE (audit_task.task_end AT TIME ZONE 'US/Pacific')::date = (NOW() AT TIME ZONE 'US/Pacific')::date
         |    AND sidewalk_user.username <> 'anonymous'
         |    AND role.role = ?
@@ -437,8 +437,8 @@ object UserDAOSlick {
       """SELECT COUNT(DISTINCT(audit_task.user_id))
         |FROM audit_task
         |INNER JOIN sidewalk_login.sidewalk_user ON sidewalk_user.user_id = audit_task.user_id
-        |INNER JOIN user_role ON sidewalk_user.user_id = user_role.user_id
-        |INNER JOIN role ON user_role.role_id = role.role_id
+        |INNER JOIN sidewalk_login.user_role ON sidewalk_user.user_id = user_role.user_id
+        |INNER JOIN sidewalk_login.role ON user_role.role_id = role.role_id
         |WHERE (audit_task.task_end AT TIME ZONE 'US/Pacific') > (now() AT TIME ZONE 'US/Pacific') - interval '168 hours'
         |    AND sidewalk_user.username <> 'anonymous'
         |    AND role.role = ?
diff --git a/app/models/label/LabelTable.scala b/app/models/label/LabelTable.scala
index b1eaca9d4e..864fabc9ef 100644
--- a/app/models/label/LabelTable.scala
+++ b/app/models/label/LabelTable.scala
@@ -1284,8 +1284,8 @@ object LabelTable {
          |            WHERE audit_task.completed = TRUE
          |        ) users_with_type
          |        INNER JOIN user_stat ON users_with_type.user_id = user_stat.user_id
-         |        INNER JOIN user_role ON users_with_type.user_id = user_role.user_id
-         |        INNER JOIN role ON user_role.role_id = role.role_id
+         |        INNER JOIN sidewalk_login.user_role ON users_with_type.user_id = user_role.user_id
+         |        INNER JOIN sidewalk_login.role ON user_role.role_id = role.role_id
          |        WHERE $userFilter
          |    ) users
          |) AS users, (
diff --git a/app/models/user/RoleTable.scala b/app/models/user/RoleTable.scala
index 83f6f9b887..0de1f6342b 100644
--- a/app/models/user/RoleTable.scala
+++ b/app/models/user/RoleTable.scala
@@ -5,7 +5,7 @@ import play.api.Play.current
 
 case class Role(roleId: Int, role: String)
 
-class RoleTable(tag: Tag) extends Table[Role](tag, "role") {
+class RoleTable(tag: Tag) extends Table[Role](tag, Some("sidewalk_login"), "role") {
   def roleId = column[Int]("role_id", O.PrimaryKey, O.AutoInc)
   def role = column[String]("role", O.NotNull)
 
diff --git a/app/models/user/UserRoleTable.scala b/app/models/user/UserRoleTable.scala
index a9ea3e7e2e..a748ce49cb 100644
--- a/app/models/user/UserRoleTable.scala
+++ b/app/models/user/UserRoleTable.scala
@@ -7,7 +7,7 @@ import scala.util.control.NonFatal
 
 case class UserRole(userRoleId: Int, userId: String, roleId: Int, communityService: Boolean)
 
-class UserRoleTable(tag: Tag) extends Table[UserRole](tag, "user_role") {
+class UserRoleTable(tag: Tag) extends Table[UserRole](tag, Some("sidewalk_login"), "user_role") {
   def userRoleId = column[Int]("user_role_id", O.PrimaryKey, O.AutoInc)
   def userId = column[String]("user_id", O.NotNull)
   def roleId = column[Int]("role_id", O.NotNull)
diff --git a/app/models/user/UserStatTable.scala b/app/models/user/UserStatTable.scala
index 32ec5fb4cb..277d68e888 100644
--- a/app/models/user/UserStatTable.scala
+++ b/app/models/user/UserStatTable.scala
@@ -333,8 +333,8 @@ object UserStatTable {
         |FROM (
         |    SELECT $groupingCol, COUNT(label_id) AS label_count
         |    FROM sidewalk_login.sidewalk_user
-        |    INNER JOIN user_role ON sidewalk_user.user_id = user_role.user_id
-        |    INNER JOIN role ON user_role.role_id = role.role_id
+        |    INNER JOIN sidewalk_login.user_role ON sidewalk_user.user_id = user_role.user_id
+        |    INNER JOIN sidewalk_login.role ON user_role.role_id = role.role_id
         |    INNER JOIN user_stat ON sidewalk_user.user_id = user_stat.user_id
         |    INNER JOIN label ON sidewalk_user.user_id = label.user_id
         |    $joinUserOrgTable
@@ -444,8 +444,8 @@ object UserStatTable {
          |       COALESCE(label_counts.other_validated_incorrect, 0) AS other_validated_incorrect,
          |       COALESCE(label_counts.other_not_validated, 0) AS other_not_validated
          |FROM user_stat
-         |INNER JOIN user_role ON user_stat.user_id = user_role.user_id
-         |INNER JOIN role ON user_role.role_id = role.role_id
+         |INNER JOIN sidewalk_login.user_role ON user_stat.user_id = user_role.user_id
+         |INNER JOIN sidewalk_login.role ON user_role.role_id = role.role_id
          |-- Validations given.
          |LEFT JOIN (
          |    SELECT label_validation.user_id,
diff --git a/app/views/admin/index.scala.html b/app/views/admin/index.scala.html
index 8e3625a2cf..1ab74297f2 100644
--- a/app/views/admin/index.scala.html
+++ b/app/views/admin/index.scala.html
@@ -849,8 +849,8 @@ <h1>Users</h1>
                                     <td>@u.email</td>
                                     <td>
                                         @if(u.role != "Owner"){
-                                            <div class="dropdown">
-                                                <button class="btn btn-default dropdown-toggle role-dropdown" type="button" id="userRoleDropdown@u.userId" data-toggle="dropdown">
+                                            <div class="dropdown role-dropdown">
+                                                <button class="btn btn-default dropdown-toggle" type="button" id="userRoleDropdown@u.userId" data-toggle="dropdown">
                                                     @u.role
                                                     <span class="caret"></span>
                                                 </button>
@@ -867,8 +867,8 @@ <h1>Users</h1>
                                         }
                                     </td>
                                     <td>
-                                        <div class="dropdown">
-                                            <button class="btn btn-default dropdown-toggle org-dropdown" type="button" id="userOrgDropdown@u.userId" data-toggle="dropdown">
+                                        <div class="dropdown org-dropdown">
+                                            <button class="btn btn-default dropdown-toggle" type="button" id="userOrgDropdown@u.userId" data-toggle="dropdown">
                                                 @u.org.getOrElse("None")
                                                 <span class="caret"></span>
                                             </button>
diff --git a/public/javascripts/Admin/src/Admin.js b/public/javascripts/Admin/src/Admin.js
index 25349e31a1..6db64ac72e 100644
--- a/public/javascripts/Admin/src/Admin.js
+++ b/public/javascripts/Admin/src/Admin.js
@@ -1158,8 +1158,8 @@ function Admin(_, $) {
     
     self.clearPlayCache = clearPlayCache;
 
-    $('.change-role').on('click', changeRole);
-    $('.change-org').on('click', changeOrg);
+    $('.role-dropdown').on('click', 'a', changeRole);=
+    $('.org-dropdown').on('click', 'a', changeOrg);
 
     return self;
 }
diff --git a/public/stylesheets/admin.css b/public/stylesheets/admin.css
index 971af26994..61e3f63097 100644
--- a/public/stylesheets/admin.css
+++ b/public/stylesheets/admin.css
@@ -33,11 +33,7 @@
     flex: 1;
 }
 
-.role-dropdown, .org-dropdown {
-    font-size: 11px;
-}
-
-.change-role, .change-org {
+.role-dropdown .dropdown-toggle, .role-dropdown li, .org-dropdown .dropdown-toggle, .org-dropdown li {
     font-size: 11px;
 }
 

From 5c725f4f2cc15c6eda261670c33d52b83d382b9a Mon Sep 17 00:00:00 2001
From: Srihari Krishnaswamy <sriharik844@gmail.com>
Date: Sun, 27 Oct 2024 18:41:13 -0700
Subject: [PATCH 17/28] Refactor Admin.js and admin html to update
 coverage-related element ids and add constructor to Admin.js

---
 Gruntfile.js                          |   1 +
 app/controllers/AdminController.scala | 215 +++++++++++++-------------
 app/views/admin/index.scala.html      |  97 ++++++------
 public/javascripts/Admin/src/Admin.js | 106 +++++++------
 4 files changed, 211 insertions(+), 208 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 9ee42790de..98d0b6ad63 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -49,6 +49,7 @@ module.exports = function(grunt) {
                 src: [
                     'public/javascripts/Admin/src/*.js',
                     'public/javascripts/common/Utilities.js',
+                    'public/javascripts/common/UtilitiesMath.js',
                     'public/javascripts/common/UtilitiesSidewalk.js',
                     'public/javascripts/common/Panomarker.js',
                     'public/javascripts/common/UtilitiesPanomarker.js'
diff --git a/app/controllers/AdminController.scala b/app/controllers/AdminController.scala
index b1829760c9..6092f7fd69 100644
--- a/app/controllers/AdminController.scala
+++ b/app/controllers/AdminController.scala
@@ -673,135 +673,134 @@ class AdminController @Inject() (implicit val env: Environment[User, SessionAuth
   /**
    * Gets street edge data for the coverage section of the admin page.
    */
-  def getStreetEdgeData = UserAwareAction.async { implicit request =>
-    if (isAdmin(request.identity)) {
-      val auditedStreetDistanceOverTimeData = Json.obj(
-        "all_time" -> StreetEdgeTable.auditedStreetDistanceOverTime("all time"),
-        "today" -> StreetEdgeTable.auditedStreetDistanceOverTime("today"),
-        "week" -> StreetEdgeTable.auditedStreetDistanceOverTime("week")
-      )
+  def getCoverageData = UserAwareAction.async { implicit request =>
+    val auditedStreetDistanceOverTimeData = Json.obj(
+      "all_time" -> StreetEdgeTable.auditedStreetDistanceOverTime("all time"),
+      "today" -> StreetEdgeTable.auditedStreetDistanceOverTime("today"),
+      "week" -> StreetEdgeTable.auditedStreetDistanceOverTime("week")
+    )
       
-      val auditedStreetsData = Json.obj(
-        "total_streets" -> StreetEdgeTable.countTotalStreets(),
-
-        "total_audited_streets" -> Json.obj(
-          "all_users" -> Json.obj(
-            "total" -> StreetEdgeTable.countAuditedStreets(),
-            "percentage" -> StreetEdgeTable.auditCompletionRate(1) * 100
-          ),
-          "high_quality" -> Json.obj(
-            "total" -> StreetEdgeTable.countAuditedStreets(1, "All", true),
-            "percentage" -> StreetEdgeTable.auditCompletionRate(1, "All", true) * 100
-          )
+    val auditedStreetsData = Json.obj(
+      "total_streets" -> StreetEdgeTable.countTotalStreets(),
+      "total_audited_streets" -> Json.obj(
+        "all_users" -> Json.obj(
+          "total" -> StreetEdgeTable.countAuditedStreets(),
+          "percentage" -> StreetEdgeTable.auditCompletionRate(1) * 100
         ),
+        "high_quality" -> Json.obj(
+          "total" -> StreetEdgeTable.countAuditedStreets(1, "All", true),
+          "percentage" -> StreetEdgeTable.auditCompletionRate(1, "All", true) * 100
+        )
+      ),
 
-        "registered" -> Json.obj(
-          "all_users" -> Json.obj(
-            "total" -> StreetEdgeTable.countAuditedStreets(1, "Registered"),
-            "percentage" -> StreetEdgeTable.auditCompletionRate(1, "Registered") * 100
-          ),
-          "high_quality" -> Json.obj(
-            "total" -> StreetEdgeTable.countAuditedStreets(1, "Registered", true),
-            "percentage" -> StreetEdgeTable.auditCompletionRate(1, "Registered", true) * 100
-          )
+      "registered" -> Json.obj(
+        "all_users" -> Json.obj(
+          "total" -> StreetEdgeTable.countAuditedStreets(1, "Registered"),
+          "percentage" -> StreetEdgeTable.auditCompletionRate(1, "Registered") * 100
         ),
+        "high_quality" -> Json.obj(
+          "total" -> StreetEdgeTable.countAuditedStreets(1, "Registered", true),
+          "percentage" -> StreetEdgeTable.auditCompletionRate(1, "Registered", true) * 100
+        )
+      ),
 
-        "anonymous" -> Json.obj(
-          "all_users" -> Json.obj(
-            "total" -> StreetEdgeTable.countAuditedStreets(1, "Anonymous"),
-            "percentage" -> StreetEdgeTable.auditCompletionRate(1, "Anonymous") * 100
-          ),
-          "high_quality" -> Json.obj(
-            "total" -> StreetEdgeTable.countAuditedStreets(1, "Anonymous", true),
-            "percentage" -> StreetEdgeTable.auditCompletionRate(1, "Anonymous", true) * 100
-          )
+      "anonymous" -> Json.obj(
+        "all_users" -> Json.obj(
+          "total" -> StreetEdgeTable.countAuditedStreets(1, "Anonymous"),
+          "percentage" -> StreetEdgeTable.auditCompletionRate(1, "Anonymous") * 100
         ),
+        "high_quality" -> Json.obj(
+          "total" -> StreetEdgeTable.countAuditedStreets(1, "Anonymous", true),
+          "percentage" -> StreetEdgeTable.auditCompletionRate(1, "Anonymous", true) * 100
+        )
+      ),
 
-        "turker" -> Json.obj(
-          "all_users" -> Json.obj(
-            "total" -> StreetEdgeTable.countAuditedStreets(1, "Turker"),
-            "percentage" -> StreetEdgeTable.auditCompletionRate(1, "Turker") * 100
-          ),
-          "high_quality" -> Json.obj(
-            "total" -> StreetEdgeTable.countAuditedStreets(1, "Turker", true),
-            "percentage" -> StreetEdgeTable.auditCompletionRate(1, "Turker", true) * 100
-          )
+      "turker" -> Json.obj(
+        "all_users" -> Json.obj(
+          "total" -> StreetEdgeTable.countAuditedStreets(1, "Turker"),
+          "percentage" -> StreetEdgeTable.auditCompletionRate(1, "Turker") * 100
         ),
+        "high_quality" -> Json.obj(
+          "total" -> StreetEdgeTable.countAuditedStreets(1, "Turker", true),
+          "percentage" -> StreetEdgeTable.auditCompletionRate(1, "Turker", true) * 100
+        )
+      ),
 
-        "researcher" -> Json.obj(
-          "all_users" -> Json.obj(
-            "total" -> StreetEdgeTable.countAuditedStreets(1, "Researcher"),
-            "percentage" -> StreetEdgeTable.auditCompletionRate(1, "Researcher") * 100
-          ),
-          "high_quality" -> Json.obj(
-            "total" -> StreetEdgeTable.countAuditedStreets(1, "Researcher", true),
-            "percentage" -> StreetEdgeTable.auditCompletionRate(1, "Researcher", true) * 100
-          )
+      "researcher" -> Json.obj(
+        "all_users" -> Json.obj(
+          "total" -> StreetEdgeTable.countAuditedStreets(1, "Researcher"),
+          "percentage" -> StreetEdgeTable.auditCompletionRate(1, "Researcher") * 100
+        ),
+        "high_quality" -> Json.obj(
+          "total" -> StreetEdgeTable.countAuditedStreets(1, "Researcher", true),
+          "percentage" -> StreetEdgeTable.auditCompletionRate(1, "Researcher", true) * 100
         )
       )
+    )
+
+    val distanceData = Json.obj(
+      "total_distance" -> StreetEdgeTable.totalStreetDistance(),
 
-      val distanceData = Json.obj(
-        "total_distance" -> StreetEdgeTable.totalStreetDistance(),
-
-        "total_audited_streets" -> Json.obj(
-          "all_users" -> Json.obj(
-            "total" -> StreetEdgeTable.auditedStreetDistance(1),
-            "percentage" -> StreetEdgeTable.streetDistanceCompletionRate(1) * 100
-          ),
-          "high_quality" -> Json.obj(
-            "total" -> StreetEdgeTable.auditedStreetDistance(1, "All", true),
-            "percentage" -> StreetEdgeTable.streetDistanceCompletionRate(1, "All", true) * 100
-          )
+      "total_audited_streets" -> Json.obj(
+        "all_users" -> Json.obj(
+          "total" -> StreetEdgeTable.auditedStreetDistance(1),
+          "percentage" -> StreetEdgeTable.streetDistanceCompletionRate(1) * 100
         ),
+        "high_quality" -> Json.obj(
+          "total" -> StreetEdgeTable.auditedStreetDistance(1, "All", true),
+          "percentage" -> StreetEdgeTable.streetDistanceCompletionRate(1, "All", true) * 100
+        )
+      ),
 
-        "registered" -> Json.obj(
-          "all_users" -> Json.obj(
-            "total" -> StreetEdgeTable.auditedStreetDistance(1, "Registered"),
-            "percentage" -> StreetEdgeTable.streetDistanceCompletionRate(1, "Registered") * 100
-          ),
-          "high_quality" -> Json.obj(
-            "total" -> StreetEdgeTable.auditedStreetDistance(1, "Registered", true),
-            "percentage" -> StreetEdgeTable.streetDistanceCompletionRate(1, "Registered", true) * 100
-          )
+      "registered" -> Json.obj(
+        "all_users" -> Json.obj(
+          "total" -> StreetEdgeTable.auditedStreetDistance(1, "Registered"),
+          "percentage" -> StreetEdgeTable.streetDistanceCompletionRate(1, "Registered") * 100
         ),
+        "high_quality" -> Json.obj(
+          "total" -> StreetEdgeTable.auditedStreetDistance(1, "Registered", true),
+          "percentage" -> StreetEdgeTable.streetDistanceCompletionRate(1, "Registered", true) * 100
+        )
+      ),
 
-        "anonymous" -> Json.obj(
-          "all_users" -> Json.obj(
-            "total" -> StreetEdgeTable.auditedStreetDistance(1, "Anonymous"),
-            "percentage" -> StreetEdgeTable.streetDistanceCompletionRate(1, "Anonymous") * 100
-          ),
-          "high_quality" -> Json.obj(
-            "total" -> StreetEdgeTable.auditedStreetDistance(1, "Anonymous", true),
-            "percentage" -> StreetEdgeTable.streetDistanceCompletionRate(1, "Anonymous", true) * 100
-          )
+      "anonymous" -> Json.obj(
+        "all_users" -> Json.obj(
+          "total" -> StreetEdgeTable.auditedStreetDistance(1, "Anonymous"),
+          "percentage" -> StreetEdgeTable.streetDistanceCompletionRate(1, "Anonymous") * 100
         ),
+        "high_quality" -> Json.obj(
+          "total" -> StreetEdgeTable.auditedStreetDistance(1, "Anonymous", true),
+          "percentage" -> StreetEdgeTable.streetDistanceCompletionRate(1, "Anonymous", true) * 100
+        )
+      ),
 
-        "turker" -> Json.obj(
-          "all_users" -> Json.obj(
-            "total" -> StreetEdgeTable.auditedStreetDistance(1, "Turker"),
-            "percentage" -> StreetEdgeTable.streetDistanceCompletionRate(1, "Turker") * 100
-          ),
-          "high_quality" -> Json.obj(
-            "total" -> StreetEdgeTable.auditedStreetDistance(1, "Turker", true),
-            "percentage" -> StreetEdgeTable.streetDistanceCompletionRate(1, "Turker", true) * 100
-          )
+      "turker" -> Json.obj(
+        "all_users" -> Json.obj(
+          "total" -> StreetEdgeTable.auditedStreetDistance(1, "Turker"),
+          "percentage" -> StreetEdgeTable.streetDistanceCompletionRate(1, "Turker") * 100
         ),
+        "high_quality" -> Json.obj(
+          "total" -> StreetEdgeTable.auditedStreetDistance(1, "Turker", true),
+          "percentage" -> StreetEdgeTable.streetDistanceCompletionRate(1, "Turker", true) * 100
+        )
+      ),
 
-        "researcher" -> Json.obj(
-          "all_users" -> Json.obj(
-            "total" -> StreetEdgeTable.auditedStreetDistance(1, "Researcher"),
-            "percentage" -> StreetEdgeTable.streetDistanceCompletionRate(1, "Researcher") * 100
-          ),
-          "high_quality" -> Json.obj(
-            "total" -> StreetEdgeTable.auditedStreetDistance(1, "Researcher", true),
-            "percentage" -> StreetEdgeTable.streetDistanceCompletionRate(1, "Researcher", true) * 100
-          )
+      "researcher" -> Json.obj(
+        "all_users" -> Json.obj(
+          "total" -> StreetEdgeTable.auditedStreetDistance(1, "Researcher"),
+          "percentage" -> StreetEdgeTable.streetDistanceCompletionRate(1, "Researcher") * 100
+        ),
+        "high_quality" -> Json.obj(
+          "total" -> StreetEdgeTable.auditedStreetDistance(1, "Researcher", true),
+          "percentage" -> StreetEdgeTable.streetDistanceCompletionRate(1, "Researcher", true) * 100
         )
       )
-      val data = Json.obj("audited_street_distance_over_time" -> auditedStreetDistanceOverTimeData, "audited_streets" -> auditedStreetsData, "distance" -> distanceData)
-      Future.successful(Ok(data))
-    } else {
-      Future.failed(new AuthenticationException("User is not an administrator"))
-    }
+    )
+    val data = Json.obj(
+      "audited_street_distance_over_time" -> auditedStreetDistanceOverTimeData,
+      "audited_streets" -> auditedStreetsData, 
+      "distance" -> distanceData
+      )
+    Future.successful(Ok(data))
   }
 }
diff --git a/app/views/admin/index.scala.html b/app/views/admin/index.scala.html
index 1b7fa0a6b9..324f175412 100644
--- a/app/views/admin/index.scala.html
+++ b/app/views/admin/index.scala.html
@@ -181,9 +181,9 @@ <h1>Activities</h1>
                                 </tr>
                                 <tr>
                                     <th>Audited Distance</th>
-                                    <th><span class="Audited-distance" id="all-time"></span></th>
-                                    <th><span class="Audited-distance" id="today"></span></th>
-                                    <th><span class="Audited-distance" id="week"></span></th>
+                                    <th><span id="audited-distance-all-time"></span></th>
+                                    <th><span id="audited-distance-today"></span></th>
+                                    <th><span id="audited-distance-week"></span></th>
                                 </tr>
                                 <tr>
                                     <th>Total Validation Users</th>
@@ -259,82 +259,82 @@ <h1>Coverage</h1>
                                 </tr>
                                 <tr>
                                     <th>Audited Streets</th>
-                                    <td><span class="Coverage-audited-streets-totals" id="all-users-value"></span>
-                                        <span class="Coverage-audited-streets-totals" id="all-users-percentage"></span></td>
-                                    <td><span class="Coverage-audited-streets-totals" id="high-quality-value"></span>
-                                        <span class="Coverage-audited-streets-totals" id="high-quality-percentage"></span></td>
-                                    <td><span class="Coverage-audited-streets-totals" id="total-streets"></span></td>
+                                    <td><span id="audited-streets-totals-all-users-value"></span>
+                                        <span id="audited-streets-totals-all-users-percentage"></span></td>
+                                    <td><span id="audited-streets-totals-high-quality-value"></span>
+                                        <span id="audited-streets-totals-high-quality-percentage"></span></td>
+                                    <td><span id="audited-streets-totals-total-streets"></span></td>
                                 </tr>
                                 <tr style="font-size: 90%;">
                                     <td style="padding-left: 30px">Registered</td>
-                                    <td><span class="Coverage-audited-streets-registered" id="all-users-value"></span>
-                                        <span class="Coverage-audited-streets-registered" id="all-users-percentage"></span></td>
-                                    <td><span class="Coverage-audited-streets-registered" id="high-quality-value"></span>
-                                        <span class="Coverage-audited-streets-registered" id="high-quality-percentage"></span></td>
+                                    <td><span id="audited-streets-registered-all-users-value"></span>
+                                        <span id="audited-streets-registered-all-users-percentage"></span></td>
+                                    <td><span id="audited-streets-registered-high-quality-value"></span>
+                                        <span id="audited-streets-registered-high-quality-percentage"></span></td>
                                     <td></td>
                                 </tr>
                                 <tr style="font-size: 90%;">
                                     <td style="padding-left: 30px">Anonymous</td>
-                                    <td><span class="Coverage-audited-streets-anonymous" id="all-users-value"></span>
-                                        <span class="Coverage-audited-streets-anonymous" id="all-users-percentage"></span></td>
-                                    <td><span class="Coverage-audited-streets-anonymous" id="high-quality-value"></span>
-                                        <span class="Coverage-audited-streets-anonymous" id="high-quality-percentage"></span></td>
+                                    <td><span id="audited-streets-anonymous-all-users-value"></span>
+                                        <span id="audited-streets-anonymous-all-users-percentage"></span></td>
+                                    <td><span id="audited-streets-anonymous-high-quality-value"></span>
+                                        <span id="audited-streets-anonymous-high-quality-percentage"></span></td>
                                     <td></td>
                                 </tr>
                                 <tr style="font-size: 90%;">
                                     <td style="padding-left: 30px">Turker</td>
-                                    <td><span class="Coverage-audited-streets-turker" id="all-users-value"></span>
-                                        <span class="Coverage-audited-streets-turker" id="all-users-percentage"></span></td>
-                                    <td><span class="Coverage-audited-streets-turker" id="high-quality-value"></span>
-                                        <span class="Coverage-audited-streets-turker" id="high-quality-percentage"></span></td>
+                                    <td><span id="audited-streets-turker-all-users-value"></span>
+                                        <span id="audited-streets-turker-all-users-percentage"></span></td>
+                                    <td><span id="audited-streets-turker-high-quality-value"></span>
+                                        <span id="audited-streets-turker-high-quality-percentage"></span></td>
                                     <td></td>
                                 </tr>
                                 <tr style="font-size: 90%;">
                                     <td style="padding-left: 30px">Researcher</td>
-                                    <td><span class="Coverage-audited-streets-researcher" id="all-users-value"></span>
-                                        <span class="Coverage-audited-streets-researcher" id="all-users-percentage"></span></td>
-                                    <td><span class="Coverage-audited-streets-researcher" id="high-quality-value"></span>
-                                        <span class="Coverage-audited-streets-researcher" id="high-quality-percentage"></span></td>
+                                    <td><span id="audited-streets-researcher-all-users-value"></span>
+                                        <span id="audited-streets-researcher-all-users-percentage"></span></td>
+                                    <td><span id="audited-streets-researcher-high-quality-value"></span>
+                                        <span id="audited-streets-researcher-high-quality-percentage"></span></td>
                                     <td></td>
                                 </tr>
                                 <tr>
                                     <th>Distance</th>
-                                    <td><span class="Coverage-distance-totals" id="all-users-value"></span>
-                                        <span class="Coverage-distance-totals" id="all-users-percentage"></span></td>
-                                    <td><span class="Coverage-distance-totals" id="high-quality-value"></span> 
-                                        <span class="Coverage-distance-totals" id="high-quality-percentage"></span></td>
-                                    <td><span class="Coverage-distance-totals" id="total-distance"></span></td>
+                                    <td><span id="distance-totals-all-users-value"></span>
+                                        <span id="distance-totals-all-users-percentage"></span></td>
+                                    <td><span id="distance-totals-high-quality-value"></span> 
+                                        <span id="distance-totals-high-quality-percentage"></span></td>
+                                    <td><span id="distance-totals-total-distance"></span></td>
                                 </tr>
                                 <tr style="font-size: 90%;">
                                     <td style="padding-left: 30px">Registered</td>
-                                    <td><span class="Coverage-distance-registered" id="all-users-value"></span>
-                                        <span class="Coverage-distance-registered" id="all-users-percentage"></span></td>
-                                    <td><span class="Coverage-distance-registered" id="high-quality-value"></span>
-                                        <span class="Coverage-distance-registered" id="high-quality-percentage"></span></td>
+                                    <td><span id="distance-registered-all-users-value"></span>
+                                        <span id="distance-registered-all-users-percentage"></span></td>
+                                    <td><span id="distance-registered-high-quality-value"></span>
+                                        <span id="distance-registered-high-quality-percentage"></span></td>
                                     <td></td>
                                 </tr>
                                 <tr style="font-size: 90%;">
                                     <td style="padding-left: 30px">Anonymous</td>
-                                    <td><span class="Coverage-distance-anonymous" id="all-users-value"></span>
-                                        <span class="Coverage-distance-anonymous" id="all-users-percentage"></span></td>
-                                    <td><span class="Coverage-distance-anonymous" id="high-quality-value"></span>
-                                        <span class="Coverage-distance-anonymous" id="high-quality-percentage"></span></td>
+                                    <td><span id="distance-anonymous-all-users-value"></span>
+                                        <span id="distance-anonymous-all-users-percentage"></span></td>
+                                    <td><span id="distance-anonymous-high-quality-value"></span>
+                                        <span id="distance-anonymous-high-quality-percentage"></span></td>
                                     <td></td>
                                 </tr>
                                 <tr style="font-size: 90%;">
                                     <td style="padding-left: 30px">Turker</td>
-                                    <td><span class="Coverage-distance-turker" id="all-users-value"></span>
-                                        <span class="Coverage-distance-turker" id="all-users-percentage"></span></td>
-                                    <td><span class="Coverage-distance-turker" id="high-quality-value"></span>
-                                        <span class="Coverage-distance-turker" id="high-quality-percentage"></span></td>
+                                    <td><span id="distance-turker-all-users-value"></span>
+                                        <span id="distance-turker-all-users-percentage"></span></td>
+                                    <td><span id="distance-turker-high-quality-value"></span>
+                                        <span id="distance-turker-high-quality-percentage"></span></td>
                                     <td></td>
                                 </tr>
                                 <tr style="font-size: 90%;">
                                     <td style="padding-left: 30px">Researcher</td>
-                                    <td><span class="Coverage-distance-researcher" id="all-users-value"></span>
-                                        <span class="Coverage-distance-researcher" id="all-users-percentage"></span></td>
-                                    <td><span class="Coverage-distance-researcher" id="high-quality-value"></span>
-                                        <span class="Coverage-distance-researcher" id="high-quality-percentage"></span></td>
+                                    <td><span id="distance-researcher-all-users-value"></span>
+                                        <span id="distance-researcher-all-users-percentage"></span></td>
+                                    <td><span id="distance-researcher-high-quality-value"></span>
+                                        <span id="distance-researcher-high-quality-percentage"></span></td>
                                     <td></td>
                                 </tr>
                             </table>
@@ -946,13 +946,6 @@ <h1>Label Search</h1>
                 debug: false
             }, function(err, t) {
                 window.admin = Admin(_, $);
-                
-                // Load street edge data from the backend & make the loader finish after that data loads.
-                window.admin.loadStreetEdgeData().then(function() {
-                    $('.loader').fadeOut('slow');
-                }).catch(function(error) {
-                    console.error("Error loading street edge data:", error);
-                });
 
                 $('#comments-table').dataTable();
                 $('#label-table').dataTable();
diff --git a/public/javascripts/Admin/src/Admin.js b/public/javascripts/Admin/src/Admin.js
index be001f1812..14aa2c6be1 100644
--- a/public/javascripts/Admin/src/Admin.js
+++ b/public/javascripts/Admin/src/Admin.js
@@ -32,6 +32,16 @@ function Admin(_, $) {
         logClicks: false
     };
 
+    // Constructor: load street edge data from the backend & make the loader finish after that data loads.
+    function _init() {
+        loadStreetEdgeData().then(function() {
+            $('.loader').fadeOut('slow');
+        }).catch(function(error) {
+            console.error("Error loading street edge data:", error);
+        });
+        return self;
+    }
+
     function initializeAdminGSVLabelView() {
         self.adminGSVLabelView = AdminGSVLabelView(true, "AdminContributionsTab");
     }
@@ -1152,76 +1162,76 @@ function Admin(_, $) {
 
     function convertDistance(distance) {
         if(i18next.t('common:measurement-system') === "metric") {
-            return distance * 1.60934;
+            return util.math.milesToKilometers(distance);
         }
         return distance;
     }
 
     function loadStreetEdgeData() {
         return new Promise((resolve, reject) => {
-            $.getJSON("/adminapi/getStreetEdgeData", function (data) {
+            $.getJSON("/adminapi/getCoverageData", function (data) {
                 // Set Audited Streets section of the Street Edge Table.
-                $(".Coverage-audited-streets-totals#all-users-value").html(data.audited_streets.total_audited_streets.all_users.total);
-                $(".Coverage-audited-streets-totals#all-users-percentage").html(`(${Math.round(data.audited_streets.total_audited_streets.all_users.percentage)}%)`);
-                $(".Coverage-audited-streets-totals#high-quality-value").html(data.audited_streets.total_audited_streets.high_quality.total);
-                $(".Coverage-audited-streets-totals#high-quality-percentage").html(`(${Math.round(data.audited_streets.total_audited_streets.high_quality.percentage)}%)`);
+                $("#audited-streets-totals-all-users-value").html(data.audited_streets.total_audited_streets.all_users.total);
+                $("#audited-streets-totals-all-users-percentage").html(`(${Math.round(data.audited_streets.total_audited_streets.all_users.percentage)}%)`);
+                $("#audited-streets-totals-high-quality-value").html(data.audited_streets.total_audited_streets.high_quality.total);
+                $("#audited-streets-totals-high-quality-percentage").html(`(${Math.round(data.audited_streets.total_audited_streets.high_quality.percentage)}%)`);
     
-                $(".Coverage-audited-streets-totals#total-streets").html(data.audited_streets.total_streets);
+                $("#audited-streets-totals-total-streets").html(data.audited_streets.total_streets);
 
-                $(".Coverage-audited-streets-registered#all-users-value").html(data.audited_streets.registered.all_users.total);
-                $(".Coverage-audited-streets-registered#all-users-percentage").html(`(${Math.round(data.audited_streets.registered.all_users.percentage)}%)`);
-                $(".Coverage-audited-streets-registered#high-quality-value").html(data.audited_streets.registered.high_quality.total);
-                $(".Coverage-audited-streets-registered#high-quality-percentage").html(`(${Math.round(data.audited_streets.registered.high_quality.percentage)}%)`);
+                $("#audited-streets-registered-all-users-value").html(data.audited_streets.registered.all_users.total);
+                $("#audited-streets-registered-all-users-percentage").html(`(${Math.round(data.audited_streets.registered.all_users.percentage)}%)`);
+                $("#audited-streets-registered-high-quality-value").html(data.audited_streets.registered.high_quality.total);
+                $("#audited-streets-registered-high-quality-percentage").html(`(${Math.round(data.audited_streets.registered.high_quality.percentage)}%)`);
     
-                $(".Coverage-audited-streets-anonymous#all-users-value").html(data.audited_streets.anonymous.all_users.total);
-                $(".Coverage-audited-streets-anonymous#all-users-percentage").html(`(${Math.round(data.audited_streets.anonymous.all_users.percentage)}%)`);
-                $(".Coverage-audited-streets-anonymous#high-quality-value").html(data.audited_streets.anonymous.high_quality.total);
-                $(".Coverage-audited-streets-anonymous#high-quality-percentage").html(`(${Math.round(data.audited_streets.anonymous.high_quality.percentage)}%)`);
+                $("#audited-streets-anonymous-all-users-value").html(data.audited_streets.anonymous.all_users.total);
+                $("#audited-streets-anonymous-all-users-percentage").html(`(${Math.round(data.audited_streets.anonymous.all_users.percentage)}%)`);
+                $("#audited-streets-anonymous-high-quality-value").html(data.audited_streets.anonymous.high_quality.total);
+                $("#audited-streets-anonymous-high-quality-percentage").html(`(${Math.round(data.audited_streets.anonymous.high_quality.percentage)}%)`);
     
-                $(".Coverage-audited-streets-turker#all-users-value").html(data.audited_streets.turker.all_users.total);
-                $(".Coverage-audited-streets-turker#all-users-percentage").html(`(${Math.round(data.audited_streets.turker.all_users.percentage)}%)`);
-                $(".Coverage-audited-streets-turker#high-quality-value").html(data.audited_streets.turker.high_quality.total);
-                $(".Coverage-audited-streets-turker#high-quality-percentage").html(`(${Math.round(data.audited_streets.turker.high_quality.percentage)}%)`);
+                $("#audited-streets-turker-all-users-value").html(data.audited_streets.turker.all_users.total);
+                $("#audited-streets-turker-all-users-percentage").html(`(${Math.round(data.audited_streets.turker.all_users.percentage)}%)`);
+                $("#audited-streets-turker-high-quality-value").html(data.audited_streets.turker.high_quality.total);
+                $("#audited-streets-turker-high-quality-percentage").html(`(${Math.round(data.audited_streets.turker.high_quality.percentage)}%)`);
     
-                $(".Coverage-audited-streets-researcher#all-users-value").html(data.audited_streets.researcher.all_users.total);
-                $(".Coverage-audited-streets-researcher#all-users-percentage").html(`(${Math.round(data.audited_streets.researcher.all_users.percentage)}%)`);
-                $(".Coverage-audited-streets-researcher#high-quality-value").html(data.audited_streets.researcher.high_quality.total);
-                $(".Coverage-audited-streets-researcher#high-quality-percentage").html(`(${Math.round(data.audited_streets.researcher.high_quality.percentage)}%)`);
+                $("#audited-streets-researcher-all-users-value").html(data.audited_streets.researcher.all_users.total);
+                $("#audited-streets-researcher-all-users-percentage").html(`(${Math.round(data.audited_streets.researcher.all_users.percentage)}%)`);
+                $("#audited-streets-researcher-high-quality-value").html(data.audited_streets.researcher.high_quality.total);
+                $("#audited-streets-researcher-high-quality-percentage").html(`(${Math.round(data.audited_streets.researcher.high_quality.percentage)}%)`);
     
                 // Set Distance section of the Street Edge Table.
                 const distanceMetricAbbrev = i18next.t('common:unit-distance-abbreviation');
 
-                $(".Coverage-distance-totals#all-users-value").html(`${convertDistance(data.distance.total_audited_streets.all_users.total).toFixed(1)} ${distanceMetricAbbrev}`);
-                $(".Coverage-distance-totals#all-users-percentage").html(`(${Math.round(data.distance.total_audited_streets.all_users.percentage)}%)`);
-                $(".Coverage-distance-totals#high-quality-value").html(`${convertDistance(data.distance.total_audited_streets.high_quality.total).toFixed(1)} ${distanceMetricAbbrev}`);
-                $(".Coverage-distance-totals#high-quality-percentage").html(`(${Math.round(data.distance.total_audited_streets.high_quality.percentage)}%)`);
+                $("#distance-totals-all-users-value").html(`${convertDistance(data.distance.total_audited_streets.all_users.total).toFixed(1)} ${distanceMetricAbbrev}`);
+                $("#distance-totals-all-users-percentage").html(`(${Math.round(data.distance.total_audited_streets.all_users.percentage)}%)`);
+                $("#distance-totals-high-quality-value").html(`${convertDistance(data.distance.total_audited_streets.high_quality.total).toFixed(1)} ${distanceMetricAbbrev}`);
+                $("#distance-totals-high-quality-percentage").html(`(${Math.round(data.distance.total_audited_streets.high_quality.percentage)}%)`);
     
-                $(".Coverage-distance-totals#total-distance").html(`${convertDistance(data.distance.total_distance).toFixed(1)} ${distanceMetricAbbrev}`);
+                $("#distance-totals-total-distance").html(`${convertDistance(data.distance.total_distance).toFixed(1)} ${distanceMetricAbbrev}`);
     
-                $(".Coverage-distance-registered#all-users-value").html(`${convertDistance(data.distance.registered.all_users.total).toFixed(1)} ${distanceMetricAbbrev}`);
-                $(".Coverage-distance-registered#all-users-percentage").html(`(${Math.round(data.distance.registered.all_users.percentage)}%)`);
-                $(".Coverage-distance-registered#high-quality-value").html(`${convertDistance(data.distance.registered.high_quality.total).toFixed(1)} ${distanceMetricAbbrev}`);
-                $(".Coverage-distance-registered#high-quality-percentage").html(`(${Math.round(data.distance.registered.high_quality.percentage)}%)`);
+                $("#distance-registered-all-users-value").html(`${convertDistance(data.distance.registered.all_users.total).toFixed(1)} ${distanceMetricAbbrev}`);
+                $("#distance-registered-all-users-percentage").html(`(${Math.round(data.distance.registered.all_users.percentage)}%)`);
+                $("#distance-registered-high-quality-value").html(`${convertDistance(data.distance.registered.high_quality.total).toFixed(1)} ${distanceMetricAbbrev}`);
+                $("#distance-registered-high-quality-percentage").html(`(${Math.round(data.distance.registered.high_quality.percentage)}%)`);
     
-                $(".Coverage-distance-anonymous#all-users-value").html(`${convertDistance(data.distance.anonymous.all_users.total).toFixed(1)} ${distanceMetricAbbrev}`);
-                $(".Coverage-distance-anonymous#all-users-percentage").html(`(${Math.round(data.distance.anonymous.all_users.percentage)}%)`);
-                $(".Coverage-distance-anonymous#high-quality-value").html(`${convertDistance(data.distance.anonymous.high_quality.total).toFixed(1)} ${distanceMetricAbbrev}`);
-                $(".Coverage-distance-anonymous#high-quality-percentage").html(`(${Math.round(data.distance.anonymous.high_quality.percentage)}%)`);
+                $("#distance-anonymous-all-users-value").html(`${convertDistance(data.distance.anonymous.all_users.total).toFixed(1)} ${distanceMetricAbbrev}`);
+                $("#distance-anonymous-all-users-percentage").html(`(${Math.round(data.distance.anonymous.all_users.percentage)}%)`);
+                $("#distance-anonymous-high-quality-value").html(`${convertDistance(data.distance.anonymous.high_quality.total).toFixed(1)} ${distanceMetricAbbrev}`);
+                $("#distance-anonymous-high-quality-percentage").html(`(${Math.round(data.distance.anonymous.high_quality.percentage)}%)`);
     
-                $(".Coverage-distance-turker#all-users-value").html(`${convertDistance(data.distance.turker.all_users.total).toFixed(1)} ${distanceMetricAbbrev}`);
-                $(".Coverage-distance-turker#all-users-percentage").html(`(${Math.round(data.distance.turker.all_users.percentage)}%)`);
-                $(".Coverage-distance-turker#high-quality-value").html(`${convertDistance(data.distance.turker.high_quality.total).toFixed(1)} ${distanceMetricAbbrev}`);
-                $(".Coverage-distance-turker#high-quality-percentage").html(`(${Math.round(data.distance.turker.high_quality.percentage)}%)`);
+                $("#distance-turker-all-users-value").html(`${convertDistance(data.distance.turker.all_users.total).toFixed(1)} ${distanceMetricAbbrev}`);
+                $("#distance-turker-all-users-percentage").html(`(${Math.round(data.distance.turker.all_users.percentage)}%)`);
+                $("#distance-turker-high-quality-value").html(`${convertDistance(data.distance.turker.high_quality.total).toFixed(1)} ${distanceMetricAbbrev}`);
+                $("#distance-turker-high-quality-percentage").html(`(${Math.round(data.distance.turker.high_quality.percentage)}%)`);
     
-                $(".Coverage-distance-researcher#all-users-value").html(`${convertDistance(data.distance.researcher.all_users.total).toFixed(1)} ${distanceMetricAbbrev}`);
-                $(".Coverage-distance-researcher#all-users-percentage").html(`(${Math.round(data.distance.researcher.all_users.percentage)}%)`);
-                $(".Coverage-distance-researcher#high-quality-value").html(`${convertDistance(data.distance.researcher.high_quality.total).toFixed(1)} ${distanceMetricAbbrev}`);
-                $(".Coverage-distance-researcher#high-quality-percentage").html(`(${Math.round(data.distance.researcher.high_quality.percentage)}%)`);
+                $("#distance-researcher-all-users-value").html(`${convertDistance(data.distance.researcher.all_users.total).toFixed(1)} ${distanceMetricAbbrev}`);
+                $("#distance-researcher-all-users-percentage").html(`(${Math.round(data.distance.researcher.all_users.percentage)}%)`);
+                $("#distance-researcher-high-quality-value").html(`${convertDistance(data.distance.researcher.high_quality.total).toFixed(1)} ${distanceMetricAbbrev}`);
+                $("#distance-researcher-high-quality-percentage").html(`(${Math.round(data.distance.researcher.high_quality.percentage)}%)`);
     
                 // Set the audited distance fields.
-                $(".Audited-distance#all-time").html(`${convertDistance(data.audited_street_distance_over_time.all_time).toFixed(1)} ${distanceMetricAbbrev}`);
-                $(".Audited-distance#today").html(`${convertDistance(data.audited_street_distance_over_time.today).toFixed(1)} ${distanceMetricAbbrev}`);
-                $(".Audited-distance#week").html(`${convertDistance(data.audited_street_distance_over_time.week).toFixed(1)} ${distanceMetricAbbrev}`);
+                $("#audited-distance-all-time").html(`${convertDistance(data.audited_street_distance_over_time.all_time).toFixed(1)} ${distanceMetricAbbrev}`);
+                $("#audited-distance-today").html(`${convertDistance(data.audited_street_distance_over_time.today).toFixed(1)} ${distanceMetricAbbrev}`);
+                $("#audited-distance-week").html(`${convertDistance(data.audited_street_distance_over_time.week).toFixed(1)} ${distanceMetricAbbrev}`);
 
                 resolve();
             })
@@ -1241,5 +1251,5 @@ function Admin(_, $) {
     $('.change-role').on('click', changeRole);
     $('.change-org').on('click', changeOrg);
 
-    return self;
+    _init();
 }

From 57dbe19e0df9d4a31e74174830fb4c216511967f Mon Sep 17 00:00:00 2001
From: Mikey Saugstad <michaelssaugstad@gmail.com>
Date: Mon, 28 Oct 2024 14:41:12 -0700
Subject: [PATCH 18/28] cleaning up some new Admin code, renamings, etc

---
 app/controllers/AdminController.scala | 184 ++++++++++++--------------
 app/views/admin/index.scala.html      |  84 ++++++------
 public/javascripts/Admin/src/Admin.js | 107 ++++++++-------
 3 files changed, 186 insertions(+), 189 deletions(-)

diff --git a/app/controllers/AdminController.scala b/app/controllers/AdminController.scala
index 6092f7fd69..c00bcac1c1 100644
--- a/app/controllers/AdminController.scala
+++ b/app/controllers/AdminController.scala
@@ -674,15 +674,9 @@ class AdminController @Inject() (implicit val env: Environment[User, SessionAuth
    * Gets street edge data for the coverage section of the admin page.
    */
   def getCoverageData = UserAwareAction.async { implicit request =>
-    val auditedStreetDistanceOverTimeData = Json.obj(
-      "all_time" -> StreetEdgeTable.auditedStreetDistanceOverTime("all time"),
-      "today" -> StreetEdgeTable.auditedStreetDistanceOverTime("today"),
-      "week" -> StreetEdgeTable.auditedStreetDistanceOverTime("week")
-    )
-      
-    val auditedStreetsData = Json.obj(
-      "total_streets" -> StreetEdgeTable.countTotalStreets(),
-      "total_audited_streets" -> Json.obj(
+    val streetCountsData = Json.obj(
+      "total" -> StreetEdgeTable.countTotalStreets(),
+      "audited" -> Json.obj(
         "all_users" -> Json.obj(
           "total" -> StreetEdgeTable.countAuditedStreets(),
           "percentage" -> StreetEdgeTable.auditCompletionRate(1) * 100
@@ -690,58 +684,53 @@ class AdminController @Inject() (implicit val env: Environment[User, SessionAuth
         "high_quality" -> Json.obj(
           "total" -> StreetEdgeTable.countAuditedStreets(1, "All", true),
           "percentage" -> StreetEdgeTable.auditCompletionRate(1, "All", true) * 100
-        )
-      ),
-
-      "registered" -> Json.obj(
-        "all_users" -> Json.obj(
-          "total" -> StreetEdgeTable.countAuditedStreets(1, "Registered"),
-          "percentage" -> StreetEdgeTable.auditCompletionRate(1, "Registered") * 100
         ),
-        "high_quality" -> Json.obj(
-          "total" -> StreetEdgeTable.countAuditedStreets(1, "Registered", true),
-          "percentage" -> StreetEdgeTable.auditCompletionRate(1, "Registered", true) * 100
-        )
-      ),
-
-      "anonymous" -> Json.obj(
-        "all_users" -> Json.obj(
-          "total" -> StreetEdgeTable.countAuditedStreets(1, "Anonymous"),
-          "percentage" -> StreetEdgeTable.auditCompletionRate(1, "Anonymous") * 100
+        "registered" -> Json.obj(
+          "all" -> Json.obj(
+            "total" -> StreetEdgeTable.countAuditedStreets(1, "Registered"),
+            "percentage" -> StreetEdgeTable.auditCompletionRate(1, "Registered") * 100
+          ),
+          "high_quality" -> Json.obj(
+            "total" -> StreetEdgeTable.countAuditedStreets(1, "Registered", true),
+            "percentage" -> StreetEdgeTable.auditCompletionRate(1, "Registered", true) * 100
+          )
         ),
-        "high_quality" -> Json.obj(
-          "total" -> StreetEdgeTable.countAuditedStreets(1, "Anonymous", true),
-          "percentage" -> StreetEdgeTable.auditCompletionRate(1, "Anonymous", true) * 100
-        )
-      ),
-
-      "turker" -> Json.obj(
-        "all_users" -> Json.obj(
-          "total" -> StreetEdgeTable.countAuditedStreets(1, "Turker"),
-          "percentage" -> StreetEdgeTable.auditCompletionRate(1, "Turker") * 100
+        "anonymous" -> Json.obj(
+          "all" -> Json.obj(
+            "total" -> StreetEdgeTable.countAuditedStreets(1, "Anonymous"),
+            "percentage" -> StreetEdgeTable.auditCompletionRate(1, "Anonymous") * 100
+          ),
+          "high_quality" -> Json.obj(
+            "total" -> StreetEdgeTable.countAuditedStreets(1, "Anonymous", true),
+            "percentage" -> StreetEdgeTable.auditCompletionRate(1, "Anonymous", true) * 100
+          )
         ),
-        "high_quality" -> Json.obj(
-          "total" -> StreetEdgeTable.countAuditedStreets(1, "Turker", true),
-          "percentage" -> StreetEdgeTable.auditCompletionRate(1, "Turker", true) * 100
-        )
-      ),
-
-      "researcher" -> Json.obj(
-        "all_users" -> Json.obj(
-          "total" -> StreetEdgeTable.countAuditedStreets(1, "Researcher"),
-          "percentage" -> StreetEdgeTable.auditCompletionRate(1, "Researcher") * 100
+        "turker" -> Json.obj(
+          "all" -> Json.obj(
+            "total" -> StreetEdgeTable.countAuditedStreets(1, "Turker"),
+            "percentage" -> StreetEdgeTable.auditCompletionRate(1, "Turker") * 100
+          ),
+          "high_quality" -> Json.obj(
+            "total" -> StreetEdgeTable.countAuditedStreets(1, "Turker", true),
+            "percentage" -> StreetEdgeTable.auditCompletionRate(1, "Turker", true) * 100
+          )
         ),
-        "high_quality" -> Json.obj(
-          "total" -> StreetEdgeTable.countAuditedStreets(1, "Researcher", true),
-          "percentage" -> StreetEdgeTable.auditCompletionRate(1, "Researcher", true) * 100
+        "researcher" -> Json.obj(
+          "all" -> Json.obj(
+            "total" -> StreetEdgeTable.countAuditedStreets(1, "Researcher"),
+            "percentage" -> StreetEdgeTable.auditCompletionRate(1, "Researcher") * 100
+          ),
+          "high_quality" -> Json.obj(
+            "total" -> StreetEdgeTable.countAuditedStreets(1, "Researcher", true),
+            "percentage" -> StreetEdgeTable.auditCompletionRate(1, "Researcher", true) * 100
+          )
         )
       )
     )
 
-    val distanceData = Json.obj(
-      "total_distance" -> StreetEdgeTable.totalStreetDistance(),
-
-      "total_audited_streets" -> Json.obj(
+    val streetDistanceData = Json.obj(
+      "total" -> StreetEdgeTable.totalStreetDistance(),
+      "audited" -> Json.obj(
         "all_users" -> Json.obj(
           "total" -> StreetEdgeTable.auditedStreetDistance(1),
           "percentage" -> StreetEdgeTable.streetDistanceCompletionRate(1) * 100
@@ -749,57 +738,60 @@ class AdminController @Inject() (implicit val env: Environment[User, SessionAuth
         "high_quality" -> Json.obj(
           "total" -> StreetEdgeTable.auditedStreetDistance(1, "All", true),
           "percentage" -> StreetEdgeTable.streetDistanceCompletionRate(1, "All", true) * 100
-        )
-      ),
-
-      "registered" -> Json.obj(
-        "all_users" -> Json.obj(
-          "total" -> StreetEdgeTable.auditedStreetDistance(1, "Registered"),
-          "percentage" -> StreetEdgeTable.streetDistanceCompletionRate(1, "Registered") * 100
         ),
-        "high_quality" -> Json.obj(
-          "total" -> StreetEdgeTable.auditedStreetDistance(1, "Registered", true),
-          "percentage" -> StreetEdgeTable.streetDistanceCompletionRate(1, "Registered", true) * 100
-        )
-      ),
-
-      "anonymous" -> Json.obj(
-        "all_users" -> Json.obj(
-          "total" -> StreetEdgeTable.auditedStreetDistance(1, "Anonymous"),
-          "percentage" -> StreetEdgeTable.streetDistanceCompletionRate(1, "Anonymous") * 100
+        "registered" -> Json.obj(
+          "all" -> Json.obj(
+            "total" -> StreetEdgeTable.auditedStreetDistance(1, "Registered"),
+            "percentage" -> StreetEdgeTable.streetDistanceCompletionRate(1, "Registered") * 100
+          ),
+          "high_quality" -> Json.obj(
+            "total" -> StreetEdgeTable.auditedStreetDistance(1, "Registered", true),
+            "percentage" -> StreetEdgeTable.streetDistanceCompletionRate(1, "Registered", true) * 100
+          )
         ),
-        "high_quality" -> Json.obj(
-          "total" -> StreetEdgeTable.auditedStreetDistance(1, "Anonymous", true),
-          "percentage" -> StreetEdgeTable.streetDistanceCompletionRate(1, "Anonymous", true) * 100
-        )
-      ),
-
-      "turker" -> Json.obj(
-        "all_users" -> Json.obj(
-          "total" -> StreetEdgeTable.auditedStreetDistance(1, "Turker"),
-          "percentage" -> StreetEdgeTable.streetDistanceCompletionRate(1, "Turker") * 100
+        "anonymous" -> Json.obj(
+          "all" -> Json.obj(
+            "total" -> StreetEdgeTable.auditedStreetDistance(1, "Anonymous"),
+            "percentage" -> StreetEdgeTable.streetDistanceCompletionRate(1, "Anonymous") * 100
+          ),
+          "high_quality" -> Json.obj(
+            "total" -> StreetEdgeTable.auditedStreetDistance(1, "Anonymous", true),
+            "percentage" -> StreetEdgeTable.streetDistanceCompletionRate(1, "Anonymous", true) * 100
+          )
         ),
-        "high_quality" -> Json.obj(
-          "total" -> StreetEdgeTable.auditedStreetDistance(1, "Turker", true),
-          "percentage" -> StreetEdgeTable.streetDistanceCompletionRate(1, "Turker", true) * 100
-        )
-      ),
-
-      "researcher" -> Json.obj(
-        "all_users" -> Json.obj(
-          "total" -> StreetEdgeTable.auditedStreetDistance(1, "Researcher"),
-          "percentage" -> StreetEdgeTable.streetDistanceCompletionRate(1, "Researcher") * 100
+        "turker" -> Json.obj(
+          "all" -> Json.obj(
+            "total" -> StreetEdgeTable.auditedStreetDistance(1, "Turker"),
+            "percentage" -> StreetEdgeTable.streetDistanceCompletionRate(1, "Turker") * 100
+          ),
+          "high_quality" -> Json.obj(
+            "total" -> StreetEdgeTable.auditedStreetDistance(1, "Turker", true),
+            "percentage" -> StreetEdgeTable.streetDistanceCompletionRate(1, "Turker", true) * 100
+          )
         ),
-        "high_quality" -> Json.obj(
-          "total" -> StreetEdgeTable.auditedStreetDistance(1, "Researcher", true),
-          "percentage" -> StreetEdgeTable.streetDistanceCompletionRate(1, "Researcher", true) * 100
+        "researcher" -> Json.obj(
+          "all" -> Json.obj(
+            "total" -> StreetEdgeTable.auditedStreetDistance(1, "Researcher"),
+            "percentage" -> StreetEdgeTable.streetDistanceCompletionRate(1, "Researcher") * 100
+          ),
+          "high_quality" -> Json.obj(
+            "total" -> StreetEdgeTable.auditedStreetDistance(1, "Researcher", true),
+            "percentage" -> StreetEdgeTable.streetDistanceCompletionRate(1, "Researcher", true) * 100
+          )
+        ),
+
+        // Audited distance over time is related, but included in a separate table on the Admin page.
+        "with_overlap" -> Json.obj(
+          "all_time" -> StreetEdgeTable.auditedStreetDistanceOverTime("all time"),
+          "today" -> StreetEdgeTable.auditedStreetDistanceOverTime("today"),
+          "week" -> StreetEdgeTable.auditedStreetDistanceOverTime("week")
         )
       )
     )
+
     val data = Json.obj(
-      "audited_street_distance_over_time" -> auditedStreetDistanceOverTimeData,
-      "audited_streets" -> auditedStreetsData, 
-      "distance" -> distanceData
+      "street_counts" -> streetCountsData,
+      "street_distance" -> streetDistanceData
       )
     Future.successful(Ok(data))
   }
diff --git a/app/views/admin/index.scala.html b/app/views/admin/index.scala.html
index 324f175412..c45bfc7a1e 100644
--- a/app/views/admin/index.scala.html
+++ b/app/views/admin/index.scala.html
@@ -259,82 +259,82 @@ <h1>Coverage</h1>
                                 </tr>
                                 <tr>
                                     <th>Audited Streets</th>
-                                    <td><span id="audited-streets-totals-all-users-value"></span>
-                                        <span id="audited-streets-totals-all-users-percentage"></span></td>
-                                    <td><span id="audited-streets-totals-high-quality-value"></span>
-                                        <span id="audited-streets-totals-high-quality-percentage"></span></td>
-                                    <td><span id="audited-streets-totals-total-streets"></span></td>
+                                    <td><span id="street-count-audited-all-users"></span>
+                                        <span id="street-count-audited-all-users-percentage"></span></td>
+                                    <td><span id="street-count-audited-high-quality-total"></span>
+                                        <span id="street-count-audited-high-quality-percentage"></span></td>
+                                    <td><span id="street-count-total"></span></td>
                                 </tr>
                                 <tr style="font-size: 90%;">
                                     <td style="padding-left: 30px">Registered</td>
-                                    <td><span id="audited-streets-registered-all-users-value"></span>
-                                        <span id="audited-streets-registered-all-users-percentage"></span></td>
-                                    <td><span id="audited-streets-registered-high-quality-value"></span>
-                                        <span id="audited-streets-registered-high-quality-percentage"></span></td>
+                                    <td><span id="street-count-audited-registered-all"></span>
+                                        <span id="street-count-audited-registered-all-percentage"></span></td>
+                                    <td><span id="street-count-audited-registered-high-quality"></span>
+                                        <span id="street-count-audited-registered-high-quality-percentage"></span></td>
                                     <td></td>
                                 </tr>
                                 <tr style="font-size: 90%;">
                                     <td style="padding-left: 30px">Anonymous</td>
-                                    <td><span id="audited-streets-anonymous-all-users-value"></span>
-                                        <span id="audited-streets-anonymous-all-users-percentage"></span></td>
-                                    <td><span id="audited-streets-anonymous-high-quality-value"></span>
-                                        <span id="audited-streets-anonymous-high-quality-percentage"></span></td>
+                                    <td><span id="street-count-audited-anonymous-all"></span>
+                                        <span id="street-count-audited-anonymous-all-percentage"></span></td>
+                                    <td><span id="street-count-audited-anonymous-high-quality"></span>
+                                        <span id="street-count-audited-anonymous-high-quality-percentage"></span></td>
                                     <td></td>
                                 </tr>
                                 <tr style="font-size: 90%;">
                                     <td style="padding-left: 30px">Turker</td>
-                                    <td><span id="audited-streets-turker-all-users-value"></span>
-                                        <span id="audited-streets-turker-all-users-percentage"></span></td>
-                                    <td><span id="audited-streets-turker-high-quality-value"></span>
-                                        <span id="audited-streets-turker-high-quality-percentage"></span></td>
+                                    <td><span id="street-count-audited-turker-all"></span>
+                                        <span id="street-count-audited-turker-all-percentage"></span></td>
+                                    <td><span id="street-count-audited-turker-high-quality"></span>
+                                        <span id="street-count-audited-turker-high-quality-percentage"></span></td>
                                     <td></td>
                                 </tr>
                                 <tr style="font-size: 90%;">
                                     <td style="padding-left: 30px">Researcher</td>
-                                    <td><span id="audited-streets-researcher-all-users-value"></span>
-                                        <span id="audited-streets-researcher-all-users-percentage"></span></td>
-                                    <td><span id="audited-streets-researcher-high-quality-value"></span>
-                                        <span id="audited-streets-researcher-high-quality-percentage"></span></td>
+                                    <td><span id="street-count-audited-researcher-all"></span>
+                                        <span id="street-count-audited-researcher-all-percentage"></span></td>
+                                    <td><span id="street-count-audited-researcher-high-quality"></span>
+                                        <span id="street-count-audited-researcher-high-quality-percentage"></span></td>
                                     <td></td>
                                 </tr>
                                 <tr>
                                     <th>Distance</th>
-                                    <td><span id="distance-totals-all-users-value"></span>
-                                        <span id="distance-totals-all-users-percentage"></span></td>
-                                    <td><span id="distance-totals-high-quality-value"></span> 
-                                        <span id="distance-totals-high-quality-percentage"></span></td>
-                                    <td><span id="distance-totals-total-distance"></span></td>
+                                    <td><span id="street-distance-audited-all-users"></span>
+                                        <span id="street-distance-audited-all-users-percentage"></span></td>
+                                    <td><span id="street-distance-audited-high-quality"></span>
+                                        <span id="street-distance-audited-high-quality-percentage"></span></td>
+                                    <td><span id="street-distance-total"></span></td>
                                 </tr>
                                 <tr style="font-size: 90%;">
                                     <td style="padding-left: 30px">Registered</td>
-                                    <td><span id="distance-registered-all-users-value"></span>
-                                        <span id="distance-registered-all-users-percentage"></span></td>
-                                    <td><span id="distance-registered-high-quality-value"></span>
-                                        <span id="distance-registered-high-quality-percentage"></span></td>
+                                    <td><span id="street-distance-registered-all"></span>
+                                        <span id="street-distance-registered-all-percentage"></span></td>
+                                    <td><span id="street-distance-registered-high-quality"></span>
+                                        <span id="street-distance-registered-high-quality-percentage"></span></td>
                                     <td></td>
                                 </tr>
                                 <tr style="font-size: 90%;">
                                     <td style="padding-left: 30px">Anonymous</td>
-                                    <td><span id="distance-anonymous-all-users-value"></span>
-                                        <span id="distance-anonymous-all-users-percentage"></span></td>
-                                    <td><span id="distance-anonymous-high-quality-value"></span>
-                                        <span id="distance-anonymous-high-quality-percentage"></span></td>
+                                    <td><span id="street-distance-anonymous-all"></span>
+                                        <span id="street-distance-anonymous-all-percentage"></span></td>
+                                    <td><span id="street-distance-anonymous-high-quality"></span>
+                                        <span id="street-distance-anonymous-high-quality-percentage"></span></td>
                                     <td></td>
                                 </tr>
                                 <tr style="font-size: 90%;">
                                     <td style="padding-left: 30px">Turker</td>
-                                    <td><span id="distance-turker-all-users-value"></span>
-                                        <span id="distance-turker-all-users-percentage"></span></td>
-                                    <td><span id="distance-turker-high-quality-value"></span>
-                                        <span id="distance-turker-high-quality-percentage"></span></td>
+                                    <td><span id="street-distance-turker-all"></span>
+                                        <span id="street-distance-turker-all-percentage"></span></td>
+                                    <td><span id="street-distance-turker-high-quality"></span>
+                                        <span id="street-distance-turker-high-quality-percentage"></span></td>
                                     <td></td>
                                 </tr>
                                 <tr style="font-size: 90%;">
                                     <td style="padding-left: 30px">Researcher</td>
-                                    <td><span id="distance-researcher-all-users-value"></span>
-                                        <span id="distance-researcher-all-users-percentage"></span></td>
-                                    <td><span id="distance-researcher-high-quality-value"></span>
-                                        <span id="distance-researcher-high-quality-percentage"></span></td>
+                                    <td><span id="street-distance-researcher-all"></span>
+                                        <span id="street-distance-researcher-all-percentage"></span></td>
+                                    <td><span id="street-distance-researcher-high-quality"></span>
+                                        <span id="street-distance-researcher-high-quality-percentage"></span></td>
                                     <td></td>
                                 </tr>
                             </table>
diff --git a/public/javascripts/Admin/src/Admin.js b/public/javascripts/Admin/src/Admin.js
index 14aa2c6be1..343af76757 100644
--- a/public/javascripts/Admin/src/Admin.js
+++ b/public/javascripts/Admin/src/Admin.js
@@ -1160,78 +1160,83 @@ function Admin(_, $) {
         } )
     }
 
-    function convertDistance(distance) {
-        if(i18next.t('common:measurement-system') === "metric") {
-            return util.math.milesToKilometers(distance);
+    function formatDistance(distance) {
+        const distanceMetricAbbrev = i18next.t('common:unit-distance-abbreviation');
+
+        let distanceInCorrectUnits = distance;
+        if (i18next.t('common:measurement-system') === "metric") {
+            distanceInCorrectUnits = util.math.milesToKilometers(distance);
         }
-        return distance;
+        return `${distanceInCorrectUnits.toFixed(1)} ${distanceMetricAbbrev}`;
+    }
+
+    function formatPercent(value) {
+        return `(${Math.round(value)}%)`;
     }
 
     function loadStreetEdgeData() {
         return new Promise((resolve, reject) => {
             $.getJSON("/adminapi/getCoverageData", function (data) {
                 // Set Audited Streets section of the Street Edge Table.
-                $("#audited-streets-totals-all-users-value").html(data.audited_streets.total_audited_streets.all_users.total);
-                $("#audited-streets-totals-all-users-percentage").html(`(${Math.round(data.audited_streets.total_audited_streets.all_users.percentage)}%)`);
-                $("#audited-streets-totals-high-quality-value").html(data.audited_streets.total_audited_streets.high_quality.total);
-                $("#audited-streets-totals-high-quality-percentage").html(`(${Math.round(data.audited_streets.total_audited_streets.high_quality.percentage)}%)`);
+                $("#street-count-audited-all-users").html(data.street_counts.audited.all_users.total);
+                $("#street-count-audited-all-users-percentage").html(formatPercent(data.street_counts.audited.all_users.percentage));
+                $("#street-count-audited-high-quality-total").html(data.street_counts.audited.high_quality.total);
+                $("#street-count-audited-high-quality-percentage").html(formatPercent(data.street_counts.audited.high_quality.percentage));
     
-                $("#audited-streets-totals-total-streets").html(data.audited_streets.total_streets);
+                $("#street-count-total").html(data.street_counts.total);
 
-                $("#audited-streets-registered-all-users-value").html(data.audited_streets.registered.all_users.total);
-                $("#audited-streets-registered-all-users-percentage").html(`(${Math.round(data.audited_streets.registered.all_users.percentage)}%)`);
-                $("#audited-streets-registered-high-quality-value").html(data.audited_streets.registered.high_quality.total);
-                $("#audited-streets-registered-high-quality-percentage").html(`(${Math.round(data.audited_streets.registered.high_quality.percentage)}%)`);
+                $("#street-count-audited-registered-all").html(data.street_counts.audited.registered.all.total);
+                $("#street-count-audited-registered-all-percentage").html(formatPercent(data.street_counts.audited.registered.all.percentage));
+                $("#street-count-audited-registered-high-quality").html(data.street_counts.audited.registered.high_quality.total);
+                $("#street-count-audited-registered-high-quality-percentage").html(formatPercent(data.street_counts.audited.registered.high_quality.percentage));
     
-                $("#audited-streets-anonymous-all-users-value").html(data.audited_streets.anonymous.all_users.total);
-                $("#audited-streets-anonymous-all-users-percentage").html(`(${Math.round(data.audited_streets.anonymous.all_users.percentage)}%)`);
-                $("#audited-streets-anonymous-high-quality-value").html(data.audited_streets.anonymous.high_quality.total);
-                $("#audited-streets-anonymous-high-quality-percentage").html(`(${Math.round(data.audited_streets.anonymous.high_quality.percentage)}%)`);
+                $("#street-count-audited-anonymous-all").html(data.street_counts.audited.anonymous.all.total);
+                $("#street-count-audited-anonymous-all-percentage").html(formatPercent(data.street_counts.audited.anonymous.all.percentage));
+                $("#street-count-audited-anonymous-high-quality").html(data.street_counts.audited.anonymous.high_quality.total);
+                $("#street-count-audited-anonymous-high-quality-percentage").html(formatPercent(data.street_counts.audited.anonymous.high_quality.percentage));
     
-                $("#audited-streets-turker-all-users-value").html(data.audited_streets.turker.all_users.total);
-                $("#audited-streets-turker-all-users-percentage").html(`(${Math.round(data.audited_streets.turker.all_users.percentage)}%)`);
-                $("#audited-streets-turker-high-quality-value").html(data.audited_streets.turker.high_quality.total);
-                $("#audited-streets-turker-high-quality-percentage").html(`(${Math.round(data.audited_streets.turker.high_quality.percentage)}%)`);
+                $("#street-count-audited-turker-all").html(data.street_counts.audited.turker.all.total);
+                $("#street-count-audited-turker-all-percentage").html(formatPercent(data.street_counts.audited.turker.all.percentage));
+                $("#street-count-audited-turker-high-quality").html(data.street_counts.audited.turker.high_quality.total);
+                $("#street-count-audited-turker-high-quality-percentage").html(formatPercent(data.street_counts.audited.turker.high_quality.percentage));
     
-                $("#audited-streets-researcher-all-users-value").html(data.audited_streets.researcher.all_users.total);
-                $("#audited-streets-researcher-all-users-percentage").html(`(${Math.round(data.audited_streets.researcher.all_users.percentage)}%)`);
-                $("#audited-streets-researcher-high-quality-value").html(data.audited_streets.researcher.high_quality.total);
-                $("#audited-streets-researcher-high-quality-percentage").html(`(${Math.round(data.audited_streets.researcher.high_quality.percentage)}%)`);
+                $("#street-count-audited-researcher-all").html(data.street_counts.audited.researcher.all.total);
+                $("#street-count-audited-researcher-all-percentage").html(formatPercent(data.street_counts.audited.researcher.all.percentage));
+                $("#street-count-audited-researcher-high-quality").html(data.street_counts.audited.researcher.high_quality.total);
+                $("#street-count-audited-researcher-high-quality-percentage").text(formatPercent(data.street_counts.audited.researcher.high_quality.percentage));
     
                 // Set Distance section of the Street Edge Table.
-                const distanceMetricAbbrev = i18next.t('common:unit-distance-abbreviation');
-
-                $("#distance-totals-all-users-value").html(`${convertDistance(data.distance.total_audited_streets.all_users.total).toFixed(1)} ${distanceMetricAbbrev}`);
-                $("#distance-totals-all-users-percentage").html(`(${Math.round(data.distance.total_audited_streets.all_users.percentage)}%)`);
-                $("#distance-totals-high-quality-value").html(`${convertDistance(data.distance.total_audited_streets.high_quality.total).toFixed(1)} ${distanceMetricAbbrev}`);
-                $("#distance-totals-high-quality-percentage").html(`(${Math.round(data.distance.total_audited_streets.high_quality.percentage)}%)`);
+                $("#street-distance-audited-all-users").html(formatDistance(data.street_distance.audited.all_users.total));
+                $("#street-distance-audited-all-users-percentage").html(formatPercent(data.street_distance.audited.all_users.percentage));
+                $("#street-distance-audited-high-quality").html(formatDistance(data.street_distance.audited.high_quality.total));
+                $("#street-distance-audited-high-quality-percentage").html(formatPercent(data.street_distance.audited.high_quality.percentage));
     
-                $("#distance-totals-total-distance").html(`${convertDistance(data.distance.total_distance).toFixed(1)} ${distanceMetricAbbrev}`);
+                $("#street-distance-total").html(formatDistance(data.street_distance.total));
     
-                $("#distance-registered-all-users-value").html(`${convertDistance(data.distance.registered.all_users.total).toFixed(1)} ${distanceMetricAbbrev}`);
-                $("#distance-registered-all-users-percentage").html(`(${Math.round(data.distance.registered.all_users.percentage)}%)`);
-                $("#distance-registered-high-quality-value").html(`${convertDistance(data.distance.registered.high_quality.total).toFixed(1)} ${distanceMetricAbbrev}`);
-                $("#distance-registered-high-quality-percentage").html(`(${Math.round(data.distance.registered.high_quality.percentage)}%)`);
+                $("#street-distance-registered-all").html(formatDistance(data.street_distance.audited.registered.all.total));
+                $("#street-distance-registered-all-percentage").html(formatPercent(data.street_distance.audited.registered.all.percentage));
+                $("#street-distance-registered-high-quality").html(formatDistance(data.street_distance.audited.registered.high_quality.total));
+                $("#street-distance-registered-high-quality-percentage").html(formatPercent(data.street_distance.audited.registered.high_quality.percentage));
     
-                $("#distance-anonymous-all-users-value").html(`${convertDistance(data.distance.anonymous.all_users.total).toFixed(1)} ${distanceMetricAbbrev}`);
-                $("#distance-anonymous-all-users-percentage").html(`(${Math.round(data.distance.anonymous.all_users.percentage)}%)`);
-                $("#distance-anonymous-high-quality-value").html(`${convertDistance(data.distance.anonymous.high_quality.total).toFixed(1)} ${distanceMetricAbbrev}`);
-                $("#distance-anonymous-high-quality-percentage").html(`(${Math.round(data.distance.anonymous.high_quality.percentage)}%)`);
+                $("#street-distance-anonymous-all").html(formatDistance(data.street_distance.audited.anonymous.all.total));
+                $("#street-distance-anonymous-all-percentage").html(formatPercent(data.street_distance.audited.anonymous.all.percentage));
+                $("#street-distance-anonymous-high-quality").html(formatDistance(data.street_distance.audited.anonymous.high_quality.total));
+                $("#street-distance-anonymous-high-quality-percentage").html(formatPercent(data.street_distance.audited.anonymous.high_quality.percentage));
     
-                $("#distance-turker-all-users-value").html(`${convertDistance(data.distance.turker.all_users.total).toFixed(1)} ${distanceMetricAbbrev}`);
-                $("#distance-turker-all-users-percentage").html(`(${Math.round(data.distance.turker.all_users.percentage)}%)`);
-                $("#distance-turker-high-quality-value").html(`${convertDistance(data.distance.turker.high_quality.total).toFixed(1)} ${distanceMetricAbbrev}`);
-                $("#distance-turker-high-quality-percentage").html(`(${Math.round(data.distance.turker.high_quality.percentage)}%)`);
+                $("#street-distance-turker-all").html(formatDistance(data.street_distance.audited.turker.all.total));
+                $("#street-distance-turker-all-percentage").html(formatPercent(data.street_distance.audited.turker.all.percentage));
+                $("#street-distance-turker-high-quality").html(formatDistance(data.street_distance.audited.turker.high_quality.total));
+                $("#street-distance-turker-high-quality-percentage").html(formatPercent(data.street_distance.audited.turker.high_quality.percentage));
     
-                $("#distance-researcher-all-users-value").html(`${convertDistance(data.distance.researcher.all_users.total).toFixed(1)} ${distanceMetricAbbrev}`);
-                $("#distance-researcher-all-users-percentage").html(`(${Math.round(data.distance.researcher.all_users.percentage)}%)`);
-                $("#distance-researcher-high-quality-value").html(`${convertDistance(data.distance.researcher.high_quality.total).toFixed(1)} ${distanceMetricAbbrev}`);
-                $("#distance-researcher-high-quality-percentage").html(`(${Math.round(data.distance.researcher.high_quality.percentage)}%)`);
+                $("#street-distance-researcher-all").html(formatDistance(data.street_distance.audited.researcher.all.total));
+                $("#street-distance-researcher-all-percentage").html(formatPercent(data.street_distance.audited.researcher.all.percentage));
+                $("#street-distance-researcher-high-quality").html(formatDistance(data.street_distance.audited.researcher.high_quality.total));
+                $("#street-distance-researcher-high-quality-percentage").html(formatPercent(data.street_distance.audited.researcher.high_quality.percentage));
     
                 // Set the audited distance fields.
-                $("#audited-distance-all-time").html(`${convertDistance(data.audited_street_distance_over_time.all_time).toFixed(1)} ${distanceMetricAbbrev}`);
-                $("#audited-distance-today").html(`${convertDistance(data.audited_street_distance_over_time.today).toFixed(1)} ${distanceMetricAbbrev}`);
-                $("#audited-distance-week").html(`${convertDistance(data.audited_street_distance_over_time.week).toFixed(1)} ${distanceMetricAbbrev}`);
+                $("#audited-distance-all-time").html(formatDistance(data.street_distance.audited.with_overlap.all_time));
+                $("#audited-distance-today").html(formatDistance(data.street_distance.audited.with_overlap.today));
+                $("#audited-distance-week").html(formatDistance(data.street_distance.audited.with_overlap.week));
 
                 resolve();
             })

From f6239e378ed4310c45505558ee99a9e695e1f828 Mon Sep 17 00:00:00 2001
From: Mikey Saugstad <michaelssaugstad@gmail.com>
Date: Mon, 28 Oct 2024 14:45:42 -0700
Subject: [PATCH 19/28] changes .html to .text

---
 public/javascripts/Admin/src/Admin.js | 88 +++++++++++++--------------
 1 file changed, 44 insertions(+), 44 deletions(-)

diff --git a/public/javascripts/Admin/src/Admin.js b/public/javascripts/Admin/src/Admin.js
index 343af76757..38edf88116 100644
--- a/public/javascripts/Admin/src/Admin.js
+++ b/public/javascripts/Admin/src/Admin.js
@@ -1178,65 +1178,65 @@ function Admin(_, $) {
         return new Promise((resolve, reject) => {
             $.getJSON("/adminapi/getCoverageData", function (data) {
                 // Set Audited Streets section of the Street Edge Table.
-                $("#street-count-audited-all-users").html(data.street_counts.audited.all_users.total);
-                $("#street-count-audited-all-users-percentage").html(formatPercent(data.street_counts.audited.all_users.percentage));
-                $("#street-count-audited-high-quality-total").html(data.street_counts.audited.high_quality.total);
-                $("#street-count-audited-high-quality-percentage").html(formatPercent(data.street_counts.audited.high_quality.percentage));
+                $("#street-count-audited-all-users").text(data.street_counts.audited.all_users.total);
+                $("#street-count-audited-all-users-percentage").text(formatPercent(data.street_counts.audited.all_users.percentage));
+                $("#street-count-audited-high-quality-total").text(data.street_counts.audited.high_quality.total);
+                $("#street-count-audited-high-quality-percentage").text(formatPercent(data.street_counts.audited.high_quality.percentage));
     
-                $("#street-count-total").html(data.street_counts.total);
+                $("#street-count-total").text(data.street_counts.total);
 
-                $("#street-count-audited-registered-all").html(data.street_counts.audited.registered.all.total);
-                $("#street-count-audited-registered-all-percentage").html(formatPercent(data.street_counts.audited.registered.all.percentage));
-                $("#street-count-audited-registered-high-quality").html(data.street_counts.audited.registered.high_quality.total);
-                $("#street-count-audited-registered-high-quality-percentage").html(formatPercent(data.street_counts.audited.registered.high_quality.percentage));
+                $("#street-count-audited-registered-all").text(data.street_counts.audited.registered.all.total);
+                $("#street-count-audited-registered-all-percentage").text(formatPercent(data.street_counts.audited.registered.all.percentage));
+                $("#street-count-audited-registered-high-quality").text(data.street_counts.audited.registered.high_quality.total);
+                $("#street-count-audited-registered-high-quality-percentage").text(formatPercent(data.street_counts.audited.registered.high_quality.percentage));
     
-                $("#street-count-audited-anonymous-all").html(data.street_counts.audited.anonymous.all.total);
-                $("#street-count-audited-anonymous-all-percentage").html(formatPercent(data.street_counts.audited.anonymous.all.percentage));
-                $("#street-count-audited-anonymous-high-quality").html(data.street_counts.audited.anonymous.high_quality.total);
-                $("#street-count-audited-anonymous-high-quality-percentage").html(formatPercent(data.street_counts.audited.anonymous.high_quality.percentage));
+                $("#street-count-audited-anonymous-all").text(data.street_counts.audited.anonymous.all.total);
+                $("#street-count-audited-anonymous-all-percentage").text(formatPercent(data.street_counts.audited.anonymous.all.percentage));
+                $("#street-count-audited-anonymous-high-quality").text(data.street_counts.audited.anonymous.high_quality.total);
+                $("#street-count-audited-anonymous-high-quality-percentage").text(formatPercent(data.street_counts.audited.anonymous.high_quality.percentage));
     
-                $("#street-count-audited-turker-all").html(data.street_counts.audited.turker.all.total);
-                $("#street-count-audited-turker-all-percentage").html(formatPercent(data.street_counts.audited.turker.all.percentage));
-                $("#street-count-audited-turker-high-quality").html(data.street_counts.audited.turker.high_quality.total);
-                $("#street-count-audited-turker-high-quality-percentage").html(formatPercent(data.street_counts.audited.turker.high_quality.percentage));
+                $("#street-count-audited-turker-all").text(data.street_counts.audited.turker.all.total);
+                $("#street-count-audited-turker-all-percentage").text(formatPercent(data.street_counts.audited.turker.all.percentage));
+                $("#street-count-audited-turker-high-quality").text(data.street_counts.audited.turker.high_quality.total);
+                $("#street-count-audited-turker-high-quality-percentage").text(formatPercent(data.street_counts.audited.turker.high_quality.percentage));
     
-                $("#street-count-audited-researcher-all").html(data.street_counts.audited.researcher.all.total);
-                $("#street-count-audited-researcher-all-percentage").html(formatPercent(data.street_counts.audited.researcher.all.percentage));
-                $("#street-count-audited-researcher-high-quality").html(data.street_counts.audited.researcher.high_quality.total);
+                $("#street-count-audited-researcher-all").text(data.street_counts.audited.researcher.all.total);
+                $("#street-count-audited-researcher-all-percentage").text(formatPercent(data.street_counts.audited.researcher.all.percentage));
+                $("#street-count-audited-researcher-high-quality").text(data.street_counts.audited.researcher.high_quality.total);
                 $("#street-count-audited-researcher-high-quality-percentage").text(formatPercent(data.street_counts.audited.researcher.high_quality.percentage));
     
                 // Set Distance section of the Street Edge Table.
-                $("#street-distance-audited-all-users").html(formatDistance(data.street_distance.audited.all_users.total));
-                $("#street-distance-audited-all-users-percentage").html(formatPercent(data.street_distance.audited.all_users.percentage));
-                $("#street-distance-audited-high-quality").html(formatDistance(data.street_distance.audited.high_quality.total));
-                $("#street-distance-audited-high-quality-percentage").html(formatPercent(data.street_distance.audited.high_quality.percentage));
+                $("#street-distance-audited-all-users").text(formatDistance(data.street_distance.audited.all_users.total));
+                $("#street-distance-audited-all-users-percentage").text(formatPercent(data.street_distance.audited.all_users.percentage));
+                $("#street-distance-audited-high-quality").text(formatDistance(data.street_distance.audited.high_quality.total));
+                $("#street-distance-audited-high-quality-percentage").text(formatPercent(data.street_distance.audited.high_quality.percentage));
     
-                $("#street-distance-total").html(formatDistance(data.street_distance.total));
+                $("#street-distance-total").text(formatDistance(data.street_distance.total));
     
-                $("#street-distance-registered-all").html(formatDistance(data.street_distance.audited.registered.all.total));
-                $("#street-distance-registered-all-percentage").html(formatPercent(data.street_distance.audited.registered.all.percentage));
-                $("#street-distance-registered-high-quality").html(formatDistance(data.street_distance.audited.registered.high_quality.total));
-                $("#street-distance-registered-high-quality-percentage").html(formatPercent(data.street_distance.audited.registered.high_quality.percentage));
+                $("#street-distance-registered-all").text(formatDistance(data.street_distance.audited.registered.all.total));
+                $("#street-distance-registered-all-percentage").text(formatPercent(data.street_distance.audited.registered.all.percentage));
+                $("#street-distance-registered-high-quality").text(formatDistance(data.street_distance.audited.registered.high_quality.total));
+                $("#street-distance-registered-high-quality-percentage").text(formatPercent(data.street_distance.audited.registered.high_quality.percentage));
     
-                $("#street-distance-anonymous-all").html(formatDistance(data.street_distance.audited.anonymous.all.total));
-                $("#street-distance-anonymous-all-percentage").html(formatPercent(data.street_distance.audited.anonymous.all.percentage));
-                $("#street-distance-anonymous-high-quality").html(formatDistance(data.street_distance.audited.anonymous.high_quality.total));
-                $("#street-distance-anonymous-high-quality-percentage").html(formatPercent(data.street_distance.audited.anonymous.high_quality.percentage));
+                $("#street-distance-anonymous-all").text(formatDistance(data.street_distance.audited.anonymous.all.total));
+                $("#street-distance-anonymous-all-percentage").text(formatPercent(data.street_distance.audited.anonymous.all.percentage));
+                $("#street-distance-anonymous-high-quality").text(formatDistance(data.street_distance.audited.anonymous.high_quality.total));
+                $("#street-distance-anonymous-high-quality-percentage").text(formatPercent(data.street_distance.audited.anonymous.high_quality.percentage));
     
-                $("#street-distance-turker-all").html(formatDistance(data.street_distance.audited.turker.all.total));
-                $("#street-distance-turker-all-percentage").html(formatPercent(data.street_distance.audited.turker.all.percentage));
-                $("#street-distance-turker-high-quality").html(formatDistance(data.street_distance.audited.turker.high_quality.total));
-                $("#street-distance-turker-high-quality-percentage").html(formatPercent(data.street_distance.audited.turker.high_quality.percentage));
+                $("#street-distance-turker-all").text(formatDistance(data.street_distance.audited.turker.all.total));
+                $("#street-distance-turker-all-percentage").text(formatPercent(data.street_distance.audited.turker.all.percentage));
+                $("#street-distance-turker-high-quality").text(formatDistance(data.street_distance.audited.turker.high_quality.total));
+                $("#street-distance-turker-high-quality-percentage").text(formatPercent(data.street_distance.audited.turker.high_quality.percentage));
     
-                $("#street-distance-researcher-all").html(formatDistance(data.street_distance.audited.researcher.all.total));
-                $("#street-distance-researcher-all-percentage").html(formatPercent(data.street_distance.audited.researcher.all.percentage));
-                $("#street-distance-researcher-high-quality").html(formatDistance(data.street_distance.audited.researcher.high_quality.total));
-                $("#street-distance-researcher-high-quality-percentage").html(formatPercent(data.street_distance.audited.researcher.high_quality.percentage));
+                $("#street-distance-researcher-all").text(formatDistance(data.street_distance.audited.researcher.all.total));
+                $("#street-distance-researcher-all-percentage").text(formatPercent(data.street_distance.audited.researcher.all.percentage));
+                $("#street-distance-researcher-high-quality").text(formatDistance(data.street_distance.audited.researcher.high_quality.total));
+                $("#street-distance-researcher-high-quality-percentage").text(formatPercent(data.street_distance.audited.researcher.high_quality.percentage));
     
                 // Set the audited distance fields.
-                $("#audited-distance-all-time").html(formatDistance(data.street_distance.audited.with_overlap.all_time));
-                $("#audited-distance-today").html(formatDistance(data.street_distance.audited.with_overlap.today));
-                $("#audited-distance-week").html(formatDistance(data.street_distance.audited.with_overlap.week));
+                $("#audited-distance-all-time").text(formatDistance(data.street_distance.audited.with_overlap.all_time));
+                $("#audited-distance-today").text(formatDistance(data.street_distance.audited.with_overlap.today));
+                $("#audited-distance-week").text(formatDistance(data.street_distance.audited.with_overlap.week));
 
                 resolve();
             })

From 5fffee5164a02a2b3e19126ec963029f6df3e56c Mon Sep 17 00:00:00 2001
From: Mikey Saugstad <michaelssaugstad@gmail.com>
Date: Mon, 28 Oct 2024 14:47:43 -0700
Subject: [PATCH 20/28] removes unused import

---
 app/views/admin/index.scala.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/views/admin/index.scala.html b/app/views/admin/index.scala.html
index c45bfc7a1e..4d2f044d27 100644
--- a/app/views/admin/index.scala.html
+++ b/app/views/admin/index.scala.html
@@ -2,7 +2,6 @@
 @import models.daos.slick._
 @import models.audit._
 @import models.label._
-@import models.street.StreetEdgeTable
 @import models.audit.AuditTaskCommentTable
 @import models.utils.DataFormatter
 

From b5bc0c8542d892d170319da36d661855f23b4458 Mon Sep 17 00:00:00 2001
From: Srihari Krishnaswamy <sriharik844@gmail.com>
Date: Mon, 28 Oct 2024 17:41:35 -0700
Subject: [PATCH 21/28] Add conf/routes change to fully hook up FE and BE

---
 conf/routes | 1 +
 1 file changed, 1 insertion(+)

diff --git a/conf/routes b/conf/routes
index b7a1d42bd7..07b7ed6ec3 100644
--- a/conf/routes
+++ b/conf/routes
@@ -76,6 +76,7 @@ GET     /adminapi/attributes/all                             @controllers.AdminC
 GET     /adminapi/validationCounts                           @controllers.AdminController.getAllUserValidationCounts
 PUT     /adminapi/clearPlayCache                             @controllers.AdminController.clearPlayCache
 GET     /adminapi/updateUserStats                            @controllers.AdminController.updateUserStats(hoursCutoff: Option[Int])
+GET     /adminapi/getCoverageData                          @controllers.AdminController.getCoverageData
 
 GET     /adminapi/webpageActivity                            @controllers.AdminController.getAllWebpageActivities
 GET     /adminapi/webpageActivity/:activity                  @controllers.AdminController.getWebpageActivities(activity: String)

From 71f2ecae4ed7b9885973f73e114b8c54302b3337 Mon Sep 17 00:00:00 2001
From: Srihari Krishnaswamy <sriharik844@gmail.com>
Date: Mon, 28 Oct 2024 23:23:22 -0700
Subject: [PATCH 22/28] Refactor to calculate percetnages on frontend and
 simplify html in admin page coverage data table

---
 app/controllers/AdminController.scala | 98 ++++++---------------------
 app/views/admin/index.scala.html      | 60 ++++++----------
 public/javascripts/Admin/src/Admin.js | 87 ++++++++++++------------
 3 files changed, 83 insertions(+), 162 deletions(-)

diff --git a/app/controllers/AdminController.scala b/app/controllers/AdminController.scala
index c00bcac1c1..14d8b468df 100644
--- a/app/controllers/AdminController.scala
+++ b/app/controllers/AdminController.scala
@@ -678,52 +678,24 @@ class AdminController @Inject() (implicit val env: Environment[User, SessionAuth
       "total" -> StreetEdgeTable.countTotalStreets(),
       "audited" -> Json.obj(
         "all_users" -> Json.obj(
-          "total" -> StreetEdgeTable.countAuditedStreets(),
-          "percentage" -> StreetEdgeTable.auditCompletionRate(1) * 100
-        ),
-        "high_quality" -> Json.obj(
-          "total" -> StreetEdgeTable.countAuditedStreets(1, "All", true),
-          "percentage" -> StreetEdgeTable.auditCompletionRate(1, "All", true) * 100
+          "all" -> StreetEdgeTable.countAuditedStreets(),
+          "high_quality" -> StreetEdgeTable.countAuditedStreets(1, "All", true)
         ),
         "registered" -> Json.obj(
-          "all" -> Json.obj(
-            "total" -> StreetEdgeTable.countAuditedStreets(1, "Registered"),
-            "percentage" -> StreetEdgeTable.auditCompletionRate(1, "Registered") * 100
-          ),
-          "high_quality" -> Json.obj(
-            "total" -> StreetEdgeTable.countAuditedStreets(1, "Registered", true),
-            "percentage" -> StreetEdgeTable.auditCompletionRate(1, "Registered", true) * 100
-          )
+          "all" -> StreetEdgeTable.countAuditedStreets(1, "Registered"),
+          "high_quality" -> StreetEdgeTable.countAuditedStreets(1, "Registered", true)
         ),
         "anonymous" -> Json.obj(
-          "all" -> Json.obj(
-            "total" -> StreetEdgeTable.countAuditedStreets(1, "Anonymous"),
-            "percentage" -> StreetEdgeTable.auditCompletionRate(1, "Anonymous") * 100
-          ),
-          "high_quality" -> Json.obj(
-            "total" -> StreetEdgeTable.countAuditedStreets(1, "Anonymous", true),
-            "percentage" -> StreetEdgeTable.auditCompletionRate(1, "Anonymous", true) * 100
-          )
+          "all" -> StreetEdgeTable.countAuditedStreets(1, "Anonymous"),
+          "high_quality" -> StreetEdgeTable.countAuditedStreets(1, "Anonymous", true)
         ),
         "turker" -> Json.obj(
-          "all" -> Json.obj(
-            "total" -> StreetEdgeTable.countAuditedStreets(1, "Turker"),
-            "percentage" -> StreetEdgeTable.auditCompletionRate(1, "Turker") * 100
-          ),
-          "high_quality" -> Json.obj(
-            "total" -> StreetEdgeTable.countAuditedStreets(1, "Turker", true),
-            "percentage" -> StreetEdgeTable.auditCompletionRate(1, "Turker", true) * 100
-          )
+          "all" -> StreetEdgeTable.countAuditedStreets(1, "Turker"),
+          "high_quality" -> StreetEdgeTable.countAuditedStreets(1, "Turker", true)
         ),
         "researcher" -> Json.obj(
-          "all" -> Json.obj(
-            "total" -> StreetEdgeTable.countAuditedStreets(1, "Researcher"),
-            "percentage" -> StreetEdgeTable.auditCompletionRate(1, "Researcher") * 100
-          ),
-          "high_quality" -> Json.obj(
-            "total" -> StreetEdgeTable.countAuditedStreets(1, "Researcher", true),
-            "percentage" -> StreetEdgeTable.auditCompletionRate(1, "Researcher", true) * 100
-          )
+          "all" -> StreetEdgeTable.countAuditedStreets(1, "Researcher"),
+          "high_quality" -> StreetEdgeTable.countAuditedStreets(1, "Researcher", true)
         )
       )
     )
@@ -732,52 +704,24 @@ class AdminController @Inject() (implicit val env: Environment[User, SessionAuth
       "total" -> StreetEdgeTable.totalStreetDistance(),
       "audited" -> Json.obj(
         "all_users" -> Json.obj(
-          "total" -> StreetEdgeTable.auditedStreetDistance(1),
-          "percentage" -> StreetEdgeTable.streetDistanceCompletionRate(1) * 100
-        ),
-        "high_quality" -> Json.obj(
-          "total" -> StreetEdgeTable.auditedStreetDistance(1, "All", true),
-          "percentage" -> StreetEdgeTable.streetDistanceCompletionRate(1, "All", true) * 100
+          "all" -> StreetEdgeTable.auditedStreetDistance(1),
+          "high_quality" -> StreetEdgeTable.auditedStreetDistance(1, "All", true)
         ),
         "registered" -> Json.obj(
-          "all" -> Json.obj(
-            "total" -> StreetEdgeTable.auditedStreetDistance(1, "Registered"),
-            "percentage" -> StreetEdgeTable.streetDistanceCompletionRate(1, "Registered") * 100
-          ),
-          "high_quality" -> Json.obj(
-            "total" -> StreetEdgeTable.auditedStreetDistance(1, "Registered", true),
-            "percentage" -> StreetEdgeTable.streetDistanceCompletionRate(1, "Registered", true) * 100
-          )
+          "all" -> StreetEdgeTable.auditedStreetDistance(1, "Registered"),
+          "high_quality" -> StreetEdgeTable.auditedStreetDistance(1, "Registered", true)
         ),
         "anonymous" -> Json.obj(
-          "all" -> Json.obj(
-            "total" -> StreetEdgeTable.auditedStreetDistance(1, "Anonymous"),
-            "percentage" -> StreetEdgeTable.streetDistanceCompletionRate(1, "Anonymous") * 100
-          ),
-          "high_quality" -> Json.obj(
-            "total" -> StreetEdgeTable.auditedStreetDistance(1, "Anonymous", true),
-            "percentage" -> StreetEdgeTable.streetDistanceCompletionRate(1, "Anonymous", true) * 100
-          )
+          "all" -> StreetEdgeTable.auditedStreetDistance(1, "Anonymous"),
+          "high_quality" -> StreetEdgeTable.auditedStreetDistance(1, "Anonymous", true)
         ),
         "turker" -> Json.obj(
-          "all" -> Json.obj(
-            "total" -> StreetEdgeTable.auditedStreetDistance(1, "Turker"),
-            "percentage" -> StreetEdgeTable.streetDistanceCompletionRate(1, "Turker") * 100
-          ),
-          "high_quality" -> Json.obj(
-            "total" -> StreetEdgeTable.auditedStreetDistance(1, "Turker", true),
-            "percentage" -> StreetEdgeTable.streetDistanceCompletionRate(1, "Turker", true) * 100
-          )
+          "all" -> StreetEdgeTable.auditedStreetDistance(1, "Turker"),
+          "high_quality" -> StreetEdgeTable.auditedStreetDistance(1, "Turker", true)
         ),
         "researcher" -> Json.obj(
-          "all" -> Json.obj(
-            "total" -> StreetEdgeTable.auditedStreetDistance(1, "Researcher"),
-            "percentage" -> StreetEdgeTable.streetDistanceCompletionRate(1, "Researcher") * 100
-          ),
-          "high_quality" -> Json.obj(
-            "total" -> StreetEdgeTable.auditedStreetDistance(1, "Researcher", true),
-            "percentage" -> StreetEdgeTable.streetDistanceCompletionRate(1, "Researcher", true) * 100
-          )
+          "all" -> StreetEdgeTable.auditedStreetDistance(1, "Researcher"),
+          "high_quality" -> StreetEdgeTable.auditedStreetDistance(1, "Researcher", true)
         ),
 
         // Audited distance over time is related, but included in a separate table on the Admin page.
@@ -792,7 +736,7 @@ class AdminController @Inject() (implicit val env: Environment[User, SessionAuth
     val data = Json.obj(
       "street_counts" -> streetCountsData,
       "street_distance" -> streetDistanceData
-      )
+    )
     Future.successful(Ok(data))
   }
 }
diff --git a/app/views/admin/index.scala.html b/app/views/admin/index.scala.html
index 4d2f044d27..bbb9615263 100644
--- a/app/views/admin/index.scala.html
+++ b/app/views/admin/index.scala.html
@@ -258,82 +258,62 @@ <h1>Coverage</h1>
                                 </tr>
                                 <tr>
                                     <th>Audited Streets</th>
-                                    <td><span id="street-count-audited-all-users"></span>
-                                        <span id="street-count-audited-all-users-percentage"></span></td>
-                                    <td><span id="street-count-audited-high-quality-total"></span>
-                                        <span id="street-count-audited-high-quality-percentage"></span></td>
+                                    <td><span id="street-count-audited-all"></span></td>
+                                    <td><span id="street-count-audited-high-quality"></span></td>
                                     <td><span id="street-count-total"></span></td>
                                 </tr>
                                 <tr style="font-size: 90%;">
                                     <td style="padding-left: 30px">Registered</td>
-                                    <td><span id="street-count-audited-registered-all"></span>
-                                        <span id="street-count-audited-registered-all-percentage"></span></td>
-                                    <td><span id="street-count-audited-registered-high-quality"></span>
-                                        <span id="street-count-audited-registered-high-quality-percentage"></span></td>
+                                    <td><span id="street-count-audited-registered-all"></span></td>
+                                    <td><span id="street-count-audited-registered-high-quality"></span></td>
                                     <td></td>
                                 </tr>
                                 <tr style="font-size: 90%;">
                                     <td style="padding-left: 30px">Anonymous</td>
-                                    <td><span id="street-count-audited-anonymous-all"></span>
-                                        <span id="street-count-audited-anonymous-all-percentage"></span></td>
-                                    <td><span id="street-count-audited-anonymous-high-quality"></span>
-                                        <span id="street-count-audited-anonymous-high-quality-percentage"></span></td>
+                                    <td><span id="street-count-audited-anonymous-all"></span></td>
+                                    <td><span id="street-count-audited-anonymous-high-quality"></span></td>
                                     <td></td>
                                 </tr>
                                 <tr style="font-size: 90%;">
                                     <td style="padding-left: 30px">Turker</td>
-                                    <td><span id="street-count-audited-turker-all"></span>
-                                        <span id="street-count-audited-turker-all-percentage"></span></td>
-                                    <td><span id="street-count-audited-turker-high-quality"></span>
-                                        <span id="street-count-audited-turker-high-quality-percentage"></span></td>
+                                    <td><span id="street-count-audited-turker-all"></span></td>
+                                    <td><span id="street-count-audited-turker-high-quality"></span></td>
                                     <td></td>
                                 </tr>
                                 <tr style="font-size: 90%;">
                                     <td style="padding-left: 30px">Researcher</td>
-                                    <td><span id="street-count-audited-researcher-all"></span>
-                                        <span id="street-count-audited-researcher-all-percentage"></span></td>
-                                    <td><span id="street-count-audited-researcher-high-quality"></span>
-                                        <span id="street-count-audited-researcher-high-quality-percentage"></span></td>
+                                    <td><span id="street-count-audited-researcher-all"></span></td>
+                                    <td><span id="street-count-audited-researcher-high-quality"></span></td>
                                     <td></td>
                                 </tr>
                                 <tr>
                                     <th>Distance</th>
-                                    <td><span id="street-distance-audited-all-users"></span>
-                                        <span id="street-distance-audited-all-users-percentage"></span></td>
-                                    <td><span id="street-distance-audited-high-quality"></span>
-                                        <span id="street-distance-audited-high-quality-percentage"></span></td>
+                                    <td><span id="street-distance-audited-all"></span></td>
+                                    <td><span id="street-distance-audited-high-quality"></span></td>
                                     <td><span id="street-distance-total"></span></td>
                                 </tr>
                                 <tr style="font-size: 90%;">
                                     <td style="padding-left: 30px">Registered</td>
-                                    <td><span id="street-distance-registered-all"></span>
-                                        <span id="street-distance-registered-all-percentage"></span></td>
-                                    <td><span id="street-distance-registered-high-quality"></span>
-                                        <span id="street-distance-registered-high-quality-percentage"></span></td>
+                                    <td><span id="street-distance-registered-all"></span></td>
+                                    <td><span id="street-distance-registered-high-quality"></span></td>
                                     <td></td>
                                 </tr>
                                 <tr style="font-size: 90%;">
                                     <td style="padding-left: 30px">Anonymous</td>
-                                    <td><span id="street-distance-anonymous-all"></span>
-                                        <span id="street-distance-anonymous-all-percentage"></span></td>
-                                    <td><span id="street-distance-anonymous-high-quality"></span>
-                                        <span id="street-distance-anonymous-high-quality-percentage"></span></td>
+                                    <td><span id="street-distance-anonymous-all"></span></td>
+                                    <td><span id="street-distance-anonymous-high-quality"></span></td>
                                     <td></td>
                                 </tr>
                                 <tr style="font-size: 90%;">
                                     <td style="padding-left: 30px">Turker</td>
-                                    <td><span id="street-distance-turker-all"></span>
-                                        <span id="street-distance-turker-all-percentage"></span></td>
-                                    <td><span id="street-distance-turker-high-quality"></span>
-                                        <span id="street-distance-turker-high-quality-percentage"></span></td>
+                                    <td><span id="street-distance-turker-all"></span></td>
+                                    <td><span id="street-distance-turker-high-quality"></span></td>
                                     <td></td>
                                 </tr>
                                 <tr style="font-size: 90%;">
                                     <td style="padding-left: 30px">Researcher</td>
-                                    <td><span id="street-distance-researcher-all"></span>
-                                        <span id="street-distance-researcher-all-percentage"></span></td>
-                                    <td><span id="street-distance-researcher-high-quality"></span>
-                                        <span id="street-distance-researcher-high-quality-percentage"></span></td>
+                                    <td><span id="street-distance-researcher-all"></span></td>
+                                    <td><span id="street-distance-researcher-high-quality"></span></td>
                                     <td></td>
                                 </tr>
                             </table>
diff --git a/public/javascripts/Admin/src/Admin.js b/public/javascripts/Admin/src/Admin.js
index 38edf88116..6b33fd8142 100644
--- a/public/javascripts/Admin/src/Admin.js
+++ b/public/javascripts/Admin/src/Admin.js
@@ -39,7 +39,6 @@ function Admin(_, $) {
         }).catch(function(error) {
             console.error("Error loading street edge data:", error);
         });
-        return self;
     }
 
     function initializeAdminGSVLabelView() {
@@ -1170,68 +1169,65 @@ function Admin(_, $) {
         return `${distanceInCorrectUnits.toFixed(1)} ${distanceMetricAbbrev}`;
     }
 
-    function formatPercent(value) {
-        return `(${Math.round(value)}%)`;
+    function formatPercent(percent) {
+        return `(${Math.round(percent)}%)`;
+    }
+
+    function calculatePercent(value, total) {
+        return (value / total) * 100;
+    }
+
+    function formatCountWithPercent(count, total) {
+        const percent = calculatePercent(count, total);
+        return `${count} ${formatPercent(percent)}`;
+    }
+
+    function formatDistanceWithPercent(distance, total) {
+        const percent = calculatePercent(distance, total);
+        return `${formatDistance(distance)} ${formatPercent(percent)}`;
     }
 
     function loadStreetEdgeData() {
         return new Promise((resolve, reject) => {
             $.getJSON("/adminapi/getCoverageData", function (data) {
+                const totalAuditedStreets = data.street_counts.total;
+                const totalAuditedDistance = data.street_distance.total;
+
                 // Set Audited Streets section of the Street Edge Table.
-                $("#street-count-audited-all-users").text(data.street_counts.audited.all_users.total);
-                $("#street-count-audited-all-users-percentage").text(formatPercent(data.street_counts.audited.all_users.percentage));
-                $("#street-count-audited-high-quality-total").text(data.street_counts.audited.high_quality.total);
-                $("#street-count-audited-high-quality-percentage").text(formatPercent(data.street_counts.audited.high_quality.percentage));
+                $("#street-count-audited-all").text(formatCountWithPercent(data.street_counts.audited.all_users.all, totalAuditedStreets));
+                $("#street-count-audited-high-quality").text(formatCountWithPercent(data.street_counts.audited.all_users.high_quality, totalAuditedStreets));
     
-                $("#street-count-total").text(data.street_counts.total);
+                $("#street-count-total").text(totalAuditedStreets);
 
-                $("#street-count-audited-registered-all").text(data.street_counts.audited.registered.all.total);
-                $("#street-count-audited-registered-all-percentage").text(formatPercent(data.street_counts.audited.registered.all.percentage));
-                $("#street-count-audited-registered-high-quality").text(data.street_counts.audited.registered.high_quality.total);
-                $("#street-count-audited-registered-high-quality-percentage").text(formatPercent(data.street_counts.audited.registered.high_quality.percentage));
+                $("#street-count-audited-registered-all").text(formatCountWithPercent(data.street_counts.audited.registered.all, totalAuditedStreets));
+                $("#street-count-audited-registered-high-quality").text(formatCountWithPercent(data.street_counts.audited.registered.high_quality, totalAuditedStreets));
     
-                $("#street-count-audited-anonymous-all").text(data.street_counts.audited.anonymous.all.total);
-                $("#street-count-audited-anonymous-all-percentage").text(formatPercent(data.street_counts.audited.anonymous.all.percentage));
-                $("#street-count-audited-anonymous-high-quality").text(data.street_counts.audited.anonymous.high_quality.total);
-                $("#street-count-audited-anonymous-high-quality-percentage").text(formatPercent(data.street_counts.audited.anonymous.high_quality.percentage));
+                $("#street-count-audited-anonymous-all").text(formatCountWithPercent(data.street_counts.audited.anonymous.all, totalAuditedStreets));
+                $("#street-count-audited-anonymous-high-quality").text(formatCountWithPercent(data.street_counts.audited.anonymous.high_quality, totalAuditedStreets));
     
-                $("#street-count-audited-turker-all").text(data.street_counts.audited.turker.all.total);
-                $("#street-count-audited-turker-all-percentage").text(formatPercent(data.street_counts.audited.turker.all.percentage));
-                $("#street-count-audited-turker-high-quality").text(data.street_counts.audited.turker.high_quality.total);
-                $("#street-count-audited-turker-high-quality-percentage").text(formatPercent(data.street_counts.audited.turker.high_quality.percentage));
+                $("#street-count-audited-turker-all").text(formatCountWithPercent(data.street_counts.audited.turker.all, totalAuditedStreets));
+                $("#street-count-audited-turker-high-quality").text(formatCountWithPercent(data.street_counts.audited.turker.high_quality, totalAuditedStreets));
     
-                $("#street-count-audited-researcher-all").text(data.street_counts.audited.researcher.all.total);
-                $("#street-count-audited-researcher-all-percentage").text(formatPercent(data.street_counts.audited.researcher.all.percentage));
-                $("#street-count-audited-researcher-high-quality").text(data.street_counts.audited.researcher.high_quality.total);
-                $("#street-count-audited-researcher-high-quality-percentage").text(formatPercent(data.street_counts.audited.researcher.high_quality.percentage));
+                $("#street-count-audited-researcher-all").text(formatCountWithPercent(data.street_counts.audited.researcher.all, totalAuditedStreets));
+                $("#street-count-audited-researcher-high-quality").text(formatCountWithPercent(data.street_counts.audited.researcher.high_quality, totalAuditedStreets));
     
                 // Set Distance section of the Street Edge Table.
-                $("#street-distance-audited-all-users").text(formatDistance(data.street_distance.audited.all_users.total));
-                $("#street-distance-audited-all-users-percentage").text(formatPercent(data.street_distance.audited.all_users.percentage));
-                $("#street-distance-audited-high-quality").text(formatDistance(data.street_distance.audited.high_quality.total));
-                $("#street-distance-audited-high-quality-percentage").text(formatPercent(data.street_distance.audited.high_quality.percentage));
+                $("#street-distance-audited-all").text(formatDistanceWithPercent(data.street_distance.audited.all_users.all, totalAuditedDistance));
+                $("#street-distance-audited-high-quality").text(formatDistanceWithPercent(data.street_distance.audited.all_users.high_quality, totalAuditedDistance));
     
-                $("#street-distance-total").text(formatDistance(data.street_distance.total));
+                $("#street-distance-total").text(formatDistance(totalAuditedDistance));
     
-                $("#street-distance-registered-all").text(formatDistance(data.street_distance.audited.registered.all.total));
-                $("#street-distance-registered-all-percentage").text(formatPercent(data.street_distance.audited.registered.all.percentage));
-                $("#street-distance-registered-high-quality").text(formatDistance(data.street_distance.audited.registered.high_quality.total));
-                $("#street-distance-registered-high-quality-percentage").text(formatPercent(data.street_distance.audited.registered.high_quality.percentage));
+                $("#street-distance-registered-all").text(formatDistanceWithPercent(data.street_distance.audited.registered.all, totalAuditedDistance));
+                $("#street-distance-registered-high-quality").text(formatDistanceWithPercent(data.street_distance.audited.registered.high_quality, totalAuditedDistance));
     
-                $("#street-distance-anonymous-all").text(formatDistance(data.street_distance.audited.anonymous.all.total));
-                $("#street-distance-anonymous-all-percentage").text(formatPercent(data.street_distance.audited.anonymous.all.percentage));
-                $("#street-distance-anonymous-high-quality").text(formatDistance(data.street_distance.audited.anonymous.high_quality.total));
-                $("#street-distance-anonymous-high-quality-percentage").text(formatPercent(data.street_distance.audited.anonymous.high_quality.percentage));
+                $("#street-distance-anonymous-all").text(formatDistanceWithPercent(data.street_distance.audited.anonymous.all, totalAuditedDistance));
+                $("#street-distance-anonymous-high-quality").text(formatDistanceWithPercent(data.street_distance.audited.anonymous.high_quality, totalAuditedDistance));
     
-                $("#street-distance-turker-all").text(formatDistance(data.street_distance.audited.turker.all.total));
-                $("#street-distance-turker-all-percentage").text(formatPercent(data.street_distance.audited.turker.all.percentage));
-                $("#street-distance-turker-high-quality").text(formatDistance(data.street_distance.audited.turker.high_quality.total));
-                $("#street-distance-turker-high-quality-percentage").text(formatPercent(data.street_distance.audited.turker.high_quality.percentage));
+                $("#street-distance-turker-all").text(formatDistanceWithPercent(data.street_distance.audited.turker.all, totalAuditedDistance));
+                $("#street-distance-turker-high-quality").text(formatDistanceWithPercent(data.street_distance.audited.turker.high_quality, totalAuditedDistance));
     
-                $("#street-distance-researcher-all").text(formatDistance(data.street_distance.audited.researcher.all.total));
-                $("#street-distance-researcher-all-percentage").text(formatPercent(data.street_distance.audited.researcher.all.percentage));
-                $("#street-distance-researcher-high-quality").text(formatDistance(data.street_distance.audited.researcher.high_quality.total));
-                $("#street-distance-researcher-high-quality-percentage").text(formatPercent(data.street_distance.audited.researcher.high_quality.percentage));
+                $("#street-distance-researcher-all").text(formatDistanceWithPercent(data.street_distance.audited.researcher.all, totalAuditedDistance));
+                $("#street-distance-researcher-high-quality").text(formatDistanceWithPercent(data.street_distance.audited.researcher.high_quality, totalAuditedDistance));
     
                 // Set the audited distance fields.
                 $("#audited-distance-all-time").text(formatDistance(data.street_distance.audited.with_overlap.all_time));
@@ -1257,4 +1253,5 @@ function Admin(_, $) {
     $('.change-org').on('click', changeOrg);
 
     _init();
+    return self;
 }

From 3e2366155262909fb0c39fe9d1adef45d887c387 Mon Sep 17 00:00:00 2001
From: Srihari Krishnaswamy <sriharik844@gmail.com>
Date: Tue, 29 Oct 2024 14:02:58 -0700
Subject: [PATCH 23/28] Deleted unused functions in StreetEdgeTable

---
 app/models/street/StreetEdgeTable.scala | 25 -------------------------
 conf/routes                             |  2 +-
 2 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/app/models/street/StreetEdgeTable.scala b/app/models/street/StreetEdgeTable.scala
index 2348a162a1..f78013e6e6 100644
--- a/app/models/street/StreetEdgeTable.scala
+++ b/app/models/street/StreetEdgeTable.scala
@@ -124,31 +124,6 @@ object StreetEdgeTable {
     streetEdgesWithoutDeleted.length.run
   }
 
-  /**
-    * Returns the audit completion rate for the specified group of users.
-    *
-    * @param auditCount
-    * @param userType
-    * @return
-    */
-  def auditCompletionRate(auditCount: Int, userType: String = "All", highQualityOnly: Boolean = false): Float = db.withSession { implicit session =>
-    val auditedStreetCount = countAuditedStreets(1, userType, highQualityOnly).toFloat
-    val allEdgesCount: Int = streetEdgesWithoutDeleted.length.run
-    auditedStreetCount / allEdgesCount
-  }
-
-  /**
-    * Calculate the proportion of the total miles of the city that have been audited at least auditCount times.
-    *
-    * @param auditCount
-    * @return Float between 0 and 1
-    */
-  def streetDistanceCompletionRate(auditCount: Int, userType: String = "All", highQualityOnly: Boolean = false): Float = db.withSession { implicit session =>
-    val auditedDistance: Float = auditedStreetDistance(auditCount, userType, highQualityOnly)
-    val totalDistance: Float = totalStreetDistance()
-    auditedDistance / totalDistance
-  }
-
   /**
     * Get the total distance in miles.
     * Reference: http://gis.stackexchange.com/questions/143436/how-do-i-calculate-st-length-in-miles
diff --git a/conf/routes b/conf/routes
index 07b7ed6ec3..1e84ff2ced 100644
--- a/conf/routes
+++ b/conf/routes
@@ -76,7 +76,7 @@ GET     /adminapi/attributes/all                             @controllers.AdminC
 GET     /adminapi/validationCounts                           @controllers.AdminController.getAllUserValidationCounts
 PUT     /adminapi/clearPlayCache                             @controllers.AdminController.clearPlayCache
 GET     /adminapi/updateUserStats                            @controllers.AdminController.updateUserStats(hoursCutoff: Option[Int])
-GET     /adminapi/getCoverageData                          @controllers.AdminController.getCoverageData
+GET     /adminapi/getCoverageData                            @controllers.AdminController.getCoverageData
 
 GET     /adminapi/webpageActivity                            @controllers.AdminController.getAllWebpageActivities
 GET     /adminapi/webpageActivity/:activity                  @controllers.AdminController.getWebpageActivities(activity: String)

From ab34ab3af5077c546c1dc39d992f41487b46de4f Mon Sep 17 00:00:00 2001
From: Mikey Saugstad <michaelssaugstad@gmail.com>
Date: Tue, 29 Oct 2024 15:36:59 -0700
Subject: [PATCH 24/28] fixes typo

---
 public/javascripts/Admin/src/Admin.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/javascripts/Admin/src/Admin.js b/public/javascripts/Admin/src/Admin.js
index 6db64ac72e..61bd350d83 100644
--- a/public/javascripts/Admin/src/Admin.js
+++ b/public/javascripts/Admin/src/Admin.js
@@ -1158,7 +1158,7 @@ function Admin(_, $) {
     
     self.clearPlayCache = clearPlayCache;
 
-    $('.role-dropdown').on('click', 'a', changeRole);=
+    $('.role-dropdown').on('click', 'a', changeRole);
     $('.org-dropdown').on('click', 'a', changeOrg);
 
     return self;

From 22fdaf4dc7aa274f0121ad780e3a1e8288e679bb Mon Sep 17 00:00:00 2001
From: Mikey Saugstad <michaelssaugstad@gmail.com>
Date: Tue, 29 Oct 2024 16:06:58 -0700
Subject: [PATCH 25/28] adds new script to import users for dev env

---
 db/import-users.sh | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100755 db/import-users.sh

diff --git a/db/import-users.sh b/db/import-users.sh
new file mode 100755
index 0000000000..c71c18e98b
--- /dev/null
+++ b/db/import-users.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+psql -v ON_ERROR_STOP=1 -U postgres -d sidewalk <<-EOSQL
+    SELECT pg_terminate_backend(pg_stat_activity.pid)
+    FROM pg_stat_activity
+    WHERE (pg_stat_activity.datname = 'sidewalk')
+    AND pid <> pg_backend_pid();
+
+    DROP SCHEMA IF EXISTS sidewalk_login CASCADE;
+EOSQL
+
+pg_restore -U sidewalk -Fc -d sidewalk /opt/sidewalk_users-dump

From 9c0b7bdb67550e3b65f0e3ecadee1f81d495bc7a Mon Sep 17 00:00:00 2001
From: Mikey Saugstad <michaelssaugstad@gmail.com>
Date: Tue, 29 Oct 2024 16:36:35 -0700
Subject: [PATCH 26/28] updates dev env instructions for unified login

---
 Makefile  | 3 +++
 README.md | 7 +++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 1eb9d9dd3f..e77d27ce28 100644
--- a/Makefile
+++ b/Makefile
@@ -39,6 +39,9 @@ docker-run:
 ssh:
 	@docker exec -it projectsidewalk-$${target} /bin/bash
 
+import-users:
+	@docker exec -it projectsidewalk-db sh -c "/opt/import-users.sh"
+
 import-dump:
 	@docker exec -it projectsidewalk-db sh -c "/opt/import-dump.sh $(db)"
 
diff --git a/README.md b/README.md
index ad72dbc47b..4e15e1dda7 100644
--- a/README.md
+++ b/README.md
@@ -83,6 +83,7 @@ On Windows, we recommend [Windows Powershell](https://docs.microsoft.com/en-us/p
 1. Modify the `SIDEWALK_CITY_ID` line in the `docker-compose.yml` to use the ID of the appropriate city, listed [here](https://github.com/ProjectSidewalk/SidewalkWebpage/wiki/Docker-Troubleshooting#first-heres-a-table-that-youll-reference-when-setting-up-your-dev-env) (it's the city that matches your database dump, so check the name of the db dump file).
 1. Modify the `DATABASE_USER` line in the `docker-compose.yml`, replacing "sidewalk" with the username from the table [linked above](https://github.com/ProjectSidewalk/SidewalkWebpage/wiki/Docker-Troubleshooting#first-heres-a-table-that-youll-reference-when-setting-up-your-dev-env).
 1. Rename the database dump file that you got from Mikey to "\<database_user\>-dump" (using the name from the prev step) and put it in the `db/` directory (other files in this dir include `init.sh` and `import-dump.sh`).
+1. Rename the users dump file that you got from Mikey to "sidewalk_users-dump" and put it in the `db/` directory as well.
 1. From the root SidewalkWebpage dir, run `make dev`. This will take time (20-30 mins or more depending on your Internet connection) as the command downloads the docker images, spins up the containers, and opens a Docker shell into the webpage container in that same terminal. The containers (running Ubuntu Stretch) will have all the necessary packages and tools so no installation is necessary. This command also initializes the database, though we still need to import the data. Successful output of this command will look like:
 
     ```
@@ -93,7 +94,8 @@ On Windows, we recommend [Windows Powershell](https://docs.microsoft.com/en-us/p
     root@[container-id]:/home#
     ```
 
-1. Run `make import-dump db=<database_user>` (needs to be the same thing you set for `DATABASE_USER`) from the root project directory outside the Docker shell (from a new Ubuntu terminal). This may take a while depending on the size of the dump. Don't panic if this step fails :) and consult the [Docker Troubleshooting wiki](https://github.com/ProjectSidewalk/SidewalkWebpage/wiki/Docker-Troubleshooting). Check the output carefully. If it looks like there are errors, do not skip to the next step, check the wiki and ask Mikey if you don't find solutions in there.
+1. Run `make import-users` from the root project directory outside the Docker shell (from a new Ubuntu terminal). This may take 1-2 minutes.
+1. Run `make import-dump db=<database_user>` (needs to be the same value you set for `DATABASE_USER`). This may take a while depending on the size of the dump. Don't panic if this step fails :) and consult the [Docker Troubleshooting wiki](https://github.com/ProjectSidewalk/SidewalkWebpage/wiki/Docker-Troubleshooting). Check the output carefully. If it looks like there are errors, do not skip to the next step, check the wiki and ask Mikey if you don't find solutions in there.
 1. Run `npm start` from inside the Docker shell (the terminal where you ran `make dev`). If this is your first time running the command, *everything* will need to be compiled. So, it may take 5+ minutes initially, but will be orders of magnitude faster in the future (~10 secs).
 
     The behavior of `npm start` is dictated by what `start` is supposed to do as defined in `package.json` file. As per the current code, running this command will run `grunt watch` & `sbt compile "~ run"` (the `~` here is triggered execution that allows for the server to run in watch mode). This should start the web server. Successful output of this command will look like:
@@ -121,7 +123,8 @@ On Windows, we recommend [Windows Powershell](https://docs.microsoft.com/en-us/p
 
 ### Setting up another database or city
 1. Acquire another database dump, put it in the `db/` directory, and rename it to "\<database_user\>-dump", using the appropriate database user from [this table](https://github.com/ProjectSidewalk/SidewalkWebpage/wiki/Docker-Troubleshooting#first-heres-a-table-that-youll-reference-when-setting-up-your-dev-env).
-1. Run `make import-dump db=<db_user>` (using the name from the prev step) from the root project directory outside the Docker shell.
+1. If your new database dump was created at a later date than the ones you've already imported, you'll need to rerun `make import-users` with a new `sidewalk_users-dump` file. Ask Mikey if you're not sure! You can see the dates the dumps were created in their original filenames.
+1. Run `make import-dump db=<db_user>` (using the name from the step 1) from the root project directory outside the Docker shell.
 1. Update the `DATABASE_USER` variable in the `docker-compose.yml` to the same name.
 1. Modify the `SIDEWALK_CITY_ID` line in `docker-compose.yml` to use the appropriate ID from [this table](https://github.com/ProjectSidewalk/SidewalkWebpage/wiki/Docker-Troubleshooting#first-heres-a-table-that-youll-reference-when-setting-up-your-dev-env).
 1. Rerun `make dev`.

From a652c3580d739af1bcd1f1dc6a012e7773d8fb6e Mon Sep 17 00:00:00 2001
From: Mikey Saugstad <michaelssaugstad@gmail.com>
Date: Thu, 31 Oct 2024 11:30:19 -0700
Subject: [PATCH 27/28] new Validate no longer breaks when trying to show
 excluded tags

---
 public/javascripts/SVValidate/src/menu/RightMenu.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/public/javascripts/SVValidate/src/menu/RightMenu.js b/public/javascripts/SVValidate/src/menu/RightMenu.js
index bb215537de..1fe27ca3ef 100644
--- a/public/javascripts/SVValidate/src/menu/RightMenu.js
+++ b/public/javascripts/SVValidate/src/menu/RightMenu.js
@@ -277,6 +277,10 @@ function RightMenu(menuUI) {
         const currTags = label.getProperty('newTags');
         // Clone the template tag element, remove the 'template' class, update the text, and add the removal onclick.
         for (let tag of currTags) {
+            if (!allTagOptions.some(t => t.tag_name === tag)) {
+                continue; // Skip tags that are now being excluded on this server. Don't want to show them.
+            }
+
             // Clone the template tag element, remove the 'template' class, and add a tag-id data attribute.
             let $tagDiv = $('.current-tag.template').clone().removeClass('template');
             $tagDiv.data('tag-id', allTagOptions.find(t => t.tag_name === tag).tag_id);

From 62d300018634b6c22172f7168779e61a5f643a25 Mon Sep 17 00:00:00 2001
From: Mikey Saugstad <michaelssaugstad@gmail.com>
Date: Thu, 31 Oct 2024 14:50:59 -0700
Subject: [PATCH 28/28] 7.20.9 -> 8.0.0

---
 build.sbt                       | 2 +-
 conf/evolutions/default/252.sql | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 conf/evolutions/default/252.sql

diff --git a/build.sbt b/build.sbt
index 94efa63879..3f2bd1914b 100644
--- a/build.sbt
+++ b/build.sbt
@@ -2,7 +2,7 @@ import play.PlayScala
 
 name := """sidewalk-webpage"""
 
-version := "7.20.9"
+version := "8.0.0"
 
 scalaVersion := "2.10.7"
 
diff --git a/conf/evolutions/default/252.sql b/conf/evolutions/default/252.sql
new file mode 100644
index 0000000000..7dab3f47fc
--- /dev/null
+++ b/conf/evolutions/default/252.sql
@@ -0,0 +1,5 @@
+# --- !Ups
+INSERT INTO version VALUES ('8.0.0', now(), 'Adds unified login: One account now works across all cities!');
+
+# --- !Downs
+DELETE FROM version WHERE version_id = '8.0.0';