diff --git a/ChaRo-iOS/ChaRo-iOS/Source/Models/ThemeDataModel.swift b/ChaRo-iOS/ChaRo-iOS/Source/Models/ThemeDataModel.swift index 750d6b47..4bfcd1aa 100644 --- a/ChaRo-iOS/ChaRo-iOS/Source/Models/ThemeDataModel.swift +++ b/ChaRo-iOS/ChaRo-iOS/Source/Models/ThemeDataModel.swift @@ -16,9 +16,9 @@ struct ThemeDataModel: Codable { // MARK: - TotalDrive struct TotalDrive: Codable { - let lastId: Int + let lastID: Int let lastCount: Int - let drive: [Drive] + let drive: [DriveElement] } diff --git a/ChaRo-iOS/ChaRo-iOS/Source/Views/Cells/TVC/ThemeScene/ThemePostAllTVC.swift b/ChaRo-iOS/ChaRo-iOS/Source/Views/Cells/TVC/ThemeScene/ThemePostAllTVC.swift index 420f008c..cdf73eca 100644 --- a/ChaRo-iOS/ChaRo-iOS/Source/Views/Cells/TVC/ThemeScene/ThemePostAllTVC.swift +++ b/ChaRo-iOS/ChaRo-iOS/Source/Views/Cells/TVC/ThemeScene/ThemePostAllTVC.swift @@ -25,7 +25,7 @@ class ThemePostAllTVC: UITableViewCell { static let identifier = "ThemePostAllTVC" var cellDelegate: ThemeCollectionViewCellDelegate? var postDelegate: PostIdDelegate? - var selectedDriveList: [Drive] = [] + var selectedDriveList: [DriveElement] = [] private var cellCount = 0 //MARK:- Life Cycle @@ -89,16 +89,16 @@ extension ThemePostAllTVC: UICollectionViewDelegate, UICollectionViewDataSource, cell.imageView.layer.cornerRadius = 10 //요소 변수화 let element = selectedDriveList[indexPath.row] - var tags = [element.drive[indexPath.row].region, element.drive[indexPath.row].theme, - element.drive[indexPath.row].warning ?? ""] as [String] + var tags = [element.region, element.theme, + element.warning ?? ""] as [String] - cell.setData(image: element.drive[indexPath.row].image, - title: element.drive[indexPath.row].title, + cell.setData(image: element.image, + title: element.title, tagCount: tags.count, tagArr: tags, - isFavorite: element.drive[indexPath.row].isFavorite, - postID: element.drive[indexPath.row].postID) + isFavorite: element.isFavorite, + postID: element.postID) cell.titleLabel.font = .notoSansBoldFont(ofSize: 17) @@ -146,10 +146,8 @@ extension ThemePostAllTVC: UICollectionViewDelegate, UICollectionViewDataSource, extension ThemePostAllTVC { func findDriveElementFrom(postId: Int) -> DriveElement?{ for element in selectedDriveList { - for driveElement in element.drive { - if driveElement.postID == postId { - return driveElement - } + if element.postID == postId { + return element } } return nil diff --git a/ChaRo-iOS/ChaRo-iOS/Source/Views/VCs/ThemeScene/ThemePostVC.swift b/ChaRo-iOS/ChaRo-iOS/Source/Views/VCs/ThemeScene/ThemePostVC.swift index df38a60f..17db645b 100644 --- a/ChaRo-iOS/ChaRo-iOS/Source/Views/VCs/ThemeScene/ThemePostVC.swift +++ b/ChaRo-iOS/ChaRo-iOS/Source/Views/VCs/ThemeScene/ThemePostVC.swift @@ -38,7 +38,7 @@ class ThemePostVC: UIViewController { var isFirstLoaded = true var cellCount = 0 private var selectedTheme = "" - private var selectedDriveList: [Drive] = [] + private var selectedDriveList: [DriveElement] = [] //MARK:- Constraint @@ -146,7 +146,8 @@ class ThemePostVC: UIViewController { { case .success(let driveData): print(driveData) - if let object = driveData as? TotalDrive { + if let object = driveData as? Drive { + print("여기까지 왓음") self.cellCount = object.drive.count self.selectedDriveList = object.drive