fix(internal/hook/field): should assign updates[$set] = bson.M{} if updates[$set]` is nil

Author: chenmingyong0423

internal/hook/field/strategy.go

@@ -94,42 +94,50 @@ func setTimeField(dest reflect.Value, timeType field.TimeType, currentTime time.
 }
 
 func beforeUpdate(dest any, currentTime time.Time, fields []*field.Filed, _ ...any) error {
-	updates, ok := dest.(bson.M)
-	if !ok || updates == nil {
-		return nil
-	}
-
-	setFields, ok := updates["$set"].(bson.M)
-	if !ok {
+	updates, exist := dest.(bson.M)
+	if !exist || updates == nil {
 		return nil
 	}
 
 	updatedFields := findAdditionalFields(currentTime, fields, findUpdatedFields)
+	if len(updatedFields) > 0 {
+		if updates["$set"] == nil {
+			updates["$set"] = bson.M{}
+		}
 
-	for k, v := range updatedFields {
-		if _, exit := setFields[k]; !exit {
-			setFields[k] = v
+		setFields, ok := updates["$set"].(bson.M)
+		if ok {
+			for k, v := range updatedFields {
+				if _, exit := setFields[k]; !exit {
+					setFields[k] = v
+				}
+			}
 		}
 	}
 
 	return nil
 }
 
 func beforeUpsert(dest any, currentTime time.Time, fields []*field.Filed, _ ...any) error {
-	updates, ok := dest.(bson.M)
-	if !ok || updates == nil {
-		return nil
-	}
-	setFields, ok := updates["$set"].(bson.M)
-	if !ok {
+	updates, exist := dest.(bson.M)
+	if !exist || updates == nil {
 		return nil
 	}
 
 	updatedTimes := findAdditionalFields(currentTime, fields, findUpdatedFields)
 
-	for k, v := range updatedTimes {
-		if _, exit := setFields[k]; !exit {
-			setFields[k] = v
+	if len(updatedTimes) > 0 {
+		if updates["$set"] == nil {
+			updates["$set"] = bson.M{}
+		}
+
+		setFields, ok := updates["$set"].(bson.M)
+		if ok {
+			for k, v := range updatedTimes {
+				if _, exit := setFields[k]; !exit {
+					setFields[k] = v
+				}
+			}
 		}
 	}
 

internal/hook/field/strategy_test.go

@@ -235,11 +235,24 @@ func Test_beforeUpdate(t *testing.T) {
 			want:    nil,
 		},
 		{
-			name:    "a bson.M updates without $set",
+			name:    "a bson.M updates without $set and not additional fields",
 			updates: bson.M{},
 			fields:  []*field.Filed{},
 			want:    bson.M{},
 		},
+		{
+			name:        "a bson.M updates without $set",
+			updates:     bson.M{},
+			currentTime: time.Date(2025, 1, 1, 0, 0, 0, 0, time.UTC),
+			fields:      field.ParseFields(&user{}),
+			want:        bson.M{"$set": bson.M{"updated_at": time.Date(2025, 1, 1, 0, 0, 0, 0, time.UTC), "update_second_time": time.Date(2025, 1, 1, 0, 0, 0, 0, time.UTC).Unix(), "update_milli_time": time.Date(2025, 1, 1, 0, 0, 0, 0, time.UTC).UnixMilli(), "update_nano_time": time.Date(2025, 1, 1, 0, 0, 0, 0, time.UTC).UnixNano()}},
+		},
+		{
+			name:    "a bson.M updates with invalid $set",
+			updates: bson.M{"$set": "invalid"},
+			fields:  field.ParseFields(&user{}),
+			want:    bson.M{"$set": "invalid"},
+		},
 		{
 			name:    "a bson.M updates but not additional fields",
 			updates: bson.M{"$set": bson.M{"name": "Mingyong Chen"}},
@@ -317,11 +330,24 @@ func Test_beforeUpsert(t *testing.T) {
 			want:    nil,
 		},
 		{
-			name:    "a bson.M updates without $set",
+			name:    "a bson.M updates without $set and not additional fields",
 			updates: bson.M{},
 			fields:  []*field.Filed{},
 			want:    bson.M{},
 		},
+		{
+			name:        "a bson.M updates without $set",
+			updates:     bson.M{},
+			currentTime: time.Date(2025, 1, 1, 0, 0, 0, 0, time.UTC),
+			fields:      field.ParseFields(&updatedUser{}),
+			want:        bson.M{"$set": bson.M{"updated_at": time.Date(2025, 1, 1, 0, 0, 0, 0, time.UTC), "update_second_time": time.Date(2025, 1, 1, 0, 0, 0, 0, time.UTC).Unix(), "update_milli_time": time.Date(2025, 1, 1, 0, 0, 0, 0, time.UTC).UnixMilli(), "update_nano_time": time.Date(2025, 1, 1, 0, 0, 0, 0, time.UTC).UnixNano()}, "$setOnInsert": bson.M{"created_at": time.Date(2025, 1, 1, 0, 0, 0, 0, time.UTC), "create_second_time": time.Date(2025, 1, 1, 0, 0, 0, 0, time.UTC).Unix(), "create_milli_time": time.Date(2025, 1, 1, 0, 0, 0, 0, time.UTC).UnixMilli(), "create_nano_time": time.Date(2025, 1, 1, 0, 0, 0, 0, time.UTC).UnixNano()}},
+		},
+		{
+			name:    "a bson.M updates with invalid $set",
+			updates: bson.M{"$set": "invalid"},
+			fields:  []*field.Filed{},
+			want:    bson.M{"$set": "invalid"},
+		},
 		{
 			name:    "a bson.M updates but not additional fields",
 			updates: bson.M{"$set": bson.M{"name": "Mingyong Chen"}},
@@ -335,13 +361,6 @@ func Test_beforeUpsert(t *testing.T) {
 			fields:      field.ParseFields(&user{}),
 			want:        bson.M{"$set": bson.M{"name": "Mingyong Chen", "updated_at": time.Date(2025, 1, 1, 0, 0, 0, 0, time.UTC), "update_second_time": time.Date(2025, 1, 1, 0, 0, 0, 0, time.UTC).Unix(), "update_milli_time": time.Date(2025, 1, 1, 0, 0, 0, 0, time.UTC).UnixMilli(), "update_nano_time": time.Date(2025, 1, 1, 0, 0, 0, 0, time.UTC).UnixNano()}, "$setOnInsert": "invalid"},
 		},
-		{
-			name:        "a bson.M updates with invalid $setOnInsert",
-			updates:     bson.M{"$set": bson.M{"name": "Mingyong Chen"}, "$setOnInsert": "invalid"},
-			currentTime: time.Date(2025, 1, 1, 0, 0, 0, 0, time.UTC),
-			fields:      field.ParseFields(&user2{}),
-			want:        bson.M{"$set": bson.M{"name": "Mingyong Chen", "updated_at": time.Date(2025, 1, 1, 0, 0, 0, 0, time.UTC).UnixMilli(), "update_second_time": time.Date(2025, 1, 1, 0, 0, 0, 0, time.UTC).Unix(), "update_milli_time": time.Date(2025, 1, 1, 0, 0, 0, 0, time.UTC).UnixMilli(), "update_nano_time": time.Date(2025, 1, 1, 0, 0, 0, 0, time.UTC).UnixNano()}, "$setOnInsert": "invalid"},
-		},
 		{
 			name:        "a bson.M updates",
 			updates:     bson.M{"$set": bson.M{"name": "Mingyong Chen"}},