Mathis/lemma
1
0
Fork 0
mirror of https://github.com/lordmathis/lemma.git synced 2025-11-06 16:04:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Combine settings and workspaces tables

Browse Source
This commit is contained in:
Matúš Námešný
2024-10-27 16:00:06 +01:00
parent ab7b018f88
commit 4544af8f0f
11 changed files with 281 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
backend/internal/api/routes.go
View File

@@ -22,7 +22,7 @@ func SetupRoutes(r chi.Router, db *db.DB, fs *filesystem.FileSystem) {
r.Route("/{workspaceId}", func(r chi.Router) {
r.Get("/", GetWorkspace(db))
r.Put("/", UpdateWorkspace(db))
r.Put("/", UpdateWorkspace(db, fs))
r.Delete("/", DeleteWorkspace(db))
// File routes
@@ -38,12 +38,6 @@ func SetupRoutes(r chi.Router, db *db.DB, fs *filesystem.FileSystem) {
})
// Settings routes
r.Route("/settings", func(r chi.Router) {
r.Get("/", GetWorkspaceSettings(db))
r.Put("/", UpdateWorkspaceSettings(db, fs))
})
// Git routes
r.Route("/git", func(r chi.Router) {
r.Post("/commit", StageCommitAndPush(fs))

137
backend/internal/api/workspace_handlers.go
View File

@@ -35,41 +35,18 @@ func CreateWorkspace(db *db.DB) http.HandlerFunc {
return
}
var requestBody struct {
Name string `json:"name"`
}
if err := json.NewDecoder(r.Body).Decode(&requestBody); err != nil {
var workspace models.Workspace
if err := json.NewDecoder(r.Body).Decode(&workspace); err != nil {
http.Error(w, "Invalid request body", http.StatusBadRequest)
return
}
workspace := &models.Workspace{
UserID: userID,
Name: requestBody.Name,
}
if err := db.CreateWorkspace(workspace); err != nil {
workspace.UserID = userID
if err := db.CreateWorkspace(&workspace); err != nil {
http.Error(w, "Failed to create workspace", http.StatusInternalServerError)
return
}
defaultSettings := &models.WorkspaceSettings{
WorkspaceID: workspace.ID,
Settings: models.UserSettings{
Theme: "light",
AutoSave: false,
GitEnabled: false,
GitAutoCommit: false,
GitCommitMsgTemplate: "${action} ${filename}",
},
}
if err := db.SaveWorkspaceSettings(defaultSettings); err != nil {
http.Error(w, "Failed to initialize workspace settings", http.StatusInternalServerError)
return
}
respondJSON(w, workspace)
}
}
@@ -97,7 +74,7 @@ func GetWorkspace(db *db.DB) http.HandlerFunc {
}
}
func UpdateWorkspace(db *db.DB) http.HandlerFunc {
func UpdateWorkspace(db *db.DB, fs *filesystem.FileSystem) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
userID, workspaceID, err := getUserAndWorkspaceIDs(r)
if err != nil {
@@ -105,33 +82,56 @@ func UpdateWorkspace(db *db.DB) http.HandlerFunc {
return
}
var requestBody struct {
Name string `json:"name"`
}
if err := json.NewDecoder(r.Body).Decode(&requestBody); err != nil {
var workspace models.Workspace
if err := json.NewDecoder(r.Body).Decode(&workspace); err != nil {
http.Error(w, "Invalid request body", http.StatusBadRequest)
return
}
workspace, err := db.GetWorkspaceByID(workspaceID)
// Set IDs from the request
workspace.ID = workspaceID
workspace.UserID = userID
// Validate the workspace
if err := workspace.Validate(); err != nil {
http.Error(w, err.Error(), http.StatusBadRequest)
return
}
// Get current workspace for comparison
currentWorkspace, err := db.GetWorkspaceByID(workspaceID)
if err != nil {
http.Error(w, "Workspace not found", http.StatusNotFound)
return
}
if workspace.UserID != userID {
if currentWorkspace.UserID != userID {
http.Error(w, "Unauthorized access to workspace", http.StatusForbidden)
return
}
workspace.Name = requestBody.Name
if err := db.UpdateWorkspace(workspace); err != nil {
// Handle Git repository setup/teardown if Git settings changed
if workspace.GitEnabled != currentWorkspace.GitEnabled ||
(workspace.GitEnabled && (workspace.GitURL != currentWorkspace.GitURL ||
workspace.GitUser != currentWorkspace.GitUser ||
workspace.GitToken != currentWorkspace.GitToken)) {
if workspace.GitEnabled {
err = fs.SetupGitRepo(userID, workspaceID, workspace.GitURL, workspace.GitUser, workspace.GitToken)
if err != nil {
http.Error(w, "Failed to setup git repo: "+err.Error(), http.StatusInternalServerError)
return
}
} else {
fs.DisableGitRepo(userID, workspaceID)
}
}
if err := db.UpdateWorkspace(&workspace); err != nil {
http.Error(w, "Failed to update workspace", http.StatusInternalServerError)
return
}
respondJSON(w, map[string]string{"name": workspace.Name})
respondJSON(w, workspace)
}
}
@@ -207,64 +207,3 @@ func UpdateLastWorkspace(db *db.DB) http.HandlerFunc {
respondJSON(w, map[string]string{"message": "Last workspace updated successfully"})
}
}
func GetWorkspaceSettings(db *db.DB) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
_, workspaceID, err := getUserAndWorkspaceIDs(r)
if err != nil {
http.Error(w, err.Error(), http.StatusBadRequest)
return
}
settings, err := db.GetWorkspaceSettings(workspaceID)
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
respondJSON(w, settings)
}
}
func UpdateWorkspaceSettings(db *db.DB, fs *filesystem.FileSystem) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
userID, workspaceID, err := getUserAndWorkspaceIDs(r)
if err != nil {
http.Error(w, err.Error(), http.StatusBadRequest)
return
}
var userSettings models.UserSettings
if err := json.NewDecoder(r.Body).Decode(&userSettings); err != nil {
http.Error(w, "Invalid request body", http.StatusBadRequest)
return
}
if err := userSettings.Validate(); err != nil {
http.Error(w, err.Error(), http.StatusBadRequest)
return
}
workspaceSettings := &models.WorkspaceSettings{
WorkspaceID: workspaceID,
Settings: userSettings,
}
if err := db.SaveWorkspaceSettings(workspaceSettings); err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
if userSettings.GitEnabled {
err := fs.SetupGitRepo(userID, workspaceID, userSettings.GitURL, userSettings.GitUser, userSettings.GitToken)
if err != nil {
http.Error(w, "Failed to setup git repo", http.StatusInternalServerError)
return
}
} else {
fs.DisableGitRepo(userID, workspaceID)
}
respondJSON(w, workspaceSettings)
}
}