Merge pull request #1 from ansg191/refactor-database

24 files changed, 0 insertions, 104 deletions

diff --git a/backend/db/embed.go b/backend/db/embed.go
index 4302300..e0a4e0b 100644
--- a/backend/db/embed.go
+++ b/backend/db/embed.go
@@ -4,14 +4,3 @@ import "embed"
 
 //go:embed migrations/*.sql
 var Migrations embed.FS
-
-//go:embed all:queries
-var queries embed.FS
-
-func GetQuery(name string) (string, error) {
-	query, err := queries.ReadFile("queries/" + name + ".sql")
-	if err != nil {
-		return "", err
-	}
-	return string(query), nil
-}
diff --git a/backend/db/queries/cookies/add_cookie.sql b/backend/db/queries/cookies/add_cookie.sql
deleted file mode 100644
index 1519da4..0000000
--- a/backend/db/queries/cookies/add_cookie.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-INSERT INTO ibd_tokens (token, expires_at, user_subject, encryption_key)
-VALUES ($1, $2, $3, $4)
\ No newline at end of file
diff --git a/backend/db/queries/cookies/get_any_cookie.sql b/backend/db/queries/cookies/get_any_cookie.sql
deleted file mode 100644
index 4e5c823..0000000
--- a/backend/db/queries/cookies/get_any_cookie.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-SELECT ibd_tokens.id, token, encrypted_key, kms_key_name, expires_at
-FROM ibd_tokens
-         INNER JOIN keys ON encryption_key = keys.id
-WHERE expires_at > NOW()
-  AND degraded = FALSE
-ORDER BY random()
-LIMIT 1;
diff --git a/backend/db/queries/cookies/get_cookies.sql b/backend/db/queries/cookies/get_cookies.sql
deleted file mode 100644
index 3828ec3..0000000
--- a/backend/db/queries/cookies/get_cookies.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-SELECT ibd_tokens.id, token, encrypted_key, kms_key_name, expires_at
-FROM ibd_tokens
-         INNER JOIN keys ON encryption_key = keys.id
-WHERE user_subject = $1
-  AND expires_at > NOW()
-  AND degraded = $2
-ORDER BY expires_at DESC;
\ No newline at end of file
diff --git a/backend/db/queries/cookies/set_cookie_degraded.sql b/backend/db/queries/cookies/set_cookie_degraded.sql
deleted file mode 100644
index 4fd8222..0000000
--- a/backend/db/queries/cookies/set_cookie_degraded.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-UPDATE ibd_tokens
-SET degraded = $1
-WHERE id = $2;
\ No newline at end of file
diff --git a/backend/db/queries/keys/add_key.sql b/backend/db/queries/keys/add_key.sql
deleted file mode 100644
index bb416c5..0000000
--- a/backend/db/queries/keys/add_key.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-INSERT INTO keys (kms_key_name, encrypted_key)
-VALUES ($1, $2)
-RETURNING id;
\ No newline at end of file
diff --git a/backend/db/queries/keys/get_key.sql b/backend/db/queries/keys/get_key.sql
deleted file mode 100644
index 97d8367..0000000
--- a/backend/db/queries/keys/get_key.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-SELECT id, kms_key_name, encrypted_key, created_at
-FROM keys
-WHERE id = $1;
\ No newline at end of file
diff --git a/backend/db/queries/sessions/check_state.sql b/backend/db/queries/sessions/check_state.sql
deleted file mode 100644
index dac73e2..0000000
--- a/backend/db/queries/sessions/check_state.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-SELECT 1
-FROM sessions
-where token = $1;
\ No newline at end of file
diff --git a/backend/db/queries/sessions/cleanup_sessions.sql b/backend/db/queries/sessions/cleanup_sessions.sql
deleted file mode 100644
index 5f2d22b..0000000
--- a/backend/db/queries/sessions/cleanup_sessions.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-DELETE FROM sessions
-WHERE expires_at < NOW();
\ No newline at end of file
diff --git a/backend/db/queries/sessions/create_session.sql b/backend/db/queries/sessions/create_session.sql
deleted file mode 100644
index 44f8c56..0000000
--- a/backend/db/queries/sessions/create_session.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-INSERT INTO sessions (token, user_subject, access_token, expires_at)
-VALUES ($1, $2, $3, $4);
\ No newline at end of file
diff --git a/backend/db/queries/sessions/create_state.sql b/backend/db/queries/sessions/create_state.sql
deleted file mode 100644
index 577ad7e..0000000
--- a/backend/db/queries/sessions/create_state.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-INSERT INTO sessions (token, expires_at)
-VALUES ($1, CURRENT_TIMESTAMP + INTERVAL '1 hour');
\ No newline at end of file
diff --git a/backend/db/queries/sessions/get_session.sql b/backend/db/queries/sessions/get_session.sql
deleted file mode 100644
index 7da8bd0..0000000
--- a/backend/db/queries/sessions/get_session.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-SELECT token, user_subject, access_token, expires_at
-FROM sessions
-WHERE token = $1;
\ No newline at end of file
diff --git a/backend/db/queries/stocks/add_analysis.sql b/backend/db/queries/stocks/add_analysis.sql
deleted file mode 100644
index 4bb4903..0000000
--- a/backend/db/queries/stocks/add_analysis.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-UPDATE chart_analysis ca
-SET processed  = true,
-    action     = $2,
-    price      = $3,
-    reason     = $4,
-    confidence = $5
-FROM ratings r
-WHERE r.id = $1
-  AND r.chart_analysis = ca.id
\ No newline at end of file
diff --git a/backend/db/queries/stocks/add_rank.sql b/backend/db/queries/stocks/add_rank.sql
deleted file mode 100644
index 07f711e..0000000
--- a/backend/db/queries/stocks/add_rank.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-INSERT INTO stock_rank (symbol, rank_type, rank)
-VALUES ($1, $2, $3);
\ No newline at end of file
diff --git a/backend/db/queries/stocks/add_rating.sql b/backend/db/queries/stocks/add_rating.sql
deleted file mode 100644
index 6c4baa0..0000000
--- a/backend/db/queries/stocks/add_rating.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-INSERT INTO ratings (symbol, composite, eps, rel_str, group_rel_str, smr, acc_dis, chart_analysis, price)
-VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)
-RETURNING id;
\ No newline at end of file
diff --git a/backend/db/queries/stocks/add_raw_chart_analysis.sql b/backend/db/queries/stocks/add_raw_chart_analysis.sql
deleted file mode 100644
index a599d87..0000000
--- a/backend/db/queries/stocks/add_raw_chart_analysis.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-INSERT INTO chart_analysis (raw_analysis)
-VALUES ($1)
-RETURNING id;
\ No newline at end of file
diff --git a/backend/db/queries/stocks/add_stock.sql b/backend/db/queries/stocks/add_stock.sql
deleted file mode 100644
index 180a9c3..0000000
--- a/backend/db/queries/stocks/add_stock.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-INSERT INTO stocks (symbol, name, ibd_url)
-VALUES ($1, $2, $3)
-ON CONFLICT (symbol)
-    DO UPDATE SET name    = $2,
-                  ibd_url = $3;
\ No newline at end of file
diff --git a/backend/db/queries/stocks/get_stock.sql b/backend/db/queries/stocks/get_stock.sql
deleted file mode 100644
index cecbd84..0000000
--- a/backend/db/queries/stocks/get_stock.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-SELECT symbol, name, ibd_url
-FROM stocks
-WHERE symbol = $1;
\ No newline at end of file
diff --git a/backend/db/queries/stocks/get_stock_info.sql b/backend/db/queries/stocks/get_stock_info.sql
deleted file mode 100644
index d4f1bf3..0000000
--- a/backend/db/queries/stocks/get_stock_info.sql
+++ /dev/null
@@ -1,14 +0,0 @@
-SELECT r.symbol,
-       s.name,
-       ca.raw_analysis,
-       r.composite,
-       r.eps,
-       r.rel_str,
-       r.group_rel_str,
-       r.smr,
-       r.acc_dis,
-       r.price
-FROM ratings r
-         INNER JOIN stocks s on r.symbol = s.symbol
-         INNER JOIN chart_analysis ca on r.chart_analysis = ca.id
-WHERE r.id = $1;
\ No newline at end of file
diff --git a/backend/db/queries/users/add_ibd_creds.sql b/backend/db/queries/users/add_ibd_creds.sql
deleted file mode 100644
index 054f328..0000000
--- a/backend/db/queries/users/add_ibd_creds.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-UPDATE users
-SET ibd_username   = $2,
-    ibd_password   = $3,
-    encryption_key = $4
-WHERE subject = $1;
\ No newline at end of file
diff --git a/backend/db/queries/users/add_user.sql b/backend/db/queries/users/add_user.sql
deleted file mode 100644
index bf97ad5..0000000
--- a/backend/db/queries/users/add_user.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-INSERT INTO users (subject)
-VALUES ($1)
-ON CONFLICT DO NOTHING;
\ No newline at end of file
diff --git a/backend/db/queries/users/get_ibd_creds.sql b/backend/db/queries/users/get_ibd_creds.sql
deleted file mode 100644
index 271abcc..0000000
--- a/backend/db/queries/users/get_ibd_creds.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-SELECT ibd_username, ibd_password, encrypted_key, kms_key_name
-FROM users
-INNER JOIN public.keys k on k.id = users.encryption_key
-WHERE subject = $1;
\ No newline at end of file
diff --git a/backend/db/queries/users/get_user.sql b/backend/db/queries/users/get_user.sql
deleted file mode 100644
index 567f988..0000000
--- a/backend/db/queries/users/get_user.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-SELECT subject, ibd_username, ibd_password, encryption_key
-FROM users
-WHERE subject = $1;
\ No newline at end of file
diff --git a/backend/db/queries/users/list_users.sql b/backend/db/queries/users/list_users.sql
deleted file mode 100644
index ceafeb2..0000000
--- a/backend/db/queries/users/list_users.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-SELECT subject, ibd_username, ibd_password, encryption_key
-FROM users;
\ No newline at end of file