[iOS] 여정 저장 Scene 비즈니스 로직 구현

iOS/Features/Home/Package.swift

@@ -54,9 +54,7 @@ let package = Package(
         .package(name: Dependency.journeyList,
                  path: Dependency.journeyList.fromCurrentPath),
         .package(name: Dependency.msUIKit,
-                 path: Dependency.msUIKit.fromRootPath),
-        .package(name: Dependency.msCoreKit,
-                 path: Dependency.msCoreKit.fromRootPath)
+                 path: Dependency.msUIKit.fromRootPath)
     ],
     targets: [
         .target(name: Target.home,

iOS/Features/JourneyList/Sources/JourneyList/Model/DTOConvertor.swift

@@ -22,7 +22,7 @@ extension Journey {
 extension Spot {
 
     init(dto: ResponsibleSpotDTO) {
-        self.photoURLs = dto.photoURLs
+        self.photoURL = dto.photoURL
     }
 
 }

iOS/Features/JourneyList/Sources/JourneyList/Model/Journey.swift

@@ -7,7 +7,7 @@
 
 import Foundation
 
-struct Journey: Hashable, Decodable {
+struct Journey: Hashable {
 
     // MARK: - Properties
 

iOS/Features/JourneyList/Sources/JourneyList/Model/Spot.swift

@@ -7,8 +7,8 @@
 
 import Foundation
 
-struct Spot: Decodable {
+struct Spot {
 
-    let photoURLs: [String]
+    let photoURL: URL
 
 }

iOS/Features/JourneyList/Sources/JourneyList/Presentation/JourneyListViewController.swift

@@ -223,8 +223,7 @@ extension JourneyListViewController: UICollectionViewDelegate {
                                              songArtist: itemIdentifier.song.artist)
             cell.update(with: cellModel)
             let photoURLs = itemIdentifier.spots
-                .flatMap { $0.photoURLs }
-                .compactMap { URL(string: $0) }
+                .map { $0.photoURL }
 
             Task {
                 cell.addImageView(count: photoURLs.count)
@@ -273,6 +272,8 @@ extension JourneyListViewController: UICollectionViewDelegate {
 
 import MSData
 import MSDesignSystem
+import MSData
+import MSNetworking
 @available(iOS 17, *)
 #Preview {
     MSFont.registerFonts()

iOS/Features/SaveJourney/Package.swift

@@ -27,10 +27,12 @@ private enum Target {
 
 private enum Dependency {
 
+    static let msData = "MSData"
+    static let combineCocoa = "CombineCocoa"
     static let msUIKit = "MSUIKit"
-    static let msFoundation = "MSFoundation"
     static let msDesignsystem = "MSDesignSystem"
     static let msLogger = "MSLogger"
+    static let msFoundation = "MSFoundation"
 
 }
 
@@ -47,13 +49,23 @@ let package = Package(
     ],
     dependencies: [
         .package(name: Dependency.msUIKit,
-                 path: Dependency.msUIKit.fromRootPath)
+                 path: Dependency.msUIKit.fromRootPath),
+        .package(name: Dependency.msData,
+                 path: Dependency.msData.fromRootPath),
+        .package(name: Dependency.msFoundation,
+                 path: Dependency.msFoundation.fromRootPath)
     ],
     targets: [
         .target(name: Target.saveJourney,
                 dependencies: [
+                    .product(name: Dependency.msData,
+                             package: Dependency.msData),
                     .product(name: Dependency.msUIKit,
-                             package: Dependency.msUIKit)
+                             package: Dependency.msUIKit),
+                    .product(name: Dependency.combineCocoa,
+                             package: Dependency.msUIKit),
+                    .product(name: Dependency.msLogger,
+                             package: Dependency.msFoundation)
                 ])
     ]
 )

iOS/Features/SaveJourney/SaveJourneyDemo/SaveJourneyDemo.xcodeproj/project.pbxproj

@@ -7,21 +7,17 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		DD197B132B1DF223001D4290 /* SaveJourney in Frameworks */ = {isa = PBXBuildFile; productRef = DD197B122B1DF223001D4290 /* SaveJourney */; };
 		DDAA4DC92B17356D002F0748 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDAA4DC82B17356D002F0748 /* AppDelegate.swift */; };
 		DDAA4DCB2B17356D002F0748 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDAA4DCA2B17356D002F0748 /* SceneDelegate.swift */; };
-		DDAA4DCD2B17356D002F0748 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDAA4DCC2B17356D002F0748 /* ViewController.swift */; };
-		DDAA4DD02B17356D002F0748 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = DDAA4DCE2B17356D002F0748 /* Main.storyboard */; };
 		DDAA4DD22B17356E002F0748 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = DDAA4DD12B17356E002F0748 /* Assets.xcassets */; };
 		DDAA4DD52B17356E002F0748 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = DDAA4DD32B17356E002F0748 /* LaunchScreen.storyboard */; };
-		DDAA4DDE2B17357F002F0748 /* SaveJourney in Frameworks */ = {isa = PBXBuildFile; productRef = DDAA4DDD2B17357F002F0748 /* SaveJourney */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
 		DDAA4DC52B17356D002F0748 /* SaveJourneyDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SaveJourneyDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		DDAA4DC82B17356D002F0748 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		DDAA4DCA2B17356D002F0748 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
-		DDAA4DCC2B17356D002F0748 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
-		DDAA4DCF2B17356D002F0748 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		DDAA4DD12B17356E002F0748 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		DDAA4DD42B17356E002F0748 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		DDAA4DD62B17356E002F0748 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -32,7 +28,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				DDAA4DDE2B17357F002F0748 /* SaveJourney in Frameworks */,
+				DD197B132B1DF223001D4290 /* SaveJourney in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -60,8 +56,6 @@
 			children = (
 				DDAA4DC82B17356D002F0748 /* AppDelegate.swift */,
 				DDAA4DCA2B17356D002F0748 /* SceneDelegate.swift */,
-				DDAA4DCC2B17356D002F0748 /* ViewController.swift */,
-				DDAA4DCE2B17356D002F0748 /* Main.storyboard */,
 				DDAA4DD12B17356E002F0748 /* Assets.xcassets */,
 				DDAA4DD32B17356E002F0748 /* LaunchScreen.storyboard */,
 				DDAA4DD62B17356E002F0748 /* Info.plist */,
@@ -86,7 +80,7 @@
 			);
 			name = SaveJourneyDemo;
 			packageProductDependencies = (
-				DDAA4DDD2B17357F002F0748 /* SaveJourney */,
+				DD197B122B1DF223001D4290 /* SaveJourney */,
 			);
 			productName = SaveJourneyDemo;
 			productReference = DDAA4DC52B17356D002F0748 /* SaveJourneyDemo.app */;
@@ -117,7 +111,7 @@
 			);
 			mainGroup = DDAA4DBC2B17356D002F0748;
 			packageReferences = (
-				DDAA4DDC2B17357F002F0748 /* XCLocalSwiftPackageReference ".." */,
+				DD197B112B1DF223001D4290 /* XCLocalSwiftPackageReference ".." */,
 			);
 			productRefGroup = DDAA4DC62B17356D002F0748 /* Products */;
 			projectDirPath = "";
@@ -135,7 +129,6 @@
 			files = (
 				DDAA4DD52B17356E002F0748 /* LaunchScreen.storyboard in Resources */,
 				DDAA4DD22B17356E002F0748 /* Assets.xcassets in Resources */,
-				DDAA4DD02B17356D002F0748 /* Main.storyboard in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -146,7 +139,6 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				DDAA4DCD2B17356D002F0748 /* ViewController.swift in Sources */,
 				DDAA4DC92B17356D002F0748 /* AppDelegate.swift in Sources */,
 				DDAA4DCB2B17356D002F0748 /* SceneDelegate.swift in Sources */,
 			);
@@ -155,14 +147,6 @@
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXVariantGroup section */
-		DDAA4DCE2B17356D002F0748 /* Main.storyboard */ = {
-			isa = PBXVariantGroup;
-			children = (
-				DDAA4DCF2B17356D002F0748 /* Base */,
-			);
-			name = Main.storyboard;
-			sourceTree = "<group>";
-		};
 		DDAA4DD32B17356E002F0748 /* LaunchScreen.storyboard */ = {
 			isa = PBXVariantGroup;
 			children = (
@@ -304,7 +288,6 @@
 				INFOPLIST_FILE = SaveJourneyDemo/Info.plist;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
-				INFOPLIST_KEY_UIMainStoryboardFile = Main;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
@@ -335,7 +318,6 @@
 				INFOPLIST_FILE = SaveJourneyDemo/Info.plist;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
-				INFOPLIST_KEY_UIMainStoryboardFile = Main;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
@@ -379,14 +361,14 @@
 /* End XCConfigurationList section */
 
 /* Begin XCLocalSwiftPackageReference section */
-		DDAA4DDC2B17357F002F0748 /* XCLocalSwiftPackageReference ".." */ = {
+		DD197B112B1DF223001D4290 /* XCLocalSwiftPackageReference ".." */ = {
 			isa = XCLocalSwiftPackageReference;
 			relativePath = ..;
 		};
 /* End XCLocalSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
-		DDAA4DDD2B17357F002F0748 /* SaveJourney */ = {
+		DD197B122B1DF223001D4290 /* SaveJourney */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = SaveJourney;
 		};

iOS/Features/SaveJourney/SaveJourneyDemo/SaveJourneyDemo/Base.lproj/LaunchScreen.storyboard

@@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13122.16" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="22155" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+    <device id="retina6_12" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13104.12"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22131"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -11,15 +14,32 @@
             <objects>
                 <viewController id="01J-lp-oVM" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" xcode11CocoaTouchSystemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                        <subviews>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="여정 저장 데모 앱" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xLC-a5-s4l">
+                                <rect key="frame" x="82.666666666666686" y="405.66666666666669" width="228" height="40.666666666666686"/>
+                                <fontDescription key="fontDescription" style="UICTFontTextStyleTitle0"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                        </subviews>
                         <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <constraints>
+                            <constraint firstItem="xLC-a5-s4l" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="ERD-Ux-t9G"/>
+                            <constraint firstItem="xLC-a5-s4l" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="h7t-5v-iea"/>
+                        </constraints>
                     </view>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
             <point key="canvasLocation" x="53" y="375"/>
         </scene>
     </scenes>
+    <resources>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+    </resources>
 </document>

iOS/Features/SaveJourney/SaveJourneyDemo/SaveJourneyDemo/Info.plist

@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>NSAppleMusicUsageDescription</key>
+	<string>음악 좀 쓸게요</string>
 	<key>UIApplicationSceneManifest</key>
 	<dict>
 		<key>UIApplicationSupportsMultipleScenes</key>
@@ -15,8 +17,6 @@
 					<string>Default Configuration</string>
 					<key>UISceneDelegateClassName</key>
 					<string>$(PRODUCT_MODULE_NAME).SceneDelegate</string>
-					<key>UISceneStoryboardFile</key>
-					<string>Main</string>
 				</dict>
 			</array>
 		</dict>

iOS/Features/SaveJourney/SaveJourneyDemo/SaveJourneyDemo/SceneDelegate.swift

@@ -7,46 +7,36 @@
 
 import UIKit
 
-class SceneDelegate: UIResponder, UIWindowSceneDelegate {
+import MSData
+import MSDesignSystem
+import SaveJourney
 
+class SceneDelegate: UIResponder, UIWindowSceneDelegate {
+
+    // MARK: - Properties
+
     var window: UIWindow?
-
-
-    func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) {
-        // Use this method to optionally configure and attach the UIWindow `window` to the provided UIWindowScene `scene`.
-        // If using a storyboard, the `window` property will automatically be initialized and attached to the scene.
-        // This delegate does not imply the connecting scene or session are new (see `application:configurationForConnectingSceneSession` instead).
-        guard let _ = (scene as? UIWindowScene) else { return }
+
+    // MARK: - Functions
+
+    func scene(_ scene: UIScene,
+               willConnectTo session: UISceneSession,
+               options connectionOptions: UIScene.ConnectionOptions) {
+        guard let windowScene = (scene as? UIWindowScene) else { return }
+        let window = UIWindow(windowScene: windowScene)
+        defer { self.window = window }
+
+        MSFont.registerFonts()
+
+        let song = Song(title: "OMG", artist: "NewJeans", albumArtURL: URL(string: "https://naver.com")!)
+        let spotRepository = SpotRepositoryImplementation()
+        let saveJourneyViewModel = SaveJourneyViewModel(selectedSong: song,
+                                                        spotRepository: spotRepository)
+        let saveJourneyViewController = SaveJourneyViewController(viewModel: saveJourneyViewModel)
+        let navigationViewController = UINavigationController(rootViewController: saveJourneyViewController)
+
+        window.rootViewController = navigationViewController
+        window.makeKeyAndVisible()
     }
-
-    func sceneDidDisconnect(_ scene: UIScene) {
-        // Called as the scene is being released by the system.
-        // This occurs shortly after the scene enters the background, or when its session is discarded.
-        // Release any resources associated with this scene that can be re-created the next time the scene connects.
-        // The scene may re-connect later, as its session was not necessarily discarded (see `application:didDiscardSceneSessions` instead).
-    }
-
-    func sceneDidBecomeActive(_ scene: UIScene) {
-        // Called when the scene has moved from an inactive state to an active state.
-        // Use this method to restart any tasks that were paused (or not yet started) when the scene was inactive.
-    }
-
-    func sceneWillResignActive(_ scene: UIScene) {
-        // Called when the scene will move from an active state to an inactive state.
-        // This may occur due to temporary interruptions (ex. an incoming phone call).
-    }
-
-    func sceneWillEnterForeground(_ scene: UIScene) {
-        // Called as the scene transitions from the background to the foreground.
-        // Use this method to undo the changes made on entering the background.
-    }
-
-    func sceneDidEnterBackground(_ scene: UIScene) {
-        // Called as the scene transitions from the foreground to the background.
-        // Use this method to save data, release shared resources, and store enough scene-specific state information
-        // to restore the scene back to its current state.
-    }
-
-
+
 }
-