Open source AI coding agent. Designed for large projects and real world tasks.
Go aiai-agentsai-developer-toolsai-toolsclicommand-linedeveloper-toolsgitgolanggpt-4llmopenaipolyglot-programmingterminalterminal-basedterminal-ui
drop users_projects, fixes for org membership/invite issues
Dane Schneiderbcd37770f902
diff --git a/app/server/db/data_models.go b/app/server/db/data_models.goindex 1e4fb698..6691a0a3 100644--- a/app/server/db/data_models.go+++ b/app/server/db/data_models.go@@ -105,32 +105,20 @@ func (orgUser *OrgUser) ToApi() *shared.OrgUser {}type Project struct {- Id string `db:"id"`- OrgId string `db:"org_id"`- Name string `db:"name"`- LastActivePlanId string `db:"last_active_plan_id"`- CreatedAt time.Time `db:"created_at"`- UpdatedAt time.Time `db:"updated_at"`+ Id string `db:"id"`+ OrgId string `db:"org_id"`+ Name string `db:"name"`+ CreatedAt time.Time `db:"created_at"`+ UpdatedAt time.Time `db:"updated_at"`}func (project *Project) ToApi() *shared.Project {return &shared.Project{- Id: project.Id,- Name: project.Name,- LastActivePlanId: project.LastActivePlanId,+ Id: project.Id,+ Name: project.Name,}}-type UserProject struct {- Id string `db:"id"`- OrgId string `db:"org_id"`- UserId string `db:"user_id"`- ProjectId string `db:"project_id"`- LastActivePlanId string `db:"last_active_plan_id"`- CreatedAt time.Time `db:"created_at"`- UpdatedAt time.Time `db:"updated_at"`-}-type Plan struct {Id string `db:"id"`OrgId string `db:"org_id"`diff --git a/app/server/db/org_helpers.go b/app/server/db/org_helpers.goindex d79fe3bc..b8961f7c 100644--- a/app/server/db/org_helpers.go+++ b/app/server/db/org_helpers.go@@ -12,8 +12,21 @@ import (func GetAccessibleOrgsForUser(user *User) ([]*Org, error) {// direct access+ var orgUsers []*OrgUservar orgs []*Org- err := Conn.Select(&orgs, "SELECT o.* FROM orgs o JOIN orgs_users ou ON o.id = ou.org_id WHERE ou.user_id = $1", user.Id)++ err := Conn.Select(&orgUsers, "SELECT * FROM orgs_users WHERE user_id = $1", user.Id)++ if err != nil {+ return nil, fmt.Errorf("error getting orgs for user: %v", err)+ }++ orgIds := make([]string, len(orgUsers))+ for i, ou := range orgUsers {+ orgIds[i] = ou.OrgId+ }++ err = Conn.Select(&orgs, "SELECT * FROM orgs WHERE id = ANY($1)", pq.Array(orgIds))if err != nil {return nil, fmt.Errorf("error getting orgs for user: %v", err)@@ -26,7 +39,7 @@ func GetAccessibleOrgsForUser(user *User) ([]*Org, error) {return nil, fmt.Errorf("error getting invites for user: %v", err)}- var orgIds []string+ orgIds = make([]string, len(invites))for _, invite := range invites {orgIds = append(orgIds, invite.OrgId)}diff --git a/app/server/db/plan_helpers.go b/app/server/db/plan_helpers.goindex 4327239b..48e68e2f 100644--- a/app/server/db/plan_helpers.go+++ b/app/server/db/plan_helpers.go@@ -376,7 +376,7 @@ func ValidatePlanAccess(planId, userId, orgId string) (*Plan, error) {return nil, nil}- hasProjectAccess, err := ValidateProjectAccess(plan.ProjectId, userId, orgId)+ hasProjectAccess, err := ProjectExists(orgId, plan.ProjectId)if err != nil {return nil, fmt.Errorf("error validating project membership: %v", err)diff --git a/app/server/db/project_helpers.go b/app/server/db/project_helpers.goindex 552e2624..34f11016 100644--- a/app/server/db/project_helpers.go+++ b/app/server/db/project_helpers.go@@ -1,16 +1,28 @@package db-import "fmt"--func ValidateProjectAccess(projectId, userId, orgId string) (bool, error) {+import (+ "database/sql"+ "fmt"+)+func ProjectExists(orgId, projectId string) (bool, error) {var count int- err := Conn.QueryRow("SELECT COUNT(*) FROM users_projects WHERE project_id = $1 AND user_id = $2 AND org_id = $3", projectId, userId, orgId).Scan(&count)+ err := Conn.QueryRow("SELECT COUNT(*) FROM projects WHERE org_id = $1 AND id = $2", orgId, projectId).Scan(&count)if err != nil {- return false, fmt.Errorf("error validating project membership: %v", err)+ return false, fmt.Errorf("error checking if project exists: %v", err)}return count > 0, nil+}++func CreateProject(orgId, name string, tx *sql.Tx) (string, error) {+ var projectId string+ err := tx.QueryRow("INSERT INTO projects (org_id, name) VALUES ($1, $2) RETURNING id", orgId, name).Scan(&projectId)++ if err != nil {+ return "", fmt.Errorf("error creating project: %v", err)+ }+ return projectId, nil}diff --git a/app/server/db/user_helpers.go b/app/server/db/user_helpers.goindex 79a99b7a..de2c7130 100644--- a/app/server/db/user_helpers.go+++ b/app/server/db/user_helpers.go@@ -3,6 +3,8 @@ package dbimport ("database/sql""fmt"++ "github.com/lib/pq")func GetUser(userId string) (*User, error) {@@ -74,7 +76,19 @@ func ListOrgUsers(orgId string) ([]*OrgUser, error) {func ListUsers(orgId string) ([]*User, error) {var users []*User- err := Conn.Select(&users, "SELECT u.* FROM users u INNER JOIN orgs_users ou ON u.id = ou.user_id WHERE ou.org_id = $1", orgId)++ orgUsers, err := ListOrgUsers(orgId)++ if err != nil {+ return nil, fmt.Errorf("error listing users: %v", err)+ }++ userIds := make([]string, len(orgUsers))+ for i, ou := range orgUsers {+ userIds[i] = ou.UserId+ }++ err = Conn.Select(&users, "SELECT * FROM users WHERE id = ANY($1)", pq.Array(userIds))if err != nil {return nil, fmt.Errorf("error listing users: %v", err)diff --git a/app/server/handlers/auth_helpers.go b/app/server/handlers/auth_helpers.goindex 2b0b3472..0e369296 100644--- a/app/server/handlers/auth_helpers.go+++ b/app/server/handlers/auth_helpers.go@@ -152,17 +152,17 @@ func authenticate(w http.ResponseWriter, r *http.Request, requireOrg bool) *typefunc authorizeProject(w http.ResponseWriter, projectId string, auth *types.ServerAuth) bool {log.Println("authorizing project")- hasProjectAccess, err := db.ValidateProjectAccess(projectId, auth.User.Id, auth.OrgId)+ projectExists, err := db.ProjectExists(auth.OrgId, projectId)if err != nil {- log.Printf("error validating project membership: %v\n", err)- http.Error(w, "error validating project membership", http.StatusInternalServerError)+ log.Printf("error validating project: %v\n", err)+ http.Error(w, "error validating project", http.StatusInternalServerError)return false}- if !hasProjectAccess {- log.Println("user is not a member of the project")- http.Error(w, "not a member of project", http.StatusUnauthorized)+ if !projectExists {+ log.Println("project does not exist in org")+ http.Error(w, "project does not exist in org", http.StatusNotFound)return false}diff --git a/app/server/handlers/projects.go b/app/server/handlers/projects.goindex 146ef823..3a8188b1 100644--- a/app/server/handlers/projects.go+++ b/app/server/handlers/projects.go@@ -60,8 +60,7 @@ func CreateProjectHandler(w http.ResponseWriter, r *http.Request) {}}()- var projectId string- err = tx.QueryRow("INSERT INTO projects (org_id, name) VALUES ($1, $2) RETURNING id", auth.OrgId, requestBody.Name).Scan(&projectId)+ projectId, err := db.CreateProject(auth.OrgId, requestBody.Name, tx)if err != nil {log.Printf("Error creating project: %v\n", err)@@ -69,14 +68,6 @@ func CreateProjectHandler(w http.ResponseWriter, r *http.Request) {return}- _, err = tx.Exec("INSERT INTO users_projects (user_id, org_id, project_id) VALUES ($1, $2, $3)", auth.User.Id, auth.OrgId, projectId)-- if err != nil {- log.Printf("Error adding owner to project: %v\n", err)- http.Error(w, "Error adding owner to project: "+err.Error(), http.StatusInternalServerError)- return- }-err = tx.Commit()if err != nil {log.Printf("Error committing transaction: %v\n", err)@@ -109,7 +100,7 @@ func ListProjectsHandler(w http.ResponseWriter, r *http.Request) {return}- rows, err := db.Conn.Query("SELECT project.id, project.name FROM users_projects INNER JOIN project ON users_projects.project_id = project.id WHERE users_projects.user_id = $1 AND users_projects.org_id = $2", auth)+ rows, err := db.Conn.Query("SELECT id, name FROM projects WHERE org_id = $1", auth.OrgId)if err != nil {log.Printf("Error listing projects: %v\n", err)diff --git a/app/server/migrations/2024032701_drop_users_projects.down.sql b/app/server/migrations/2024032701_drop_users_projects.down.sqlnew file mode 100644index 00000000..27cfdba1--- /dev/null+++ b/app/server/migrations/2024032701_drop_users_projects.down.sql@@ -0,0 +1,12 @@+CREATE TABLE IF NOT EXISTS users_projects (+ id UUID PRIMARY KEY DEFAULT uuid_generate_v4(),+ org_id UUID NOT NULL REFERENCES orgs(id) ON DELETE CASCADE,+ user_id UUID NOT NULL REFERENCES users(id) ON DELETE CASCADE,+ project_id UUID NOT NULL REFERENCES projects(id) ON DELETE CASCADE,+ last_active_plan_id UUID REFERENCES plans(id),+ created_at TIMESTAMP NOT NULL DEFAULT NOW(),+ updated_at TIMESTAMP NOT NULL DEFAULT NOW()+);+CREATE TRIGGER update_users_projects_modtime BEFORE UPDATE ON users_projects FOR EACH ROW EXECUTE FUNCTION update_updated_at_column();++CREATE INDEX users_projects_idx ON users_projects(user_id, org_id, project_id);\ No newline at end of filediff --git a/app/server/migrations/2024032701_drop_users_projects.up.sql b/app/server/migrations/2024032701_drop_users_projects.up.sqlnew file mode 100644index 00000000..02bd1b78--- /dev/null+++ b/app/server/migrations/2024032701_drop_users_projects.up.sql@@ -0,0 +1 @@+DROP TABLE IF EXISTS users_projects;\ No newline at end of filediff --git a/app/shared/data_models.go b/app/shared/data_models.goindex 38aed42a..d0df7674 100644--- a/app/shared/data_models.go+++ b/app/shared/data_models.go@@ -39,9 +39,8 @@ type Invite struct {}type Project struct {- Id string `json:"id"`- Name string `json:"name"`- LastActivePlanId string `json:"lastActivePlanId"`+ Id string `json:"id"`+ Name string `json:"name"`}type Plan struct {