Merge branch 'develop' into network/#207

Author: Yeonnies

CERTI-iOS/Application/DIContainer/AppDIContainer.swift

@@ -27,6 +27,7 @@ final class AppDIContainer {
     private lazy var acquisitionService: AcquisitionServiceProtocol = AcquisitionService()
     private lazy var careersService: CareersServiceProtocol = CareersService()
     private lazy var activityService: ActivityServiceProtocol = ActivityService()
+    private lazy var reportService: ReportServiceProtocol = ReportService()
     private lazy var commentService: CommentServiceProtocol = CommentService()
 
     // MARK: - Repositories
@@ -42,6 +43,7 @@ final class AppDIContainer {
     private lazy var careersRepository: CareersRepository = DefaultCareersRepository(service: careersService)
     private lazy var activityRepository: ActivityRepository = DefaultActivityRepository(service: activityService)
     private lazy var commentRepository: CommentRepository = DefaultCommentRepository(service: commentService)
+    private lazy var ReportRepository: ReportRepository = DefaultReportRepository(service: reportService)
 }
 
 
@@ -208,8 +210,12 @@ extension AppDIContainer {
         return DefaultEditUnivUseCase(repository: userRepository)
     }
 
-    func makeToggleNotificationSettingUseCase() -> DefaultToggleNotificationSettingUseCase {
-        return DefaultToggleNotificationSettingUseCase(repository: userRepository)
+    func makeToggleMarketingSettingUseCase() -> DefaultToggleMarketingSettingUseCase {
+        return DefaultToggleMarketingSettingUseCase(repository: userRepository)
+    }
+    
+    func makeTogglePrivacySettingUseCase() -> DefaultTogglePrivacySettingUseCase {
+        return DefaultTogglePrivacySettingUseCase(repository: userRepository)
     }
 
     func makeGetNotificationSettingUseCase() -> DefaultGetNotificationSettingUseCase {
@@ -251,6 +257,18 @@ extension AppDIContainer {
     func makeLikeCommentUseCase() -> LikeCommentUseCase {
         return DefaultLikeCommentUseCase(repository: commentRepository)
     }
+    
+    func makeReportCommentUserCase() -> ReportCommentUseCase {
+        return DefaultReportCommentUseCase(repository: ReportRepository)
+    }
+    
+    func makeEditAcquisitionUseCase() -> EditAcquisitionUseCase {
+        return DefaultEditAcquisitionUseCase(repository: acquisitionRepository)
+    }
+    
+    func makeEditPreCertificationUseCase() -> EditPreCertificationUseCase {
+        return DefaultEditPreCertificationUseCase(repository: homeRepository)
+    }
 }
 
 
@@ -289,7 +307,8 @@ extension AppDIContainer {
           fetchCommentUseCase: makeFetchCommentUseCase(),
           addCommentUseCase: makeAddCommentUseCase(),
           deleteCommentUseCase: makeDeleteCommentUseCase(),
-          likeCommentUseCase: makeLikeCommentUseCase()
+          likeCommentUseCase: makeLikeCommentUseCase(),
+          reportCommentUseCase: makeReportCommentUserCase()
         )
     }
 
@@ -326,9 +345,14 @@ extension AppDIContainer {
             getFavoriteCertificationUseCase: makeGetFavoritePreCertificationUseCase(),
             withDrawUseCase: makeWithDrawUseCase(),
             getNotificationSettingUseCase: makeGetNotificationSettingUseCase(),
-            toggleNotificationSettingUseCase: makeToggleNotificationSettingUseCase(),
+            toggleMarketingSettingUseCase: makeToggleMarketingSettingUseCase(),
+            togglePrivacySettingUseCase: makeTogglePrivacySettingUseCase(),
             switchFavoriteUseCase: makeSwitchFavoriteUseCase(),
-            fetchAcquisitionListUseCase: makeFetchAcquisitionListUseCase()
+            fetchAcquisitionListUseCase: makeFetchAcquisitionListUseCase(),
+            deleteAcquisitionUseCase: makeDeleteAcquisitionUseCase(),
+            deletePreCertificationUseCase: makeDeletePreCertificationUseCase(),
+            editAcquisitionUseCase: makeEditAcquisitionUseCase(),
+            editPreCertificationUseCase: makeEditPreCertificationUseCase()
         )
     }
 

CERTI-iOS/Data/Network/Acquisition/AcquisitionAPI.swift

@@ -14,6 +14,7 @@ enum AcquisitionAPI {
     case addAcquisition(request: AddAcquisitionRequestDTO)
     case fetchAcquisitionDetail(id: Int)
     case deleteAcquisition(id: Int)
+    case editAcquisition(request: EditAcquisitionRequestDTO, id: Int)
 }
 
 extension AcquisitionAPI: BaseTargetType {
@@ -34,6 +35,8 @@ extension AcquisitionAPI: BaseTargetType {
             return "acquisition/\(id)"
         case .deleteAcquisition(let id):
             return "acquisition/\(id)"
+        case .editAcquisition(_, let id):
+            return "acquisition/\(id)"
         }
     }
 
@@ -47,6 +50,8 @@ extension AcquisitionAPI: BaseTargetType {
             return .get
         case .deleteAcquisition:
             return .delete
+        case .editAcquisition:
+            return .patch
         }
     }
 
@@ -60,6 +65,8 @@ extension AcquisitionAPI: BaseTargetType {
             return .requestPlain
         case .deleteAcquisition:
             return .requestPlain
+        case .editAcquisition(let request, _):
+            return .requestJSONEncodable(request)
         }
     }
 

CERTI-iOS/Data/Network/Acquisition/AcquisitionService.swift

@@ -14,6 +14,7 @@ protocol AcquisitionServiceProtocol {
     func addAcquisition(request: AddAcquisitionRequestDTO) async -> Result<BaseResponseDTO<Bool>, NetworkError>
     func fetchAcquisitionDetail(id: Int) async -> Result<AcquisitionDetailResponseDTO, NetworkError>
     func deleteAcquisition(id: Int) async -> Result<Void, NetworkError>
+    func editAcquisition(request: EditAcquisitionRequestDTO, id: Int) async -> Result<Void, NetworkError>
 }
 
 final class AcquisitionService: BaseService, AcquisitionServiceProtocol {
@@ -34,4 +35,8 @@ final class AcquisitionService: BaseService, AcquisitionServiceProtocol {
     func deleteAcquisition(id: Int) async -> Result<Void, NetworkError> {
         return await requestVoid(provider, .deleteAcquisition(id: id))
     }
+    
+    func editAcquisition(request: EditAcquisitionRequestDTO, id: Int) async -> Result<Void, NetworkError> {
+        return await requestVoid(provider, .editAcquisition(request: request, id: id))
+    }
 }

CERTI-iOS/Data/Network/Acquisition/DTO/Request/EditAcquisitionRequestDTO.swift

@@ -0,0 +1,12 @@
+//
+//  EditAcquisitionRequestDTO.swift
+//  CERTI-iOS
+//
+//  Created by OneTen on 2/13/26.
+//
+
+import Foundation
+
+struct EditAcquisitionRequestDTO: Codable {
+    let acquisitionDate, grade: String
+}

CERTI-iOS/Data/Network/Certification/DTO/Response/CertificationInfoResponseDTO.swift

@@ -29,7 +29,8 @@ extension CertificationInfoResponseDTO {
             iconIndex: iconIndex,
             city: "",
             state: "",
-            testDate: ""
+            testDate: "",
+            preCertificationId: nil
         )
     }
 }

CERTI-iOS/Data/Network/Home/DTO/Request/EditPreCertificationRequestDTO.swift

@@ -0,0 +1,12 @@
+//
+//  EditPreCertificationRequestDTO.swift
+//  CERTI-iOS
+//
+//  Created by OneTen on 2/13/26.
+//
+
+import Foundation
+
+struct EditPreCertificationRequestDTO: Codable {
+    let testDate, city, state: String
+}

CERTI-iOS/Data/Network/Home/DTO/Response/PreCertificationInfoResponseDTO.swift

@@ -27,10 +27,11 @@ struct PreCertificationDataInfo: Codable {
     let nearestTestDate, agencyName: String
     let iconIndex: Int
     let city, state, testDate: String
+    let preCertificationId: Int?
 
     enum CodingKeys: String, CodingKey {
         case certificationID = "certificationId"
-        case certificationName, certificationType, description, averagePeriod, nearestTestDate, agencyName, iconIndex, city, state, testDate
+        case certificationName, certificationType, description, averagePeriod, nearestTestDate, agencyName, iconIndex, city, state, testDate, preCertificationId
     }
 
     func toPreCertificationEntityData() -> PreCertificationEntityData {
@@ -45,7 +46,8 @@ struct PreCertificationDataInfo: Codable {
             iconIndex: iconIndex,
             city: city,
             state: state,
-            testDate: testDate
+            testDate: testDate,
+            preCertificationId: preCertificationId
         )
     }
 }

CERTI-iOS/Data/Network/Home/HomeAPI.swift

@@ -16,6 +16,7 @@ enum HomeAPI {
     case getMonthlyPreCertification(year: Int, month: Int)
     case getDailyPreCertification(date: String)
     case addPreCertification(request: AddPreCertificationRequestDTO)
+    case editPreCertification(request: EditPreCertificationRequestDTO, id: Int)
 }
 
 extension HomeAPI: BaseTargetType {
@@ -40,6 +41,8 @@ extension HomeAPI: BaseTargetType {
             return "home/pre-certification/day"
         case .addPreCertification:
             return "home/pre-certification"
+        case .editPreCertification(_, id: let id):
+            return "home/pre-certification/\(id)"
         }
     }
 
@@ -57,6 +60,8 @@ extension HomeAPI: BaseTargetType {
             return .get
         case .getDailyPreCertification:
             return .get
+        case .editPreCertification:
+            return .patch
         }
     }
 
@@ -82,6 +87,8 @@ extension HomeAPI: BaseTargetType {
             )
         case .addPreCertification(let request):
             return .requestJSONEncodable(request)
+        case .editPreCertification(let request, _):
+            return .requestJSONEncodable(request)
         }
     }
 

CERTI-iOS/Data/Network/Home/HomeService.swift

@@ -16,6 +16,7 @@ protocol HomeServiceProtocol {
     func getMonthlyPreCertification(year: Int, month: Int) async -> Result<MonthlyPreCertificationResponseDTO, NetworkError>
     func getDailyPreCertification(date: String) async -> Result<DailyPreCertificationResponseDTO, NetworkError>
     func addPreCertification(request: AddPreCertificationRequestDTO) async -> Result<BaseResponseDTO<Bool>, NetworkError>
+    func editPreCertification(request: EditPreCertificationRequestDTO, id: Int) async -> Result<Void, NetworkError>
 }
 
 final class HomeService: BaseService, HomeServiceProtocol {
@@ -45,4 +46,8 @@ final class HomeService: BaseService, HomeServiceProtocol {
     func getDailyPreCertification(date: String) async -> Result<DailyPreCertificationResponseDTO, NetworkError> {
         return await requestDecodable(provider, .getDailyPreCertification(date: date))
     }
+        
+    func editPreCertification(request: EditPreCertificationRequestDTO, id: Int) async -> Result<Void, NetworkError> {
+        return await requestVoid(provider, .editPreCertification(request: request, id: id))
+    }
 }

CERTI-iOS/Data/Network/Report/DTO/ReportAPI.swift

@@ -0,0 +1,44 @@
+//
+//  ReportAPI.swift
+//  CERTI-iOS
+//
+//  Created by 이상엽 on 2/11/26.
+//
+
+import Foundation
+
+import Moya
+
+enum ReportAPI {
+    case reportComment(commentId: Int, request: ReportCommentRequestDTO)
+}
+
+extension ReportAPI: BaseTargetType {
+    var headerType: HeaderType {
+        switch self {
+        default:
+            return .accessTokenHeader
+        }
+    }
+    
+    var path: String {
+        switch self {
+        case .reportComment(let commentId, _):
+            return "report/comment/\(commentId)"
+        }
+    }
+    
+    var method: Moya.Method {
+        switch self {
+        case .reportComment:
+            return .post
+        }
+    }
+    
+    var task: Moya.Task {
+        switch self {
+        case .reportComment(_, let request):
+            return .requestJSONEncodable(request)
+        }
+    }
+}