Skip to content

๐Ÿ› [fix] ์ „ ๊ธฐ๋Šฅ ์˜์—ญ ๋ฒ„๊ทธ ์ผ๊ด„ ์ˆ˜์ • โ€” ์ฝ”๋“œ๋ฒ ์ด์Šค ์ „์ˆ˜ ์กฐ์‚ฌ ๊ฒฐ๊ณผ#181

Merged
leeari95 merged 10 commits into
release/3.2.4from
claude/fix-cross-feature-bugs
Jul 5, 2026

Conversation

@geeksbaek

Copy link
Copy Markdown
Collaborator

๊ฐœ์š”

์ฝ”๋“œ๋ฒ ์ด์Šค ์ „์ฒด๋ฅผ ์ „์ˆ˜ ์กฐ์‚ฌ(๋ณ‘๋ ฌ ๋ฆฌ๋ทฐ ์—์ด์ „ํŠธ 4๊ฐœ + ์ˆ˜๋™ ์ฝ”๋“œ ์ถ”์  ๊ฒ€์ฆ)ํ•˜์—ฌ ๋ฐœ๊ฒฌํ•œ ๋ฒ„๊ทธ๋“ค์„ ์ผ๊ด„ ์ˆ˜์ •ํ•ฉ๋‹ˆ๋‹ค.

Base๊ฐ€ codex/fix-icloud-sync-reset(#179)์ธ ์ด์œ : SafetySnapshotService, CoreDataDailyTaskStorage ๋“ฑ #179์—์„œ ๋ณ€๊ฒฝ๋œ ํŒŒ์ผ์„ ํ•จ๊ป˜ ์ˆ˜์ •ํ•˜๋ฏ€๋กœ ์ถฉ๋Œ ๋ฐฉ์ง€๋ฅผ ์œ„ํ•ด #179 ์œ„์— ์Šคํƒํ–ˆ์Šต๋‹ˆ๋‹ค. #179 ๋จธ์ง€ ํ›„ ์ž๋™์œผ๋กœ develop์œผ๋กœ retarget ๋ฉ๋‹ˆ๋‹ค.

์ˆ˜์ •ํ•œ ๋ฒ„๊ทธ (๊ฒ€์ฆ ์™„๋ฃŒ)

# ์‹ฌ๊ฐ๋„ ์œ„์น˜ ๋‚ด์šฉ
1 P1 Items.reset() npcLike relay ์ดˆ๊ธฐํ™” ๋ˆ„๋ฝ โ€” ๋ฐ์ดํ„ฐ ์ดˆ๊ธฐํ™” ํ›„์—๋„ NPC ์ข‹์•„์š”๊ฐ€ ํ™”๋ฉด์— ์ž”์กด, ์ดํ›„ ํ† ๊ธ€ ์‹œ stale ๋ชฉ๋ก ๊ธฐ๋ฐ˜์œผ๋กœ ์ €์žฅ
2 P1 MusicPlayerManager block ๊ธฐ๋ฐ˜ ๊ณก ์ข…๋ฃŒ ์˜ต์ €๋ฒ„๊ฐ€ removeObserver(self)๋กœ ์ œ๊ฑฐ๋˜์ง€ ์•Š์•„ choice()๋งˆ๋‹ค ๋ˆ„์  โ€” ๊ณก ์ข…๋ฃŒ ์‹œ ํ•ธ๋“ค๋Ÿฌ ๋‹ค์ค‘ ์‹คํ–‰(fullRepeat์—์„œ ๊ณก ๊ฑด๋„ˆ๋œ€). ๋˜ํ•œ ํŠน์ • AVPlayerItem์— ๋ฐ”์ธ๋”ฉ๋˜์–ด ๊ณก ์ „ํ™˜ ํ›„ ์•Œ๋ฆผ ๋ˆ„๋ฝ ๊ฐ€๋Šฅ. ํ† ํฐ ๋ณด๊ด€ + object: nil + currentItem ๊ฒ€์ฆ์œผ๋กœ ์ˆ˜์ •, ๋“ฑ๋ก ์ง€์ ์„ player ์žฌ์ƒ์„ฑ ์‹œ์ ์œผ๋กœ ์ผ์›ํ™”
3 P1 VillagersCellReactor / NPCCellReactor updateLike/updateHouse๊ฐ€ state๋ฅผ ๊ฐฑ์‹ ํ•˜์ง€ ์•Š์•„ ๋ชฉ๋ก ์…€์˜ ํ•˜ํŠธ/์ง‘ ๋ฒ„ํŠผ์ด ์‹œ๊ฐ์ ์œผ๋กœ ํ† ๊ธ€๋˜์ง€ ์•Š์Œ (์ƒ์„ธ ํ™”๋ฉด reactor์—๋Š” ์žˆ๋Š” ๋กœ์ง์ด ์…€ reactor์— ๋ˆ„๋ฝ)
4 P1โ†’ํฌ๋ž˜์‹œ DailyTask / CoreDataDailyTaskStorage / ๋งคํ•‘ CloudKit ๋ถ€๋ถ„ import ํ›„ progressList๊ฐ€ amount๋ณด๋‹ค ์งง์œผ๋ฉด UI๋Š” amount ๊ธฐ์ค€์œผ๋กœ ์…€์„ ๋งŒ๋“ค์–ด toggle ์‹œ index out of range ํฌ๋ž˜์‹œ (๋ฉ”์ธ ์Šค๋ ˆ๋“œ + ๋ฐฑ๊ทธ๋ผ์šด๋“œ ์–‘์ชฝ). toDomain() ๊ธธ์ด ์ •๊ทœํ™” + ๋ชจ๋ธ/storage toggle ๋ณด์ •์œผ๋กœ ์ˆ˜์ • (์†์ƒ ๋ฐ์ดํ„ฐ ์ž๊ฐ€ ์น˜์œ )
5 P1 SafetySnapshotService pendingWorkItem์ด CoreData ์ €์žฅ ์•Œ๋ฆผ(์ž„์˜ ์Šค๋ ˆ๋“œ)ยทmainยทsync-reset ์•Œ๋ฆผ์—์„œ ๋™๊ธฐํ™” ์—†์ด ์ ‘๊ทผ๋˜๋Š” data race โ€” OSAllocatedUnfairLock ๋ณดํ˜ธ + flushNow() ์ „์šฉ queue ๋™๊ธฐ ์‹คํ–‰์œผ๋กœ debounce ์“ฐ๊ธฐ์™€ ํŒŒ์ผ I/O ์ง๋ ฌํ™”
6 P2 NPCLikeEntity.toDomain() genderAsia์— gender ๊ฐ’์„ ์ฝ์–ด CoreData ์™•๋ณต๋งˆ๋‹ค genderAsia ์†์‹ค
7 P2 MusicPlayerManager.setUpBackground() ์•„ํŠธ์›Œํฌ ๋‹ค์šด๋กœ๋“œ ๊ตฌ๋…์ด ์‹ฑ๊ธ€ํ†ค disposeBag์— ๋ˆ„์  โ€” ๋А๋ฆฐ ๋„คํŠธ์›Œํฌ์—์„œ ์ด์ „ ๊ณก ์ด๋ฏธ์ง€๊ฐ€ ์ž ๊ธˆํ™”๋ฉด now playing์„ ๋ฎ์–ด์”€. ๊ณก๋ณ„ disposeBag์œผ๋กœ ๊ต์ฒด
8 P2 AppCoordinator 5๊ฐœ ํƒญ ์ฝ”๋””๋„ค์ดํ„ฐ ์ค‘ AnimalsCoordinator๋งŒ setUpParent(to:) ๋ˆ„๋ฝ (latent โ€” ์ž์‹ ์ •๋ฆฌ ๊ฒฝ๋กœ ๋ฌด๋ ฅํ™”)
9 P2 Localizable.strings DashboardCoordinator๊ฐ€ ์‚ฌ์šฉํ•˜๋Š” "Unknown error" ํ‚ค๊ฐ€ ko/en ๋ชจ๋‘ ๋ถ€์žฌ โ€” ์ถ”๊ฐ€

์กฐ์‚ฌํ–ˆ์ง€๋งŒ ์ˆ˜์ •ํ•˜์ง€ ์•Š์€ ํ•ญ๋ชฉ (์‚ฌ์œ )

  • TurnipPrices Monday AM ํ•„์ˆ˜ ๊ฒ€์ฆ: ์ „์šฉ ์•ˆ๋‚ด ๋ฉ”์‹œ์ง€๊นŒ์ง€ ๊ตฌํ˜„๋œ ์˜๋„๋œ ์ œํ’ˆ ๊ฒ€์ฆ์œผ๋กœ ํŒ๋‹จ (predictor๋Š” nil ํ—ˆ์šฉํ•˜์ง€๋งŒ UX ์ •์ฑ… ์˜์—ญ)
  • TurnipPricesReactor.calculatedPrices ์ƒํƒœ ๋ถˆ์ผ์น˜: ํ•ด๋‹น ์ƒํƒœ๋ฅผ ์ฝ๋Š” ์†Œ๋น„์ž๊ฐ€ ์—†์–ด ์‹ค์‚ฌ์šฉ ์˜ํ–ฅ ์—†์Œ (๋ฐ๋“œ ์ƒํƒœ โ€” ๋ณ„๋„ ์ •๋ฆฌ ๋Œ€์ƒ)
  • ์ƒ์„ธ ํ™”๋ฉด reactor์˜ fetch ์™„๋ฃŒ ์ „ ํ† ๊ธ€ ์‹œ nil ์ƒํƒœ ์˜คํŒ: ๋ฒ„ํŠผ ๋น„ํ™œ์„ฑํ™” ๋“ฑ ์ œํ’ˆ ๊ฒฐ์ • ํ•„์š”
  • scene ์žฌ์—ฐ๊ฒฐ ์‹œ fresh-install ๊ฒฝ๋กœ ์žฌ์ง„์ž… ๋“ฑ ์ด๋ก ์  ์—ฃ์ง€: ์žฌํ˜„ ๊ฒฝ๋กœ ๋ฏธํ™•์ธ

ํ…Œ์ŠคํŠธ

  • make test โ€” CoreDataStorageICloudResetTests 21๊ฐœ ํ†ต๊ณผ (progressList ์†์ƒ ํšŒ๊ท€ ํ…Œ์ŠคํŠธ 2๊ฐœ ์‹ ๊ทœ)
  • swiftlint โ€” ์—๋Ÿฌ 0
  • make validate โ€” ํ†ต๊ณผ

๐Ÿค– Generated with Claude Code

๋ฐฑ์ข…์—ด and others added 9 commits June 4, 2026 02:38
๋ฆฌ๋ทฐ์—์„œ ํƒ€๋‹นํ•˜๋‹ค๊ณ  ํŒ๋‹จํ•œ ํ•ญ๋ชฉ์„ ํŒจ์น˜ํ•œ๋‹ค.

- AppEnvironment: isUnitTesting์˜ NSClassFromString("XCTestCase") fallback ์ œ๊ฑฐ.
  ํ…Œ์ŠคํŠธ ์Šคํ‚ด์ด IS_UNIT_TESTING=1์„ ์ฃผ์ž…ํ•˜๋ฏ€๋กœ ํ™˜๊ฒฝ ๋ณ€์ˆ˜๋งŒ์œผ๋กœ ํŒ์ •ํ•ด ๋ฆด๋ฆฌ์Šค
  ํ…”๋ ˆ๋ฉ”ํŠธ๋ฆฌ ๋ฌด๋ ฅํ™”/ํ–ฅํ›„ UI ํ…Œ์ŠคํŠธ ๋ถ€ํŒ… ์‹คํŒจ ๋ฆฌ์Šคํฌ๋ฅผ ์ฐจ๋‹จ.
- SafetySnapshotService: ํ…Œ์ŠคํŠธ ์ „์šฉ beforeApplyingSnapshot seam์„ #if DEBUG๋กœ
  ๊ฒฉ๋ฆฌ(production restore ์ฃฝ์€ ์ฝ”๋“œ ์ œ๊ฑฐ). backup ์ œ์™ธ ์‹คํŒจ๋ฅผ Log.error๋กœ ๋ณด๊ณ .
- CoreDataStorage: ๋™๊ธฐํ™” ์˜์† ํ”Œ๋ž˜๊ทธ ์ €์žฅ์†Œ๋ฅผ ์ฃผ์ž… ๊ฐ€๋Šฅํ•œ userDefaults๋กœ ๋ถ„๋ฆฌํ•ด
  ํ…Œ์ŠคํŠธ๊ฐ€ .standard(์‹ค์ œ ์•ฑ suite)๋ฅผ ์˜ค์—ผ์‹œํ‚ค์ง€ ์•Š๋„๋ก ํ•จ. hasEverHadUserCollection
  setter์˜ UserDefaults I/O๋ฅผ lock ์ž„๊ณ„์˜์—ญ ๋ฐ–์œผ๋กœ ์ด๋™. completeFirstImportWait์˜
  timedOut/waiting ๊ฐฑ์‹  ์ˆœ์„œ๋ฅผ fail-safeํ•˜๊ฒŒ ์กฐ์ •ํ•ด TOCTOU ์œˆ๋„์šฐ ์ œ๊ฑฐ.
- Log.Snapshot์— isFirstImportTimedOut ์ถ”๊ฐ€(Crashlytics ์ง„๋‹จ ๊ณต๋ฐฑ ๋ณด์™„),
  event/click์˜ isFirebaseConfigured ๊ฐ€๋“œ ์Šคํƒ€์ผ ํ†ต์ผ.
- logSyncDiagnostics ํด๋กœ์ € owner ๋„ค์ด๋ฐ/guard ๋’ค ๋นˆ ์ค„, #if DEBUG ๋ฐ ํ…Œ์ŠคํŠธ helper
  extension MARK ์ถ”๊ฐ€, ์‹ ๊ทœ ํŒŒ์ผ ์ž‘์„ฑ์ž ํ—ค๋” ์ •๋ ฌ.
- ํ…Œ์ŠคํŠธ: ๊ฒฉ๋ฆฌ๋œ UserDefaults suite ์ฃผ์ž…์œผ๋กœ ์ „ํ™˜ํ•˜๊ณ  ์ •์  reset helper ์ œ๊ฑฐ.

https://claude.ai/code/session_01L4kUZhiUNUtnr18SabrHzR
[review] PR #179 ๋ฆฌ๋ทฐ ์ฝ”๋ฉ˜ํŠธ ๋ฐ˜์˜ โ€” ํ…Œ์ŠคํŠธ seam ๊ฒฉ๋ฆฌยท์ง„๋‹จยท์ปจ๋ฒค์…˜ ๋ณด๊ฐ•
- cleanupOrphanedEntities๊ฐ€ ์ฒซ import ํ›„ 120์ดˆ grace period๋ฅผ ๋ฌด์‹œํ•˜๊ณ 
  ์ผ์‹œ์  orphan์„ ์‚ญ์ œํ•  ์ˆ˜ ์žˆ๋˜ ๊ฒฝ๋กœ ์ฐจ๋‹จ (isWithinGracePeriod ๊ฐ€๋“œ ์ถ”๊ฐ€)
- ์„ฑ๊ณต import๋กœ UC๊ฐ€ ๋ณต๊ตฌ๋˜๋ฉด recovery grace ํƒ€์ž„์Šคํƒฌํ”„๋ฅผ ์ •๋ฆฌํ•˜๋Š”
  clearRecoveryInitiatedIfRecovered ์—ฐ๊ฒฐ (๊ธฐ์กด clearRecoveryInitiated ๋ฐ๋“œ API ํ•ด์†Œ)
- ๋ฐ˜๋ณต sync ์‹คํŒจ๋กœ ์ปฌ๋ ‰์…˜ ์ƒ์„ฑ์ด ์–ต์ œ๋œ ๋ณดํ˜ธ ๋ชจ๋“œ ์ƒํƒœ๋ฅผ ์„ธ์…˜๋‹น 1ํšŒ Alert๋กœ ์•ˆ๋‚ด
  (isAwaitingCloudDataWithoutCollection + SceneDelegate.handleCloudSyncError)
- CoreDataStorage ํŒŒ์ผ ๊ธธ์ด ํ•œ๋„ ์ดˆ๊ณผ๋กœ Data Recovery extension์„
  CoreDataStorage+Recovery.swift๋กœ ๋ถ„๋ฆฌ
- ํšŒ๊ท€ ํ…Œ์ŠคํŠธ 6๊ฐœ ์ถ”๊ฐ€ (์ด 19๊ฐœ ํ†ต๊ณผ)

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
๋นŒ๋“œ์˜ SwiftLint autocorrect ๋‹จ๊ณ„๊ฐ€ ์ˆ˜์ •ํ•œ unneeded_override ๋“ฑ ๊ธฐ๊ณ„์  ๋ณ€๊ฒฝ.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
์ฝ”๋“œ๋ฒ ์ด์Šค ์ „์ˆ˜ ์กฐ์‚ฌ์—์„œ ๋ฐœ๊ฒฌยท๊ฒ€์ฆ๋œ ๋ฒ„๊ทธ ์ˆ˜์ •:

- Items.reset()์ด npcLike relay๋ฅผ ์ดˆ๊ธฐํ™”ํ•˜์ง€ ์•Š์•„ ๋ฐ์ดํ„ฐ ์ดˆ๊ธฐํ™” ํ›„์—๋„
  NPC ์ข‹์•„์š” ๋ชฉ๋ก์ด ํ™”๋ฉด์— ๋‚จ๋˜ ๋ฌธ์ œ ์ˆ˜์ •
- NPCLikeEntity.toDomain()์ด genderAsia ๋Œ€์‹  gender๋ฅผ ์ฝ์–ด CoreData ์™•๋ณต ์‹œ
  genderAsia๊ฐ€ ์†์‹ค๋˜๋˜ ๋งคํ•‘ ์˜ค๋ฅ˜ ์ˆ˜์ •
- CloudKit ๋ถ€๋ถ„ import๋กœ DailyTask progressList๊ฐ€ amount๋ณด๋‹ค ์งง์•„์ง€๋ฉด
  toggle ์‹œ index out of range๋กœ ํฌ๋ž˜์‹œํ•˜๋˜ ๋ฌธ์ œ ์ˆ˜์ • โ€” toDomain ์ •๊ทœํ™” +
  ๋ชจ๋ธ/storage toggle ๊ธธ์ด ๋ณด์ • (์ž๊ฐ€ ์น˜์œ )
- MusicPlayerManager: block ๊ธฐ๋ฐ˜ ๊ณก ์ข…๋ฃŒ ์˜ต์ €๋ฒ„๊ฐ€ removeObserver(self)๋กœ
  ์ œ๊ฑฐ๋˜์ง€ ์•Š์•„ ๋ˆ„์  ๋“ฑ๋ก๋˜๊ณ (์ž๋™ ๋‹ค์Œ ๊ณก ๋‹ค์ค‘ ์‹คํ–‰), ํŠน์ • AVPlayerItem์—
  ๋ฐ”์ธ๋”ฉ๋˜์–ด ๊ณก ์ „ํ™˜ ํ›„ ์•Œ๋ฆผ์„ ๋ชป ๋ฐ›๋˜ ๋ฌธ์ œ ์ˆ˜์ • โ€” ํ† ํฐ ๋ณด๊ด€ + object nil +
  currentItem ๊ฒ€์ฆ, ๋“ฑ๋ก ์ง€์ ์„ player ์žฌ์ƒ์„ฑ ์‹œ์ ์œผ๋กœ ์ผ์›ํ™”
- MusicPlayerManager: ์ž ๊ธˆํ™”๋ฉด ์•„ํŠธ์›Œํฌ ๋‹ค์šด๋กœ๋“œ๋ฅผ ๊ณก๋ณ„ disposeBag์œผ๋กœ ๊ต์ฒดํ•ด
  ์ด์ „ ๊ณก ์ด๋ฏธ์ง€๊ฐ€ ๋Šฆ๊ฒŒ ๋„์ฐฉํ•ด now playing ์ •๋ณด๋ฅผ ๋ฎ์–ด์“ฐ๋˜ ๋ฌธ์ œ ์ˆ˜์ •
- VillagersCellReactor/NPCCellReactor: updateLike/updateHouse ์‹œ state๋ฅผ
  ๊ฐฑ์‹ ํ•˜์ง€ ์•Š์•„ ๋ชฉ๋ก ์…€์˜ ํ•˜ํŠธ/์ง‘ ๋ฒ„ํŠผ์ด ์‹œ๊ฐ์ ์œผ๋กœ ํ† ๊ธ€๋˜์ง€ ์•Š๋˜ ๋ฌธ์ œ ์ˆ˜์ •
- SafetySnapshotService.pendingWorkItem์„ OSAllocatedUnfairLock์œผ๋กœ ๋ณดํ˜ธํ•˜๊ณ 
  flushNow๋ฅผ ์ „์šฉ queue ๋™๊ธฐ ์‹คํ–‰์œผ๋กœ ๋ณ€๊ฒฝ (๋ฉ€ํ‹ฐ์Šค๋ ˆ๋“œ data race ํ•ด์†Œ)
- AppCoordinator: AnimalsCoordinator๋งŒ setUpParent ๋ˆ„๋ฝ๋˜์–ด ์žˆ๋˜ ๋น„๋Œ€์นญ ์ˆ˜์ •
- DashboardCoordinator๊ฐ€ ์‚ฌ์šฉํ•˜๋Š” "Unknown error" ๋กœ์ปฌ๋ผ์ด์ œ์ด์…˜ ํ‚ค ์ถ”๊ฐ€ (ko/en)
- ํšŒ๊ท€ ํ…Œ์ŠคํŠธ 2๊ฐœ ์ถ”๊ฐ€ (progressList ์†์ƒ ์‹œ๋‚˜๋ฆฌ์˜ค, ์ด 21๊ฐœ ํ†ต๊ณผ)

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
@coderabbitai

coderabbitai Bot commented Jun 10, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

โš™๏ธ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro

Run ID: 06bb3665-38a5-4f64-898b-e95bfa4adeaa

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • ๐Ÿ” Trigger review
โœจ Finishing Touches
๐Ÿงช Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch claude/fix-cross-feature-bugs

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

โค๏ธ Share

Comment @coderabbitai help to get the list of available commands.

@geeksbaek
geeksbaek changed the base branch from codex/fix-icloud-sync-reset to develop June 10, 2026 15:45
@leeari95
leeari95 changed the base branch from develop to release/3.2.4 July 5, 2026 13:22
์ถฉ๋Œ ํ•ด๊ฒฐ:
- CoreDataStorageICloudResetTests.swift: ์–‘์ชฝ ํ…Œ์ŠคํŠธ ํ•ฉ์ง‘ํ•ฉ ์œ ์ง€
  (progressList ์†์ƒ ํ…Œ์ŠคํŠธ 2๊ฑด + sync protection ํ…Œ์ŠคํŠธ ์œ ์ง€)
- docs/features/icloud-sync.md: SafetySnapshot ๋™์‹œ์„ฑ ๋ณดํ˜ธ ์„ค๋ช… ์œ ์ง€

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@leeari95
leeari95 merged commit 8a212b9 into release/3.2.4 Jul 5, 2026
2 checks passed
@leeari95
leeari95 deleted the claude/fix-cross-feature-bugs branch July 5, 2026 13:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants