Release/1.0.10 -> main

.github/workflows/pull-request.yml

@@ -0,0 +1,58 @@
+name: Bottles Pull Request Workflow
+
+on:
+  pull_request:
+    branches:
+      - develop
+    types: [ opened, reopened, synchronize ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Send Slack Notification
+        if: github.event.action == 'opened' || github.event.action == 'reopened'
+        env:
+          DATA: |
+            {
+              "blocks": [
+                {
+                  "type": "section",
+                  "text": {
+                    "type": "mrkdwn",
+                    "text": "*iOS PR* :bell: <@U07LESGBQEP> <@U07LHEEU2BW>"
+                  }
+                },
+                {
+                  "type": "section",
+                  "fields": [
+                    {
+                      "type": "mrkdwn",
+                      "text": "*Author:*\n<https://github.com/${{ github.event.sender.login }}|${{ github.event.sender.login }}>"
+                    },
+                    {
+                      "type": "mrkdwn",
+                      "text": "*Title:*\n${{ github.event.pull_request.title }}"
+                    }
+                  ]
+                },
+                {
+                  "type": "section",
+                  "text": {
+                    "type": "mrkdwn",
+                    "text": "*Description:*\n${{ github.event.pull_request.body }}"
+                  }
+                },
+                {
+                  "type": "section",
+                  "text": {
+                    "type": "mrkdwn",
+                    "text": "*Pull Request URL:*\n<${{ github.event.pull_request.html_url }}|View PR>"
+                  }
+                }
+              ]
+            }
+        run: |
+          curl -X POST -H 'Content-type: application/json' \
+          -d "$DATA" \
+          ${{ secrets.SLACK_WEBHOOK_URL }}

Plugins/DependencyPlugin/ProjectDescriptionHelpers/Modules.swift

@@ -27,6 +27,7 @@ public extension ModulePath {
 // MARK: - FeatureModule
 public extension ModulePath {
     enum Feature: String, CaseIterable {
+        case GoodFeeling
         case Guide
         case TabBar
         case Report
@@ -48,6 +49,7 @@ public extension ModulePath {
 
 public extension ModulePath {
     enum Domain: String, CaseIterable {
+        case Application
         case Error
         case User
         case Report
@@ -64,6 +66,7 @@ public extension ModulePath {
 
 public extension ModulePath {
     enum Core: String, CaseIterable {
+        case URLHandler
         case Toast
         case KeyChainStore
         case WebView

Projects/App/Sources/AppDelegate.swift

@@ -28,14 +28,14 @@ final class AppDelegate: UIResponder, UIApplicationDelegate, MessagingDelegate {
     UIApplication.shared.registerForRemoteNotifications()
     UNUserNotificationCenter.current().delegate = self
     Messaging.messaging().delegate = self
-
+    setNotification()
     application.registerForRemoteNotifications()
-
     store.send(.appDelegate(.didFinishLunching))
     return true
   }
 }
 
+// MARK: - UNUserNotificationCenterDelegate
 extension AppDelegate: UNUserNotificationCenterDelegate {
   func messaging(
     _ messaging: Messaging,
@@ -62,3 +62,41 @@ extension AppDelegate: UNUserNotificationCenterDelegate {
     return [.badge, .sound, .banner, .list]
   }
 }
+
+// MARK: - objc funcs
+private extension AppDelegate {
+  @objc func checkPushNotificationStatus() {
+    UNUserNotificationCenter.current()
+      .getNotificationSettings { [weak self] permission in
+        guard let self = self else { return }
+        DispatchQueue.main.async {
+          switch permission.authorizationStatus {
+          case .notDetermined:
+            self.store.send(.appDelegate(.pushNotificationAllowStatusDidChanged(isAllow: true)))
+          case .denied:
+            self.store.send(.appDelegate(.pushNotificationAllowStatusDidChanged(isAllow: false)))
+          case .authorized:
+            self.store.send(.appDelegate(.pushNotificationAllowStatusDidChanged(isAllow: true)))
+          case .provisional:
+            self.store.send(.appDelegate(.pushNotificationAllowStatusDidChanged(isAllow: false)))
+          case .ephemeral:
+            self.store.send(.appDelegate(.pushNotificationAllowStatusDidChanged(isAllow: true)))
+          @unknown default:
+            Log.error("Unknow Notification Status")
+          }
+        }
+      }
+  }
+}
+
+// MARK: - Private Methods
+private extension AppDelegate {
+  func setNotification() {
+    NotificationCenter.default.addObserver(
+      self,
+      selector: #selector(checkPushNotificationStatus),
+      name: UIApplication.willEnterForegroundNotification,
+      object: nil
+    )
+  }
+}

Projects/Core/Logger/Interface/Sources/Log.swift

@@ -5,7 +5,7 @@
 //  Created by 임현규 on 7/23/24.
 //
 
-import Foundation
+import UIKit
 import OSLog
 
 public enum Log {
@@ -132,6 +132,79 @@ public extension Log {
     let logMessage = "\(message ?? "")"
     log(message: logMessage, level: level, fileName: fileName, line: line, funcName: funcName)
     assertionFailure(logMessage)
+#if !DEBUG
+    Task {
+      guard let url = URL(string: Bundle.main.infoDictionary?["SLACK_WEBHOOK_URL"] as? String ?? "")
+      else {
+        return
+      }
+      guard let appVersion = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String,
+            let buildNumber = Bundle.main.infoDictionary?["CFBundleVersion"] as? String
+      else {
+        return
+      }
+      async let device = UIDevice.current
+      let systemVersion = await device.systemVersion
+      let deviceName = await UIDevice.current.name
+
+      let errorLogJsonObject: [String: Any] = [
+        "pretext": "iOS Error Occured🔥",
+        "color": "#36a64f",
+        "fields": [
+          [
+            "title": "Message",
+            "value": "\(message ?? "no message")",
+            "short": true
+          ],
+          [
+            "title": "File Name",
+            "value": "\(fileName)",
+            "short": true
+          ],
+          [
+            "title": "Function Name",
+            "value": "\(funcName)",
+            "short": true
+          ],
+          [
+            "title": "Line",
+            "value": "\(line)",
+            "short": true
+          ],
+          [
+            "title": "Version",
+            "value": "\(appVersion)",
+            "short": true
+          ],
+          [
+            "title": "Build Number",
+            "value": "\(buildNumber)",
+            "short": true
+          ],
+          [
+            "title": "Device Name",
+            "value": "\(deviceName)",
+            "short": true
+          ],
+          [
+            "title": "iOS Version",
+            "value": "\(systemVersion)",
+            "short": true
+          ]
+        ]
+      ]
+      do {
+        let errorLogJsonData = try JSONSerialization.data(withJSONObject: errorLogJsonObject)
+        var request = URLRequest(url: url)
+        request.httpMethod = "POST"
+        request.setValue("application/json", forHTTPHeaderField: "Content-Type")
+        request.httpBody = errorLogJsonData
+        _ = try await URLSession.shared.data(for: request)
+      } catch {
+        Log.debug(error)
+      }
+    }
+#endif
   }
 
   static func fatal(message: Any?, level: Level = .fault, fileName: String = #fileID, line: Int = #line, funcName: StaticString = #function) {

Projects/Core/Network/Project.swift

@@ -18,7 +18,8 @@ let project = Project.makeModule(
             factory: .init(
                 dependencies: [
                     .core(interface: .Network),
-                    .core(interface: .Logger)
+                    .core(interface: .Logger),
+                    .core(implements: .KeyChainStore)
                 ]
             )
         ),

Projects/Core/Network/Sources/Interceptor/TokenInterceptor.swift

@@ -6,6 +6,7 @@
 //
 
 import Foundation
+import UIKit
 
 import CoreKeyChainStore
 import CoreLoggerInterface
@@ -30,7 +31,32 @@ public class TokenInterceptor: RequestInterceptor {
       urlRequest.setValue("Bearer \(accessToken)", forHTTPHeaderField: "Authorization")
     }
 
+    var deviceName: String {
+      if let simulatorModelIdentifier = ProcessInfo().environment["SIMULATOR_MODEL_IDENTIFIER"] {
+        return simulatorModelIdentifier
+      } else {
+        var systemInfo = utsname()
+        uname(&systemInfo)
+        let modelIdentifier = withUnsafePointer(to: &systemInfo.machine) {
+          $0.withMemoryRebound(to: CChar.self, capacity: 1) { ptr in
+            String(validatingUTF8: ptr)
+          }
+        }
+        return modelIdentifier ?? ""
+      }
+    }
+    let appVersion = (Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String) ?? ""
+    let deviceID = UIDevice.current.identifierForVendor?.uuidString ?? ""
+    var osVersion = UIDevice.current.systemVersion
+
+    urlRequest.setValue(appVersion, forHTTPHeaderField: "X-App-Version")
+    urlRequest.setValue(deviceName, forHTTPHeaderField: "X-Device-Model")
+    urlRequest.setValue(osVersion, forHTTPHeaderField: "X-OS-Version")
+    urlRequest.setValue(deviceID, forHTTPHeaderField: "X-Device-ID")
+    urlRequest.setValue("iOS", forHTTPHeaderField: "X-App-Platform")
+
     print(urlRequest.headers)
+
     completion(.success(urlRequest))
   }
 

Projects/Core/Network/Sources/MoyaPulgins/MoyaLoggerPlugin.swift

@@ -33,7 +33,7 @@ final class MoyaLoggerPlugin: PluginType {
       log += "header: \(headers)\n"
     }
     if let body = httpRequest.httpBody, let bodyString = String(bytes: body, encoding: String.Encoding.utf8) {
-      log += "bodyString: \(bodyString)"
+      log += "bodyString: \(bodyString)\n"
     }
 
     log += "---------------------------------------------"
@@ -79,7 +79,7 @@ final class MoyaLoggerPlugin: PluginType {
     if let data = error.response?.data {
       log += "Data - \(data)\n"
     } else {
-      log += "Data - empty"
+      log += "Data - empty\n"
     }
 
     log += "---------------------------------------------"

Projects/Core/URLHandler/Interface/Sources/BottleURLType.swift

@@ -0,0 +1,31 @@
+//
+//  BottleURLType.swift
+//  CoreURLHandlerInterface
+//
+//  Created by JongHoon on 9/20/24.
+//
+
+import Foundation
+
+public enum BottleURLType {
+  case bottleAppStore
+  case bottleAppLookUp
+  case kakaoChannelTalk
+  case setting
+
+  public var url: URL {
+    switch self {
+    case .bottleAppStore:
+      return URL(string: Bundle.main.infoDictionary?["APP_STORE_URL"] as? String ?? "")!
+
+    case .kakaoChannelTalk:
+      return URL(string: Bundle.main.infoDictionary?["KAKAO_CHANNEL_TALK_URL"] as? String ?? "")!
+
+    case .bottleAppLookUp:
+      return URL(string: Bundle.main.infoDictionary?["APP_LOOK_UP_URL"] as? String ?? "")!
+
+    case .setting:
+      return URL(string: "App-prefs:root=General")!
+    }
+  }
+}

Projects/Core/URLHandler/Interface/Sources/URLHandler.swift

@@ -0,0 +1,19 @@
+//
+//  URLHandler.swift
+//  CoreURLHandlerInterface
+//
+//  Created by JongHoon on 9/20/24.
+//
+
+import UIKit
+
+public final class URLHandler {
+
+  public static let shared = URLHandler()
+
+  private init() { }
+
+  public func openURL(urlType: BottleURLType) {
+    UIApplication.shared.open(urlType.url)
+  }
+}

Projects/Core/URLHandler/Project.swift

@@ -0,0 +1,40 @@
+import ProjectDescription
+import ProjectDescriptionHelpers
+import DependencyPlugin
+
+let project = Project.makeModule(
+    name: ModulePath.Core.name+ModulePath.Core.URLHandler.rawValue,
+    targets: [    
+        .core(
+            interface: .URLHandler,
+            factory: .init()
+        ),
+        .core(
+            implements: .URLHandler,
+            factory: .init(
+                dependencies: [
+                    .core(interface: .URLHandler)
+                ]
+            )
+        ),
+
+        .core(
+            testing: .URLHandler,
+            factory: .init(
+                dependencies: [
+                    .core(interface: .URLHandler)
+                ]
+            )
+        ),
+        .core(
+            tests: .URLHandler,
+            factory: .init(
+                dependencies: [
+                    .core(testing: .URLHandler),
+                    .core(implements: .URLHandler)
+                ]
+            )
+        ),
+
+    ]
+)

Projects/Core/URLHandler/Sources/Source.swift

@@ -0,0 +1 @@
+// This is for Tuist

Projects/Core/URLHandler/Testing/Sources/URLHandlerTesting.swift

@@ -0,0 +1 @@
+// This is for Tuist