changes based on pr comments

- fixed the test case for non sgwrite
- refactored code around the spec

Author: RIT3shSapata

db/crud.go

@@ -295,13 +295,13 @@ func (c *DatabaseCollection) CompactDocChannelHistory(ctx context.Context, docid
 
 	// build macro expansion for sync data. This will avoid the update to xattrs causing an extra import event (i.e. sync cas will be == to doc cas)
 	opts := &sgbucket.MutateInOptions{}
-	spec := []sgbucket.MacroExpansionSpec{}
-	// Only update _sync.cas if the pre-compaction doc had already been imported by SGW
+	// Only update _sync.cas and _mou.cas if the pre-compaction doc had already been imported by SGW
 	if isSgWrite {
-		spec = append(spec, sgbucket.NewMacroExpansionSpec(XattrMouCasPath(), sgbucket.MacroCas))
-		spec = append(spec, sgbucket.NewMacroExpansionSpec(xattrCasPath(base.SyncXattrName), sgbucket.MacroCas))
+		opts.MacroExpansion = []sgbucket.MacroExpansionSpec{
+			sgbucket.NewMacroExpansionSpec(XattrMouCasPath(), sgbucket.MacroCas),
+			sgbucket.NewMacroExpansionSpec(xattrCasPath(base.SyncXattrName), sgbucket.MacroCas),
+		}
 	}
-	opts.MacroExpansion = spec
 	opts.PreserveExpiry = true // if doc has expiry, we should preserve this
 
 	updatedXattr := map[string][]byte{

rest/api_test.go

@@ -4179,12 +4179,14 @@ func TestCompactNonImportedDocWithAutoImport(t *testing.T) {
 	assert.Equal(t, []string{"test_channel"}, compactedChannels)
 
 	// Step 9: Verify compaction succeeded and history was removed
-	syncData, err := collection.GetDocSyncData(ctx, nonImportedDocID)
+	require.NoError(t, err)
+	syncData, _, err := collection.GetDocSyncDataNoImport(ctx, nonImportedDocID, db.DocUnmarshalSync)
 	require.NoError(t, err)
 	// History should be compacted
 	assert.Less(t, len(syncData.ChannelSetHistory), len(syncDataBefore.ChannelSetHistory))
 	// CV must be updated by the import triggered during compaction
-	assert.NotEqual(t, cvBeforeCompaction, syncData.CVOrRevTreeID(), "cv should be updated after compaction import")
+	// This assertion should be changed after CBG-5397
+	assert.Equal(t, cvBeforeCompaction, syncData.CVOrRevTreeID(), "cv should be updated after compaction import")
 
 	// Step 10: Verify document is still accessible and intact
 	docFromBucket, _, err := rt.GetSingleDataStore().GetRaw(ctx, nonImportedDocID)