From 8f0e30e9cd329520c5b77c4a76cce9961d317889 Mon Sep 17 00:00:00 2001 From: tantaka tomokazu Date: Mon, 28 Oct 2024 15:28:22 +0900 Subject: [PATCH] fix(server): debug export project file (#1200) --- .../adapter/gql/resolver_mutation_project.go | 12 ++++---- server/internal/usecase/interactor/scene.go | 29 +++++++++---------- server/pkg/scene/builder/builder.go | 8 ++--- 3 files changed, 23 insertions(+), 26 deletions(-) diff --git a/server/internal/adapter/gql/resolver_mutation_project.go b/server/internal/adapter/gql/resolver_mutation_project.go index 0354e00d11..96699dfaf6 100644 --- a/server/internal/adapter/gql/resolver_mutation_project.go +++ b/server/internal/adapter/gql/resolver_mutation_project.go @@ -128,9 +128,9 @@ func (r *mutationResolver) ExportProject(ctx context.Context, input gqlmodel.Exp t := time.Now().UTC() entropy := ulid.Monotonic(rand.New(rand.NewSource(uint64(t.UnixNano()))), 0) name := ulid.MustNew(ulid.Timestamp(t), entropy) - zipFile, err := fs.Create(fmt.Sprintf("%s.zip", name.String())) + zipFile, err := fs.Create(fmt.Sprintf("%s.zip", strings.ToLower(name.String()))) if err != nil { - return nil, err + return nil, errors.New("Fail Zip Create :" + err.Error()) } defer func() { if cerr := zipFile.Close(); cerr != nil && err == nil { @@ -155,25 +155,25 @@ func (r *mutationResolver) ExportProject(ctx context.Context, input gqlmodel.Exp } prj, err := usecases(ctx).Project.ExportProject(ctx, pid, zipWriter, getOperator(ctx)) if err != nil { - return nil, err + return nil, errors.New("Fail ExportProject :" + err.Error()) } sce, data, err := usecases(ctx).Scene.ExportScene(ctx, prj, zipWriter) if err != nil { - return nil, err + return nil, errors.New("Fail ExportScene :" + err.Error()) } data["project"] = gqlmodel.ToProject(prj) plgs, schemas, err := usecases(ctx).Plugin.ExportPlugins(ctx, sce, zipWriter) if err != nil { - return nil, err + return nil, errors.New("Fail ExportPlugins :" + err.Error()) } data["plugins"] = gqlmodel.ToPlugins(plgs) data["schemas"] = gqlmodel.ToPropertySchemas(schemas) err = usecases(ctx).Project.UploadExportProjectZip(ctx, zipWriter, zipFile, data, prj) if err != nil { - return nil, err + return nil, errors.New("Fail UploadExportProjectZip :" + err.Error()) } return &gqlmodel.ExportProjectPayload{ diff --git a/server/internal/usecase/interactor/scene.go b/server/internal/usecase/interactor/scene.go index 26772957f7..31fe3f60d3 100644 --- a/server/internal/usecase/interactor/scene.go +++ b/server/internal/usecase/interactor/scene.go @@ -599,21 +599,21 @@ func (i *Scene) ExportScene(ctx context.Context, prj *project.Project, zipWriter sce, err := i.sceneRepo.FindByProject(ctx, prj.ID()) if err != nil { - return nil, nil, err + return nil, nil, errors.New("Fail scene :" + err.Error()) } sceneID := sce.ID() nlsLayers, err := i.nlsLayerRepo.FindByScene(ctx, sceneID) if err != nil { - return nil, nil, err + return nil, nil, errors.New("Fail nlsLayer :" + err.Error()) } layerStyles, err := i.layerStyles.FindByScene(ctx, sceneID) if err != nil { - return nil, nil, err + return nil, nil, errors.New("Fail layerStyles :" + err.Error()) } storyList, err := i.storytellingRepo.FindByScene(ctx, sceneID) if err != nil { - return nil, nil, err + return nil, nil, errors.New("Fail storytelling :" + err.Error()) } story := (*storyList)[0] sceneJSON, err := builder.New( @@ -632,7 +632,7 @@ func (i *Scene) ExportScene(ctx context.Context, prj *project.Project, zipWriter prj.TrackingID(), ) if err != nil { - return nil, nil, err + return nil, nil, errors.New("Fail BuildResult :" + err.Error()) } // nlsLayer file resources @@ -645,9 +645,8 @@ func (i *Scene) ExportScene(ctx context.Context, prj *project.Project, zipWriter if ok { url, ok := data["url"].(string) if ok { - err := i.addZipAsset(ctx, zipWriter, url) - if err != nil { - return nil, nil, err + if err := i.addZipAsset(ctx, zipWriter, url); err != nil { + return nil, nil, errors.New("Fail addZipAsset :" + err.Error()) } } } @@ -660,7 +659,7 @@ func (i *Scene) ExportScene(ctx context.Context, prj *project.Project, zipWriter } widgetProperties, err := i.propertyRepo.FindByIDs(ctx, widgetPropertyIDs) if err != nil { - return nil, nil, err + return nil, nil, errors.New("Fail widgetProperties :" + err.Error()) } // widget button icon @@ -678,9 +677,8 @@ func (i *Scene) ExportScene(ctx context.Context, prj *project.Project, zipWriter if !ok { continue } - err := i.addZipAsset(ctx, zipWriter, u.Path) - if err != nil { - return nil, nil, err + if err := i.addZipAsset(ctx, zipWriter, u.Path); err != nil { + return nil, nil, errors.New("Fail addZipAsset :" + err.Error()) } } } @@ -695,7 +693,7 @@ func (i *Scene) ExportScene(ctx context.Context, prj *project.Project, zipWriter } pageProperties, err := i.propertyRepo.FindByIDs(ctx, pagePropertyIDs) if err != nil { - return nil, nil, err + return nil, nil, errors.New("Fail property :" + err.Error()) } // page block src for _, property := range pageProperties { @@ -706,9 +704,8 @@ func (i *Scene) ExportScene(ctx context.Context, prj *project.Project, zipWriter if !ok { continue } - err := i.addZipAsset(ctx, zipWriter, u.Path) - if err != nil { - return nil, nil, err + if err := i.addZipAsset(ctx, zipWriter, u.Path); err != nil { + return nil, nil, errors.New("Fail addZipAsset :" + err.Error()) } } } diff --git a/server/pkg/scene/builder/builder.go b/server/pkg/scene/builder/builder.go index 91dc6607c5..df47c8d821 100644 --- a/server/pkg/scene/builder/builder.go +++ b/server/pkg/scene/builder/builder.go @@ -136,13 +136,13 @@ func (b *Builder) BuildResult(ctx context.Context, publishedAt time.Time, coreSu sceneData, err := b.buildScene(ctx, publishedAt, coreSupport, enableGa, trackingId) if err != nil { - return nil, err + return nil, errors.New("Fail buildScene :" + err.Error()) } if b.story != nil { story, err := b.buildStory(ctx) if err != nil { - return nil, err + return nil, errors.New("Fail buildStory :" + err.Error()) } sceneData.Story = story } @@ -150,7 +150,7 @@ func (b *Builder) BuildResult(ctx context.Context, publishedAt time.Time, coreSu if b.nlsLayer != nil { nlsLayers, err := b.buildNLSLayers(ctx) if err != nil { - return nil, err + return nil, errors.New("Fail buildNLSLayers :" + err.Error()) } sceneData.NLSLayers = nlsLayers } @@ -158,7 +158,7 @@ func (b *Builder) BuildResult(ctx context.Context, publishedAt time.Time, coreSu if b.layerStyles != nil { layerStyles, err := b.buildLayerStyles(ctx) if err != nil { - return nil, err + return nil, errors.New("Fail buildLayerStyles :" + err.Error()) } sceneData.LayerStyles = layerStyles }