Merge pull request #3166 from harehare/improve_import_export

Import and Export Improvements
harehare · Oct 12, 2023 · afccf11 · afccf11
2 parents c8d0dd5 + fc152f8
commit afccf11
Show file tree

Hide file tree

Showing 16 changed files with 221 additions and 568 deletions.
diff --git a/backend/internal/domain/repository/item/diagramitem.go b/backend/internal/domain/repository/item/diagramitem.go
@@ -9,7 +9,7 @@ import (
 
 type ItemRepository interface {
 	FindByID(ctx context.Context, userID string, itemID string, isPublic bool) mo.Result[*diagramitem.DiagramItem]
-	Find(ctx context.Context, userID string, offset, limit int, isPublic bool, isBookmark bool) mo.Result[[]*diagramitem.DiagramItem]
+	Find(ctx context.Context, userID string, offset, limit int, isPublic bool, isBookmark bool, shouldLoadText bool) mo.Result[[]*diagramitem.DiagramItem]
 	Save(ctx context.Context, userID string, item *diagramitem.DiagramItem, isPublic bool) mo.Result[*diagramitem.DiagramItem]
 	Delete(ctx context.Context, userID string, itemID string, isPublic bool) mo.Result[bool]
 }
diff --git a/backend/internal/domain/service/service.go b/backend/internal/domain/service/service.go
@@ -9,8 +9,10 @@ import (
 	"errors"
 	"net"
 	"os"
+	"slices"
 	"time"
 
+	"github.com/99designs/gqlgen/graphql"
 	jwt "github.com/form3tech-oss/jwt-go"
 	"github.com/harehare/textusm/internal/context/values"
 	"github.com/harehare/textusm/internal/domain/model/item/diagramitem"
@@ -55,11 +57,13 @@ func isAuthenticated(ctx context.Context) error {
 }
 
 func (s *Service) Find(ctx context.Context, offset, limit int, isPublic bool, isBookmark bool, fields map[string]struct{}) mo.Result[[]*diagramitem.DiagramItem] {
+	shouldLoadText := slices.Contains(graphql.CollectAllFields(ctx), "text")
+
 	if err := isAuthenticated(ctx); err != nil {
 		return mo.Err[[]*diagramitem.DiagramItem](err)
 	}
 
-	return s.repo.Find(ctx, values.GetUID(ctx).OrEmpty(), offset, limit, isPublic, isBookmark)
+	return s.repo.Find(ctx, values.GetUID(ctx).OrEmpty(), offset, limit, isPublic, isBookmark, shouldLoadText)
 }
 
 func (s *Service) FindByID(ctx context.Context, itemID string, isPublic bool) mo.Result[*diagramitem.DiagramItem] {

diff --git a/backend/internal/infra/firebase/item/diagramitem.go b/backend/internal/infra/firebase/item/diagramitem.go
@@ -49,7 +49,7 @@ func (r *FirestoreItemRepository) FindByID(ctx context.Context, userID string, i
 	})
 }
 
-func (r *FirestoreItemRepository) Find(ctx context.Context, userID string, offset, limit int, isPublic bool, isBookmark bool) mo.Result[[]*diagramitem.DiagramItem] {
+func (r *FirestoreItemRepository) Find(ctx context.Context, userID string, offset, limit int, isPublic bool, isBookmark bool, shouldLoadText bool) mo.Result[[]*diagramitem.DiagramItem] {
 	var (
 		items []*diagramitem.DiagramItem
 		iter  *firestore.DocumentIterator
@@ -79,7 +79,17 @@ func (r *FirestoreItemRepository) Find(ctx context.Context, userID string, offse
 		}
 
 		items = append(items, i.Map(func(v *diagramitem.DiagramItem) (*diagramitem.DiagramItem, error) {
-			return v.ClearText(), nil
+			if shouldLoadText && v.IsSaveToStorage() {
+				ret := r.findFromCloudStorage(ctx, userID, v.ID())
+				if ret.IsError() {
+					slog.Error("Failed find diagram", "userID", userID, "itemID", v.ID(), "isPublic", isPublic)
+					return nil, ret.Error()
+				}
+				v.UpdateEncryptedText(ret.OrEmpty())
+				return v, nil
+			} else {
+				return v.ClearText(), nil
+			}
 		}).OrEmpty())
 	}
 
@@ -237,5 +247,5 @@ func (r *FirestoreItemRepository) deleteToFirestore(ctx context.Context, userID
 
 func (r *FirestoreItemRepository) deleteToCloudStorage(ctx context.Context, userID, itemID string) mo.Result[bool] {
 	storage := firebase.NewCloudStorage(r.storage)
-	return storage.Delete(ctx, userID, itemID)
+	return storage.Delete(ctx, storageRoot, userID, itemID)
 }
diff --git a/backend/internal/infra/firebase/storage.go b/backend/internal/infra/firebase/storage.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"compress/gzip"
 	"context"
+	"fmt"
 	"io"
 	"strings"
 
@@ -94,14 +95,16 @@ func (s *CloudStorage) Get(ctx context.Context, prefix string, paths ...string)
 	return mo.Ok(string(body))
 }
 
-func (s *CloudStorage) Delete(ctx context.Context, uid, itemID string) mo.Result[bool] {
+func (s *CloudStorage) Delete(ctx context.Context, prefix, uid, itemID string) mo.Result[bool] {
 	bucket, err := s.client.DefaultBucket()
 
 	if err != nil {
 		return mo.Err[bool](err)
 	}
 
-	if err = bucket.Object(getObjectName(uid, itemID)).Delete(ctx); err != nil {
+	fmt.Println(getObjectName(prefix, uid, itemID))
+
+	if err = bucket.Object(getObjectName(prefix, uid, itemID)).Delete(ctx); err != nil {
 		return mo.Err[bool](err)
 	}
 

diff --git a/firebase.json b/firebase.json
@@ -2,7 +2,12 @@
   "hosting": {
     "public": "frontend/dist",
     "target": "textusm",
-    "ignore": ["firebase.json", "**/.*", "**/node_modules/**", "**/*.map"],
+    "ignore": [
+      "firebase.json",
+      "**/.*",
+      "**/node_modules/**",
+      "**/*.map"
+    ],
     "rewrites": [
       {
         "source": "**",
@@ -74,7 +79,8 @@
     },
     "hosting": {
       "port": 5000
-    }
+    },
+    "singleProjectMode": true
   },
   "storage": {
     "rules": "storage.rules"