refactor: remove GetTableName, db.Model already exists

helpwave · Nov 8, 2022 · b4db02c · b4db02c
1 parent 892d7d3
commit b4db02c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git a/routes/pagination.go b/routes/pagination.go
@@ -3,7 +3,6 @@ package routes
 import (
 	"github.com/gin-gonic/gin"
 	"gorm.io/gorm"
-	"rest-api/util"
 	"strconv"
 )
 
@@ -40,7 +39,7 @@ func GetPagination(ctx *gin.Context, db *gorm.DB, model interface{}) (PaginatedR
 	}
 
 	var totalSize int64
-	tx := db.Table(util.GetTableName(db, model)).Count(&totalSize)
+	tx := db.Model(model).Count(&totalSize)
 
 	if tx.Error != nil {
 		return PaginatedResponse{}, tx.Error

diff --git a/util/util.go b/util/util.go
@@ -2,7 +2,6 @@ package util
 
 import (
 	"fmt"
-	"gorm.io/gorm"
 	"os"
 	"strings"
 )
@@ -20,11 +19,3 @@ func GetEnvOr(key, fallback string) string {
 func Formatted(arg any) string {
 	return strings.Replace(fmt.Sprintf("%v", arg), "\n", "\\n", -1)
 }
-
-// GetTableName returns the table name of a model
-// e.g.: `GetTableName(db, EmergencyRoom{})` will return "emergency_rooms"
-func GetTableName(db *gorm.DB, model interface{}) string {
-	stmt := &gorm.Statement{DB: db}
-	_ = stmt.Parse(&model)
-	return stmt.Schema.Table
-}