댓글 date 타입 수정

pins/Domain/Entity/CommentRequest.swift

@@ -12,5 +12,5 @@ struct CommentRequest: Codable {
     let pinId: String
     let userId: String
     let content: String
-    let createdAt: String
+    let createdAt: Date
 }

pins/Domain/Entity/CommentResponse.swift

@@ -39,6 +39,6 @@ struct CommentResponse {
         self.userProfile = profile
         self.userDescription = user.description ?? ""
         self.content = commentRequest.content
-        self.createdAt = commentRequest.createdAt.convertDaysAgo()
+        self.createdAt = commentRequest.createdAt.currentDateTimeAsString().convertDaysAgo()
     }
 }

pins/Domain/UseCase/DetailUseCase.swift

@@ -32,7 +32,7 @@ final class DetailUseCase: DetailUseCaseProtocol {
             pinId: pinId,
             userId: userId,
             content: text,
-            createdAt: Date().currentDateTimeAsString()))
+            createdAt: Date()))
         } catch {
             throw error
         }
@@ -52,19 +52,20 @@ final class DetailUseCase: DetailUseCaseProtocol {
 
     func getComments(pinId: String) async throws -> [CommentResponse] {
         let commentRequests = try await fetchCommentRequests(pinId: pinId)
-        return try await withThrowingTaskGroup(of: CommentResponse?.self, returning: [CommentResponse].self) { group in
-            var commentResponses: [CommentResponse] = []
-            for commentRequest in commentRequests {
+        return try await withThrowingTaskGroup(of: (Int, CommentResponse?).self, returning: [CommentResponse].self) { group in
+            var commentResponses: [(Int, CommentResponse)] = []
+            for (index, commentRequest) in commentRequests.enumerated() {
                 group.addTask { [weak self] in
-                    return try await self?.processCommentRequest(commentRequest)
+                    let response = try await self?.processCommentRequest(commentRequest)
+                    return (index, response)
                 }
             }
-            for try await response in group {
+            for try await (index, response) in group {
                 if let response = response {
-                    commentResponses.append(response)
+                    commentResponses.append((index, response))
                 }
             }
-            return commentResponses
+            return commentResponses.sorted(by: { $0.0 < $1.0 }).map { $0.1 }
         }
     }
 }

pins/Extension/String+Extensions.swift

@@ -49,10 +49,10 @@ extension String {
 
     func birthDateToAge() -> Int {
         String.dateFormatter.dateFormat = "yyMMdd"
-        let birthDate = String.dateFormatter.date(from: self)
+        let birthDate = String.dateFormatter.date(from: self) ?? Date()
         let calendar = Calendar.current
-        let ageComponents = calendar.dateComponents([.year], from: birthDate!, to: Date())
-        let age = ageComponents.year!
+        let ageComponents = calendar.dateComponents([.year], from: birthDate, to: Date())
+        let age = ageComponents.year ?? 0
         return age
     }
 }

pinsTests/MockClass.swift

@@ -49,7 +49,7 @@ final class MockFirestorageService: FirestorageServiceProtocol {
 }
 
 final class MockCommentService: CommentServiceProtocol {
-    var mockComment: [CommentRequest] = [CommentRequest(id: "testId", pinId: "testPin", userId: "testUserId", content: "testComment", createdAt: "")]
+    var mockComment: [CommentRequest] = [CommentRequest(id: "testId", pinId: "testPin", userId: "testUserId", content: "testComment", createdAt: Date())]
     func getComments(pinId: String) async -> [pins.CommentRequest] {
         return mockComment
     }