Skip to content

Commit 88f88a3

Browse files
opficdevopficdev
authored
[#272] Todo를 제거한 후 해당 Todo에 대한 푸시알림 데이터가 일정 시간 그대로 유지되는 이슈를 해결한다 (#274)
* style: 주석 추가 * refactor: Store 어셈블러 분리 * chore: 유닛 테스트 삭제 및 Xcode에서는 iOS 프로젝트만 담당하도록 폴더링 제거 * feat: 삭제 실패 시 복원하는 로직 추가 * refactor: todo 삭제 책임을 firebase function으로 이관 * refactor: todo 삭제 실행 취소를 firebase function으로 처리 * refactor: undo 후 서버에서 재 fetch 하는 형태를 통해 SSOT를 만족함 * refactor: 각 서비스에서 enum으로 firebase functions 관리 * refactor: 불필요 액션 제거 및 pendingTask 대신 임시로 갖고있는 Todo의 id 형태로 최소화 * style: 변수명 수정
1 parent a85996c commit 88f88a3

24 files changed

Lines changed: 428 additions & 275 deletions

‎DevLog.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 176 deletions
Original file line numberDiff line numberDiff line change
@@ -15,29 +15,13 @@
1515
DFABA3B02E23526500FEFBDB /* FirebaseFirestore in Frameworks */ = {isa = PBXBuildFile; productRef = DFABA3AF2E23526500FEFBDB /* FirebaseFirestore */; };
1616
DFABA3B22E23526500FEFBDB /* FirebaseFunctions in Frameworks */ = {isa = PBXBuildFile; productRef = DFABA3B12E23526500FEFBDB /* FirebaseFunctions */; };
1717
DFABA3B42E23526500FEFBDB /* FirebaseMessaging in Frameworks */ = {isa = PBXBuildFile; productRef = DFABA3B32E23526500FEFBDB /* FirebaseMessaging */; };
18-
DFD643A72EC787AB0073E133 /* firebase.json in Resources */ = {isa = PBXBuildFile; fileRef = DFD643A42EC787AB0073E133 /* firebase.json */; };
19-
DFD643A92EC787AB0073E133 /* package.json in Resources */ = {isa = PBXBuildFile; fileRef = DFD643A02EC787AB0073E133 /* package.json */; };
20-
DFD643AC2EC787AB0073E133 /* tsconfig.json in Resources */ = {isa = PBXBuildFile; fileRef = DFD643A22EC787AB0073E133 /* tsconfig.json */; };
21-
DFD643AE2EC787AB0073E133 /* package-lock.json in Resources */ = {isa = PBXBuildFile; fileRef = DFD643A12EC787AB0073E133 /* package-lock.json */; };
2218
DFD645402EC827A10073E133 /* .gitignore in Resources */ = {isa = PBXBuildFile; fileRef = DFD6453F2EC827A10073E133 /* .gitignore */; };
2319
DFD74E2F2E423EA700613803 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = DFD74E2E2E423EA700613803 /* README.md */; };
2420
DFF2DACE2EDC02AD00778738 /* OrderedCollections in Frameworks */ = {isa = PBXBuildFile; productRef = DFF2DACD2EDC02AD00778738 /* OrderedCollections */; };
2521
/* End PBXBuildFile section */
2622

2723
/* Begin PBXFileReference section */
28-
DF3416452E45F67C00F9312B /* DevLog_Unit.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = DevLog_Unit.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
2924
DFD48B002DC4D6E2005905C5 /* DevLog.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = DevLog.app; sourceTree = BUILT_PRODUCTS_DIR; };
30-
DFD643952EC787AB0073E133 /* apple.ts */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.typescript; path = apple.ts; sourceTree = "<group>"; };
31-
DFD643962EC787AB0073E133 /* github.ts */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.typescript; path = github.ts; sourceTree = "<group>"; };
32-
DFD643972EC787AB0073E133 /* google.ts */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.typescript; path = google.ts; sourceTree = "<group>"; };
33-
DFD643992EC787AB0073E133 /* notification.ts */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.typescript; path = notification.ts; sourceTree = "<group>"; };
34-
DFD6439A2EC787AB0073E133 /* schedule.ts */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.typescript; path = schedule.ts; sourceTree = "<group>"; };
35-
DFD6439C2EC787AB0073E133 /* delete.ts */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.typescript; path = delete.ts; sourceTree = "<group>"; };
36-
DFD6439E2EC787AB0073E133 /* index.ts */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.typescript; path = index.ts; sourceTree = "<group>"; };
37-
DFD643A02EC787AB0073E133 /* package.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = package.json; sourceTree = "<group>"; };
38-
DFD643A12EC787AB0073E133 /* package-lock.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = "package-lock.json"; sourceTree = "<group>"; };
39-
DFD643A22EC787AB0073E133 /* tsconfig.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = tsconfig.json; sourceTree = "<group>"; };
40-
DFD643A42EC787AB0073E133 /* firebase.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = firebase.json; sourceTree = "<group>"; };
4125
DFD6453F2EC827A10073E133 /* .gitignore */ = {isa = PBXFileReference; lastKnownFileType = text; path = .gitignore; sourceTree = "<group>"; };
4226
DFD74E2E2E423EA700613803 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
4327
/* End PBXFileReference section */
@@ -54,11 +38,6 @@
5438
/* End PBXFileSystemSynchronizedBuildFileExceptionSet section */
5539

5640
/* Begin PBXFileSystemSynchronizedRootGroup section */
57-
DF3416462E45F67C00F9312B /* DevLog_Unit */ = {
58-
isa = PBXFileSystemSynchronizedRootGroup;
59-
path = DevLog_Unit;
60-
sourceTree = "<group>";
61-
};
6241
DF8AB7982E938B0B00E50BBF /* DevLog */ = {
6342
isa = PBXFileSystemSynchronizedRootGroup;
6443
exceptions = (
@@ -70,13 +49,6 @@
7049
/* End PBXFileSystemSynchronizedRootGroup section */
7150

7251
/* Begin PBXFrameworksBuildPhase section */
73-
DF3416422E45F67C00F9312B /* Frameworks */ = {
74-
isa = PBXFrameworksBuildPhase;
75-
buildActionMask = 2147483647;
76-
files = (
77-
);
78-
runOnlyForDeploymentPostprocessing = 0;
79-
};
8052
DFD48AFD2DC4D6E2005905C5 /* Frameworks */ = {
8153
isa = PBXFrameworksBuildPhase;
8254
buildActionMask = 2147483647;
@@ -102,80 +74,19 @@
10274
DFD6453F2EC827A10073E133 /* .gitignore */,
10375
DF8AB7982E938B0B00E50BBF /* DevLog */,
10476
DFD74E2E2E423EA700613803 /* README.md */,
105-
DF3416462E45F67C00F9312B /* DevLog_Unit */,
10677
DFE28EB62DCCF26300B28FE5 /* Frameworks */,
10778
DFD48B012DC4D6E2005905C5 /* Products */,
108-
DFD643A52EC787AB0073E133 /* Firebase */,
10979
);
11080
sourceTree = "<group>";
11181
};
11282
DFD48B012DC4D6E2005905C5 /* Products */ = {
11383
isa = PBXGroup;
11484
children = (
11585
DFD48B002DC4D6E2005905C5 /* DevLog.app */,
116-
DF3416452E45F67C00F9312B /* DevLog_Unit.xctest */,
11786
);
11887
name = Products;
11988
sourceTree = "<group>";
12089
};
121-
DFD643982EC787AB0073E133 /* auth */ = {
122-
isa = PBXGroup;
123-
children = (
124-
DFD643952EC787AB0073E133 /* apple.ts */,
125-
DFD643962EC787AB0073E133 /* github.ts */,
126-
DFD643972EC787AB0073E133 /* google.ts */,
127-
);
128-
path = auth;
129-
sourceTree = "<group>";
130-
};
131-
DFD6439B2EC787AB0073E133 /* fcm */ = {
132-
isa = PBXGroup;
133-
children = (
134-
DFD643992EC787AB0073E133 /* notification.ts */,
135-
DFD6439A2EC787AB0073E133 /* schedule.ts */,
136-
);
137-
path = fcm;
138-
sourceTree = "<group>";
139-
};
140-
DFD6439D2EC787AB0073E133 /* user */ = {
141-
isa = PBXGroup;
142-
children = (
143-
DFD6439C2EC787AB0073E133 /* delete.ts */,
144-
);
145-
path = user;
146-
sourceTree = "<group>";
147-
};
148-
DFD6439F2EC787AB0073E133 /* src */ = {
149-
isa = PBXGroup;
150-
children = (
151-
DFD643982EC787AB0073E133 /* auth */,
152-
DFD6439B2EC787AB0073E133 /* fcm */,
153-
DFD6439D2EC787AB0073E133 /* user */,
154-
DFD6439E2EC787AB0073E133 /* index.ts */,
155-
);
156-
path = src;
157-
sourceTree = "<group>";
158-
};
159-
DFD643A32EC787AB0073E133 /* functions */ = {
160-
isa = PBXGroup;
161-
children = (
162-
DFD6439F2EC787AB0073E133 /* src */,
163-
DFD643A02EC787AB0073E133 /* package.json */,
164-
DFD643A12EC787AB0073E133 /* package-lock.json */,
165-
DFD643A22EC787AB0073E133 /* tsconfig.json */,
166-
);
167-
path = functions;
168-
sourceTree = "<group>";
169-
};
170-
DFD643A52EC787AB0073E133 /* Firebase */ = {
171-
isa = PBXGroup;
172-
children = (
173-
DFD643A32EC787AB0073E133 /* functions */,
174-
DFD643A42EC787AB0073E133 /* firebase.json */,
175-
);
176-
path = Firebase;
177-
sourceTree = "<group>";
178-
};
17990
DFE28EB62DCCF26300B28FE5 /* Frameworks */ = {
18091
isa = PBXGroup;
18192
children = (
@@ -186,28 +97,6 @@
18697
/* End PBXGroup section */
18798

18899
/* Begin PBXNativeTarget section */
189-
DF3416442E45F67C00F9312B /* DevLog_Unit */ = {
190-
isa = PBXNativeTarget;
191-
buildConfigurationList = DF34164B2E45F67C00F9312B /* Build configuration list for PBXNativeTarget "DevLog_Unit" */;
192-
buildPhases = (
193-
DF3416412E45F67C00F9312B /* Sources */,
194-
DF3416422E45F67C00F9312B /* Frameworks */,
195-
DF3416432E45F67C00F9312B /* Resources */,
196-
);
197-
buildRules = (
198-
);
199-
dependencies = (
200-
);
201-
fileSystemSynchronizedGroups = (
202-
DF3416462E45F67C00F9312B /* DevLog_Unit */,
203-
);
204-
name = DevLog_Unit;
205-
packageProductDependencies = (
206-
);
207-
productName = DevLog_Unit;
208-
productReference = DF3416452E45F67C00F9312B /* DevLog_Unit.xctest */;
209-
productType = "com.apple.product-type.bundle.unit-test";
210-
};
211100
DFD48AFF2DC4D6E2005905C5 /* DevLog */ = {
212101
isa = PBXNativeTarget;
213102
buildConfigurationList = DFD48B112DC4D6E4005905C5 /* Build configuration list for PBXNativeTarget "DevLog" */;
@@ -250,9 +139,6 @@
250139
LastSwiftUpdateCheck = 1640;
251140
LastUpgradeCheck = 2600;
252141
TargetAttributes = {
253-
DF3416442E45F67C00F9312B = {
254-
CreatedOnToolsVersion = 16.4;
255-
};
256142
DFD48AFF2DC4D6E2005905C5 = {
257143
CreatedOnToolsVersion = 16.3;
258144
};
@@ -279,42 +165,23 @@
279165
projectRoot = "";
280166
targets = (
281167
DFD48AFF2DC4D6E2005905C5 /* DevLog */,
282-
DF3416442E45F67C00F9312B /* DevLog_Unit */,
283168
);
284169
};
285170
/* End PBXProject section */
286171

287172
/* Begin PBXResourcesBuildPhase section */
288-
DF3416432E45F67C00F9312B /* Resources */ = {
289-
isa = PBXResourcesBuildPhase;
290-
buildActionMask = 2147483647;
291-
files = (
292-
);
293-
runOnlyForDeploymentPostprocessing = 0;
294-
};
295173
DFD48AFE2DC4D6E2005905C5 /* Resources */ = {
296174
isa = PBXResourcesBuildPhase;
297175
buildActionMask = 2147483647;
298176
files = (
299177
DFD645402EC827A10073E133 /* .gitignore in Resources */,
300178
DFD74E2F2E423EA700613803 /* README.md in Resources */,
301-
DFD643A72EC787AB0073E133 /* firebase.json in Resources */,
302-
DFD643A92EC787AB0073E133 /* package.json in Resources */,
303-
DFD643AC2EC787AB0073E133 /* tsconfig.json in Resources */,
304-
DFD643AE2EC787AB0073E133 /* package-lock.json in Resources */,
305179
);
306180
runOnlyForDeploymentPostprocessing = 0;
307181
};
308182
/* End PBXResourcesBuildPhase section */
309183

310184
/* Begin PBXSourcesBuildPhase section */
311-
DF3416412E45F67C00F9312B /* Sources */ = {
312-
isa = PBXSourcesBuildPhase;
313-
buildActionMask = 2147483647;
314-
files = (
315-
);
316-
runOnlyForDeploymentPostprocessing = 0;
317-
};
318185
DFD48AFC2DC4D6E2005905C5 /* Sources */ = {
319186
isa = PBXSourcesBuildPhase;
320187
buildActionMask = 2147483647;
@@ -332,40 +199,6 @@
332199
/* End PBXTargetDependency section */
333200

334201
/* Begin XCBuildConfiguration section */
335-
DF3416492E45F67C00F9312B /* Debug */ = {
336-
isa = XCBuildConfiguration;
337-
buildSettings = {
338-
CODE_SIGN_STYLE = Automatic;
339-
CURRENT_PROJECT_VERSION = 1;
340-
DEAD_CODE_STRIPPING = YES;
341-
GENERATE_INFOPLIST_FILE = YES;
342-
MACOSX_DEPLOYMENT_TARGET = 15.5;
343-
MARKETING_VERSION = 1.0;
344-
PRODUCT_BUNDLE_IDENTIFIER = "opfic.DevLog-Unit";
345-
PRODUCT_NAME = "$(TARGET_NAME)";
346-
SDKROOT = macosx;
347-
SWIFT_EMIT_LOC_STRINGS = NO;
348-
SWIFT_VERSION = 5.0;
349-
};
350-
name = Debug;
351-
};
352-
DF34164A2E45F67C00F9312B /* Release */ = {
353-
isa = XCBuildConfiguration;
354-
buildSettings = {
355-
CODE_SIGN_STYLE = Automatic;
356-
CURRENT_PROJECT_VERSION = 1;
357-
DEAD_CODE_STRIPPING = YES;
358-
GENERATE_INFOPLIST_FILE = YES;
359-
MACOSX_DEPLOYMENT_TARGET = 15.5;
360-
MARKETING_VERSION = 1.0;
361-
PRODUCT_BUNDLE_IDENTIFIER = "opfic.DevLog-Unit";
362-
PRODUCT_NAME = "$(TARGET_NAME)";
363-
SDKROOT = macosx;
364-
SWIFT_EMIT_LOC_STRINGS = NO;
365-
SWIFT_VERSION = 5.0;
366-
};
367-
name = Release;
368-
};
369202
DFD48B122DC4D6E4005905C5 /* Debug */ = {
370203
isa = XCBuildConfiguration;
371204
baseConfigurationReferenceAnchor = DF8AB7982E938B0B00E50BBF /* DevLog */;
@@ -592,15 +425,6 @@
592425
/* End XCBuildConfiguration section */
593426

594427
/* Begin XCConfigurationList section */
595-
DF34164B2E45F67C00F9312B /* Build configuration list for PBXNativeTarget "DevLog_Unit" */ = {
596-
isa = XCConfigurationList;
597-
buildConfigurations = (
598-
DF3416492E45F67C00F9312B /* Debug */,
599-
DF34164A2E45F67C00F9312B /* Release */,
600-
);
601-
defaultConfigurationIsVisible = 0;
602-
defaultConfigurationName = Release;
603-
};
604428
DFD48AFB2DC4D6E2005905C5 /* Build configuration list for PBXProject "DevLog" */ = {
605429
isa = XCConfigurationList;
606430
buildConfigurations = (

‎DevLog/App/Assembler/Assembler.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ protocol Assembler {
1111

1212
final class AppAssembler: Assembler {
1313
private let assemblers: [Assembler] = [
14+
PersistenceAssembler(),
1415
InfraAssembler(),
1516
DataAssembler(),
1617
DomainAssembler()

‎DevLog/App/Assembler/DomainAssembler.swift‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,10 @@ private extension DomainAssembler {
6666
container.register(DeleteTodoUseCase.self) {
6767
DeleteTodoUseCaseImpl(container.resolve(TodoRepository.self))
6868
}
69+
70+
container.register(UndoDeleteTodoUseCase.self) {
71+
UndoDeleteTodoUseCaseImpl(container.resolve(TodoRepository.self))
72+
}
6973
}
7074

7175
func registerUserDataUseCases(_ container: DIContainer) {

‎DevLog/App/Assembler/InfraAssembler.swift‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,5 @@ final class InfraAssembler: Assembler {
5252
WebPageMetadataService()
5353
}
5454

55-
container.register(UserDefaultsStore.self) {
56-
UserDefaultsStore()
57-
}
58-
59-
container.register(ThemeStore.self) {
60-
ThemeStore()
61-
}
6255
}
6356
}

‎DevLog/App/Assembler/PersistenceAssembler.swift‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
//
2+
// PersistenceAssembler.swift
3+
// DevLog
4+
//
5+
// Created by opfic on 3/15/26.
6+
//
7+
8+
final class PersistenceAssembler: Assembler {
9+
func assemble(_ container: any DIContainer) {
10+
container.register(UserDefaultsStore.self) {
11+
UserDefaultsStore()
12+
}
13+
14+
container.register(ThemeStore.self) {
15+
ThemeStore()
16+
}
17+
}
18+
}

‎DevLog/Data/Repository/TodoRepositoryImpl.swift‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,8 @@ final class TodoRepositoryImpl: TodoRepository {
3333
func deleteTodo(_ todoId: String) async throws {
3434
try await todoService.deleteTodo(todoId: todoId)
3535
}
36+
37+
func undoDeleteTodo(_ todoId: String) async throws {
38+
try await todoService.undoDeleteTodo(todoId: todoId)
39+
}
3640
}

‎DevLog/Domain/Protocol/TodoRepository.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@ protocol TodoRepository {
1212
func fetchTodo(_ todoId: String) async throws -> Todo
1313
func upsertTodo(_ todo: Todo) async throws
1414
func deleteTodo(_ todoId: String) async throws
15+
func undoDeleteTodo(_ todoId: String) async throws
1516
}

‎DevLog/Domain/UseCase/Todo/Delete/UndoDeleteTodoUseCase.swift‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
//
2+
// UndoDeleteTodoUseCase.swift
3+
// DevLog
4+
//
5+
// Created by opfic on 3/15/26.
6+
//
7+
8+
protocol UndoDeleteTodoUseCase {
9+
func execute(_ todoId: String) async throws
10+
}

‎DevLog/Domain/UseCase/Todo/Delete/UndoDeleteTodoUseCaseImpl.swift‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
//
2+
// UndoDeleteTodoUseCaseImpl.swift
3+
// DevLog
4+
//
5+
// Created by opfic on 3/15/26.
6+
//
7+
8+
final class UndoDeleteTodoUseCaseImpl: UndoDeleteTodoUseCase {
9+
private let repository: TodoRepository
10+
11+
init(_ repository: TodoRepository) {
12+
self.repository = repository
13+
}
14+
15+
func execute(_ todoId: String) async throws {
16+
try await repository.undoDeleteTodo(todoId)
17+
}
18+
}

DevLog/Infra/Extension/FirebaseAuthUser.swift renamed to DevLog/Infra/Extension/FirebaseAuthUser+.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// FirebaseAuthUser.swift
2+
// FirebaseAuthUser+.swift
33
// DevLog
44
//
55
// Created by 최윤진 on 11/3/25.

0 commit comments

Comments
 (0)