Skip to content

Commit

Permalink
chore: reduce unnecessary API (#49)
Browse files Browse the repository at this point in the history
  • Loading branch information
@duyhungtnn
duyhungtnn authored Nov 9, 2023
1 parent 78d8db6 commit c790e2a
Show file tree
Hide file tree
Showing 26 changed files with 416 additions and 397 deletions.
40 changes: 20 additions & 20 deletions Bucketeer.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
006E85DE28E032E800B5D90D /* EventInteractorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 006E85DD28E032E800B5D90D /* EventInteractorTests.swift */; };
006E85E028E0333F00B5D90D /* MockClock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 006E85DF28E0333F00B5D90D /* MockClock.swift */; };
006E85E228E033B000B5D90D /* MockIdGenerator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 006E85E128E033B000B5D90D /* MockIdGenerator.swift */; };
006E85E428E034A700B5D90D /* MockEventDao.swift in Sources */ = {isa = PBXBuildFile; fileRef = 006E85E328E034A700B5D90D /* MockEventDao.swift */; };
006E85E428E034A700B5D90D /* MockEventSQLDao.swift in Sources */ = {isa = PBXBuildFile; fileRef = 006E85E328E034A700B5D90D /* MockEventSQLDao.swift */; };
006E85E628E035D000B5D90D /* MockEventUpdateListener.swift in Sources */ = {isa = PBXBuildFile; fileRef = 006E85E528E035D000B5D90D /* MockEventUpdateListener.swift */; };
006E85E828E038BC00B5D90D /* MockLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 006E85E728E038BC00B5D90D /* MockLogger.swift */; };
25E2B0082A33812C002E410C /* Version.swift in Sources */ = {isa = PBXBuildFile; fileRef = 25E2B0072A33812C002E410C /* Version.swift */; };
Expand All @@ -89,9 +89,9 @@
9322C794292CF6050040178F /* Bucketeer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0065C3BE28C7BB76002D92A2 /* Bucketeer.framework */; };
9322C795292CF6050040178F /* Bucketeer.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 0065C3BE28C7BB76002D92A2 /* Bucketeer.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
9340CA0928D9D1DD00E690CC /* EvaluationStorageTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9340CA0828D9D1DD00E690CC /* EvaluationStorageTests.swift */; };
9340CA1928DA0F6200E690CC /* EventDao.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9340CA1628DA0F6200E690CC /* EventDao.swift */; };
9340CA1928DA0F6200E690CC /* EventSQLDao.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9340CA1628DA0F6200E690CC /* EventSQLDao.swift */; };
9340CA1A28DA0F6200E690CC /* EventEntity.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9340CA1728DA0F6200E690CC /* EventEntity.swift */; };
9340CA1B28DA0F6200E690CC /* EventDaoImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9340CA1828DA0F6200E690CC /* EventDaoImpl.swift */; };
9340CA1B28DA0F6200E690CC /* EventDaoSQLImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9340CA1828DA0F6200E690CC /* EventDaoSQLImpl.swift */; };
9340CA1F28DA106200E690CC /* EventDaoTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9340CA1E28DA106200E690CC /* EventDaoTests.swift */; };
9340CA2C28DAEA1500E690CC /* MigrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9340CA2B28DAEA1500E690CC /* MigrationTests.swift */; };
9340CA5928E1CD2600E690CC /* UserHolder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9340CA5828E1CD2600E690CC /* UserHolder.swift */; };
Expand All @@ -118,8 +118,8 @@
93AC8F7E28E34B5C00A4719B /* EvaluationForegroundTask.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93AC8F7D28E34B5C00A4719B /* EvaluationForegroundTask.swift */; };
93AC8F8028E351C500A4719B /* ScheduledTask.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93AC8F7F28E351C500A4719B /* ScheduledTask.swift */; };
941E007E2A4FD964002CBFBB /* BKTConfigTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 941E007D2A4FD964002CBFBB /* BKTConfigTests.swift */; };
942AD4EB2A7EA94400348B3E /* EvaluationDao.swift in Sources */ = {isa = PBXBuildFile; fileRef = 942AD4EA2A7EA94400348B3E /* EvaluationDao.swift */; };
942AD4ED2A7EA98900348B3E /* EvaluationSQLDao.swift in Sources */ = {isa = PBXBuildFile; fileRef = 942AD4EC2A7EA98900348B3E /* EvaluationSQLDao.swift */; };
942AD4EB2A7EA94400348B3E /* EvaluationSQLDao.swift in Sources */ = {isa = PBXBuildFile; fileRef = 942AD4EA2A7EA94400348B3E /* EvaluationSQLDao.swift */; };
942AD4ED2A7EA98900348B3E /* EvaluationSQLDaoImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 942AD4EC2A7EA98900348B3E /* EvaluationSQLDaoImpl.swift */; };
942AD4EF2A7EAE1200348B3E /* EvaluationStorageImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 942AD4EE2A7EAE1200348B3E /* EvaluationStorageImpl.swift */; };
942AD4F12A7EC06D00348B3E /* EvaluationDaoTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 942AD4F02A7EC06D00348B3E /* EvaluationDaoTests.swift */; };
9433F2EE2A79745800436F91 /* EvaluationUserDefaultDaoTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9433F2ED2A79745800436F91 /* EvaluationUserDefaultDaoTest.swift */; };
Expand Down Expand Up @@ -280,7 +280,7 @@
006E85DD28E032E800B5D90D /* EventInteractorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventInteractorTests.swift; sourceTree = "<group>"; };
006E85DF28E0333F00B5D90D /* MockClock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockClock.swift; sourceTree = "<group>"; };
006E85E128E033B000B5D90D /* MockIdGenerator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockIdGenerator.swift; sourceTree = "<group>"; };
006E85E328E034A700B5D90D /* MockEventDao.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockEventDao.swift; sourceTree = "<group>"; };
006E85E328E034A700B5D90D /* MockEventSQLDao.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockEventSQLDao.swift; sourceTree = "<group>"; };
006E85E528E035D000B5D90D /* MockEventUpdateListener.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockEventUpdateListener.swift; sourceTree = "<group>"; };
006E85E728E038BC00B5D90D /* MockLogger.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockLogger.swift; sourceTree = "<group>"; };
25E2B0072A33812C002E410C /* Version.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Version.swift; sourceTree = "<group>"; };
Expand All @@ -298,9 +298,9 @@
6B6ACE1C234DDA0000BD6069 /* SplashViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SplashViewController.swift; sourceTree = "<group>"; };
6B6ACE1E234DDA0100BD6069 /* SecondViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SecondViewController.swift; sourceTree = "<group>"; };
9340CA0828D9D1DD00E690CC /* EvaluationStorageTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EvaluationStorageTests.swift; sourceTree = "<group>"; };
9340CA1628DA0F6200E690CC /* EventDao.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EventDao.swift; sourceTree = "<group>"; };
9340CA1628DA0F6200E690CC /* EventSQLDao.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EventSQLDao.swift; sourceTree = "<group>"; };
9340CA1728DA0F6200E690CC /* EventEntity.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EventEntity.swift; sourceTree = "<group>"; };
9340CA1828DA0F6200E690CC /* EventDaoImpl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EventDaoImpl.swift; sourceTree = "<group>"; };
9340CA1828DA0F6200E690CC /* EventDaoSQLImpl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EventDaoSQLImpl.swift; sourceTree = "<group>"; };
9340CA1E28DA106200E690CC /* EventDaoTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventDaoTests.swift; sourceTree = "<group>"; };
9340CA2B28DAEA1500E690CC /* MigrationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MigrationTests.swift; sourceTree = "<group>"; };
9340CA5828E1CD2600E690CC /* UserHolder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserHolder.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -328,8 +328,8 @@
93AC8F7D28E34B5C00A4719B /* EvaluationForegroundTask.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EvaluationForegroundTask.swift; sourceTree = "<group>"; };
93AC8F7F28E351C500A4719B /* ScheduledTask.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScheduledTask.swift; sourceTree = "<group>"; };
941E007D2A4FD964002CBFBB /* BKTConfigTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BKTConfigTests.swift; sourceTree = "<group>"; };
942AD4EA2A7EA94400348B3E /* EvaluationDao.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EvaluationDao.swift; sourceTree = "<group>"; };
942AD4EC2A7EA98900348B3E /* EvaluationSQLDao.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EvaluationSQLDao.swift; sourceTree = "<group>"; };
942AD4EA2A7EA94400348B3E /* EvaluationSQLDao.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EvaluationSQLDao.swift; sourceTree = "<group>"; };
942AD4EC2A7EA98900348B3E /* EvaluationSQLDaoImpl.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EvaluationSQLDaoImpl.swift; sourceTree = "<group>"; };
942AD4EE2A7EAE1200348B3E /* EvaluationStorageImpl.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EvaluationStorageImpl.swift; sourceTree = "<group>"; };
942AD4F02A7EC06D00348B3E /* EvaluationDaoTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EvaluationDaoTests.swift; sourceTree = "<group>"; };
9433F2ED2A79745800436F91 /* EvaluationUserDefaultDaoTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EvaluationUserDefaultDaoTest.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -554,8 +554,8 @@
006E85C028DECF2200B5D90D /* EvaluationInteractor.swift */,
94F042F22A750E420060B1E4 /* EvaluationUserDefaultDaoImpl.swift */,
946E17442A7D48A900F6D8C2 /* EvaluationUserDefaultsDao.swift */,
942AD4EA2A7EA94400348B3E /* EvaluationDao.swift */,
942AD4EC2A7EA98900348B3E /* EvaluationSQLDao.swift */,
942AD4EA2A7EA94400348B3E /* EvaluationSQLDao.swift */,
942AD4EC2A7EA98900348B3E /* EvaluationSQLDaoImpl.swift */,
946540362A821A11009BF89F /* EvaluationMemCacheDao.swift */,
);
path = Evaluation;
Expand Down Expand Up @@ -600,7 +600,7 @@
946C3B142A7F929700458B9B /* MockEvaluationStorage.swift */,
937DE96E28E4A29000743FDB /* MockEvaluationInteractor.swift */,
00696DB228DB59CF000068E1 /* MockEvaluations.swift */,
006E85E328E034A700B5D90D /* MockEventDao.swift */,
006E85E328E034A700B5D90D /* MockEventSQLDao.swift */,
937DE97028E4A2B700743FDB /* MockEventInteractor.swift */,
00696DAE28DB5476000068E1 /* MockEvents.swift */,
006E85E528E035D000B5D90D /* MockEventUpdateListener.swift */,
Expand Down Expand Up @@ -695,8 +695,8 @@
9340CA1528DA0F6200E690CC /* Event */ = {
isa = PBXGroup;
children = (
9340CA1628DA0F6200E690CC /* EventDao.swift */,
9340CA1828DA0F6200E690CC /* EventDaoImpl.swift */,
9340CA1628DA0F6200E690CC /* EventSQLDao.swift */,
9340CA1828DA0F6200E690CC /* EventDaoSQLImpl.swift */,
9340CA1728DA0F6200E690CC /* EventEntity.swift */,
006E85CD28DEE23100B5D90D /* EventInteractor.swift */,
);
Expand Down Expand Up @@ -1069,7 +1069,7 @@
006E85D628E01B0F00B5D90D /* BKTError.swift in Sources */,
004245BB28F12D9B00045542 /* BKTEvaluation.swift in Sources */,
00696D6928D1CA77000068E1 /* BKTLogger.swift in Sources */,
942AD4EB2A7EA94400348B3E /* EvaluationDao.swift in Sources */,
942AD4EB2A7EA94400348B3E /* EvaluationSQLDao.swift in Sources */,
9340CA5B28E1CE7200E690CC /* BKTUser.swift in Sources */,
006E85D028DEE42E00B5D90D /* Clock.swift in Sources */,
9340CA5E28E1F29000E690CC /* Component.swift in Sources */,
Expand All @@ -1084,16 +1084,16 @@
94B203222A97128B004C4E5D /* BackgroundTaskIndentifier.swift in Sources */,
004B15FB290FBF79007F5357 /* EvaluationBackgroundTask.swift in Sources */,
00696D7128D1D258000068E1 /* EvaluationStorage.swift in Sources */,
942AD4ED2A7EA98900348B3E /* EvaluationSQLDao.swift in Sources */,
942AD4ED2A7EA98900348B3E /* EvaluationSQLDaoImpl.swift in Sources */,
00696D7328D1D295000068E1 /* EvaluationEntity.swift in Sources */,
93AC8F7E28E34B5C00A4719B /* EvaluationForegroundTask.swift in Sources */,
94F042F32A750E420060B1E4 /* EvaluationUserDefaultDaoImpl.swift in Sources */,
006E85C128DECF2200B5D90D /* EvaluationInteractor.swift in Sources */,
94F042F72A76C66C0060B1E4 /* UserEvaluationCondition.swift in Sources */,
0065C3E328C8136D002D92A2 /* Event.swift in Sources */,
004CF1F32929C9E500CCC3DF /* EventBackgroundTask.swift in Sources */,
9340CA1928DA0F6200E690CC /* EventDao.swift in Sources */,
9340CA1B28DA0F6200E690CC /* EventDaoImpl.swift in Sources */,
9340CA1928DA0F6200E690CC /* EventSQLDao.swift in Sources */,
9340CA1B28DA0F6200E690CC /* EventDaoSQLImpl.swift in Sources */,
946540372A821A11009BF89F /* EvaluationMemCacheDao.swift in Sources */,
0065C3E528C813D6002D92A2 /* EventData.swift in Sources */,
9340CA1A28DA0F6200E690CC /* EventEntity.swift in Sources */,
Expand Down Expand Up @@ -1169,7 +1169,7 @@
006E85C728DED62700B5D90D /* MockEvaluationDao.swift in Sources */,
937DE96F28E4A29000743FDB /* MockEvaluationInteractor.swift in Sources */,
00696DB328DB59CF000068E1 /* MockEvaluations.swift in Sources */,
006E85E428E034A700B5D90D /* MockEventDao.swift in Sources */,
006E85E428E034A700B5D90D /* MockEventSQLDao.swift in Sources */,
937DE97128E4A2B700743FDB /* MockEventInteractor.swift in Sources */,
00696DAF28DB5476000068E1 /* MockEvents.swift in Sources */,
946C3B152A7F929700458B9B /* MockEvaluationStorage.swift in Sources */,
Expand Down
2 changes: 1 addition & 1 deletion Bucketeer/Sources/Internal/DI/Component.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ final class ComponentImpl: Component {
device: dataModule.device,
eventsMaxBatchQueueCount: dataModule.config.eventsMaxQueueSize,
apiClient: dataModule.apiClient,
eventDao: dataModule.eventDao,
eventDao: dataModule.eventSQLDao,
clock: dataModule.clock,
idGenerator: dataModule.idGenerator,
logger: dataModule.config.logger,
Expand Down
10 changes: 5 additions & 5 deletions Bucketeer/Sources/Internal/DI/DataModule.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ protocol DataModule {
var userHolder: UserHolder { get }
var apiClient: ApiClient { get }
var evaluationStorage: EvaluationStorage { get }
var eventDao: EventDao { get }
var eventSQLDao: EventSQLDao { get }
var defaults: Defaults { get }
var idGenerator: IdGenerator { get }
var clock: Clock { get }
Expand All @@ -17,14 +17,14 @@ final class DataModuleImpl: DataModule {
let user: User
let config: BKTConfig
let sqlite: SQLite
let eventDao: EventDao
let eventSQLDao: EventSQLDao

init(user: User, config: BKTConfig) throws {
self.user = user
self.config = config
self.sqlite = try DatabaseOpenHelper.createDatabase(logger: config.logger)
self.evaluationDao = EvaluationSQLDao(db: sqlite)
self.eventDao = EventDaoImpl(db: sqlite)
self.evaluationDao = EvaluationSQLDaoImpl(db: sqlite)
self.eventSQLDao = EventDaoSQLImpl(db: sqlite)
}

private(set) lazy var clock: Clock = ClockImpl()
Expand All @@ -40,7 +40,7 @@ final class DataModuleImpl: DataModule {
private(set) lazy var defaults: Defaults = UserDefaults.standard
private(set) lazy var device: Device = DeviceImpl()
// Evaluation Data Access Layer
private let evaluationDao: EvaluationDao
private let evaluationDao: EvaluationSQLDao
private lazy var evaluationMemCacheDao: EvaluationMemCacheDao = EvaluationMemCacheDao()
private lazy var evaluationUserDefaultsDao: EvaluationUserDefaultsDao = EvaluationUserDefaultDaoImpl(defaults: defaults)
private(set) lazy var evaluationStorage: EvaluationStorage = EvaluationStorageImpl(
Expand Down
12 changes: 0 additions & 12 deletions Bucketeer/Sources/Internal/Evaluation/EvaluationDao.swift
View file

This file was deleted.

Loading

0 comments on commit c790e2a

Please sign in to comment.