refactor

reearth · Dec 23, 2024 · e80cf07 · e80cf07
1 parent d2f3636
commit e80cf07
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/.github/workflows/build_copier.yml b/.github/workflows/build_copier.yml
@@ -29,7 +29,7 @@ jobs:
         env:
           BRANCH: ${{ github.event.workflow_run.head_branch }}
         run: |
-          echo "sha_short=$(git rev-parse --short HEAD))" >> "$GITHUB_OUTPUT"
+          echo "sha_short=$(git rev-parse --short HEAD)" >> "$GITHUB_OUTPUT"
           if [[ "$BRANCH" = "release" ]]; then
             TAG=$(git tag --points-at HEAD)
             if [[ ! -z "$TAG" ]]; then

diff --git a/server/internal/infrastructure/gcp/taskrunner.go b/server/internal/infrastructure/gcp/taskrunner.go
@@ -145,7 +145,7 @@ func decompressAsset(ctx context.Context, p task.Payload, conf *TaskConfig) erro
 }
 
 func copy(ctx context.Context, p task.Payload, conf *TaskConfig) error {
-	if p.Copy == nil {
+	if !p.Copy.Validate() {
 		return nil
 	}
 

diff --git a/server/internal/usecase/interactor/model.go b/server/internal/usecase/interactor/model.go
@@ -413,6 +413,7 @@ func (i Model) copyMetaSchema(ctx context.Context, oldMetaSchemaId id.SchemaID,
 }
 
 func (i Model) copyItems(ctx context.Context, oldSchemaID, newSchemaID id.SchemaID, newModelID id.ModelID) error {
+	collection := "item"
 	filter, err := json.Marshal(bson.M{"schema": oldSchemaID.String()})
 	if err != nil {
 		return err
@@ -434,7 +435,7 @@ func (i Model) copyItems(ctx context.Context, oldSchemaID, newSchemaID id.Schema
 	if err != nil {
 		return err
 	}
-	return i.triggerCopyEvent(ctx, "item", string(filter), string(changes))
+	return i.triggerCopyEvent(ctx, collection, string(filter), string(changes))
 }
 
 func (i Model) triggerCopyEvent(ctx context.Context, collection, filter, changes string) error {

diff --git a/server/pkg/task/task.go b/server/pkg/task/task.go
@@ -57,6 +57,10 @@ func (p *CopyPayload) Payload() Payload {
 	}
 }
 
+func (p *CopyPayload) Validate() bool {
+	return p != nil && p.Changes != "" && p.Collection != "" && p.Filter != ""
+}
+
 type Changes map[string]Change
 type Change struct {
 	Type  ChangeType