chore: update schema

cli/cmd/organization/list/organization_list_test.go

@@ -36,16 +36,13 @@ func TestList(t *testing.T) {
 					Slug: fmt.Sprintf("name-%s-slug", id),
 				},
 			}
-			organizationsAsStrings = append(organizationsAsStrings, test.OrganizationMembershipToResponse(struct {
-				Role         test.Role
-				Organization struct {
-					ID   string
-					Name string
-					Slug string
-				}
-			}{
-				Role:         test.Role(organization.Role),
-				Organization: organization.Organization,
+			organizationsAsStrings = append(organizationsAsStrings, test.OrganizationMembershipToResponse(test.Membership{
+				Role: test.Role(organization.Role),
+				Organization: test.Organization{
+					ID:   organization.Organization.ID,
+					Name: organization.Organization.Name,
+					Slug: organization.Organization.Slug,
+				},
 			}))
 		}
 

cli/internal/gql/organization/create.go

@@ -2,6 +2,7 @@ package organization
 
 import (
 	"context"
+	"errors"
 
 	"git.sr.ht/~emersion/gqlclient"
 )
@@ -22,16 +23,23 @@ func Create(name string, client *gqlclient.Client) (Organization, error) {
 		return resp.OrganizationCreate, err
 	}
 
+	if resp.OrganizationCreate.Typename != "Organization" {
+		return resp.OrganizationCreate, errors.New(resp.OrganizationCreate.Typename)
+	}
+
 	return resp.OrganizationCreate, nil
 }
 
 func createOrganizationCreateOperation(name string) *gqlclient.Operation {
 	op := gqlclient.NewOperation(`
 	mutation OrganizationCreate($name: String!) {
 		organizationCreate(input: { name: $name }) {
-			id
-			name
-			slug
+			__typename
+			... on Organization {
+				id
+				name
+				slug
+			}
 		}
 	}
 `)

cli/internal/gql/organization/create_test.go

@@ -12,9 +12,10 @@ import (
 func TestCreate(t *testing.T) {
 	t.Run("can return organization on OrganizationCreate mutation", func(t *testing.T) {
 		expectedOrganization := Organization{
-			ID:   "id",
-			Name: "name",
-			Slug: "slug",
+			Typename: "Organization",
+			ID:       "id",
+			Name:     "name",
+			Slug:     "slug",
 		}
 		response := organizationToQueryResult("organizationCreate", expectedOrganization)
 		c := test.CreateTestGqlClient(t, response)
@@ -46,6 +47,18 @@ func TestCreate(t *testing.T) {
 		assert.NotErrorIs(t, err, ErrOrganizationNameInvalidCharacter)
 		assert.Equal(t, Organization{}, actualOrganization)
 	})
+
+	t.Run("given non-organization return type it returns the type as an error", func(t *testing.T) {
+		o := Organization{Typename: "OrganizationSlugOccupied"}
+		response := organizationToQueryResult("organizationCreate", o)
+		c := test.CreateTestGqlClient(t, response)
+
+		_, err := Create("", c)
+
+		if assert.Error(t, err) {
+			assert.Equal(t, "OrganizationSlugOccupied", err.Error())
+		}
+	})
 }
 
 func organizationToQueryResult(queryName string, o Organization) string {
@@ -58,8 +71,9 @@ func organizationToQueryResult(queryName string, o Organization) string {
 
 func organizationToResponse(o Organization) string {
 	return fmt.Sprintf(`{
+		"__typename": "%s",
 		"id": "%s",
 		"name": "%s",
 		"slug": "%s"
-	}`, o.ID, o.Name, o.Slug)
+	}`, o.Typename, o.ID, o.Name, o.Slug)
 }

cli/internal/gql/organization/types.go

@@ -1,9 +1,10 @@
 package organization
 
 type Organization struct {
-	ID   string
-	Name string
-	Slug string
+	Typename string `json:"__typename"`
+	ID       string
+	Name     string
+	Slug     string
 }
 
 type Role string

cli/internal/gql/user/query_user_test.go

@@ -23,16 +23,13 @@ func TestQueryUser(t *testing.T) {
 			FullName:    "Test User",
 			Memberships: []organization.OrganizationMembership{membership},
 		}
-		membershipAsString := test.OrganizationMembershipToResponse(struct {
-			Role         test.Role
-			Organization struct {
-				ID   string
-				Name string
-				Slug string
-			}
-		}{
-			Role:         test.Role(membership.Role),
-			Organization: membership.Organization,
+		membershipAsString := test.OrganizationMembershipToResponse(test.Membership{
+			Role: test.Role(membership.Role),
+			Organization: test.Organization{
+				ID:   membership.Organization.ID,
+				Name: membership.Organization.Name,
+				Slug: membership.Organization.Slug,
+			},
 		})
 
 		response := `{

cli/test/query_response_helpers.go

@@ -52,15 +52,18 @@ const (
 	User  Role = "USER"
 )
 
-func OrganizationMembershipToResponse(o struct {
+type Organization struct {
+	ID   string
+	Name string
+	Slug string
+}
+
+type Membership struct {
 	Role         Role
-	Organization struct {
-		ID   string
-		Name string
-		Slug string
-	}
-},
-) string {
+	Organization Organization
+}
+
+func OrganizationMembershipToResponse(o Membership) string {
 	return fmt.Sprintf(`{
 		"role": "%s",
 		"organization": {

python/src/numerous/generated/graphql/__init__.py

@@ -24,7 +24,7 @@
     AppSubscriptionStatus,
     AuthRole,
     Role,
-    ShareOfferStatus,
+    SubscriptionOfferStatus,
     ToolHashType,
 )
 from .exceptions import (
@@ -47,6 +47,7 @@
 )
 from .input_types import (
     AppCreateInfo,
+    AppDeployInput,
     AppSecret,
     BuildPushInput,
     ElementInput,
@@ -55,7 +56,7 @@
     NewOrganization,
     NewTool,
     OrganizationInvitationInput,
-    ShareOfferInput,
+    SubscriptionOfferInput,
 )
 from .update_element import UpdateElement, UpdateElementElementUpdate
 from .updates import (
@@ -95,6 +96,7 @@
     "AllElementsSessionAllTextField",
     "AllElementsSessionAllTextFieldGraphContext",
     "AppCreateInfo",
+    "AppDeployInput",
     "AppDeploymentStatus",
     "AppSecret",
     "AppSubscriptionStatus",
@@ -122,9 +124,9 @@
     "NumberFieldValue",
     "OrganizationInvitationInput",
     "Role",
-    "ShareOfferInput",
-    "ShareOfferStatus",
     "SliderValue",
+    "SubscriptionOfferInput",
+    "SubscriptionOfferStatus",
     "TextFieldValue",
     "ToolHashType",
     "UpdateElement",

python/src/numerous/generated/graphql/enums.py

@@ -23,7 +23,7 @@ class AppDeploymentStatus(str, Enum):
     UNKNOWN = "UNKNOWN"
 
 
-class ShareOfferStatus(str, Enum):
+class SubscriptionOfferStatus(str, Enum):
     ACCEPTED = "ACCEPTED"
     REJECTED = "REJECTED"
     PENDING = "PENDING"

python/src/numerous/generated/graphql/input_types.py

@@ -9,15 +9,16 @@
 from .enums import Role
 
 
+class NewOrganization(BaseModel):
+    name: str
+    slug: Optional[str] = None
+
+
 class OrganizationInvitationInput(BaseModel):
     role: Role
     email: str
 
 
-class NewOrganization(BaseModel):
-    name: str
-
-
 class NewTool(BaseModel):
     user_id: str = Field(alias="userId")
     manifest: str
@@ -29,9 +30,13 @@ class AppCreateInfo(BaseModel):
     description: str
 
 
-class ShareOfferInput(BaseModel):
+class AppDeployInput(BaseModel):
+    secrets: Optional[List["AppSecret"]] = None
+
+
+class SubscriptionOfferInput(BaseModel):
     email: str
-    app_id: str = Field(alias="appId")
+    app_name: str = Field(alias="appName")
 
 
 class ElementInput(BaseModel):