chore: refactor code (RMCCX-7619)

rakutentech · Dec 17, 2024 · 792fc43 · 792fc43
1 parent 8008963
commit 792fc43
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 22 deletions.
diff --git a/Sources/RInAppMessaging/CampaignDispatcher.swift b/Sources/RInAppMessaging/CampaignDispatcher.swift
@@ -106,29 +106,11 @@ internal class CampaignDispatcher: CampaignDispatcherType, TaskSchedulable {
         fetchCampaignImagesAndDisplay(campaign: campaign)
     }
 
-    func createCarouselDataList(from data: [String: ImageDetails], using images: [UIImage?]) -> [CarouselData] {
-        let sortedKeys = Array(data.keys).sorted()
-        var imageDataList: [CarouselData] = []
-
-        for (index, key) in sortedKeys.enumerated() {
-            guard index < images.count else { break }
-
-            let image = images[index]
-            let altText = data[key]?.altText
-            let link = data[key]?.link
-
-            imageDataList.append(CarouselData(image: image, altText: altText, link: link))
-        }
-
-        return imageDataList
-    }
-
     func fetchCampaignImagesAndDisplay(campaign: Campaign) {
         if let carouselData = campaign.data.customJson?.carousel,
            !(carouselData.images?.isEmpty ?? true) {
             fetchImagesArray(from: carouselData) { images in
                 guard let carouselData = carouselData.images else { return }
-                // let carouselHandler = CarouselModelHandler(data: carouselData, images: images)
                 let carouselHandler = self.createCarouselDataList(from: carouselData, using: images)
                 self.displayCampaign(campaign, carouselData: carouselHandler)
             }
@@ -292,4 +274,21 @@ extension CampaignDispatcher {
             }
         }
     }
+
+    func createCarouselDataList(from data: [String: ImageDetails], using images: [UIImage?]) -> [CarouselData] {
+        let sortedKeys = Array(data.keys).sorted()
+        var imageDataList: [CarouselData] = []
+
+        for (index, key) in sortedKeys.enumerated() {
+            guard index < images.count else { break }
+
+            let image = images[index]
+            let altText = data[key]?.altText
+            let link = data[key]?.link
+
+            imageDataList.append(CarouselData(image: image, altText: altText, link: link))
+        }
+
+        return imageDataList
+    }
 }
diff --git a/Sources/RInAppMessaging/Views/FullView.swift b/Sources/RInAppMessaging/Views/FullView.swift
@@ -374,10 +374,8 @@ internal class FullView: UIView, FullViewType, RichContentBrowsable {
     }
 
     func configureCarouselView(viewModel: FullViewModel) {
-        guard let carouselData = viewModel.carouselData else { return }
-        if layout == .carousel {
-            carouselView.configure(carouselData: carouselData)
-        }
+        guard layout == .carousel, let carouselData = viewModel.carouselData else { return }
+        carouselView.configure(carouselData: carouselData)
     }
 
     @objc private func onActionButtonClick(_ sender: ActionButton) {