From 4f9168a2290e5fc4d2951d503a24202c029c5a92 Mon Sep 17 00:00:00 2001
From: Bryan Frimin <bryan@getprobo.com>
Date: Tue, 13 May 2025 15:26:30 -0700
Subject: [PATCH] Fix cannot upload organiation logo

Signed-off-by: Bryan Frimin <bryan@getprobo.com>
---
 pkg/probo/organization_service.go        | 23 ++++++++++-------------
 pkg/server/api/console/v1/v1_resolver.go |  7 ++++++-
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/pkg/probo/organization_service.go b/pkg/probo/organization_service.go
index 03a9aa633..00fbe8e91 100644
--- a/pkg/probo/organization_service.go
+++ b/pkg/probo/organization_service.go
@@ -44,12 +44,9 @@ type (
 	}
 
 	UpdateOrganizationRequest struct {
-		ID          gid.GID
-		Name        *string
-		File        io.Reader
-		Filename    string
-		FileSize    int64
-		ContentType string
+		ID   gid.GID
+		Name *string
+		File *File
 	}
 )
 
@@ -138,11 +135,11 @@ func (s OrganizationService) Update(
 
 				var fileSize int64
 				var fileContent io.ReadSeeker
-				filename := req.Filename
-				contentType := req.ContentType
+				filename := req.File.Filename
+				contentType := req.File.ContentType
 
-				if seeker, ok := req.File.(io.Seeker); ok {
-					if req.FileSize <= 0 {
+				if seeker, ok := req.File.Content.(io.Seeker); ok {
+					if req.File.Size <= 0 {
 						size, err := seeker.Seek(0, io.SeekEnd)
 						if err != nil {
 							return fmt.Errorf("cannot determine file size: %w", err)
@@ -154,11 +151,11 @@ func (s OrganizationService) Update(
 							return fmt.Errorf("cannot reset file position: %w", err)
 						}
 					} else {
-						fileSize = req.FileSize
+						fileSize = req.File.Size
 					}
-					fileContent = req.File.(io.ReadSeeker)
+					fileContent = req.File.Content.(io.ReadSeeker)
 				} else {
-					buf, err := io.ReadAll(req.File)
+					buf, err := io.ReadAll(req.File.Content)
 					if err != nil {
 						return fmt.Errorf("cannot read file: %w", err)
 					}
diff --git a/pkg/server/api/console/v1/v1_resolver.go b/pkg/server/api/console/v1/v1_resolver.go
index 1bd019649..2ac1e1136 100644
--- a/pkg/server/api/console/v1/v1_resolver.go
+++ b/pkg/server/api/console/v1/v1_resolver.go
@@ -334,7 +334,12 @@ func (r *mutationResolver) UpdateOrganization(ctx context.Context, input types.U
 	}
 
 	if input.Logo != nil {
-		req.File = input.Logo.File
+		req.File = &probo.File{
+			Filename:    input.Logo.Filename,
+			ContentType: input.Logo.ContentType,
+			Size:        input.Logo.Size,
+			Content:     input.Logo.File,
+		}
 	}
 
 	organization, err := svc.Organizations.Update(ctx, req)