removed intermediate /internal directory

domains/accounts/accounts.go

@@ -7,11 +7,12 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"ruben/inventory2/internal/consts"
-	"ruben/inventory2/internal/logging"
 
 	"github.com/jackc/pgx/v5"
 	"github.com/jackc/pgx/v5/pgxpool"
+
+	"ruben/inventory2/consts"
+	"ruben/inventory2/logging"
 )
 
 type (

domains/accounts/mocks.go

@@ -4,11 +4,12 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"ruben/inventory2/internal/consts"
 
 	"github.com/google/uuid"
 	"github.com/jackc/pgx/v5"
 	"github.com/jackc/pgx/v5/pgtype"
+
+	"ruben/inventory2/consts"
 )
 
 type (

domains/accounts/page.go

@@ -4,11 +4,12 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"ruben/inventory2/internal/consts"
 	"slices"
 	"strings"
 
 	"github.com/jackc/pgx/v5"
+
+	"ruben/inventory2/consts"
 )
 
 // TODO: simpify, if possible (single query ideal)

domains/accounts/sync_groups.go

@@ -4,11 +4,12 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"ruben/inventory2/internal/consts"
 	"slices"
 
 	"github.com/jackc/pgx/v5"
 	"github.com/jackc/pgx/v5/pgtype"
+
+	"ruben/inventory2/consts"
 )
 
 type (

domains/authentication/auth.go

@@ -13,8 +13,8 @@ import (
 	"github.com/jackc/pgx/v5/pgxpool"
 	"golang.org/x/oauth2"
 
-	"ruben/inventory2/internal/consts"
-	"ruben/inventory2/internal/logging"
+	"ruben/inventory2/consts"
+	"ruben/inventory2/logging"
 )
 
 // TODO: move these to a config?

domains/authentication/store.go

@@ -5,11 +5,12 @@ import (
 	"crypto/rand"
 	"errors"
 	"fmt"
-	"ruben/inventory2/internal/consts"
 	"time"
 
 	"github.com/jackc/pgx/v5"
 	"github.com/jackc/pgx/v5/pgtype"
+
+	"ruben/inventory2/consts"
 )
 
 // NewState creates a new state for logging in, saving it in the database.

domains/platforms/etsy/client.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"ruben/inventory2/internal/domains/platforms/etsy/generated_client"
+	"ruben/inventory2/domains/platforms/etsy/generated_client"
 )
 
 func newFixedAccessTokenClient(apiKey, accessToken string) (*generated_client.ClientWithResponses, error) {

domains/platforms/etsy/etsy.go

@@ -16,8 +16,8 @@ import (
 	"github.com/google/uuid"
 	"github.com/jackc/pgx/v5/pgxpool"
 
-	"ruben/inventory2/internal/domains/platforms/etsy/generated_client"
-	"ruben/inventory2/internal/logging"
+	"ruben/inventory2/domains/platforms/etsy/generated_client"
+	"ruben/inventory2/logging"
 )
 
 //go:generate oapi-codegen -generate types,client -package generated_client -o generated_client/client.go openapi.3.0.2.json

domains/raw_events/events.go

@@ -4,12 +4,13 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"ruben/inventory2/internal/logging"
 	"time"
 
 	"github.com/jackc/pgx/v5"
 	"github.com/jackc/pgx/v5/pgtype"
 	"github.com/jackc/pgx/v5/pgxpool"
+
+	"ruben/inventory2/logging"
 )
 
 type (

main.go

@@ -21,12 +21,12 @@ import (
 	"github.com/jackc/pgx/v5/pgxpool"
 	"github.com/lmittmann/tint"
 
-	"ruben/inventory2/internal/domains/accounts"
-	"ruben/inventory2/internal/domains/authentication"
-	etsy_platform "ruben/inventory2/internal/domains/platforms/etsy"
-	"ruben/inventory2/internal/domains/raw_events"
-	"ruben/inventory2/internal/logging"
-	"ruben/inventory2/internal/server"
+	"ruben/inventory2/domains/accounts"
+	"ruben/inventory2/domains/authentication"
+	etsy_platform "ruben/inventory2/domains/platforms/etsy"
+	"ruben/inventory2/domains/raw_events"
+	"ruben/inventory2/logging"
+	"ruben/inventory2/server"
 )
 
 const (

server/api/accounts/router.go

@@ -8,13 +8,13 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/google/uuid"
 
-	"ruben/inventory2/internal/consts"
-	"ruben/inventory2/internal/domains/accounts"
-	"ruben/inventory2/internal/logging"
-	"ruben/inventory2/internal/server/auth"
-	"ruben/inventory2/internal/server/param"
-	"ruben/inventory2/internal/server/response"
-	"ruben/inventory2/internal/server/sse"
+	"ruben/inventory2/consts"
+	"ruben/inventory2/domains/accounts"
+	"ruben/inventory2/logging"
+	"ruben/inventory2/server/auth"
+	"ruben/inventory2/server/param"
+	"ruben/inventory2/server/response"
+	"ruben/inventory2/server/sse"
 )
 
 type accountSubrouter struct {

server/api/apis.go

@@ -3,17 +3,17 @@ package api
 import (
 	"github.com/gin-gonic/gin"
 
-	"ruben/inventory2/internal/domains/accounts"
-	etsy_platform "ruben/inventory2/internal/domains/platforms/etsy"
-	"ruben/inventory2/internal/domains/raw_events"
-	"ruben/inventory2/internal/logging"
-	accounts_api "ruben/inventory2/internal/server/api/accounts"
-	auth_api "ruben/inventory2/internal/server/api/auth"
-	sse_api "ruben/inventory2/internal/server/api/sse"
-	"ruben/inventory2/internal/server/api/webhooks"
-	etsy_webhooks "ruben/inventory2/internal/server/api/webhooks/etsy"
-	"ruben/inventory2/internal/server/auth"
-	"ruben/inventory2/internal/server/sse"
+	"ruben/inventory2/domains/accounts"
+	etsy_platform "ruben/inventory2/domains/platforms/etsy"
+	"ruben/inventory2/domains/raw_events"
+	"ruben/inventory2/logging"
+	accounts_api "ruben/inventory2/server/api/accounts"
+	auth_api "ruben/inventory2/server/api/auth"
+	sse_api "ruben/inventory2/server/api/sse"
+	"ruben/inventory2/server/api/webhooks"
+	etsy_webhooks "ruben/inventory2/server/api/webhooks/etsy"
+	"ruben/inventory2/server/auth"
+	"ruben/inventory2/server/sse"
 )
 
 func Routes(

server/api/auth/router.go

@@ -3,12 +3,13 @@ package auth
 import (
 	"context"
 	"fmt"
-	"ruben/inventory2/internal/domains/authentication"
-	"ruben/inventory2/internal/logging"
-	"ruben/inventory2/internal/server/cookies"
-	"ruben/inventory2/internal/server/response"
 
 	"github.com/gin-gonic/gin"
+
+	"ruben/inventory2/domains/authentication"
+	"ruben/inventory2/logging"
+	"ruben/inventory2/server/cookies"
+	"ruben/inventory2/server/response"
 )
 
 type loginSubrouter struct {

server/api/sse/router.go

@@ -6,10 +6,10 @@ import (
 
 	"github.com/gin-gonic/gin"
 
-	"ruben/inventory2/internal/logging"
-	"ruben/inventory2/internal/server/auth"
-	"ruben/inventory2/internal/server/response"
-	"ruben/inventory2/internal/server/sse"
+	"ruben/inventory2/logging"
+	"ruben/inventory2/server/auth"
+	"ruben/inventory2/server/response"
+	"ruben/inventory2/server/sse"
 )
 
 const (

server/api/webhooks/etsy/webhooks.go

@@ -6,12 +6,12 @@ import (
 	"strconv"
 	"time"
 
-	"ruben/inventory2/internal/domains/platforms/etsy"
-	"ruben/inventory2/internal/domains/raw_events"
-	"ruben/inventory2/internal/logging"
-	"ruben/inventory2/internal/server/response"
-
 	"github.com/gin-gonic/gin"
+
+	"ruben/inventory2/domains/platforms/etsy"
+	"ruben/inventory2/domains/raw_events"
+	"ruben/inventory2/logging"
+	"ruben/inventory2/server/response"
 )
 
 type (

server/api/webhooks/tiktok/webhooks.go

@@ -5,11 +5,11 @@ import (
 	"fmt"
 	"time"
 
-	"ruben/inventory2/internal/domains/raw_events"
-	"ruben/inventory2/internal/logging"
-	"ruben/inventory2/internal/server/response"
-
 	"github.com/gin-gonic/gin"
+
+	"ruben/inventory2/domains/raw_events"
+	"ruben/inventory2/logging"
+	"ruben/inventory2/server/response"
 )
 
 func Routes(

server/api/webhooks/webhooks.go

@@ -1,14 +1,14 @@
 package webhooks
 
 import (
-	etsy_platform "ruben/inventory2/internal/domains/platforms/etsy"
-	"ruben/inventory2/internal/domains/raw_events"
-	"ruben/inventory2/internal/logging"
-	"ruben/inventory2/internal/server/api/webhooks/etsy"
-	"ruben/inventory2/internal/server/api/webhooks/tiktok"
-	"ruben/inventory2/internal/server/api/webhooks/wix"
-
 	"github.com/gin-gonic/gin"
+
+	etsy_platform "ruben/inventory2/domains/platforms/etsy"
+	"ruben/inventory2/domains/raw_events"
+	"ruben/inventory2/logging"
+	"ruben/inventory2/server/api/webhooks/etsy"
+	"ruben/inventory2/server/api/webhooks/tiktok"
+	"ruben/inventory2/server/api/webhooks/wix"
 )
 
 type Config struct {

server/api/webhooks/wix/webhooks.go

@@ -5,11 +5,11 @@ import (
 	"fmt"
 	"time"
 
-	"ruben/inventory2/internal/domains/raw_events"
-	"ruben/inventory2/internal/logging"
-	"ruben/inventory2/internal/server/response"
-
 	"github.com/gin-gonic/gin"
+
+	"ruben/inventory2/domains/raw_events"
+	"ruben/inventory2/logging"
+	"ruben/inventory2/server/response"
 )
 
 func Routes(

server/auth/auth.go

@@ -8,14 +8,14 @@ import (
 	"io"
 	"time"
 
-	"ruben/inventory2/internal/consts"
-	"ruben/inventory2/internal/domains/accounts"
-	"ruben/inventory2/internal/domains/authentication"
-	"ruben/inventory2/internal/logging"
-	"ruben/inventory2/internal/server/cookies"
-	"ruben/inventory2/internal/server/response"
-
 	"github.com/gin-gonic/gin"
+
+	"ruben/inventory2/consts"
+	"ruben/inventory2/domains/accounts"
+	"ruben/inventory2/domains/authentication"
+	"ruben/inventory2/logging"
+	"ruben/inventory2/server/cookies"
+	"ruben/inventory2/server/response"
 )
 
 type (

server/param/params.go

@@ -2,8 +2,9 @@ package param
 
 import (
 	"encoding"
-	"ruben/inventory2/internal/domains/accounts"
 	"strconv"
+
+	"ruben/inventory2/domains/accounts"
 )
 
 // encoding.TextUnmarshaler instances for Spec

server/param/spec.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/gin-gonic/gin"
 
-	"ruben/inventory2/internal/server/response"
+	"ruben/inventory2/server/response"
 )
 
 // Spec is the entry point of the package.

server/response/body.go

@@ -4,7 +4,8 @@ import (
 	"fmt"
 	"io"
 	"net/http"
-	"ruben/inventory2/internal/server/redirect"
+
+	"ruben/inventory2/server/redirect"
 )
 
 type (

server/response/cookie.go

@@ -4,7 +4,8 @@ import (
 	"fmt"
 	"io"
 	"net/http"
-	"ruben/inventory2/internal/server/redirect"
+
+	"ruben/inventory2/server/redirect"
 )
 
 type (

server/response/error.go

@@ -4,8 +4,9 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
-	"ruben/inventory2/internal/consts"
 	"strings"
+
+	"ruben/inventory2/consts"
 )
 
 type (

server/response/header.go

@@ -4,7 +4,8 @@ import (
 	"fmt"
 	"io"
 	"net/http"
-	"ruben/inventory2/internal/server/redirect"
+
+	"ruben/inventory2/server/redirect"
 )
 
 type (

server/response/html.go

@@ -5,7 +5,8 @@ import (
 	"fmt"
 	"io"
 	"net/http"
-	"ruben/inventory2/internal/server/redirect"
+
+	"ruben/inventory2/server/redirect"
 )
 
 type (

server/response/json.go

@@ -6,7 +6,8 @@ import (
 	"fmt"
 	"io"
 	"net/http"
-	"ruben/inventory2/internal/server/redirect"
+
+	"ruben/inventory2/server/redirect"
 )
 
 type (

server/response/redirect.go

@@ -4,7 +4,8 @@ import (
 	"fmt"
 	"io"
 	"net/http"
-	"ruben/inventory2/internal/server/redirect"
+
+	"ruben/inventory2/server/redirect"
 )
 
 type (

server/response/response.go

@@ -4,7 +4,7 @@ import (
 	"io"
 	"net/http"
 
-	"ruben/inventory2/internal/server/redirect"
+	"ruben/inventory2/server/redirect"
 )
 
 type (

server/response/status.go

@@ -5,7 +5,7 @@ import (
 	"io"
 	"net/http"
 
-	"ruben/inventory2/internal/server/redirect"
+	"ruben/inventory2/server/redirect"
 )
 
 type (

server/response/write.go

@@ -5,9 +5,10 @@ import (
 	"fmt"
 	"io"
 	"net/http"
-	"ruben/inventory2/internal/consts"
 
 	"github.com/gin-gonic/gin"
+
+	"ruben/inventory2/consts"
 )
 
 func HandleResponses(c *gin.Context) {

server/server.go

@@ -8,16 +8,16 @@ import (
 
 	"github.com/gin-gonic/gin"
 
-	"ruben/inventory2/internal/domains/accounts"
-	"ruben/inventory2/internal/domains/authentication"
-	etsy_platform "ruben/inventory2/internal/domains/platforms/etsy"
-	"ruben/inventory2/internal/domains/raw_events"
-	"ruben/inventory2/internal/logging"
-	"ruben/inventory2/internal/server/api"
-	"ruben/inventory2/internal/server/auth"
-	"ruben/inventory2/internal/server/response"
-	"ruben/inventory2/internal/server/sse"
-	"ruben/inventory2/internal/server/ui"
+	"ruben/inventory2/domains/accounts"
+	"ruben/inventory2/domains/authentication"
+	etsy_platform "ruben/inventory2/domains/platforms/etsy"
+	"ruben/inventory2/domains/raw_events"
+	"ruben/inventory2/logging"
+	"ruben/inventory2/server/api"
+	"ruben/inventory2/server/auth"
+	"ruben/inventory2/server/response"
+	"ruben/inventory2/server/sse"
+	"ruben/inventory2/server/ui"
 )
 
 type Router struct {

server/sse/publisher.go

@@ -11,7 +11,7 @@ import (
 
 	"github.com/gin-gonic/gin"
 
-	"ruben/inventory2/internal/logging"
+	"ruben/inventory2/logging"
 )
 
 type (

server/ui/router.go

@@ -10,15 +10,15 @@ import (
 	"strconv"
 	"strings"
 
-	"ruben/inventory2/internal/domains/accounts"
-	etsy_platform "ruben/inventory2/internal/domains/platforms/etsy"
-	"ruben/inventory2/internal/domains/raw_events"
-	"ruben/inventory2/internal/logging"
-	"ruben/inventory2/internal/server/auth"
-	"ruben/inventory2/internal/server/response"
-
 	"github.com/angelbeltran/templater"
 	"github.com/gin-gonic/gin"
+
+	"ruben/inventory2/domains/accounts"
+	etsy_platform "ruben/inventory2/domains/platforms/etsy"
+	"ruben/inventory2/domains/raw_events"
+	"ruben/inventory2/logging"
+	"ruben/inventory2/server/auth"
+	"ruben/inventory2/server/response"
 )
 
 type (