merge: develop category feature

Author: Siwon-L

Projects/App/Project.swift

@@ -8,7 +8,7 @@ let project = Project(
   ),
   settings: .settings(
     base: .init()
-      .marketingVersion("2.0.4")
+      .marketingVersion("2.1.0")
       .swiftVersion("5.7")
       .currentProjectVersion("1")
       .appleGenericVersioningSystem()
@@ -40,11 +40,11 @@ let project = Project(
         configurations: [
           .debug(name: "Debug", settings: [
             "CODE_SIGN_IDENTITY": "Apple Development: Nayeon Gu (3CMPGMMD7L)",
-            "PROVISIONING_PROFILE_SPECIFIER": "match Development com.yapp.moneymong.WidgetExtension"
+            "PROVISIONING_PROFILE_SPECIFIER": "match Development com.yapp.moneymong.WidgetExtension 1769511006"
           ]),
           .release(name: "Release", settings: [
             "CODE_SIGN_IDENTITY": "Apple Distribution: Nayeon Gu (H5G7RFWFSQ)",
-            "PROVISIONING_PROFILE_SPECIFIER": "match AppStore com.yapp.moneymong.WidgetExtension"
+            "PROVISIONING_PROFILE_SPECIFIER": "match AppStore com.yapp.moneymong.WidgetExtension 1769511389"
           ])
         ]
       )
@@ -56,6 +56,7 @@ let project = Project(
       bundleId: "com.yapp.moneymong",
       deploymentTarget: .iOS(targetVersion: "15.0", devices: .iphone),
       infoPlist: .extendingDefault(with: [
+        "UIDesignRequiresCompatibility": true,
         "CFBundleDisplayName": "머니몽",
         "UISupportedInterfaceOrientations": [
           "UIInterfaceOrientationPortrait"
@@ -117,11 +118,11 @@ let project = Project(
         configurations: [
           .debug(name: "Debug", settings: [
             "CODE_SIGN_IDENTITY": "Apple Development: Nayeon Gu (3CMPGMMD7L)",
-            "PROVISIONING_PROFILE_SPECIFIER": "match Development com.yapp.moneymong"
+            "PROVISIONING_PROFILE_SPECIFIER": "match Development com.yapp.moneymong 1769511003"
           ]),
           .release(name: "Release", settings: [
             "CODE_SIGN_IDENTITY": "Apple Distribution: Nayeon Gu (H5G7RFWFSQ)",
-            "PROVISIONING_PROFILE_SPECIFIER": "match AppStore com.yapp.moneymong"
+            "PROVISIONING_PROFILE_SPECIFIER": "match AppStore com.yapp.moneymong 1769511386"
           ])
         ]
       ),

Projects/App/Sources/SceneDelegate.swift

@@ -185,6 +185,21 @@ extension SceneDelegate {
       return ReissueCodeUseCase(repo: agencyRepo)
     }
 
+    DIContainer.shared.register(type: GetCategoriesUseCaseInterface.self) {
+      let agencyRepo = AgencyRepository(networkManager: networkManager, localStorage: localStorage, memoryCache: memoryCache)
+      return GetCategoriesUseCase(repo: agencyRepo)
+    }
+    
+    DIContainer.shared.register(type: DeleteCategoryUseCaseInterface.self) {
+      let agencyRepo = AgencyRepository(networkManager: networkManager, localStorage: localStorage, memoryCache: memoryCache)
+      return DeleteCategoryUseCase(repo: agencyRepo)
+    }
+    
+    DIContainer.shared.register(type: CreateCategoryUseCaseInterface.self) {
+      let agencyRepo = AgencyRepository(networkManager: networkManager, localStorage: localStorage, memoryCache: memoryCache)
+      return CreateCategoryUseCase(repo: agencyRepo)
+    }
+    
     // MARK: - Ledger UseCase Dependency
     DIContainer.shared.register(type: CreateLedgerUseCaseInterface.self) {
       let ledgerRepo = LedgerRepository(networkManager: networkManager, localStorage: localStorage)

Projects/Core/MMNetwork/Sources/NetworkManager.swift

@@ -29,13 +29,15 @@ public final class NetworkManager: NetworkManagerInterfacae {
     {
       if let message = errorResponse.message {
         throw MoneyMongError.appError(
-          MoneyMongError.Code(rawValue: errorResponse.code) ?? .default
+          MoneyMongError.Code(rawValue: errorResponse.code) ?? .default,
+          errorMessage: message
         )
       }
 
       if let messages = errorResponse.messages {
         throw MoneyMongError.appError(
-          MoneyMongError.Code(rawValue: errorResponse.code) ?? .default
+          MoneyMongError.Code(rawValue: errorResponse.code) ?? .default,
+          errorMessage: messages.first
         )
       }
     }
@@ -96,13 +98,15 @@ public final class NetworkManager: NetworkManagerInterfacae {
       {
         if let message = errorResponse.message {
           throw MoneyMongError.appError(
-            MoneyMongError.Code(rawValue: errorResponse.code) ?? .default
+            MoneyMongError.Code(rawValue: errorResponse.code) ?? .default,
+            errorMessage: message
           )
         }
 
         if let messages = errorResponse.messages {
           throw MoneyMongError.appError(
-            MoneyMongError.Code(rawValue: errorResponse.code) ?? .default
+            MoneyMongError.Code(rawValue: errorResponse.code) ?? .default,
+            errorMessage: messages.first
           )
         }
       }

Projects/Core/Repository/Sources/APIs/AgencyAPI/Repository/AgencyAPI.swift

@@ -12,6 +12,9 @@ enum AgencyAPI {
   case certificateCode(param: InvitationCodeCertificationRequestDTO) // 초대코드 인증
   case reissueCode(id: Int) // 초대코드 재발급
   case delete(id: Int) // 소속삭제
+  case getCategories(id: Int)
+  case createCategory(query: CreateCategoryRequestDTO)
+  case deleteCategory(id: Int)
 }
 
 extension AgencyAPI: TargetType {
@@ -30,6 +33,7 @@ extension AgencyAPI: TargetType {
     case .certificateCode: return "v2/agencies/invitation-code"
     case let .reissueCode(id): return "v1/agencies/\(id)/invitation-code"
     case let .delete(id): return "v1/agencies/\(id)"
+    case .getCategories, .createCategory, .deleteCategory: return "v1/agencies/categories"
     }
   }
 
@@ -44,6 +48,9 @@ extension AgencyAPI: TargetType {
     case .certificateCode: return .post
     case .reissueCode: return .patch
     case .delete: return .delete
+    case .getCategories: return .get
+    case .createCategory: return .post
+    case .deleteCategory: return .delete
     }
   }
 
@@ -58,6 +65,9 @@ extension AgencyAPI: TargetType {
     case let .certificateCode(param): return .requestJSONEncodable(params: param)
     case .reissueCode: return .plain
     case .delete: return .plain
+    case let .getCategories(id): return .requestJSONEncodable(query: ["agencyId":id])
+    case let .createCategory(params): return .requestJSONEncodable(params: params)
+    case let .deleteCategory(id): return .requestJSONEncodable(params: ["categoryId":id])
     }
   }
 

Projects/Core/Repository/Sources/APIs/AgencyAPI/Repository/AgencyRepository.swift

@@ -100,4 +100,19 @@ public struct AgencyRepository: AgencyRepositoryInterface {
     localStorage.deleteCurrentLedgerInfo()
     memoryCache.delete(key: "v1/agencies/me")
   }
+  
+  public func getCategories(id: Int) async throws -> [MMCategory] {
+    let targetType = AgencyAPI.getCategories(id: id)
+    return try await networkManager.request(target: targetType, of: CategoriesResponseDTO.self).toEntity
+  }
+  
+  public func createCategory(agencyId: Int, name: String) async throws {
+    let targetType = AgencyAPI.createCategory(query: CreateCategoryRequestDTO(agencyId: agencyId, name: name))
+    try await networkManager.request(target: targetType)
+  }
+  
+  public func deleteCategory(id: Int) async throws {
+    let targetType = AgencyAPI.deleteCategory(id: id)
+    try await networkManager.request(target: targetType)
+  }
 }

Projects/Core/Repository/Sources/APIs/AgencyAPI/RequestDTO/CreateCategoryRequestDTO.swift

@@ -0,0 +1,6 @@
+import Foundation
+
+struct CreateCategoryRequestDTO: Encodable {
+  let agencyId: Int
+  let name: String
+}

Projects/Core/Repository/Sources/APIs/AgencyAPI/ResponseDTO/CategoriesResponseDTO.swift

@@ -0,0 +1,11 @@
+import Foundation
+
+import BaseDomain
+import MMNetworkInterface
+
+struct CategoriesResponseDTO: Responsable {
+  let agencyId: Int
+  let categories: [CategoryResponseDTO]
+  
+  var toEntity: [MMCategory] { categories.map(\.toEntity) }
+}

Projects/Core/Repository/Sources/APIs/AgencyAPI/ResponseDTO/CategoryResponseDTO.swift

@@ -0,0 +1,13 @@
+import Foundation
+
+import BaseDomain
+import MMNetworkInterface
+
+struct CategoryResponseDTO: Responsable {
+  let id: Int
+  let name: String
+  
+  var toEntity: MMCategory {
+    return MMCategory(id: id, name: name)
+  }
+}

Projects/Core/Repository/Sources/APIs/LedgerAPI/Repository/LedgerRepository.swift

@@ -24,7 +24,8 @@ public final class LedgerRepository: LedgerRepositoryInterface {
     amount: Int,
     description: String,
     paymentDate: String,
-    documentImageUrls: [String]
+    documentImageUrls: [String],
+    category: String?
   ) async throws {
     let targetType = LedgerAPI.create(
       id: id,
@@ -34,7 +35,8 @@ public final class LedgerRepository: LedgerRepositoryInterface {
         amount: amount,
         description: description,
         paymentDate: paymentDate,
-        documentImageUrls: documentImageUrls
+        documentImageUrls: documentImageUrls,
+        category: category
       )
     )
     let ledger = try await networkManager.request(target: targetType, of: LedgerDetailResponseDTO.self)
@@ -63,7 +65,8 @@ public final class LedgerRepository: LedgerRepositoryInterface {
         amount: ledger.amount,
         description: ledger.description,
         paymentDate: ledger.paymentDate,
-        documentImageUrls: ledger.documentImageUrls.map { $0.url }
+        documentImageUrls: ledger.documentImageUrls.map { $0.url },
+        category: ledger.category
       )
     )
     let entity = try await networkManager.request(target: targetType, of: LedgerDetailResponseDTO.self).toEntity

Projects/Core/Repository/Sources/APIs/LedgerAPI/RequestDTO/LedgerRequestDTO.swift

@@ -8,4 +8,5 @@ struct LedgerRequestDTO: Encodable {
   let paymentDate: String
   let receiptImageUrls: [String] = []
   let documentImageUrls: [String]
+  let category: String?
 }