Refactor some reflection

Author: jc21

backend/internal/api/middleware/list_query.go

@@ -9,7 +9,6 @@ import (
 
 	c "npm/internal/api/context"
 	h "npm/internal/api/http"
-	"npm/internal/entity"
 	"npm/internal/model"
 	"npm/internal/tags"
 	"npm/internal/util"
@@ -23,7 +22,7 @@ import (
 // After we have determined what the Filters are to be, they are saved on the Context
 // to be used later in other endpoints.
 func ListQuery(obj interface{}) func(http.Handler) http.Handler {
-	schemaData := entity.GetFilterSchema(obj, true)
+	schemaData := tags.GetFilterSchema(obj)
 	filterMap := tags.GetFilterMap(obj)
 
 	return func(next http.Handler) http.Handler {

backend/internal/entity/accesslist/model.go

@@ -2,16 +2,16 @@ package accesslist
 
 import (
 	"npm/internal/database"
-	"npm/internal/entity"
 	"npm/internal/entity/user"
+	"npm/internal/model"
 	"npm/internal/types"
 
 	"github.com/rotisserie/eris"
 )
 
 // Model is the model
 type Model struct {
-	entity.ModelBase
+	model.ModelBase
 	UserID uint        `json:"user_id" gorm:"column:user_id" filter:"user_id,integer"`
 	Name   string      `json:"name" gorm:"column:name" filter:"name,string"`
 	Meta   types.JSONB `json:"meta" gorm:"column:meta"`

backend/internal/entity/auth/model.go

@@ -2,7 +2,7 @@ package auth
 
 import (
 	"npm/internal/database"
-	"npm/internal/entity"
+	"npm/internal/model"
 
 	"github.com/rotisserie/eris"
 	"golang.org/x/crypto/bcrypt"
@@ -15,7 +15,7 @@ const (
 
 // Model is the model
 type Model struct {
-	entity.ModelBase
+	model.ModelBase
 	UserID uint   `json:"user_id" gorm:"column:user_id"`
 	Type   string `json:"type" gorm:"column:type;default:password"`
 	Secret string `json:"secret,omitempty" gorm:"column:secret"`

backend/internal/entity/certificate/model.go

@@ -10,11 +10,11 @@ import (
 	"npm/internal/acme"
 	"npm/internal/config"
 	"npm/internal/database"
-	"npm/internal/entity"
 	"npm/internal/entity/certificateauthority"
 	"npm/internal/entity/dnsprovider"
 	"npm/internal/entity/user"
 	"npm/internal/logger"
+	"npm/internal/model"
 	"npm/internal/serverevents"
 	"npm/internal/types"
 	"npm/internal/util"
@@ -44,7 +44,7 @@ const (
 
 // Model is the model
 type Model struct {
-	entity.ModelBase
+	model.ModelBase
 	UserID                 uint                 `json:"user_id" gorm:"column:user_id" filter:"user_id,integer"`
 	Type                   string               `json:"type" gorm:"column:type" filter:"type,string"`
 	CertificateAuthorityID types.NullableDBUint `json:"certificate_authority_id" gorm:"column:certificate_authority_id" filter:"certificate_authority_id,integer"`

backend/internal/entity/certificateauthority/model.go

@@ -5,15 +5,15 @@ import (
 	"path/filepath"
 
 	"npm/internal/database"
-	"npm/internal/entity"
 	"npm/internal/errors"
+	"npm/internal/model"
 
 	"github.com/rotisserie/eris"
 )
 
 // Model is the model
 type Model struct {
-	entity.ModelBase
+	model.ModelBase
 	Name                string `json:"name" gorm:"column:name" filter:"name,string"`
 	AcmeshServer        string `json:"acmesh_server" gorm:"column:acmesh_server" filter:"acmesh_server,string"`
 	CABundle            string `json:"ca_bundle" gorm:"column:ca_bundle" filter:"ca_bundle,string"`

backend/internal/entity/dnsprovider/model.go

@@ -5,16 +5,16 @@ import (
 
 	"npm/internal/database"
 	"npm/internal/dnsproviders"
-	"npm/internal/entity"
 	"npm/internal/logger"
+	"npm/internal/model"
 	"npm/internal/types"
 
 	"github.com/rotisserie/eris"
 )
 
 // Model is the model
 type Model struct {
-	entity.ModelBase
+	model.ModelBase
 	UserID     uint        `json:"user_id" gorm:"column:user_id" filter:"user_id,integer"`
 	Name       string      `json:"name" gorm:"column:name" filter:"name,string"`
 	AcmeshName string      `json:"acmesh_name" gorm:"column:acmesh_name" filter:"acmesh_name,string"`

backend/internal/entity/filters.go

@@ -9,7 +9,7 @@ import (
 func GetFilterMap(m interface{}, includeBaseEntity bool) map[string]model.FilterMapValue {
 	filterMap := tags.GetFilterMap(m)
 	if includeBaseEntity {
-		return mergeFilterMaps(tags.GetFilterMap(ModelBase{}), filterMap)
+		return mergeFilterMaps(tags.GetFilterMap(model.ModelBase{}), filterMap)
 	}
 
 	return filterMap

backend/internal/entity/filters_schema.go

@@ -3,11 +3,11 @@ package host
 import (
 	"fmt"
 	"npm/internal/database"
-	"npm/internal/entity"
 	"npm/internal/entity/certificate"
 	"npm/internal/entity/nginxtemplate"
 	"npm/internal/entity/upstream"
 	"npm/internal/entity/user"
+	"npm/internal/model"
 	"npm/internal/status"
 	"npm/internal/types"
 	"npm/internal/util"
@@ -26,7 +26,7 @@ const (
 
 // Model is the model
 type Model struct {
-	entity.ModelBase
+	model.ModelBase
 	UserID                uint                 `json:"user_id" gorm:"column:user_id" filter:"user_id,integer"`
 	Type                  string               `json:"type" gorm:"column:type" filter:"type,string"`
 	NginxTemplateID       uint                 `json:"nginx_template_id" gorm:"column:nginx_template_id" filter:"nginx_template_id,integer"`