From 67abba1f6704f036ef29a70d31c610b85120befd Mon Sep 17 00:00:00 2001
From: Teajey <21069848+Teajey@users.noreply.github.com>
Date: Wed, 18 Dec 2024 22:01:41 +0900
Subject: [PATCH] refac: db/ as submodule of api/

---
 .gitignore                          | 2 +-
 server/{ => api}/db/db.go           | 0
 server/{ => api}/db/gen_init_sql.go | 0
 server/{ => api}/db/group.go        | 0
 server/{ => api}/db/init.sql        | 0
 server/{ => api}/db/migration/1.sql | 0
 server/{ => api}/db/user.go         | 0
 server/api/login.go                 | 2 +-
 server/api/register.go              | 2 +-
 server/main.go                      | 3 ++-
 server/routing/context.go           | 2 +-
 server/routing/foreign_wishlist.go  | 2 +-
 server/routing/groups.go            | 2 +-
 server/routing/home.go              | 2 +-
 server/routing/todo.go              | 2 +-
 server/routing/users.go             | 2 +-
 server/routing/wishlist.go          | 2 +-
 17 files changed, 12 insertions(+), 11 deletions(-)
 rename server/{ => api}/db/db.go (100%)
 rename server/{ => api}/db/gen_init_sql.go (100%)
 rename server/{ => api}/db/group.go (100%)
 rename server/{ => api}/db/init.sql (100%)
 rename server/{ => api}/db/migration/1.sql (100%)
 rename server/{ => api}/db/user.go (100%)

diff --git a/.gitignore b/.gitignore
index 518ff42..d862823 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,5 @@
 gin-bin
 *lishwist.db
 .env*.local
-server/db/init_sql.go
+server/api/db/init_sql.go
 .ignored/
diff --git a/server/db/db.go b/server/api/db/db.go
similarity index 100%
rename from server/db/db.go
rename to server/api/db/db.go
diff --git a/server/db/gen_init_sql.go b/server/api/db/gen_init_sql.go
similarity index 100%
rename from server/db/gen_init_sql.go
rename to server/api/db/gen_init_sql.go
diff --git a/server/db/group.go b/server/api/db/group.go
similarity index 100%
rename from server/db/group.go
rename to server/api/db/group.go
diff --git a/server/db/init.sql b/server/api/db/init.sql
similarity index 100%
rename from server/db/init.sql
rename to server/api/db/init.sql
diff --git a/server/db/migration/1.sql b/server/api/db/migration/1.sql
similarity index 100%
rename from server/db/migration/1.sql
rename to server/api/db/migration/1.sql
diff --git a/server/db/user.go b/server/api/db/user.go
similarity index 100%
rename from server/db/user.go
rename to server/api/db/user.go
diff --git a/server/api/login.go b/server/api/login.go
index 9e39d3a..d4d9341 100644
--- a/server/api/login.go
+++ b/server/api/login.go
@@ -1,7 +1,7 @@
 package api
 
 import (
-	"lishwist/db"
+	"lishwist/api/db"
 	"lishwist/templates"
 	"log"
 
diff --git a/server/api/register.go b/server/api/register.go
index 88b5312..1d72fa5 100644
--- a/server/api/register.go
+++ b/server/api/register.go
@@ -3,7 +3,7 @@ package api
 import (
 	"log"
 
-	"lishwist/db"
+	"lishwist/api/db"
 	"lishwist/templates"
 
 	"golang.org/x/crypto/bcrypt"
diff --git a/server/main.go b/server/main.go
index 6f63b08..d77f133 100644
--- a/server/main.go
+++ b/server/main.go
@@ -6,7 +6,8 @@ import (
 	"net/http"
 
 	"lishwist/api"
-	"lishwist/db"
+	// TODO: lishwist/api/db ought not to be used outside lishwist/api
+	"lishwist/api/db"
 	"lishwist/env"
 	"lishwist/router"
 	"lishwist/routing"
diff --git a/server/routing/context.go b/server/routing/context.go
index e8c9fb0..1d48290 100644
--- a/server/routing/context.go
+++ b/server/routing/context.go
@@ -1,7 +1,7 @@
 package routing
 
 import (
-	"lishwist/db"
+	"lishwist/api/db"
 	"lishwist/rsvp"
 	"net/http"
 )
diff --git a/server/routing/foreign_wishlist.go b/server/routing/foreign_wishlist.go
index 99b8944..0eb0123 100644
--- a/server/routing/foreign_wishlist.go
+++ b/server/routing/foreign_wishlist.go
@@ -1,7 +1,7 @@
 package routing
 
 import (
-	"lishwist/db"
+	"lishwist/api/db"
 	"lishwist/rsvp"
 	"net/http"
 )
diff --git a/server/routing/groups.go b/server/routing/groups.go
index f38e22e..a6db5e5 100644
--- a/server/routing/groups.go
+++ b/server/routing/groups.go
@@ -4,7 +4,7 @@ import (
 	"net/http"
 	"slices"
 
-	"lishwist/db"
+	"lishwist/api/db"
 	"lishwist/rsvp"
 )
 
diff --git a/server/routing/home.go b/server/routing/home.go
index c2a5084..7f05b79 100644
--- a/server/routing/home.go
+++ b/server/routing/home.go
@@ -3,7 +3,7 @@ package routing
 import (
 	"net/http"
 
-	"lishwist/db"
+	"lishwist/api/db"
 	"lishwist/env"
 	"lishwist/rsvp"
 )
diff --git a/server/routing/todo.go b/server/routing/todo.go
index 470aabf..d856a3e 100644
--- a/server/routing/todo.go
+++ b/server/routing/todo.go
@@ -1,7 +1,7 @@
 package routing
 
 import (
-	"lishwist/db"
+	"lishwist/api/db"
 	"lishwist/rsvp"
 	"net/http"
 )
diff --git a/server/routing/users.go b/server/routing/users.go
index 05fc35a..826f14b 100644
--- a/server/routing/users.go
+++ b/server/routing/users.go
@@ -1,7 +1,7 @@
 package routing
 
 import (
-	"lishwist/db"
+	"lishwist/api/db"
 	"lishwist/rsvp"
 	"net/http"
 )
diff --git a/server/routing/wishlist.go b/server/routing/wishlist.go
index 798c6a5..d8b2c4e 100644
--- a/server/routing/wishlist.go
+++ b/server/routing/wishlist.go
@@ -1,7 +1,7 @@
 package routing
 
 import (
-	"lishwist/db"
+	"lishwist/api/db"
 	"lishwist/rsvp"
 	"net/http"
 )