feat(backend): introduce org namespaced api routes

This commit is contained in:
2026-01-02 00:22:08 +00:00
parent ebcdcf2cea
commit 490699e113
10 changed files with 233 additions and 37 deletions

View File

@@ -0,0 +1,7 @@
package organization
import "errors"
var (
ErrOrganizationNotFound = errors.New("organization not found")
)

View File

@@ -0,0 +1,59 @@
package organization
import (
"errors"
"strings"
"github.com/get-drexa/drexa/internal/account"
"github.com/get-drexa/drexa/internal/httperr"
"github.com/get-drexa/drexa/internal/reqctx"
"github.com/get-drexa/drexa/internal/user"
"github.com/gofiber/fiber/v2"
"github.com/uptrace/bun"
)
func NewMiddleware(orgService *Service, accountService *account.Service, db *bun.DB) fiber.Handler {
return func(c *fiber.Ctx) error {
slug := strings.ToLower(c.Params("orgSlug"))
if slug == "" {
return c.SendStatus(fiber.StatusNotFound)
}
u, _ := reqctx.AuthenticatedUser(c).(*user.User)
if u == nil {
return c.SendStatus(fiber.StatusUnauthorized)
}
var org *Organization
var err error
if slug == reservedSlug {
org, err = orgService.PersonalOrganizationForUser(c.Context(), db, u.ID)
} else {
org, err = orgService.OrganizationBySlug(c.Context(), db, slug)
}
if err != nil {
if errors.Is(err, ErrOrganizationNotFound) {
return c.SendStatus(fiber.StatusNotFound)
}
return httperr.Internal(err)
}
acc, err := accountService.FindUserAccountInOrg(c.Context(), db, org.ID, u.ID)
if err != nil {
if errors.Is(err, account.ErrAccountNotFound) {
return c.SendStatus(fiber.StatusNotFound)
}
return httperr.Internal(err)
}
if acc.Status != account.StatusActive {
return c.SendStatus(fiber.StatusNotFound)
}
reqctx.SetCurrentAccount(c, acc)
reqctx.SetCurrentOrganization(c, org)
return c.Next()
}
}

View File

@@ -2,7 +2,10 @@ package organization
import (
"context"
"database/sql"
"errors"
"github.com/get-drexa/drexa/internal/account"
"github.com/google/uuid"
"github.com/uptrace/bun"
)
@@ -37,8 +40,39 @@ func (s *Service) OrganizationByID(ctx context.Context, db bun.IDB, id uuid.UUID
var org Organization
err := db.NewSelect().Model(&org).Where("id = ?", id).Scan(ctx)
if err != nil {
if errors.Is(err, sql.ErrNoRows) {
return nil, ErrOrganizationNotFound
}
return nil, err
}
return &org, nil
}
func (s *Service) OrganizationBySlug(ctx context.Context, db bun.IDB, slug string) (*Organization, error) {
var org Organization
err := db.NewSelect().Model(&org).Where("lower(slug) = lower(?)", slug).Scan(ctx)
if err != nil {
if errors.Is(err, sql.ErrNoRows) {
return nil, ErrOrganizationNotFound
}
return nil, err
}
return &org, nil
}
func (s *Service) PersonalOrganizationForUser(ctx context.Context, db bun.IDB, userID uuid.UUID) (*Organization, error) {
var org Organization
err := db.NewSelect().Model(&org).
Join("JOIN accounts ON accounts.org_id = organization.id").
Where("accounts.user_id = ?", userID).
Where("accounts.status = ?", account.StatusActive).
Where("organization.kind = ?", KindPersonal).
Scan(ctx)
if err != nil {
if errors.Is(err, sql.ErrNoRows) {
return nil, ErrOrganizationNotFound
}
return nil, err
}
return &org, nil
}

View File

@@ -8,7 +8,11 @@ import (
"testing"
"time"
"github.com/get-drexa/drexa/internal/account"
"github.com/get-drexa/drexa/internal/database"
"github.com/get-drexa/drexa/internal/password"
"github.com/get-drexa/drexa/internal/user"
"github.com/google/uuid"
"github.com/testcontainers/testcontainers-go/modules/postgres"
)
@@ -62,6 +66,64 @@ func TestService_CreatePersonalOrganization(t *testing.T) {
t.Fatalf("unexpected org name: got %q want %q", got.Name, "Personal Org")
}
})
t.Run("organization by slug", func(t *testing.T) {
slug := "test-org"
orgWithSlug := &Organization{
ID: uuid.Must(uuid.NewV7()),
Kind: KindTeam,
Name: "Team Org",
Slug: &slug,
}
if _, err := db.NewInsert().Model(orgWithSlug).Returning("*").Exec(ctx); err != nil {
t.Fatalf("insert org with slug: %v", err)
}
for _, candidate := range []string{"TEST-ORG", "Test-Org", "test-org"} {
got, err := svc.OrganizationBySlug(ctx, db, candidate)
if err != nil {
t.Fatalf("OrganizationBySlug(%q): %v", candidate, err)
}
if got.ID != orgWithSlug.ID {
t.Fatalf("unexpected org id: got %q want %q", got.ID, orgWithSlug.ID)
}
if got.Slug == nil || *got.Slug != slug {
t.Fatalf("unexpected org slug: got %v want %q", got.Slug, slug)
}
}
})
t.Run("personal organization for user", func(t *testing.T) {
accSvc := account.NewService()
userSvc := user.NewService()
hashed, err := password.HashString("test-password")
if err != nil {
t.Fatalf("HashString: %v", err)
}
u, err := userSvc.RegisterUser(ctx, db, user.UserRegistrationOptions{
Email: fmt.Sprintf("org-user-%s@example.com", uuid.Must(uuid.NewV7())),
DisplayName: "Org User",
Password: hashed,
})
if err != nil {
t.Fatalf("RegisterUser: %v", err)
}
acc, err := accSvc.CreateAccount(ctx, db, org.ID, u.ID, account.RoleAdmin, account.StatusActive)
if err != nil {
t.Fatalf("CreateAccount: %v", err)
}
got, err := svc.PersonalOrganizationForUser(ctx, db, acc.UserID)
if err != nil {
t.Fatalf("PersonalOrganizationForUser: %v", err)
}
if got.ID != org.ID {
t.Fatalf("unexpected org id: got %q want %q", got.ID, org.ID)
}
})
}
func runPostgres(ctx context.Context) (_ *postgres.PostgresContainer, err error) {