Skip to content

The only tool you need to know what is happening and how to fix it.

progress

dduxf6bc02f4117f
diff --git a/backend/app/controllers/auth.controller.go b/backend/app/controllers/auth.controller.go
index 74afaec1..eb46c63e 100644
--- a/backend/app/controllers/auth.controller.go
+++ b/backend/app/controllers/auth.controller.go
@@ -39,20 +39,15 @@ func (a authController) Login(c *gin.Context) {
return nil, err
}
- projects, err := repositories.ProjectRepository.FindByUserId(tx, user.Id)
+ projects, err := repositories.ProjectRepository.FindAllWithBackendUrlByUserId(tx, user.Id)
if err != nil {
return nil, err
}
- projectsResponse := make([]models.ProjectResponse, len(projects))
- for i, proj := range projects {
- projectsResponse[i] = proj.ToResponse()
- }
-
return &models.LoginResponse{
Token: token,
User: user.ToResponse(),
- Projects: projectsResponse,
+ Projects: projects,
}, nil
})
@@ -115,21 +110,16 @@ func (a authController) Register(c *gin.Context) {
return nil, err
}
- projects, err := repositories.ProjectRepository.FindByUserId(tx, user.Id)
+ projects, err := repositories.ProjectRepository.FindAllWithBackendUrlByUserId(tx, user.Id)
if err != nil {
return nil, err
}
- projectsResponse := make([]models.ProjectResponse, len(projects))
- for i, proj := range projects {
- projectsResponse[i] = proj.ToResponse()
- }
-
return &models.RegisterResponse{
Token: token,
User: user.ToResponse(),
- Project: project.ToWithToken(),
- Projects: projectsResponse,
+ Project: *project.ToProjectWithBackendUrl(),
+ Projects: projects,
}, nil
})
diff --git a/backend/app/controllers/project.controller.go b/backend/app/controllers/project.controller.go
index 0d740329..cfd50f7f 100644
--- a/backend/app/controllers/project.controller.go
+++ b/backend/app/controllers/project.controller.go
@@ -12,7 +12,6 @@ import (
"unicode/utf8"
"github.com/gin-gonic/gin"
- "github.com/google/uuid"
traceway "go.tracewayapp.com"
)
@@ -36,11 +35,10 @@ type CreateProjectRequest struct {
Framework string `json:"framework" binding:"required"`
}
-// ListProjects returns projects accessible by the authenticated user
func (p projectController) ListProjects(c *gin.Context) {
userId := middleware.GetUserId(c)
- projects, err := pgdb.ExecuteTransaction(func(tx *sql.Tx) ([]*models.Project, error) {
+ projectsWithBackendUrl, err := pgdb.ExecuteTransaction(func(tx *sql.Tx) ([]*models.Project, error) {
return repositories.ProjectRepository.FindByUserId(tx, userId)
})
if err != nil {
@@ -48,13 +46,7 @@ func (p projectController) ListProjects(c *gin.Context) {
return
}
- // Convert to response format (without tokens)
- response := make([]models.ProjectResponse, len(projects))
- for i, proj := range projects {
- response[i] = proj.ToResponse()
- }
-
- c.JSON(http.StatusOK, response)
+ c.JSON(http.StatusOK, projectsWithBackendUrl)
}
// CreateProject creates a new project and returns it with its token
@@ -76,7 +68,6 @@ func (p projectController) CreateProject(c *gin.Context) {
return
}
- // Validate framework
if !validFrameworks[request.Framework] {
c.JSON(http.StatusBadRequest, gin.H{"error": "Framework must be one of: stdlib, fasthttp, gin, fiber, chi, custom"})
return
@@ -90,29 +81,9 @@ func (p projectController) CreateProject(c *gin.Context) {
return
}
- // Add to cache
cache.ProjectCache.AddProject(project)
- // Return with token since this is creation
- c.JSON(http.StatusCreated, (*project).ToWithToken())
-}
-
-// GetProject returns a project by ID with its token (for connection page)
-func (p projectController) GetProject(c *gin.Context) {
- projectId, err := uuid.Parse(c.Param("id"))
- if err != nil {
- c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid project ID"})
- return
- }
-
- project := cache.ProjectCache.GetById(projectId)
- if project == nil {
- c.JSON(http.StatusNotFound, gin.H{"error": "Project not found"})
- return
- }
-
- // Return with token for connection page
- c.JSON(http.StatusOK, project.ToWithToken())
+ c.JSON(http.StatusCreated, project.ToProjectWithBackendUrl())
}
var ProjectController = projectController{}
diff --git a/backend/app/controllers/routes.go b/backend/app/controllers/routes.go
index 1f022b09..df0591b7 100644
--- a/backend/app/controllers/routes.go
+++ b/backend/app/controllers/routes.go
@@ -30,7 +30,6 @@ func RegisterControllers(router *gin.RouterGroup) {
// Project management
router.GET("/projects", middleware.UseAppAuth, ProjectController.ListProjects)
router.POST("/projects", middleware.UseAppAuth, middleware.RequireWriteAccess, ProjectController.CreateProject)
- router.GET("/projects/:id", middleware.UseAppAuth, middleware.RequireProjectAccess, ProjectController.GetProject)
// Dashboard endpoints (projectId in query param)
router.POST("/stats", middleware.UseAppAuth, middleware.RequireProjectAccess, MetricRecordController.FindHomepageStats)
diff --git a/backend/app/models/auth.model.go b/backend/app/models/auth.model.go
index ff08629d..0d8178df 100644
--- a/backend/app/models/auth.model.go
+++ b/backend/app/models/auth.model.go
@@ -6,9 +6,9 @@ type LoginRequest struct {
}
type LoginResponse struct {
- Token string `json:"token"`
- User UserResponse `json:"user"`
- Projects []ProjectResponse `json:"projects"`
+ Token string `json:"token"`
+ User UserResponse `json:"user"`
+ Projects []*ProjectWithBackendUrl `json:"projects"`
}
type RegisterRequest struct {
@@ -21,8 +21,8 @@ type RegisterRequest struct {
}
type RegisterResponse struct {
- Token string `json:"token"`
- User UserResponse `json:"user"`
- Project ProjectWithToken `json:"project"`
- Projects []ProjectResponse `json:"projects"`
+ Token string `json:"token"`
+ User UserResponse `json:"user"`
+ Project ProjectWithBackendUrl `json:"project"`
+ Projects []*ProjectWithBackendUrl `json:"projects"`
}
diff --git a/backend/app/models/project.model.go b/backend/app/models/project.model.go
index 78d5f033..d708e7d9 100644
--- a/backend/app/models/project.model.go
+++ b/backend/app/models/project.model.go
@@ -7,13 +7,6 @@ import (
"github.com/google/uuid"
)
-func getBackendUrl() string {
- if url := os.Getenv("BACKEND_URL"); url != "" {
- return url
- }
- return "https://tracewayapp.com"
-}
-
type Project struct {
Id uuid.UUID `json:"id"`
Name string `json:"name"`
@@ -23,44 +16,18 @@ type Project struct {
CreatedAt time.Time `json:"createdAt"`
}
-type ProjectResponse struct {
- Id uuid.UUID `json:"id"`
- Name string `json:"name"`
- Framework string `json:"framework"`
- OrganizationId *int `json:"organizationId"`
- CreatedAt time.Time `json:"createdAt"`
- BackendUrl string `json:"backendUrl"`
+func (p Project) ToProjectWithBackendUrl() *ProjectWithBackendUrl {
+ return &ProjectWithBackendUrl{Project: p, BackendUrl: getBackendUrl()}
}
-type ProjectWithToken struct {
- Id uuid.UUID `json:"id"`
- Name string `json:"name"`
- Token string `json:"token"`
- Framework string `json:"framework"`
- OrganizationId *int `json:"organizationId"`
- CreatedAt time.Time `json:"createdAt"`
- BackendUrl string `json:"backendUrl"`
-}
-
-func (p *Project) ToResponse() ProjectResponse {
- return ProjectResponse{
- Id: p.Id,
- Name: p.Name,
- Framework: p.Framework,
- OrganizationId: p.OrganizationId,
- CreatedAt: p.CreatedAt,
- BackendUrl: getBackendUrl(),
+func getBackendUrl() string {
+ if url := os.Getenv("BACKEND_URL"); url != "" {
+ return url
}
+ return "https://tracewayapp.com"
}
-func (p *Project) ToWithToken() ProjectWithToken {
- return ProjectWithToken{
- Id: p.Id,
- Name: p.Name,
- Token: p.Token,
- Framework: p.Framework,
- OrganizationId: p.OrganizationId,
- CreatedAt: p.CreatedAt,
- BackendUrl: getBackendUrl(),
- }
+type ProjectWithBackendUrl struct {
+ Project
+ BackendUrl string `json:"backendUrl"`
}
diff --git a/backend/app/repositories/project.repository.go b/backend/app/repositories/project.repository.go
index 26d74704..a83cd42f 100644
--- a/backend/app/repositories/project.repository.go
+++ b/backend/app/repositories/project.repository.go
@@ -11,6 +11,22 @@ import (
type projectRepository struct{}
+func (p *projectRepository) FindAllWithBackendUrlByUserId(tx *sql.Tx, userId int) ([]*models.ProjectWithBackendUrl, error) {
+ projects, err := p.FindByUserId(tx, userId)
+
+ if err != nil {
+ return nil, err
+ }
+
+ projectsWithBackendUrl := []*models.ProjectWithBackendUrl{}
+
+ for _, project := range projects {
+ projectsWithBackendUrl = append(projectsWithBackendUrl, project.ToProjectWithBackendUrl())
+ }
+
+ return projectsWithBackendUrl, nil
+}
+
func (p *projectRepository) FindAll(tx *sql.Tx) ([]*models.Project, error) {
return lit.Select[models.Project](
tx,