Merge branch 'develop'

Projects/Feature/SplashFeature/Sources/SplashView.swift

@@ -18,6 +18,45 @@ struct SplashView: View {
                 .resizable()
                 .frame(width: 200, height: 200)
         }
+        .alert(isPresented: $viewModel.showUpdateAlert) {
+            if viewModel.forceAlert {
+                return Alert(
+                    title: Text(viewModel.alertTitle),
+                    message: Text(viewModel.alertMessage),
+                    dismissButton: Alert.Button.destructive(
+                        Text("확인"),
+                        action: {
+                            viewModel.openAppStore()
+                        }
+                    )
+                )
+            } else {
+                let reissue: () -> Void = {
+                    viewModel.compareRefreshToke { authority in
+                        appState.authority = authority
+                        appState.sceneFlow = .main
+                    } onError: { _ in
+                        appState.sceneFlow = .auth
+                    }
+                }
+
+                return Alert(
+                    title: Text(viewModel.alertTitle),
+                    message: Text(viewModel.alertMessage),
+                    primaryButton: Alert.Button.destructive(
+                        Text("확인"),
+                        action: {
+                            viewModel.openAppStore()
+                            reissue()
+                        }
+                    ),
+                    secondaryButton: Alert.Button.cancel(
+                        Text("취소"),
+                        action: reissue
+                    )
+                )
+            }
+        }
         .onAppear {
             viewModel.onAppear { authority in
                 appState.authority = authority
@@ -26,34 +65,5 @@ struct SplashView: View {
                 appState.sceneFlow = .auth
             }
         }
-        .alert(isPresented: $viewModel.showUpdateAlert) {
-            Alert(
-                title: Text(viewModel.alertTitle),
-                message: Text(viewModel.alertMessage),
-                primaryButton: Alert.Button.destructive(
-                    Text("확인"),
-                    action: {
-                        viewModel.openAppStore()
-                        appState.sceneFlow = .auth
-                    }
-                ),
-                secondaryButton: Alert.Button.cancel(
-                    Text("취소")
-                )
-            )
-        }
-        .alert(isPresented: $viewModel.showUpdateForceAlert) {
-            Alert(
-                title: Text(viewModel.alertTitle),
-                message: Text(viewModel.alertMessage),
-                dismissButton: Alert.Button.destructive(
-                    Text("확인"),
-                    action: {
-                        viewModel.openAppStore()
-                        appState.sceneFlow = .auth
-                    }
-                )
-            )
-        }
     }
 }

Projects/Feature/SplashFeature/Sources/SplashViewModel.swift

@@ -7,7 +7,7 @@ import UsersDomainInterface
 final class SplashViewModel: BaseViewModel {
     private let reissueTokenUseCase: any ReissueTokenUseCase
     @Published var showUpdateAlert: Bool = false
-    @Published var showUpdateForceAlert: Bool = false
+    @Published var forceAlert: Bool = false
     public var alertTitle = ""
     public var alertMessage = ""
     private let appleID = "6450888392"
@@ -23,46 +23,57 @@ final class SplashViewModel: BaseViewModel {
         onError: @escaping (Error) -> Void
     ) {
         update {
-            addCancellable(reissueTokenUseCase.execute()) { authority in
-                if authority {
-                    onSuccess(.developer)
-                } else {
-                    onSuccess(.student)
-                }
-            } onReceiveError: { error in
-                onError(error)
+            self.compareRefreshToke(onSuccess: onSuccess, onError: onError)
+        }
+    }
+
+    func compareRefreshToke(
+        onSuccess: @escaping (AuthorityType) -> Void,
+        onError: @escaping (Error) -> Void
+    ) {
+        addCancellable(reissueTokenUseCase.execute()) { authority in
+            if authority {
+                onSuccess(.developer)
+            } else {
+                onSuccess(.student)
             }
+        } onReceiveError: { error in
+            onError(error)
         }
     }
 
-    private func update(action: () -> Void) {
+    private func update(action: @escaping () -> Void) {
         let appVersion = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String
+        let urlString = "http://itunes.apple.com/lookup?id=\(self.appleID)&country=kr"
 
-        let latestVersion: String? = {
-            guard let url = URL(string: "http://itunes.apple.com/lookup?id=\(self.appleID)&country=kr"),
-                  let data = try? Data(contentsOf: url),
-                  let json = try? JSONSerialization.jsonObject(with: data, options: .allowFragments) as? [String: Any],
+        guard appVersion != "0.0.0" else { return action() }
+        guard let url = URL(string: urlString)  else { return }
+        let urlRequest = URLRequest(url: url)
+        URLSession.shared.dataTask(with: urlRequest) { data, _, _ in
+            guard let json = try? JSONSerialization.jsonObject(with: data!, options: .allowFragments) as? [String: Any],
                   let results = json["results"] as? [[String: Any]],
-                  let appStoreVersion = results[0]["version"] as? String else {
-                return nil
-            }
-            return appStoreVersion
-        }()
-
-        let marketingVersion = latestVersion!
-        let currentProjectVersion = appVersion!
-        let splitMarketingVersion = marketingVersion.split(separator: ".").map {$0}
-        let splitCurrentProjectVersion = currentProjectVersion.split(separator: ".").map {$0}
+                  let marketingVersion = results[0]["version"] as? String else { return }
+            let currentProjectVersion = appVersion!
+            let splitMarketingVersion = marketingVersion.split(separator: ".").map {$0}
+            let splitCurrentProjectVersion = currentProjectVersion.split(separator: ".").map {$0}
 
-        alertTitle = "업데이트 알림"
-        alertMessage = "JOBIS의 새로운 버전이 있습니다.\n\(marketingVersion) 버전으로 업데이트 해주세요."
-        if splitCurrentProjectVersion[0] < splitMarketingVersion[0] {
-            showUpdateForceAlert.toggle()
-        } else if  splitCurrentProjectVersion[1] < splitMarketingVersion[1] {
-            showUpdateForceAlert.toggle()
-        } else {
-            showUpdateAlert.toggle()
+            DispatchQueue.main.async {
+                self.alertTitle = "업데이트 알림"
+                self.alertMessage = "JOBIS의 새로운 버전이 있습니다.\n\(marketingVersion) 버전으로 업데이트 해주세요."
+                if splitCurrentProjectVersion[0] < splitMarketingVersion[0] {
+                    self.showUpdateAlert.toggle()
+                    self.forceAlert.toggle()
+                } else if splitCurrentProjectVersion[1] < splitMarketingVersion[1] {
+                    self.showUpdateAlert.toggle()
+                    self.forceAlert.toggle()
+                } else if  splitCurrentProjectVersion[2] < splitMarketingVersion[2] {
+                    self.showUpdateAlert.toggle()
+                } else {
+                    action()
+                }
+            }
         }
+        .resume()
     }
 
     func openAppStore() {

Projects/Shared/DesignSystem/Resources/Icons.xcassets/MilitaryExceptionOn.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "Frame 20767.svg",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Projects/Shared/DesignSystem/Sources/Image/JOBISIcon.swift

@@ -34,7 +34,8 @@ public struct JOBISIcon: View {
         case menu
         case profile
         case house
-        case militaryServiceExceptionIcon
+        case militaryExceptionOn
+        case militaryExceptionOff
         case bookmarkOn
         case bookmarkOff
         case filterIcon
@@ -140,8 +141,11 @@ public struct JOBISIcon: View {
         case .house:
             return DesignSystemAsset.Icons.house.suiImage
 
-        case .militaryServiceExceptionIcon:
-            return DesignSystemAsset.Icons.militaryServiceExceptionIcon.suiImage
+        case .militaryExceptionOn:
+            return DesignSystemAsset.Icons.militaryExceptionOn.suiImage
+
+        case .militaryExceptionOff:
+            return DesignSystemAsset.Icons.militaryExceptionOff.suiImage
 
         case .bookmarkOn:
             return DesignSystemAsset.Icons.bookmarkOn.suiImage

Projects/Shared/DesignSystem/Sources/Image/URLImage.swift

@@ -13,7 +13,11 @@ public struct URLImage: View {
 
     public init(imageURL urlString: String, shape: ImageShape) {
         let baseURL = Environment.getUrlValue(key: .s3BaseUrl)
-        self.imageURL = baseURL.appendingPathComponent(urlString)
+        if urlString.contains(baseURL.description) {
+            imageURL = URL(string: urlString)
+        } else {
+            self.imageURL = baseURL.appendingPathComponent(urlString)
+        }
 
         self.shape = shape
     }