[server][core] move db and storage into core

server/internal/command/appcmd/appcmd.go

@@ -6,8 +6,8 @@ import (
 	"os"
 
 	"github.com/shroff/phylum/server/internal/core/app"
-	"github.com/shroff/phylum/server/internal/db"
-	"github.com/shroff/phylum/server/internal/storage"
+	"github.com/shroff/phylum/server/internal/core/db"
+	"github.com/shroff/phylum/server/internal/core/storage"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )

server/internal/command/appcmd/storage.go

@@ -7,7 +7,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/shroff/phylum/server/internal/storage"
+	"github.com/shroff/phylum/server/internal/core/storage"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )

server/internal/command/command.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/shroff/phylum/server/internal/command/appcmd"
 	"github.com/shroff/phylum/server/internal/command/fs"
-	"github.com/shroff/phylum/server/internal/db"
+	"github.com/shroff/phylum/server/internal/core/db"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"

server/internal/command/fs/cmd.go

@@ -6,9 +6,9 @@ import (
 	"os"
 
 	"github.com/shroff/phylum/server/internal/core/app"
+	"github.com/shroff/phylum/server/internal/core/db"
 	"github.com/shroff/phylum/server/internal/core/fs"
-	"github.com/shroff/phylum/server/internal/db"
-	"github.com/shroff/phylum/server/internal/storage"
+	"github.com/shroff/phylum/server/internal/core/storage"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )

server/internal/command/schema.go

@@ -6,7 +6,7 @@ import (
 	"os"
 	"strconv"
 
-	"github.com/shroff/phylum/server/internal/db"
+	"github.com/shroff/phylum/server/internal/core/db"
 	"github.com/spf13/cobra"
 )
 

server/internal/core/app/app.go

@@ -6,9 +6,9 @@ import (
 	"time"
 
 	"github.com/google/uuid"
+	"github.com/shroff/phylum/server/internal/core/db"
 	"github.com/shroff/phylum/server/internal/core/fs"
-	"github.com/shroff/phylum/server/internal/db"
-	"github.com/shroff/phylum/server/internal/storage"
+	"github.com/shroff/phylum/server/internal/core/storage"
 )
 
 const defaultUserUsername = "phylum"

server/internal/core/app/auth.go

@@ -8,8 +8,8 @@ import (
 
 	"github.com/jackc/pgx/v5"
 	"github.com/jackc/pgx/v5/pgtype"
+	"github.com/shroff/phylum/server/internal/core/db"
 	"github.com/shroff/phylum/server/internal/core/errors"
-	"github.com/shroff/phylum/server/internal/db"
 	"golang.org/x/exp/rand"
 )
 

server/internal/core/app/user_manager.go

@@ -6,9 +6,9 @@ import (
 
 	"github.com/google/uuid"
 	"github.com/jackc/pgx/v5"
+	"github.com/shroff/phylum/server/internal/core/db"
 	"github.com/shroff/phylum/server/internal/core/errors"
 	"github.com/shroff/phylum/server/internal/core/fs"
-	"github.com/shroff/phylum/server/internal/db"
 )
 
 var ErrUserNotFound = errors.NewError(http.StatusNotFound, "user_not_found", "no such user")

server/internal/core/db/db_handler.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/jackc/pgx/v5"
 	"github.com/jackc/pgx/v5/pgxpool"
-	"github.com/shroff/phylum/server/internal/db/migrations"
+	"github.com/shroff/phylum/server/internal/core/db/migrations"
 	"github.com/sirupsen/logrus"
 )
 

server/internal/core/db/schema.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/shroff/phylum/server/internal/db/migrations"
+	"github.com/shroff/phylum/server/internal/core/db/migrations"
 	"github.com/sirupsen/logrus"
 )
 

server/internal/core/fs/filesystem.go

@@ -11,8 +11,8 @@ import (
 
 	"github.com/google/uuid"
 	"github.com/jackc/pgx/v5"
-	"github.com/shroff/phylum/server/internal/db"
-	"github.com/shroff/phylum/server/internal/storage"
+	"github.com/shroff/phylum/server/internal/core/db"
+	"github.com/shroff/phylum/server/internal/core/storage"
 	"github.com/sirupsen/logrus"
 )
 

server/internal/core/storage/storage.go

@@ -8,7 +8,7 @@ import (
 	"io"
 
 	"github.com/google/uuid"
-	"github.com/shroff/phylum/server/internal/db"
+	"github.com/shroff/phylum/server/internal/core/db"
 )
 
 type Storage interface {

server/sqlc.yml

@@ -2,11 +2,11 @@ version: "2"
 sql:
   - engine: "postgresql"
     queries: "sql/queries"
-    schema: "internal/db/migrations/data"
+    schema: "internal/core/db/migrations/data"
     gen:
       go:
         package: "db"
-        out: "internal/db"
+        out: "internal/core/db"
         sql_package: "pgx/v5"
         overrides:
           - db_type: "uuid"