Test concurrent sync

pkg/cli/database/testutils.go

@@ -63,7 +63,8 @@ func InitTestMemoryDB(t *testing.T) *DB {
 
 // InitTestFileDB initializes a file-based test database with the default schema.
 func InitTestFileDB(t *testing.T) (*DB, string) {
-	dbPath := filepath.Join(t.TempDir(), "dnote.db")
+	uuid := mustGenerateTestUUID(t)
+	dbPath := filepath.Join(t.TempDir(), fmt.Sprintf("dnote-%s.db", uuid))
 	db := InitTestFileDBRaw(t, dbPath)
 	return db, dbPath
 }

pkg/e2e/sync/edge_cases_test.go

@@ -19,6 +19,7 @@
 package sync
 
 import (
+	"io"
 	"testing"
 
 	"github.com/dnote/dnote/pkg/assert"
@@ -26,6 +27,7 @@ import (
 	cliDatabase "github.com/dnote/dnote/pkg/cli/database"
 	clitest "github.com/dnote/dnote/pkg/cli/testutils"
 	"github.com/google/uuid"
+	"github.com/pkg/errors"
 )
 
 // TestSync_EmptyFragmentPreservesLastMaxUSN verifies that last_max_usn is not reset to 0
@@ -71,3 +73,94 @@ func TestSync_EmptyFragmentPreservesLastMaxUSN(t *testing.T) {
 
 	assert.Equal(t, lastMaxUSN, 3, "last_max_usn should be 3 after syncing")
 }
+
+// TestSync_ConcurrentInitialSync reproduces the issue where two clients with identical
+// local data syncing simultaneously to an empty server results in 500 errors.
+//
+// This demonstrates the race condition:
+// - Client1 starts sync to empty server, gets empty server state
+// - Client2 syncs.
+// - Client1 tries to create same books → 409 "duplicate"
+// - Client1 tries to create notes with wrong UUIDs → 500 "record not found"
+// - stepSync recovers by renaming local books with _2 suffix
+func TestSync_ConcurrentInitialSync(t *testing.T) {
+	env := setupTestEnv(t)
+
+	user := setupUserAndLogin(t, env)
+
+	// Step 1: Create local data and sync
+	clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "javascript", "-c", "js note from client1")
+	clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync")
+	checkState(t, env.DB, user, env.ServerDB, systemState{
+		clientNoteCount:  1,
+		clientBookCount:  1,
+		clientLastMaxUSN: 2,
+		clientLastSyncAt: serverTime.Unix(),
+		serverNoteCount:  1,
+		serverBookCount:  1,
+		serverUserMaxUSN: 2,
+	})
+
+	// Step 2: Switch to new empty server to simulate concurrent initial sync scenario
+	switchToEmptyServer(t, &env)
+	user = setupUserAndLogin(t, env)
+
+	// Set up client2 with separate database
+	client2DB, client2DBPath := cliDatabase.InitTestFileDB(t)
+	login(t, client2DB, env.ServerDB, user)
+	client2DB.Close() // Close so CLI can access the database
+
+	// Step 3: Client1 syncs to empty server, but during sync Client2 uploads same data
+	// This simulates the race condition deterministically
+	raceCallback := func(stdout io.Reader, stdin io.WriteCloser) error {
+		// Wait for empty server prompt to ensure Client1 has called GetSyncState
+		clitest.MustWaitForPrompt(t, stdout, clitest.PromptEmptyServer)
+
+		// Now Client2 creates the same book and note via CLI (creating the race condition)
+		clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "--dbPath", client2DBPath, "add", "javascript", "-c", "js note from client2")
+		clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "--dbPath", client2DBPath, "sync")
+
+		// User confirms sync
+		if _, err := io.WriteString(stdin, "y\n"); err != nil {
+			return errors.Wrap(err, "confirming sync")
+		}
+
+		return nil
+	}
+
+	// Client1 continues sync - will hit 409 conflict, then 500 error, then recover
+	clitest.MustWaitDnoteCmd(t, env.CmdOpts, raceCallback, cliBinaryName, "sync")
+
+	// After sync:
+	// - Server has 2 books: "javascript" (from client2) and "javascript_2" (from client1 renamed)
+	// - Server has 2 notes
+	// - Both clients should converge to the same state
+	expectedState := systemState{
+		clientNoteCount:  2, // both notes
+		clientBookCount:  2, // javascript and javascript_2
+		clientLastMaxUSN: 4, // 2 books + 2 notes
+		clientLastSyncAt: serverTime.Unix(),
+		serverNoteCount:  2,
+		serverBookCount:  2,
+		serverUserMaxUSN: 4,
+	}
+	checkState(t, env.DB, user, env.ServerDB, expectedState)
+
+	// Client2 syncs again to download client1's data
+	clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "--dbPath", client2DBPath, "sync")
+	client2DB = clitest.MustOpenDatabase(t, client2DBPath)
+	defer client2DB.Close()
+
+	// Client2 should have converged to the same state as client1
+	checkState(t, client2DB, user, env.ServerDB, expectedState)
+
+	// Verify no orphaned notes on server
+	var orphanedCount int
+	if err := env.ServerDB.Raw(`
+		SELECT COUNT(*) FROM notes
+		WHERE book_uuid NOT IN (SELECT uuid FROM books)
+	`).Scan(&orphanedCount).Error; err != nil {
+		t.Fatal(err)
+	}
+	assert.Equal(t, orphanedCount, 0, "server should have no orphaned notes after sync")
+}