refactoring models dir position

generate/user.go

@@ -6,7 +6,7 @@ import (
 	"os"
 	"sample/constants"
 	"sample/db"
-	"sample/db/models"
+	"sample/models"
 
 	signature_header "github.com/cloudmatelabs/go-activitypub-signature-header"
 )

main.go

@@ -3,6 +3,7 @@ package main
 import (
 	"sample/constants"
 	"sample/db"
+	"sample/models"
 	"sample/router"
 
 	"github.com/gofiber/fiber/v2"
@@ -12,7 +13,7 @@ func main() {
 	constants.LoadEnv()
 	db.Connect()
 	if constants.DB_MIGRATE == "true" {
-		db.Migrate()
+		models.Migrate()
 	}
 
 	app := fiber.New()

models/migrate.go

@@ -0,0 +1,12 @@
+package models
+
+import "sample/db"
+
+func Migrate() {
+	db.DB.AutoMigrate(
+		&User{},
+		&UserProfile{},
+		&UserKeyPair{},
+		&UserInbox{},
+	)
+}

db/models/user.go → models/user.go

@@ -1,6 +1,7 @@
 package models
 
 import (
+	"sample/db"
 	"time"
 
 	"gorm.io/gorm"
@@ -14,3 +15,9 @@ type User struct {
 	CreatedAt time.Time
 	DeletedAt gorm.DeletedAt
 }
+
+func (u User) Exists() bool {
+	var count int64
+	db.DB.Model(&User{}).Where("id = ?", u.ID).Count(&count)
+	return count > 0
+}

router/user/inbox/router.go

@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"net/http"
 	"sample/db"
-	"sample/db/models"
+	"sample/models"
 	"strings"
 
 	jsonld_helper "github.com/cloudmatelabs/go-jsonld-helper"
@@ -20,7 +20,7 @@ import (
 func Route(c *fiber.Ctx) error {
 	id := c.Params("id")
 
-	if !userExists(id) {
+	if !(models.User{ID: id}.Exists()) {
 		return c.SendStatus(fiber.StatusNotFound)
 	}
 
@@ -61,12 +61,6 @@ func Route(c *fiber.Ctx) error {
 	return c.SendStatus(fiber.StatusAccepted)
 }
 
-func userExists(id string) bool {
-	var count int64
-	db.DB.Model(&models.User{}).Where("id = ?", id).Count(&count)
-	return count > 0
-}
-
 func useContextCache(body []byte) (origin []byte, cached []byte) {
 	origin = body
 	cached = bytes.Replace(

router/user/user.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"sample/constants"
 	"sample/db"
-	"sample/db/models"
+	"sample/models"
 	"strings"
 
 	"github.com/gofiber/fiber/v2"