From 11f0679be16bf7d4c7729d9ba20f6e612a703186 Mon Sep 17 00:00:00 2001 From: GeonH0 Date: Mon, 13 Jan 2025 12:44:19 +0900 Subject: [PATCH 1/2] =?UTF-8?q?Fix:=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20?= =?UTF-8?q?=EB=84=A4=EC=9D=B4=EB=B0=8D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Data/Network/DTO/RecipeDetailDTO.swift | 10 +++++----- .../Data/Network/DTO/RecipeImageDTO.swift | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/HomeCafeRecipes/HomeCafeRecipes/Data/Network/DTO/RecipeDetailDTO.swift b/HomeCafeRecipes/HomeCafeRecipes/Data/Network/DTO/RecipeDetailDTO.swift index b11c7cb..96ef8b4 100644 --- a/HomeCafeRecipes/HomeCafeRecipes/Data/Network/DTO/RecipeDetailDTO.swift +++ b/HomeCafeRecipes/HomeCafeRecipes/Data/Network/DTO/RecipeDetailDTO.swift @@ -14,9 +14,9 @@ struct RecipeDetailDTO: Decodable { let likesCount: Int let createdAt: String let writer: UserDTO - let imageUrls: [String] // 배열로 수신 + let imageUrls: [RecipeImageDTO] let isLikedByCurrentUser: Bool - + enum CodingKeys: String, CodingKey { case id = "recipeId" case name = "recipeName" @@ -24,7 +24,7 @@ struct RecipeDetailDTO: Decodable { case likesCount = "recipeLikesCnt" case createdAt = "createdAt" case writer = "writer" - case imageUrls = "recipeImgUrls" + case imageUrls = "recipeImages" case isLikedByCurrentUser = "isLiked" } } @@ -32,12 +32,12 @@ struct RecipeDetailDTO: Decodable { extension RecipeDetailDTO { func toDomain() -> Recipe { return Recipe( - id: id, + id: id, type: .coffee, name: name, description: description, writer: writer.toDomain(), - imageUrls: imageUrls, + imageUrls: imageUrls.map{ $0.recipeImageUrl }, isLikedByCurrentUser: isLikedByCurrentUser, likeCount: likesCount, createdAt: DateFormatter.iso8601.date(from: createdAt) ?? Date() diff --git a/HomeCafeRecipes/HomeCafeRecipes/Data/Network/DTO/RecipeImageDTO.swift b/HomeCafeRecipes/HomeCafeRecipes/Data/Network/DTO/RecipeImageDTO.swift index bb5cdea..dad3894 100644 --- a/HomeCafeRecipes/HomeCafeRecipes/Data/Network/DTO/RecipeImageDTO.swift +++ b/HomeCafeRecipes/HomeCafeRecipes/Data/Network/DTO/RecipeImageDTO.swift @@ -12,7 +12,7 @@ struct RecipeImageDTO: Decodable { let recipeImageUrl: String private enum CodingKeys: String, CodingKey { - case recipeImageID = "recipeImgId" - case recipeImageUrl = "recipeImgUrl" + case recipeImageID = "recipeImageId" + case recipeImageUrl = "recipeImageUrl" } } From 40e0a683ce917ede68cf135b4de43048c82f0bd6 Mon Sep 17 00:00:00 2001 From: GeonH0 Date: Mon, 13 Jan 2025 15:45:54 +0900 Subject: [PATCH 2/2] =?UTF-8?q?Fix:=20print=EB=AC=B8=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Presentation/Feed/View/RecipeDetailViewController.swift | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/HomeCafeRecipes/HomeCafeRecipes/Presentation/Feed/View/RecipeDetailViewController.swift b/HomeCafeRecipes/HomeCafeRecipes/Presentation/Feed/View/RecipeDetailViewController.swift index 50d5188..756b9f9 100644 --- a/HomeCafeRecipes/HomeCafeRecipes/Presentation/Feed/View/RecipeDetailViewController.swift +++ b/HomeCafeRecipes/HomeCafeRecipes/Presentation/Feed/View/RecipeDetailViewController.swift @@ -90,8 +90,7 @@ extension RecipeDetailViewController: RecipeDetailViewDelegate { print("Recipe ID is missing") return } - router.presentCommentViewModally(from: self, recipeID: recipeID) - print(recipeID) + router.presentCommentViewModally(from: self, recipeID: recipeID) } func didTapBookmarkButton() {