Add update organziation

Signed-off-by: gearnode <bryan@frimin.fr>

pkg/coredata/migrations/20250313T110700Z.sql

@@ -0,0 +1 @@
+ALTER TABLE organizations RENAME COLUMN logo_url TO logo_object_key;

pkg/coredata/organization.go

@@ -27,12 +27,12 @@ import (
 
 type (
 	Organization struct {
-		ID        gid.GID      `db:"id"`
-		TenantID  gid.TenantID `db:"tenant_id"`
-		Name      string       `db:"name"`
-		LogoURL   string       `db:"logo_url"`
-		CreatedAt time.Time    `db:"created_at"`
-		UpdatedAt time.Time    `db:"updated_at"`
+		ID            gid.GID      `db:"id"`
+		TenantID      gid.TenantID `db:"tenant_id"`
+		Name          string       `db:"name"`
+		LogoObjectKey string       `db:"logo_object_key"`
+		CreatedAt     time.Time    `db:"created_at"`
+		UpdatedAt     time.Time    `db:"updated_at"`
 	}
 
 	Organizations []*Organization
@@ -49,7 +49,7 @@ SELECT
     tenant_id,
     id,
     name,
-    logo_url,
+    logo_object_key,
     created_at,
     updated_at
 FROM
@@ -89,19 +89,19 @@ INSERT INTO organizations (
     tenant_id,
     id,
     name,
-    logo_url,
+    logo_object_key,
     created_at,
     updated_at
-) VALUES (@tenant_id, @id, @name, @logo_url, @created_at, @updated_at)
+) VALUES (@tenant_id, @id, @name, @logo_object_key, @created_at, @updated_at)
 `
 
 	args := pgx.StrictNamedArgs{
-		"tenant_id":  o.TenantID,
-		"id":         o.ID,
-		"name":       o.Name,
-		"logo_url":   o.LogoURL,
-		"created_at": o.CreatedAt,
-		"updated_at": o.UpdatedAt,
+		"tenant_id":       o.TenantID,
+		"id":              o.ID,
+		"name":            o.Name,
+		"logo_object_key": o.LogoObjectKey,
+		"created_at":      o.CreatedAt,
+		"updated_at":      o.UpdatedAt,
 	}
 
 	_, err := conn.Exec(ctx, q, args)
@@ -111,3 +111,38 @@ INSERT INTO organizations (
 
 	return nil
 }
+
+func (o *Organization) Update(
+	ctx context.Context,
+	scope Scoper,
+	conn pg.Conn,
+) error {
+	q := `
+UPDATE organizations
+SET
+    name = @name,
+    logo_object_key = @logo_object_key,
+    updated_at = @updated_at
+WHERE
+    %s
+    AND id = @id
+`
+
+	q = fmt.Sprintf(q, scope.SQLFragment())
+
+	args := pgx.StrictNamedArgs{
+		"id":              o.ID,
+		"name":            o.Name,
+		"logo_object_key": o.LogoObjectKey,
+		"updated_at":      o.UpdatedAt,
+	}
+
+	maps.Copy(args, scope.SQLArguments())
+
+	_, err := conn.Exec(ctx, q, args)
+	if err != nil {
+		return fmt.Errorf("cannot update organization: %w", err)
+	}
+
+	return nil
+}

pkg/probo/organization_service.go

@@ -17,10 +17,14 @@ package probo
 import (
 	"context"
 	"fmt"
+	"io"
 	"time"
 
+	"github.com/aws/aws-sdk-go-v2/aws"
+	"github.com/aws/aws-sdk-go-v2/service/s3"
 	"github.com/getprobo/probo/pkg/coredata"
 	"github.com/getprobo/probo/pkg/gid"
+	"go.gearno.de/crypto/uuid"
 	"go.gearno.de/kit/pg"
 )
 
@@ -32,6 +36,12 @@ type (
 	CreateOrganizationRequest struct {
 		Name string
 	}
+
+	UpdateOrganizationRequest struct {
+		ID   gid.GID
+		Name *string
+		File io.Reader
+	}
 )
 
 func (s OrganizationService) Create(
@@ -94,3 +104,85 @@ func (s OrganizationService) Get(
 
 	return organization, nil
 }
+
+func (s OrganizationService) Update(
+	ctx context.Context,
+	req UpdateOrganizationRequest,
+) (*coredata.Organization, error) {
+	organization := &coredata.Organization{}
+
+	err := s.svc.pg.WithConn(
+		ctx,
+		func(conn pg.Conn) error {
+			if err := organization.LoadByID(ctx, conn, s.svc.scope, req.ID); err != nil {
+				return fmt.Errorf("cannot load organization: %w", err)
+			}
+
+			organization.UpdatedAt = time.Now()
+
+			if req.Name != nil {
+				organization.Name = *req.Name
+			}
+
+			if req.File != nil {
+				objectKey, err := uuid.NewV7()
+				if err != nil {
+					return fmt.Errorf("cannot generate object key: %w", err)
+				}
+
+				_, err = s.svc.s3.PutObject(ctx, &s3.PutObjectInput{
+					Bucket: aws.String(s.svc.bucket),
+					Key:    aws.String(objectKey.String()),
+					Body:   req.File,
+				})
+
+				if err != nil {
+					return fmt.Errorf("cannot upload file to S3: %w", err)
+				}
+
+				organization.LogoObjectKey = objectKey.String()
+			}
+
+			if err := organization.Update(ctx, s.svc.scope, conn); err != nil {
+				return fmt.Errorf("cannot update organization: %w", err)
+			}
+
+			return nil
+		},
+	)
+
+	if err != nil {
+		return nil, err
+	}
+
+	return organization, nil
+}
+
+func (s OrganizationService) GenerateLogoURL(
+	ctx context.Context,
+	organizationID gid.GID,
+	expiresIn time.Duration,
+) (*string, error) {
+	organization, err := s.Get(ctx, organizationID)
+	if err != nil {
+		return nil, fmt.Errorf("cannot get organization: %w", err)
+	}
+
+	if organization.LogoObjectKey == "" {
+		return nil, nil
+	}
+
+	presignClient := s3.NewPresignClient(s.svc.s3)
+
+	presignedReq, err := presignClient.PresignGetObject(ctx, &s3.GetObjectInput{
+		Bucket: aws.String(s.svc.bucket),
+		Key:    aws.String(organization.LogoObjectKey),
+	}, func(opts *s3.PresignOptions) {
+		opts.Expires = expiresIn
+	})
+	if err != nil {
+		return nil, fmt.Errorf("cannot presign GetObject request: %w", err)
+	}
+
+	return &presignedReq.URL, nil
+}

pkg/server/api/console/v1/schema.graphql

@@ -107,7 +107,7 @@ type OrganizationEdge {
 type Organization implements Node {
   id: ID!
   name: String!
-  logoUrl: String!
+  logoUrl: String @goField(forceResolver: true)
 
   frameworks(
     first: Int
@@ -467,7 +467,7 @@ input CreateOrganizationInput {
 input UpdateOrganizationInput {
   organizationId: ID!
   name: String
-  logoUrl: String
+  logo: Upload
 }
 
 input DeleteOrganizationInput {

pkg/server/api/console/v1/schema/schema.go

@@ -427,6 +427,7 @@ type MutationResolver interface {
 	ConfirmEmail(ctx context.Context, input types.ConfirmEmailInput) (*types.ConfirmEmailPayload, error)
 }
 type OrganizationResolver interface {
+	LogoURL(ctx context.Context, obj *types.Organization) (*string, error)
 	Frameworks(ctx context.Context, obj *types.Organization, first *int, after *page.CursorKey, last *int, before *page.CursorKey) (*types.FrameworkConnection, error)
 	Vendors(ctx context.Context, obj *types.Organization, first *int, after *page.CursorKey, last *int, before *page.CursorKey) (*types.VendorConnection, error)
 	Peoples(ctx context.Context, obj *types.Organization, first *int, after *page.CursorKey, last *int, before *page.CursorKey) (*types.PeopleConnection, error)
@@ -2065,7 +2066,7 @@ type OrganizationEdge {
 type Organization implements Node {
   id: ID!
   name: String!
-  logoUrl: String!
+  logoUrl: String @goField(forceResolver: true)
 
   frameworks(
     first: Int
@@ -2425,7 +2426,7 @@ input CreateOrganizationInput {
 input UpdateOrganizationInput {
   organizationId: ID!
   name: String
-  logoUrl: String
+  logo: Upload
 }
 
 input DeleteOrganizationInput {
@@ -7462,29 +7463,26 @@ func (ec *executionContext) _Organization_logoUrl(ctx context.Context, field gra
 	ctx = graphql.WithFieldContext(ctx, fc)
 	resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (any, error) {
 		ctx = rctx // use context from middleware stack in children
-		return obj.LogoURL, nil
+		return ec.resolvers.Organization().LogoURL(rctx, obj)
 	})
 	if err != nil {
 		ec.Error(ctx, err)
 		return graphql.Null
 	}
 	if resTmp == nil {
-		if !graphql.HasFieldError(ctx, fc) {
-			ec.Errorf(ctx, "must not be null")
-		}
 		return graphql.Null
 	}
-	res := resTmp.(string)
+	res := resTmp.(*string)
 	fc.Result = res
-	return ec.marshalNString2string(ctx, field.Selections, res)
+	return ec.marshalOString2ᚖstring(ctx, field.Selections, res)
 }
 
 func (ec *executionContext) fieldContext_Organization_logoUrl(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) {
 	fc = &graphql.FieldContext{
 		Object:     "Organization",
 		Field:      field,
-		IsMethod:   false,
-		IsResolver: false,
+		IsMethod:   true,
+		IsResolver: true,
 		Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) {
 			return nil, errors.New("field of type String does not have child fields")
 		},
@@ -13938,7 +13936,7 @@ func (ec *executionContext) unmarshalInputUpdateOrganizationInput(ctx context.Co
 		asMap[k] = v
 	}
 
-	fieldsInOrder := [...]string{"organizationId", "name", "logoUrl"}
+	fieldsInOrder := [...]string{"organizationId", "name", "logo"}
 	for _, k := range fieldsInOrder {
 		v, ok := asMap[k]
 		if !ok {
@@ -13959,13 +13957,13 @@ func (ec *executionContext) unmarshalInputUpdateOrganizationInput(ctx context.Co
 				return it, err
 			}
 			it.Name = data
-		case "logoUrl":
-			ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("logoUrl"))
-			data, err := ec.unmarshalOString2ᚖstring(ctx, v)
+		case "logo":
+			ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("logo"))
+			data, err := ec.unmarshalOUpload2ᚖgithubᚗcomᚋ99designsᚋgqlgenᚋgraphqlᚐUpload(ctx, v)
 			if err != nil {
 				return it, err
 			}
-			it.LogoURL = data
+			it.Logo = data
 		}
 	}
 
@@ -15815,10 +15813,33 @@ func (ec *executionContext) _Organization(ctx context.Context, sel ast.Selection
 				atomic.AddUint32(&out.Invalids, 1)
 			}
 		case "logoUrl":
-			out.Values[i] = ec._Organization_logoUrl(ctx, field, obj)
-			if out.Values[i] == graphql.Null {
-				atomic.AddUint32(&out.Invalids, 1)
+			field := field
+
+			innerFunc := func(ctx context.Context, _ *graphql.FieldSet) (res graphql.Marshaler) {
+				res = ec._Organization_logoUrl(ctx, field, obj)
+				return res
 			}
+
+			if field.Deferrable != nil {
+				dfs, ok := deferred[field.Deferrable.Label]
+				di := 0
+				if ok {
+					dfs.AddField(field)
+					di = len(dfs.Values) - 1
+				} else {
+					dfs = graphql.NewFieldSet([]graphql.CollectedField{field})
+					deferred[field.Deferrable.Label] = dfs
+				}
+				dfs.Concurrently(di, func(ctx context.Context) graphql.Marshaler {
+					return innerFunc(ctx, dfs)
+				})
+
+				// don't run the out.Concurrently() call below
+				out.Values[i] = graphql.Null
+				continue
+			}
+
+			out.Concurrently(i, func(ctx context.Context) graphql.Marshaler { return innerFunc(ctx, out) })
 		case "frameworks":
 			field := field
 
@@ -19835,6 +19856,22 @@ var (
 	}
 )
 
+func (ec *executionContext) unmarshalOUpload2ᚖgithubᚗcomᚋ99designsᚋgqlgenᚋgraphqlᚐUpload(ctx context.Context, v any) (*graphql.Upload, error) {
+	if v == nil {
+		return nil, nil
+	}
+	res, err := graphql.UnmarshalUpload(v)
+	return &res, graphql.ErrorOnPath(ctx, err)
+}
+
+func (ec *executionContext) marshalOUpload2ᚖgithubᚗcomᚋ99designsᚋgqlgenᚋgraphqlᚐUpload(ctx context.Context, sel ast.SelectionSet, v *graphql.Upload) graphql.Marshaler {
+	if v == nil {
+		return graphql.Null
+	}
+	res := graphql.MarshalUpload(*v)
+	return res
+}
+
 func (ec *executionContext) marshalO__EnumValue2ᚕgithubᚗcomᚋ99designsᚋgqlgenᚋgraphqlᚋintrospectionᚐEnumValueᚄ(ctx context.Context, sel ast.SelectionSet, v []introspection.EnumValue) graphql.Marshaler {
 	if v == nil {
 		return graphql.Null

pkg/server/api/console/v1/types/organization.go

@@ -22,7 +22,6 @@ func NewOrganization(o *coredata.Organization) *Organization {
 	return &Organization{
 		ID:        o.ID,
 		Name:      o.Name,
-		LogoURL:   o.LogoURL,
 		CreatedAt: o.CreatedAt,
 		UpdatedAt: o.UpdatedAt,
 	}

pkg/server/api/console/v1/types/types.go

@@ -253,7 +253,7 @@ type Mutation struct {
 type Organization struct {
 	ID         gid.GID              `json:"id"`
 	Name       string               `json:"name"`
-	LogoURL    string               `json:"logoUrl"`
+	LogoURL    *string              `json:"logoUrl,omitempty"`
 	Frameworks *FrameworkConnection `json:"frameworks"`
 	Vendors    *VendorConnection    `json:"vendors"`
 	Peoples    *PeopleConnection    `json:"peoples"`
@@ -399,9 +399,9 @@ type UpdateFrameworkPayload struct {
 }
 
 type UpdateOrganizationInput struct {
-	OrganizationID gid.GID `json:"organizationId"`
-	Name           *string `json:"name,omitempty"`
-	LogoURL        *string `json:"logoUrl,omitempty"`
+	OrganizationID gid.GID         `json:"organizationId"`
+	Name           *string         `json:"name,omitempty"`
+	Logo           *graphql.Upload `json:"logo,omitempty"`
 }
 
 type UpdateOrganizationPayload struct {

pkg/server/api/console/v1/v1_resolver.go

@@ -197,6 +197,29 @@ func (r *mutationResolver) CreateOrganization(ctx context.Context, input types.C
 	}, nil
 }
 
+// UpdateOrganization is the resolver for the updateOrganization field.
+func (r *mutationResolver) UpdateOrganization(ctx context.Context, input types.UpdateOrganizationInput) (*types.UpdateOrganizationPayload, error) {
+	svc := r.GetTenantServiceIfAuthorized(ctx, input.OrganizationID.TenantID())
+
+	req := probo.UpdateOrganizationRequest{
+		ID:   input.OrganizationID,
+		Name: input.Name,
+	}
+
+	if input.Logo != nil {
+		req.File = input.Logo.File
+	}
+
+	organization, err := svc.Organizations.Update(ctx, req)
+	if err != nil {
+		return nil, fmt.Errorf("cannot update organization: %w", err)
+	}
+
+	return &types.UpdateOrganizationPayload{
+		Organization: types.NewOrganization(organization),
+	}, nil
+}
+
 // DeleteOrganization is the resolver for the deleteOrganization field.
 func (r *mutationResolver) DeleteOrganization(ctx context.Context, input types.DeleteOrganizationInput) (*types.DeleteOrganizationPayload, error) {
 	panic(fmt.Errorf("not implemented: DeleteOrganization - deleteOrganization"))
@@ -320,6 +343,11 @@ func (r *mutationResolver) UpdateFramework(ctx context.Context, input types.Upda
 	}, nil
 }
 
+// ImportFramework is the resolver for the importFramework field.
+func (r *mutationResolver) ImportFramework(ctx context.Context, input types.ImportFrameworkInput) (*types.ImportFrameworkPayload, error) {
+	panic(fmt.Errorf("not implemented: ImportFramework - importFramework"))
+}
+
 // CreateControl is the resolver for the createControl field.
 func (r *mutationResolver) CreateControl(ctx context.Context, input types.CreateControlInput) (*types.CreateControlPayload, error) {
 	svc := r.GetTenantServiceIfAuthorized(ctx, input.FrameworkID.TenantID())
@@ -464,6 +492,13 @@ func (r *mutationResolver) ConfirmEmail(ctx context.Context, input types.Confirm
 	return &types.ConfirmEmailPayload{Success: true}, nil
 }
 
+// LogoURL is the resolver for the logoUrl field.
+func (r *organizationResolver) LogoURL(ctx context.Context, obj *types.Organization) (*string, error) {
+	svc := r.GetTenantServiceIfAuthorized(ctx, obj.ID.TenantID())
+
+	return svc.Organizations.GenerateLogoURL(ctx, obj.ID, 1*time.Hour)
+}
+
 // Frameworks is the resolver for the frameworks field.
 func (r *organizationResolver) Frameworks(ctx context.Context, obj *types.Organization, first *int, after *page.CursorKey, last *int, before *page.CursorKey) (*types.FrameworkConnection, error) {
 	svc := r.GetTenantServiceIfAuthorized(ctx, obj.ID.TenantID())