Mathis/lemma
1
0
Fork 0
mirror of https://github.com/lordmathis/lemma.git synced 2025-11-05 15:44:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use InsertStruct

Browse Source
This commit is contained in:
Matúš Námešný
2025-02-27 21:44:32 +01:00
parent c0de3538dc
commit e89b4a0e14
7 changed files with 87 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
server/internal/db/sessions.go
View File

@@ -10,11 +10,12 @@ import (
// CreateSession inserts a new session record into the database
func (db *database) CreateSession(session *models.Session) error {
query := NewQuery(db.dbType).
Insert("sessions", "id", "user_id", "refresh_token", "expires_at", "created_at").
Values(5).
AddArgs(session.ID, session.UserID, session.RefreshToken, session.ExpiresAt, session.CreatedAt)
_, err := db.Exec(query.String(), query.Args()...)
query, err := NewQuery(db.dbType).
InsertStruct(session, "sessions")
if err != nil {
return fmt.Errorf("failed to create query: %w", err)
}
_, err = db.Exec(query.String(), query.Args()...)
if err != nil {
return fmt.Errorf("failed to store session: %w", err)
}

21
server/internal/db/struct_query.go
View File

@@ -11,6 +11,7 @@ type DBField struct {
Name string
Value any
Type reflect.Type
useDefault bool
}
func StructTagsToFields(s any) ([]DBField, error) {
@@ -47,14 +48,28 @@ func StructTagsToFields(s any) ([]DBField, error) {
tag = toSnakeCase(f.Name)
}
if strings.Contains(tag, "omitempty") && reflect.DeepEqual(v.Field(i).Interface(), reflect.Zero(f.Type).Interface()) {
useDefault := false
if strings.Contains(tag, ",") {
parts := strings.Split(tag, ",")
tag = parts[0]
for _, opt := range parts[1:] {
switch opt {
case "omitempty":
if reflect.DeepEqual(v.Field(i).Interface(), reflect.Zero(f.Type).Interface()) {
continue
}
case "default":
useDefault = true
}
}
}
fields = append(fields, DBField{
Name: tag,
Value: v.Field(i).Interface(),
Type: f.Type,
useDefault: useDefault,
})
}
return fields, nil
@@ -86,6 +101,10 @@ func (q *Query) InsertStruct(s any, table string) (*Query, error) {
values := make([]any, 0, len(fields))
for _, f := range fields {
if f.useDefault {
continue
}
columns = append(columns, f.Name)
values = append(values, f.Value)
}

38
server/internal/db/users.go
View File

@@ -17,11 +17,14 @@ func (db *database) CreateUser(user *models.User) (*models.User, error) {
}
defer tx.Rollback()
query := NewQuery(db.dbType).
Insert("users", "email", "display_name", "password_hash", "role").
Values(4).
AddArgs(user.Email, user.DisplayName, user.PasswordHash, user.Role).
Returning("id", "created_at")
query, err := NewQuery(db.dbType).
InsertStruct(user, "users")
if err != nil {
return nil, fmt.Errorf("failed to create query: %w", err)
}
query.Returning("id", "created_at")
err = tx.QueryRow(query.String(), query.Args()...).
Scan(&user.ID, &user.CreatedAt)
@@ -69,23 +72,16 @@ func (db *database) CreateUser(user *models.User) (*models.User, error) {
func (db *database) createWorkspaceTx(tx *sql.Tx, workspace *models.Workspace) error {
log := getLogger().WithGroup("users")
insertQuery := NewQuery(db.dbType).
Insert("workspaces",
"user_id", "name",
"theme", "auto_save", "show_hidden_files",
"git_enabled", "git_url", "git_user", "git_token",
"git_auto_commit", "git_commit_msg_template",
"git_commit_name", "git_commit_email").
Values(13).
AddArgs(
workspace.UserID, workspace.Name,
workspace.Theme, workspace.AutoSave, workspace.ShowHiddenFiles,
workspace.GitEnabled, workspace.GitURL, workspace.GitUser, workspace.GitToken,
workspace.GitAutoCommit, workspace.GitCommitMsgTemplate,
workspace.GitCommitName, workspace.GitCommitEmail).
Returning("id")
insertQuery, err := NewQuery(db.dbType).
InsertStruct(workspace, "workspaces")
err := tx.QueryRow(insertQuery.String(), insertQuery.Args()...).Scan(&workspace.ID)
if err != nil {
return fmt.Errorf("failed to create query: %w", err)
}
insertQuery.Returning("id")
err = tx.QueryRow(insertQuery.String(), insertQuery.Args()...).Scan(&workspace.ID)
if err != nil {
return fmt.Errorf("failed to insert workspace: %w", err)
}

21
server/internal/db/workspaces.go
View File

@@ -24,19 +24,16 @@ func (db *database) CreateWorkspace(workspace *models.Workspace) error {
if err != nil {
return fmt.Errorf("failed to encrypt token: %w", err)
}
workspace.GitToken = encryptedToken
query := NewQuery(db.dbType).
Insert("workspaces",
"user_id", "name", "theme", "auto_save", "show_hidden_files",
"git_enabled", "git_url", "git_user", "git_token",
"git_auto_commit", "git_commit_msg_template",
"git_commit_name", "git_commit_email").
Values(13).
AddArgs(
workspace.UserID, workspace.Name, workspace.Theme, workspace.AutoSave, workspace.ShowHiddenFiles,
workspace.GitEnabled, workspace.GitURL, workspace.GitUser, encryptedToken,
workspace.GitAutoCommit, workspace.GitCommitMsgTemplate, workspace.GitCommitName, workspace.GitCommitEmail).
Returning("id", "created_at")
query, err := NewQuery(db.dbType).
InsertStruct(workspace, "workspaces")
if err != nil {
return fmt.Errorf("failed to create query: %w", err)
}
query.Returning("id", "created_at")
err = db.QueryRow(query.String(), query.Args()...).
Scan(&workspace.ID, &workspace.CreatedAt)

10
server/internal/models/session.go
View File

@@ -5,9 +5,9 @@ import "time"
// Session represents a user session in the database
type Session struct {
ID string // Unique session identifier
UserID int // ID of the user this session belongs to
RefreshToken string // The refresh token associated with this session
ExpiresAt time.Time // When this session expires
CreatedAt time.Time // When this session was created
ID string `db:"id,default"` // Unique session identifier
UserID int `db:"user_id"` // ID of the user this session belongs to
RefreshToken string `db:"refresh_token"` // The refresh token associated with this session
ExpiresAt time.Time `db:"expires_at"` // When this session expires
CreatedAt time.Time `db:"created_at,default"` // When this session was created
}

14
server/internal/models/user.go
View File

@@ -20,13 +20,13 @@ const (
// User represents a user in the system
type User struct {
ID int `json:"id" validate:"required,min=1"`
Email string `json:"email" validate:"required,email"`
DisplayName string `json:"displayName"`
PasswordHash string `json:"-"`
Role UserRole `json:"role" validate:"required,oneof=admin editor viewer"`
CreatedAt time.Time `json:"createdAt"`
LastWorkspaceID int `json:"lastWorkspaceId"`
ID int `json:"id" db:"id,default" validate:"required,min=1"`
Email string `json:"email" db:"email" validate:"required,email"`
DisplayName string `json:"displayName" db:"display_name"`
PasswordHash string `json:"-" db:"password_hash"`
Role UserRole `json:"role" db:"role" validate:"required,oneof=admin editor viewer"`
CreatedAt time.Time `json:"createdAt" db:"created_at,default"`
LastWorkspaceID int `json:"lastWorkspaceId" db:"last_workspace_id"`
}
// Validate validates the user struct

32
server/internal/models/workspace.go
View File

@@ -6,24 +6,24 @@ import (
// Workspace represents a user's workspace in the system
type Workspace struct {
ID int `json:"id" validate:"required,min=1"`
UserID int `json:"userId" validate:"required,min=1"`
Name string `json:"name" validate:"required"`
CreatedAt time.Time `json:"createdAt"`
LastOpenedFilePath string `json:"lastOpenedFilePath"`
ID int `json:"id" db:"id,default" validate:"required,min=1"`
UserID int `json:"userId" db:"user_id" validate:"required,min=1"`
Name string `json:"name" db:"name" validate:"required"`
CreatedAt time.Time `json:"createdAt" db:"created_at,default"`
LastOpenedFilePath string `json:"lastOpenedFilePath" db:"last_opened_file_path"`
// Integrated settings
Theme string `json:"theme" validate:"oneof=light dark"`
AutoSave bool `json:"autoSave"`
ShowHiddenFiles bool `json:"showHiddenFiles"`
GitEnabled bool `json:"gitEnabled"`
GitURL string `json:"gitUrl" validate:"required_if=GitEnabled true"`
GitUser string `json:"gitUser" validate:"required_if=GitEnabled true"`
GitToken string `json:"gitToken" validate:"required_if=GitEnabled true"`
GitAutoCommit bool `json:"gitAutoCommit"`
GitCommitMsgTemplate string `json:"gitCommitMsgTemplate"`
GitCommitName string `json:"gitCommitName"`
GitCommitEmail string `json:"gitCommitEmail" validate:"omitempty,required_if=GitEnabled true,email"`
Theme string `json:"theme" db:"theme" validate:"oneof=light dark"`
AutoSave bool `json:"autoSave" db:"auto_save"`
ShowHiddenFiles bool `json:"showHiddenFiles" db:"show_hidden_files"`
GitEnabled bool `json:"gitEnabled" db:"git_enabled"`
GitURL string `json:"gitUrl" db:"git_url" validate:"required_if=GitEnabled true"`
GitUser string `json:"gitUser" db:"git_user" validate:"required_if=GitEnabled true"`
GitToken string `json:"gitToken" db:"git_token" validate:"required_if=GitEnabled true"`
GitAutoCommit bool `json:"gitAutoCommit" db:"git_auto_commit"`
GitCommitMsgTemplate string `json:"gitCommitMsgTemplate" db:"git_commit_msg_template"`
GitCommitName string `json:"gitCommitName" db:"git_commit_name"`
GitCommitEmail string `json:"gitCommitEmail" db:"git_commit_email" validate:"omitempty,required_if=GitEnabled true,email"`
}
// Validate validates the workspace struct