Feat/#456 댓글/답글 관련 API 연동

.github/workflows/build_test.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   build:
-    runs-on: macos-latest
+    runs-on: macos-15
 
     steps:
       - name: Checkout code

ByeBoo-iOS/ByeBoo-iOS/Data/DataDependencyAssembler.swift

@@ -71,6 +71,12 @@ struct DataDependencyAssembler: DependencyAssembler {
         DIContainer.shared.register(type: NotificationInterface.self) { _ in
             return DefaultNotificationRepository(networkService: networkService)
         }
+        DIContainer.shared.register(type: CommentInterface.self) { _ in
+            return DefaultCommentRepository(
+                network: networkService,
+                userDefaultService: userDefaultService
+            )
+        }
     }
 }
 

ByeBoo-iOS/ByeBoo-iOS/Data/Model/CommonQuestAnswerRepliesResponseDTO.swift

@@ -10,7 +10,7 @@ import Foundation
 struct CommonQuestAnswerRepliesResponseDTO: Decodable {
     let totalCount: Int
     let comment: CommonQuestAnswerCommentResponseDTO
-    let replies: [CommonQuestAnswerReplyResponseDTO]
+    let replies: [CommonQuestAnswerCommentResponseDTO]
 }
 
 struct CommonQuestAnswerCommentResponseDTO: Decodable {
@@ -22,27 +22,19 @@ struct CommonQuestAnswerCommentResponseDTO: Decodable {
     let writerId: Int
 }
 
-struct CommonQuestAnswerReplyResponseDTO: Decodable {
-    let content: String
-    let writer: String
-    let createdAt: String
-    let profileIcon: String
-    let commentId: Int
-    let writerId: Int
-}
-
 extension CommonQuestAnswerRepliesResponseDTO {
-    func toEntity(userName: String) -> [CommonQuestCommentEntity] {
-        replies.map {
-            $0.toEntity(userName: userName)
-        }
+    func toEntity(userID: Int) -> CommonQuestReplyListEntity {
+        .init(
+            totalCount: totalCount,
+            replies: replies.map { $0.toEntity(userID: userID) }
+        )
     }
 }
 
-extension CommonQuestAnswerReplyResponseDTO {
-    func toEntity(userName: String) -> CommonQuestCommentEntity {
+extension CommonQuestAnswerCommentResponseDTO {
+    func toEntity(userID: Int) -> CommonQuestCommentEntity {
         .init(
-            isMyComment: userName == writer ? true : false,
+            isMyComment: userID == writerId ? true : false,
             commentID: commentId,
             replyCount: nil,
             writerID: writerId,

ByeBoo-iOS/ByeBoo-iOS/Data/Model/CommonQuestCommentRequestDTO.swift

@@ -0,0 +1,13 @@
+//
+//  CommonQuestCommentRequestDTO.swift
+//  ByeBoo-iOS
+//
+//  Created by 이나연 on 6/14/26.
+//
+
+import Foundation
+
+struct CommonQuestCommentRequestDTO: Encodable {
+    let content: String
+    let targetId: Int
+}

ByeBoo-iOS/ByeBoo-iOS/Data/Model/CommonQuestReplyRequestDTO.swift

@@ -0,0 +1,12 @@
+//
+//  CommonQuestReplyRequestDTO.swift
+//  ByeBoo-iOS
+//
+//  Created by 이나연 on 6/14/26.
+//
+
+import Foundation
+
+struct CommonQuestReplyRequestDTO: Encodable {
+    let content: String 
+}

ByeBoo-iOS/ByeBoo-iOS/Data/Model/ReportRequestDTO.swift

@@ -0,0 +1,13 @@
+//
+//  ReportRequestDTO.swift
+//  ByeBoo-iOS
+//
+//  Created by 이나연 on 6/16/26.
+//
+
+import Foundation
+
+struct ReportRequestDTO: Encodable {
+    let targetType: String
+    let targetId: Int
+}

ByeBoo-iOS/ByeBoo-iOS/Data/Network/EndPoint/CommentAPI.swift

@@ -0,0 +1,81 @@
+//
+//  CommentAPI.swift
+//  ByeBoo-iOS
+//
+//  Created by 이나연 on 6/14/26.
+//
+
+import Foundation
+
+import Alamofire
+
+enum CommentAPI {
+    case postComment(dto: CommonQuestCommentRequestDTO)
+    case postReply(commentID: Int, dto: CommonQuestReplyRequestDTO)
+    case fetchReplies(commentID: Int)
+    case patchComment(commentID: Int, dto: CommonQuestReplyRequestDTO)
+    case deleteComment(commentID: Int)
+}
+
+extension CommentAPI: EndPoint {
+    var basePath: String {
+        return "/api/v1/comments"
+    }
+
+    var path: String {
+        switch self {
+        case .postComment:
+            return ""
+        case .patchComment(let commentID, _), .deleteComment(let commentID):
+            return "/\(commentID)"
+        case .postReply(let commentID, _), .fetchReplies(let commentID):
+            return "/\(commentID)/replies"
+        }
+    }
+
+    var method: Alamofire.HTTPMethod {
+        switch self {
+        case .postComment, .postReply:
+            return .post
+        case .fetchReplies:
+            return .get
+        case .patchComment:
+            return .patch
+        case .deleteComment:
+            return .delete
+        }
+    }
+
+    var headers: HeaderType {
+        switch self {
+        case .postComment, .postReply, .fetchReplies, .patchComment, .deleteComment:
+            return .withAuth
+        }
+    }
+
+    var parameterEncoding: any Alamofire.ParameterEncoding {
+        switch self {
+        case .postComment, .postReply, .patchComment:
+            return JSONEncoding.default
+        case .fetchReplies, .deleteComment:
+            return URLEncoding.default
+        }
+    }
+
+    var queryParameters: [String : String]? {
+        nil
+    }
+
+    var bodyParameters: Alamofire.Parameters? {
+        switch self {
+        case .postComment(let dto):
+            return try? dto.toDictionary()
+        case .postReply(_, let dto):
+            return try? dto.toDictionary()
+        case .patchComment(_, let dto):
+            return try? dto.toDictionary()
+        case .fetchReplies, .deleteComment:
+            return nil
+        }
+    }
+}

ByeBoo-iOS/ByeBoo-iOS/Data/Network/EndPoint/ReportsAPI.swift

@@ -10,18 +10,18 @@ import Foundation
 import Alamofire
 
 enum ReportsAPI {
-    case postReport(answerID: Int)
+    case postReport(dto: ReportRequestDTO)
 }
 
 extension ReportsAPI: EndPoint {
     var basePath: String {
-        return "/api/v1/reports"
+        return "/api/v2/reports"
     }
 
     var path: String {
         switch self {
-        case .postReport(let answerID):
-            return "/common-quests/\(answerID)"
+        case .postReport:
+            return ""
         }
     }
 
@@ -33,7 +33,6 @@ extension ReportsAPI: EndPoint {
     }
 
     var headers: HeaderType {
-        let keychainService = DefaultKeychainService()
         return .withAuth
     }
 
@@ -49,8 +48,9 @@ extension ReportsAPI: EndPoint {
     }
 
     var bodyParameters: Alamofire.Parameters? {
-        nil
+        switch self {
+        case .postReport(let dto):
+            return try? dto.toDictionary()
+        }
     }
-
-
 }

ByeBoo-iOS/ByeBoo-iOS/Data/Repository/CommentRepository.swift

@@ -0,0 +1,50 @@
+//
+//  CommentRepository.swift
+//  ByeBoo-iOS
+//
+//  Created by 이나연 on 6/14/26.
+//
+
+import Foundation
+
+struct DefaultCommentRepository: CommentInterface {
+
+    private let network: NetworkService
+    private let userDefaultServcie: UserDefaultService
+
+    init(
+        network: NetworkService,
+        userDefaultService: UserDefaultService
+    ) {
+        self.network = network
+        self.userDefaultServcie = userDefaultService
+    }
+
+    func postComment(content: String, answerID: Int) async throws {
+        let postCommentRequestDTO: CommonQuestCommentRequestDTO = .init(content: content, targetId: answerID)
+        let _ = try await network.request(CommentAPI.postComment(dto: postCommentRequestDTO))
+    }
+
+    func postReply(content: String, commentID: Int) async throws {
+        let postReplyRequestDTO: CommonQuestReplyRequestDTO = .init(content: content)
+        let _ = try await network.request(CommentAPI.postReply(commentID: commentID, dto: postReplyRequestDTO))
+    }
+
+    func fetchReplies(commentID: Int) async throws -> CommonQuestReplyListEntity {
+        let userID: Int = userDefaultServcie.load(key: .userID) ?? 0
+        let result = try await network.request(
+            CommentAPI.fetchReplies(commentID: commentID),
+            decodingType: CommonQuestAnswerRepliesResponseDTO.self
+        )
+        return result.toEntity(userID: userID)
+    }
+
+    func patchComment(content: String, commentID: Int) async throws {
+        let patchCommentRequestDTO: CommonQuestReplyRequestDTO = .init(content: content)
+        let _ = try await network.request(CommentAPI.patchComment(commentID: commentID, dto: patchCommentRequestDTO))
+    }
+
+    func deleteComment(commentID: Int) async throws {
+        let _ = try await network.request(CommentAPI.deleteComment(commentID: commentID))
+    }
+}

ByeBoo-iOS/ByeBoo-iOS/Data/Repository/ReportsRepository.swift

@@ -15,9 +15,9 @@ struct DefaultReportsRepository: ReportsInterface {
         self.networkService = networkService
     }
 
-    func reportCommonQuest(answerID: Int) async throws {
-        let _ = try await networkService.request(
-            ReportsAPI.postReport(answerID: answerID)
-        )
+    func reportCommonQuest(targetID: Int, targetType: CommonQuestTargetType) async throws {
+        let reportRequestDTO: ReportRequestDTO = .init(targetType: targetType.rawValue, targetId: targetID)
+        ByeBooLogger.debug("\(targetID), \(targetType)")
+        _ = try await networkService.request(ReportsAPI.postReport(dto: reportRequestDTO))
     }
 }

ByeBoo-iOS/ByeBoo-iOS/Domain/DomainDependencyAssembler.swift

@@ -23,11 +23,12 @@ struct DomainDependencyAssembler: DependencyAssembler {
               let forbiddenWordRepository = DIContainer.shared.resolve(type: ForbiddenWordInterface.self),
               let commonQuestRepository = DIContainer.shared.resolve(type: CommonQuestInterface.self),
               let blocksRepository = DIContainer.shared.resolve(type: BlocksInterface.self),
+              let notificationRepository = DIContainer.shared.resolve(type: NotificationInterface.self),
               let reportsRepository = DIContainer.shared.resolve(type: ReportsInterface.self),
-              let notificationRepository = DIContainer.shared.resolve(type: NotificationInterface.self) else {
-            ByeBooLogger.error(ByeBooError.DIFailedError)
-            return
-        }
+              let commentRepository = DIContainer.shared.resolve(type: CommentInterface.self) else {
+                ByeBooLogger.error(ByeBooError.DIFailedError)
+                return
+            }
 
         DIContainer.shared.register(type: FetchUserJourneyUseCase.self) { _ in
             return DefaultFetchUserJourneyUseCase(repository: userRepository)
@@ -212,6 +213,12 @@ struct DomainDependencyAssembler: DependencyAssembler {
         DIContainer.shared.register(type: FetchCommonQuestDetailUseCase.self) { _ in
             return DefaultFetchCommonQuestDetailUseCase(repository: commonQuestRepository)
         }
+        DIContainer.shared.register(type: PostCommonQuestCommentUseCase.self) { _ in
+            return DefaultPostCommonQuestCommentUseCase(repository: commentRepository)
+        }
+        DIContainer.shared.register(type: PostCommonQuestReplyUseCase.self) { _ in
+            return DefaultPostCommonQuestReplyUseCase(repository: commentRepository)
+        }
 
         DIContainer.shared.register(type: PostCommonQuestLikeUseCase.self) { _ in
              return DefaultPostCommonQuestLikeUseCase(repository: commonQuestRepository)
@@ -233,6 +240,18 @@ struct DomainDependencyAssembler: DependencyAssembler {
             return DefaultFetchHasUnreadNotificationUseCase(repository: notificationRepository)
         }
 
+        DIContainer.shared.register(type: FetchCommonQuestRepliesUseCase.self) { _ in
+            return DefaultFetchCommonQuestRepliesUseCase(repository: commentRepository)
+        }
+
+        DIContainer.shared.register(type: DeleteCommentReplyUseCase.self) { _ in
+            return DefaultDeleteCommentReplyUseCase(repository: commentRepository)
+        }
+
+        DIContainer.shared.register(type: EditCommentReplyUseCase.self) { _ in
+            return DefaultEditCommentReplyUseCase(repository: commentRepository)
+        }
+
         DIContainer.shared.register(type: ReadAllNotificationsUseCase.self) { _ in
             return DefaultReadAllNotificationsUseCase(repository: notificationRepository)
         }

ByeBoo-iOS/ByeBoo-iOS/Domain/Entity/CommonQuestReplyListEntity.swift

@@ -0,0 +1,13 @@
+//
+//  CommonQuestReplyListEntity.swift
+//  ByeBoo-iOS
+//
+//  Created by 이나연 on 6/15/26.
+//
+
+import Foundation
+
+struct CommonQuestReplyListEntity {
+    let totalCount: Int
+    let replies: [CommonQuestCommentEntity]
+}

ByeBoo-iOS/ByeBoo-iOS/Domain/Entity/Enum/CommonQuestTargetType.swift

@@ -0,0 +1,13 @@
+//
+//  CommonQuestTargetType.swift
+//  ByeBoo-iOS
+//
+//  Created by 이나연 on 6/16/26.
+//
+
+import Foundation
+
+enum CommonQuestTargetType: String {
+    case comment = "COMMENT"
+    case commonQuest = "COMMON_QUEST"
+}

ByeBoo-iOS/ByeBoo-iOS/Domain/Interface/CommentInterface.swift

@@ -0,0 +1,16 @@
+//
+//  CommentInterface.swift
+//  ByeBoo-iOS
+//
+//  Created by 이나연 on 6/14/26.
+//
+
+import Foundation
+
+protocol CommentInterface {
+    func postComment(content: String, answerID: Int) async throws
+    func postReply(content: String, commentID: Int) async throws
+    func fetchReplies(commentID: Int) async throws -> CommonQuestReplyListEntity
+    func patchComment(content: String, commentID: Int) async throws
+    func deleteComment(commentID: Int) async throws
+}

ByeBoo-iOS/ByeBoo-iOS/Domain/Interface/ReportsInterface.swift

@@ -6,5 +6,5 @@
 //
 
 protocol ReportsInterface {
-    func reportCommonQuest(answerID: Int) async throws
+    func reportCommonQuest(targetID: Int, targetType: CommonQuestTargetType) async throws
 }