fix(web,server,worker): resolve threads bug in copier

server/go.mod

@@ -23,6 +23,7 @@ require (
 	github.com/k0kubun/pp/v3 v3.3.0
 	github.com/kelseyhightower/envconfig v1.4.0
 	github.com/labstack/echo/v4 v4.12.0
+	github.com/labstack/gommon v0.4.2
 	github.com/oapi-codegen/oapi-codegen/v2 v2.4.1
 	github.com/oapi-codegen/runtime v1.1.1
 	github.com/paulmach/go.geojson v1.5.0
@@ -116,7 +117,6 @@ require (
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/jpillora/opts v1.2.3 // indirect
 	github.com/klauspost/compress v1.17.11 // indirect
-	github.com/labstack/gommon v0.4.2 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/maruel/panicparse/v2 v2.3.1 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect

server/internal/adapter/gql/gqlmodel/convert_item.go

@@ -20,14 +20,13 @@ func ToItem(vi item.Versioned, s *schema.Schema, gsList schema.List) *Item {
 	for _, s2 := range gsList {
 		groupFields = append(groupFields, toItemFields(i.Fields(), s2, true)...)
 	}
-	return &Item{
+	itm := Item{
 		ID:                     IDFrom(i.ID()),
 		ProjectID:              IDFrom(i.Project()),
 		SchemaID:               IDFrom(i.Schema()),
 		ModelID:                IDFrom(i.Model()),
 		UserID:                 IDFromRef(i.User()),
 		IntegrationID:          IDFromRef(i.Integration()),
-		ThreadID:               IDFrom(i.Thread()),
 		MetadataID:             IDFromRef(i.MetadataItem()),
 		IsMetadata:             i.IsMetadata(),
 		OriginalID:             IDFromRef(i.MetadataItem()),
@@ -39,6 +38,10 @@ func ToItem(vi item.Versioned, s *schema.Schema, gsList schema.List) *Item {
 		Version:                vi.Version().String(),
 		Title:                  i.GetTitle(s),
 	}
+	if !i.Thread().Ref().IsNil() {
+		itm.ThreadID = IDFromRef(i.Thread().Ref())
+	}
+	return &itm
 }
 func toItemFields(fields item.Fields, s *schema.Schema, isGroupSchema bool) []*ItemField {
 	var res []*ItemField

server/internal/adapter/gql/gqlmodel/convert_item_test.go

@@ -53,7 +53,7 @@ func TestToItem(t *testing.T) {
 				ProjectID:     IDFrom(pid),
 				ModelID:       IDFrom(mid),
 				SchemaID:      IDFrom(sid),
-				ThreadID:      IDFrom(tid),
+				ThreadID:      IDFromRef(tid.Ref()),
 				UserID:        IDFromRef(uid.Ref()),
 				IntegrationID: IDFromRef(nid.Ref()),
 				CreatedAt:     i.ID().Timestamp(),

server/internal/infrastructure/mongo/mongodoc/item.go

@@ -62,12 +62,11 @@ func NewVersionedItemConsumer() *VersionedItemConsumer {
 
 func NewItem(i *item.Item) (*ItemDocument, string) {
 	itmId := i.ID().String()
-	return &ItemDocument{
+	d := ItemDocument{
 		ID:           itmId,
 		Schema:       i.Schema().String(),
 		ModelID:      i.Model().String(),
 		Project:      i.Project().String(),
-		Thread:       i.Thread().String(),
 		MetadataItem: i.MetadataItem().StringRef(),
 		OriginalItem: i.OriginalItem().StringRef(),
 		Fields: lo.FilterMap(i.Fields(), func(f *item.Field, _ int) (ItemFieldDocument, bool) {
@@ -89,7 +88,11 @@ func NewItem(i *item.Item) (*ItemDocument, string) {
 		Integration:          i.Integration().StringRef(),
 		Assets:               i.AssetIDs().Strings(),
 		IsMetadata:           i.IsMetadata(),
-	}, itmId
+	}
+	if !i.Thread().IsEmpty() {
+		d.Thread = i.Thread().String()
+	}
+	return &d, itmId
 }
 
 func (d *ItemDocument) Model() (*item.Item, error) {
@@ -113,11 +116,6 @@ func (d *ItemDocument) Model() (*item.Item, error) {
 		return nil, err
 	}
 
-	tid, err := id.ThreadIDFrom(d.Thread)
-	if err != nil {
-		return nil, err
-	}
-
 	fields, err := util.TryMap(d.Fields, func(f ItemFieldDocument) (*item.Field, error) {
 		// compat
 		if f.Field != "" {
@@ -152,11 +150,18 @@ func (d *ItemDocument) Model() (*item.Item, error) {
 		Model(mid).
 		MetadataItem(id.ItemIDFromRef(d.MetadataItem)).
 		OriginalItem(id.ItemIDFromRef(d.OriginalItem)).
-		Thread(tid).
 		IsMetadata(d.IsMetadata).
 		Fields(fields).
 		Timestamp(d.Timestamp)
 
+	if d.Thread != "" {
+		tid, err := id.ThreadIDFrom(d.Thread)
+		if err != nil {
+			return nil, err
+		}
+		ib.Thread(tid)
+	}
+
 	if uId := accountdomain.UserIDFromRef(d.User); uId != nil {
 		ib = ib.User(*uId)
 	}

server/internal/usecase/interactor/model.go

@@ -455,6 +455,10 @@ func (i Model) copyItems(ctx context.Context, oldSchemaID, newSchemaID id.Schema
 			Type:  task.ChangeTypeULID,
 			Value: timestamp.UnixMilli(),
 		},
+		"thread": {
+			Type:  task.ChangeTypeSet,
+			Value: nil,
+		},
 		"__r": { // tag
 			Type:  task.ChangeTypeSet,
 			Value: []string{"latest"},

server/pkg/item/builder.go

@@ -30,9 +30,9 @@ func (b *Builder) Build() (*Item, error) {
 	if b.i.model.IsNil() {
 		return nil, ErrInvalidID
 	}
-	if b.i.thread.IsNil() {
-		return nil, ErrInvalidID
-	}
+	// if b.i.thread.IsNil() {
+	// 	return nil, ErrInvalidID
+	// }
 	if b.i.timestamp.IsZero() {
 		b.i.timestamp = util.Now()
 	}

server/pkg/item/builder_test.go

@@ -167,19 +167,19 @@ func TestBuilder_Build(t *testing.T) {
 			want:    nil,
 			wantErr: id.ErrInvalidID,
 		},
-		{
-			name: "should fail: invalid thread ID",
-			fields: fields{
-				i: &Item{
-					id:      iid,
-					schema:  sid,
-					project: pid,
-					model:   mid,
-				},
-			},
-			want:    nil,
-			wantErr: id.ErrInvalidID,
-		},
+		// {
+		// 	name: "should fail: invalid thread ID",
+		// 	fields: fields{
+		// 		i: &Item{
+		// 			id:      iid,
+		// 			schema:  sid,
+		// 			project: pid,
+		// 			model:   mid,
+		// 		},
+		// 	},
+		// 	want:    nil,
+		// 	wantErr: id.ErrInvalidID,
+		// },
 	}
 
 	for _, tt := range tests {

server/schemas/item.graphql

@@ -1,7 +1,7 @@
 type Item implements Node {
   id: ID!
   schemaId: ID!
-  threadId: ID!
+  threadId: ID
   modelId: ID!
   projectId: ID!
   integrationId: ID
@@ -16,7 +16,7 @@ type Item implements Node {
   model: Model!
   status: ItemStatus!
   project: Project!
-  thread: Thread!
+  thread: Thread
   fields: [ItemField!]!
   assets: [Asset]!
   referencedItems:[Item!]

web/src/components/organisms/Project/Content/ContentList/hooks.ts

@@ -396,7 +396,7 @@ export default () => {
               createdBy: { id: item.createdBy?.id ?? "", name: item.createdBy?.name ?? "" },
               updatedBy: item.updatedBy?.name ?? "",
               fields: fieldsGet(item as unknown as Item),
-              comments: item.thread.comments.map(comment =>
+              comments: item.thread?.comments.map(comment =>
                 fromGraphQLComment(comment as GQLComment),
               ),
               version: item.version,

worker/internal/infrastructure/mongo/copier.go

@@ -3,6 +3,7 @@ package mongo
 import (
 	"context"
 	"errors"
+	"strings"
 
 	"github.com/google/uuid"
 	"github.com/oklog/ulid"
@@ -97,7 +98,7 @@ func (r *Copier) Copy(ctx context.Context, f bson.M, changesMap task.Changes) er
 				if err != nil {
 					return rerror.ErrInternalBy(err)
 				}
-				result[k] = newId.String()
+				result[k] = strings.ToLower(newId.String())
 			case task.ChangeTypeSet:
 				result[k] = change.Value
 			}