drexa/drive
1
0
Fork 0
mirror of https://github.com/get-drexa/drive.git synced 2026-02-02 19:31:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(backend): return "my" slug for personal org

Browse Source
This commit is contained in:
Kenneth
2026-01-02 23:16:00 +00:00
parent 37056db77f
commit ceb4c9f23c
2 changed files with 36 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
apps/backend/internal/drexa/api_integration_test.go
View File

@@ -142,6 +142,9 @@ func TestRegistrationFlow(t *testing.T) {
if login.Organizations[0].Kind != string(organization.KindPersonal) { if login.Organizations[0].Kind != string(organization.KindPersonal) {
t.Fatalf("unexpected organization kind: %q", login.Organizations[0].Kind) t.Fatalf("unexpected organization kind: %q", login.Organizations[0].Kind)
} }
if login.Organizations[0].Slug != organization.ReservedSlug {
t.Fatalf("unexpected personal organization slug: %q", login.Organizations[0].Slug)
}
}) })
t.Run("drives list", func(t *testing.T) { t.Run("drives list", func(t *testing.T) {
@@ -186,6 +189,9 @@ func TestRegistrationFlow(t *testing.T) {
if orgs[0].Kind != string(organization.KindPersonal) { if orgs[0].Kind != string(organization.KindPersonal) {
t.Fatalf("unexpected organization kind: %q", orgs[0].Kind) t.Fatalf("unexpected organization kind: %q", orgs[0].Kind)
} }
if orgs[0].Slug != organization.ReservedSlug {
t.Fatalf("unexpected personal organization slug: %q", orgs[0].Slug)
}
}) })
t.Run("organizations/:orgSlug", func(t *testing.T) { t.Run("organizations/:orgSlug", func(t *testing.T) {
@@ -199,6 +205,9 @@ func TestRegistrationFlow(t *testing.T) {
if myOrg.Kind != string(organization.KindPersonal) { if myOrg.Kind != string(organization.KindPersonal) {
t.Fatalf("unexpected personal org kind: %q", myOrg.Kind) t.Fatalf("unexpected personal org kind: %q", myOrg.Kind)
} }
if myOrg.Slug != organization.ReservedSlug {
t.Fatalf("unexpected personal org slug: %q", myOrg.Slug)
}
orgID, err := uuid.NewV7() orgID, err := uuid.NewV7()
if err != nil { if err != nil {

27
apps/backend/internal/organization/organization.go
View File

@@ -1,6 +1,7 @@
package organization package organization
import ( import (
"encoding/json"
"time" "time"
"github.com/google/uuid" "github.com/google/uuid"
@@ -26,6 +27,32 @@ type Organization struct {
UpdatedAt time.Time `bun:"updated_at,notnull,nullzero" json:"updatedAt"` UpdatedAt time.Time `bun:"updated_at,notnull,nullzero" json:"updatedAt"`
} }
func (o Organization) MarshalJSON() ([]byte, error) {
type organizationJSON struct {
ID uuid.UUID `json:"id"`
Kind Kind `json:"kind"`
Name string `json:"name"`
Slug *string `json:"slug,omitempty"`
CreatedAt time.Time `json:"createdAt"`
UpdatedAt time.Time `json:"updatedAt"`
}
slug := o.Slug
if o.Kind == KindPersonal {
s := ReservedSlug
slug = &s
}
return json.Marshal(organizationJSON{
ID: o.ID,
Kind: o.Kind,
Name: o.Name,
Slug: slug,
CreatedAt: o.CreatedAt,
UpdatedAt: o.UpdatedAt,
})
}
func newOrganizationID() (uuid.UUID, error) { func newOrganizationID() (uuid.UUID, error) {
return uuid.NewV7() return uuid.NewV7()
} }