feat(models): rename ModelPublicUser to ModelPublicUsers and update references
Some checks failed
CI / Test (1.22) (push) Failing after -22m18s
CI / Test (1.23) (push) Failing after -22m7s
CI / Lint (push) Failing after -22m32s
CI / Build (push) Failing after -22m38s

* Update user-related models to use plural naming for consistency
* Add relationships to ModelPublicUsers in related models
* Adjust database migration and schema to reflect changes
* Remove deprecated ModelPublicUser
This commit is contained in:
Hein
2026-02-20 17:56:02 +02:00
parent a3ff2dc497
commit cecbd2cef5
13 changed files with 107 additions and 89 deletions

View File

@@ -78,7 +78,7 @@ func CreateTables(ctx context.Context) error {
// For PostgreSQL, use BUN's auto-generation
models := []interface{}{
(*models.ModelPublicUser)(nil),
(*models.ModelPublicUsers)(nil),
(*models.ModelPublicAPIKey)(nil),
(*models.ModelPublicHook)(nil),
(*models.ModelPublicWhatsappAccount)(nil),

View File

@@ -74,19 +74,19 @@ func (r *Repository[T]) Count(ctx context.Context, filter map[string]interface{}
// UserRepository provides user-specific operations
type UserRepository struct {
*Repository[models.ModelPublicUser]
*Repository[models.ModelPublicUsers]
}
// NewUserRepository creates a new user repository
func NewUserRepository(db *bun.DB) *UserRepository {
return &UserRepository{
Repository: NewRepository[models.ModelPublicUser](db),
Repository: NewRepository[models.ModelPublicUsers](db),
}
}
// GetByUsername retrieves a user by username
func (r *UserRepository) GetByUsername(ctx context.Context, username string) (*models.ModelPublicUser, error) {
var user models.ModelPublicUser
func (r *UserRepository) GetByUsername(ctx context.Context, username string) (*models.ModelPublicUsers, error) {
var user models.ModelPublicUsers
err := r.db.NewSelect().Model(&user).Where("username = ?", username).Scan(ctx)
if err != nil {
return nil, err
@@ -95,8 +95,8 @@ func (r *UserRepository) GetByUsername(ctx context.Context, username string) (*m
}
// GetByEmail retrieves a user by email
func (r *UserRepository) GetByEmail(ctx context.Context, email string) (*models.ModelPublicUser, error) {
var user models.ModelPublicUser
func (r *UserRepository) GetByEmail(ctx context.Context, email string) (*models.ModelPublicUsers, error) {
var user models.ModelPublicUsers
err := r.db.NewSelect().Model(&user).Where("email = ?", email).Scan(ctx)
if err != nil {
return nil, err

View File

@@ -32,7 +32,7 @@ func SeedData(ctx context.Context) error {
}
now := time.Now()
adminUser := &models.ModelPublicUser{
adminUser := &models.ModelPublicUsers{
ID: resolvespec_common.NewSqlString(uuid.New().String()),
Username: resolvespec_common.NewSqlString("admin"),
Email: resolvespec_common.NewSqlString("admin@whatshooked.local"),