refactor : fix order of catagories

codesquad-members-2021 · Apr 23, 2021 · d36f63d · d36f63d
1 parent 61b3575
commit d36f63d
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/iOS/.DS_Store b/iOS/.DS_Store
diff --git a/iOS/BanchanCode/BanchanCode/Delegate/CollectionViewDataSource.swift b/iOS/BanchanCode/BanchanCode/Delegate/CollectionViewDataSource.swift
@@ -15,8 +15,18 @@ class CollectionViewDataSource: NSObject, UICollectionViewDataSource {
         super.init()
     }
 
+    convenience init(mainDishes: [Dish], soupDishes: [Dish], sideDishes: [Dish]) {
+        self.init(allDishes: [DishList(category: .main, dishes: mainDishes),
+                              DishList(category: .soup, dishes: soupDishes),
+                              DishList(category: .side, dishes: sideDishes)])
+    }
+
     func load(dishes: DishList) {
-        allDishes.append(dishes)
+        allDishes.enumerated().forEach { (index, dishList) in
+            if dishList.category == dishes.category {
+                allDishes[index].dishes = dishes.dishes
+            }
+        }
     }
 
     func numberOfSections(in collectionView: UICollectionView) -> Int {

diff --git a/iOS/BanchanCode/BanchanCode/Domain/Entities/Dish.swift b/iOS/BanchanCode/BanchanCode/Domain/Entities/Dish.swift
@@ -33,6 +33,6 @@ struct DishList {
             }
         }
     }
-    let category: Category
-    let dishes: [Dish]
+    var category: Category
+    var dishes: [Dish]
 }
diff --git a/iOS/BanchanCode/BanchanCode/MainViewController.swift b/iOS/BanchanCode/BanchanCode/MainViewController.swift
@@ -12,11 +12,14 @@ class MainViewController: UIViewController {
     @IBOutlet weak var dishCollectionView: UICollectionView!
     var mainDelegate: CollectionViewDelegate?
     var mainDataSource: CollectionViewDataSource?
+    var mainDishes: [Dish]?
+    var soupDishes: [Dish]?
+    var sideDishes: [Dish]?
 
     override func viewDidLoad() {
         super.viewDidLoad()
         mainDelegate = CollectionViewDelegate()
-        mainDataSource = CollectionViewDataSource(allDishes: [])
+        mainDataSource = CollectionViewDataSource(mainDishes: [], soupDishes: [], sideDishes: [])
 
         dishCollectionView.delegate = mainDelegate
         dishCollectionView.dataSource = mainDataSource