Release Version 1.6.0 (#320)

Boolti/Boolti.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,12 +1,13 @@
 {
+  "originHash" : "ba72e758b1b94600eb81e0357ba3aff8e6794b75600107a0940665d577057d88",
   "pins" : [
     {
       "identity" : "abseil-cpp-binary",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/google/abseil-cpp-binary.git",
       "state" : {
-        "revision" : "748c7837511d0e6a507737353af268484e1745e2",
-        "version" : "1.2024011601.1"
+        "revision" : "194a6706acbd25e4ef639bcaddea16e8758a3e27",
+        "version" : "1.2024011602.0"
       }
     },
     {
@@ -59,8 +60,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/firebase/firebase-ios-sdk.git",
       "state" : {
-        "revision" : "e57841b296d04370ea23580f908881b0ccab17b9",
-        "version" : "10.28.1"
+        "revision" : "eca84fd638116dd6adb633b5a3f31cc7befcbb7d",
+        "version" : "10.29.0"
       }
     },
     {
@@ -122,8 +123,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/kakao/kakao-ios-sdk.git",
       "state" : {
-        "revision" : "e9e649d3ba823c3673867d3d09010fc77005a940",
-        "version" : "2.22.3"
+        "revision" : "66b3bddc2657e8ccb7a16fa0264aac99c57be09b",
+        "version" : "2.22.5"
       }
     },
     {
@@ -132,7 +133,7 @@
       "location" : "https://github.com/kakao/kakao-ios-sdk-rx",
       "state" : {
         "branch" : "master",
-        "revision" : "37ac7e289fea5f62b3b1f62d06290a18a202a5b0"
+        "revision" : "b5d6cd4bbf29e5e2a79b8a1d3c43e8df606dbb40"
       }
     },
     {
@@ -311,10 +312,10 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-protobuf.git",
       "state" : {
-        "revision" : "9f0c76544701845ad98716f3f6a774a892152bcb",
-        "version" : "1.26.0"
+        "revision" : "e17d61f26df0f0e06f58f6977ba05a097a720106",
+        "version" : "1.27.1"
       }
     }
   ],
-  "version" : 2
+  "version" : 3
 }

Boolti/Boolti/Application/Info.plist

@@ -2,6 +2,10 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>GIFT_URL</key>
+	<string>${GIFT_URL}</string>
+	<key>UIUserInterfaceStyle</key>
+	<string>Dark</string>
 	<key>BASE_URL</key>
 	<string>${BASE_URL}</string>
 	<key>CFBundleURLTypes</key>

Boolti/Boolti/Application/SceneDelegate.swift

@@ -43,26 +43,42 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
         if let incomingURL = userActivity.webpageURL {
             let _ = DynamicLinks.dynamicLinks().handleUniversalLink(incomingURL) { dynamicLinks, error in
 
-                // 현재 파라미터가 하나 뿐이므로 일단 showID만 때내기
-                // 만약 다른 dynamic link가 들어오게 되면 다른 함수로 빼서 처리하기!
                 guard let url = dynamicLinks?.url else { return }
                 let urlString = url.absoluteString
-                let components = urlString.split(separator: "/")
-
-                guard let lastComponent = components.last else { return }
-                guard let concertID = Int(lastComponent) else { return }
-                UserDefaults.landingDestination = .concertDetail(concertId: concertID)
+                var components = urlString.split(separator: "/")
+
+                guard let data = components.popLast(),
+                      let key = components.popLast() else { return }
 
-                // active인지 아닌 지를 확인해서 둘 메소드 다 실행되지는 않게 구현하기
-                NotificationCenter.default.post(
-                    name: Notification.Name.didTabBarSelectedIndexChanged,
-                    object: nil,
-                    userInfo: ["tabBarIndex" : HomeTab.concert.rawValue]
-                )
-                NotificationCenter.default.post(
-                    name: Notification.Name.LandingDestination.concertDetail,
-                    object: nil
-                )
+                // 선물 등록일 경우
+                if key == "gift" {
+                    UserDefaults.landingDestination = .concertList(giftUuid: String(data))
+
+                    // active인지 아닌 지를 확인해서 둘 메소드 다 실행되지는 않게 구현하기
+                    NotificationCenter.default.post(
+                        name: Notification.Name.didTabBarSelectedIndexChanged,
+                        object: nil,
+                        userInfo: ["tabBarIndex" : HomeTab.concert.rawValue]
+                    )
+                    NotificationCenter.default.post(
+                        name: Notification.Name.LandingDestination.concertList,
+                        object: nil
+                    )
+                } else {
+                    guard let concertID = Int(data) else { return }
+                    UserDefaults.landingDestination = .concertDetail(concertId: concertID)
+
+                    // active인지 아닌 지를 확인해서 둘 메소드 다 실행되지는 않게 구현하기
+                    NotificationCenter.default.post(
+                        name: Notification.Name.didTabBarSelectedIndexChanged,
+                        object: nil,
+                        userInfo: ["tabBarIndex" : HomeTab.concert.rawValue]
+                    )
+                    NotificationCenter.default.post(
+                        name: Notification.Name.LandingDestination.concertDetail,
+                        object: nil
+                    )
+                }
             }
         }
     }

Boolti/Boolti/Resources/Assets.xcassets/AccentColor.colorset/Contents.json

@@ -1,6 +1,15 @@
 {
   "colors" : [
     {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x27",
+          "green" : "0x68",
+          "red" : "0xFF"
+        }
+      },
       "idiom" : "universal"
     }
   ],

Boolti/Boolti/Resources/Assets.xcassets/apple_provider.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "apple_provider.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Boolti/Boolti/Resources/Assets.xcassets/gift.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "icon.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Boolti/Boolti/Resources/Assets.xcassets/giftcard.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "giftcard.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Boolti/Boolti/Resources/Assets.xcassets/kakao_provider.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "kakao_provider.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Boolti/Boolti/Sources/Entities/Ticket/GiftReservationDetailEntity.swift

@@ -0,0 +1,37 @@
+//
+//  GiftReservationDetailEntity.swift
+//  Boolti
+//
+//  Created by Miro on 7/11/24.
+//
+
+import Foundation
+
+struct GiftReservationDetailEntity: ReservationDetailEntityProtocol {
+
+    let concertPosterImageURLPath: String
+    let concertTitle: String
+    let salesTicketName: String
+    let ticketType: TicketType
+    let ticketCount: Int
+    let depositDeadLine: String
+    let paymentMethod: PaymentMethod?
+    let totalPaymentAmount: String
+    let reservationStatus: ReservationStatus
+    let ticketingDate: String?
+    let salesEndTime: String
+    let csReservationID: String
+    let easyPayProvider: String?
+    let accountTransferBank: String?
+    let paymentCardDetail: PaymentCardDetail?
+    let showDate: Date
+
+    let giftID: Int
+    let giftUUID: String
+    let giftMessage: String
+    let giftImageURLPath: String
+    let recipientName: String
+    let recipientPhoneNumber: String
+    let senderName: String
+    let senderPhoneNumber: String
+}

Boolti/Boolti/Sources/Entities/Ticket/Protocol/ReservationDetailEntityProtocol.swift

@@ -0,0 +1,28 @@
+//
+//  ReservationDetailEntityProtocol.swift
+//  Boolti
+//
+//  Created by Miro on 7/11/24.
+//
+
+import Foundation
+
+protocol ReservationDetailEntityProtocol {
+
+    var concertPosterImageURLPath: String { get }
+    var concertTitle: String { get }
+    var salesTicketName: String { get }
+    var ticketType: TicketType { get }
+    var ticketCount: Int { get }
+    var depositDeadLine: String { get }
+    var paymentMethod: PaymentMethod? { get }
+    var totalPaymentAmount: String { get }
+    var reservationStatus: ReservationStatus { get }
+    var ticketingDate: String? { get }
+    var salesEndTime: String { get }
+    var csReservationID: String { get }
+    var easyPayProvider: String? { get }
+    var accountTransferBank: String? { get }
+    var paymentCardDetail: PaymentCardDetail? { get }
+    var showDate: Date { get }
+}

Boolti/Boolti/Sources/Entities/Ticket/TicketReservationDetailEntity.swift

@@ -106,8 +106,7 @@ struct PaymentCardDetail {
     let issuer: String
 }
 
-
-struct TicketReservationDetailEntity {
+struct TicketReservationDetailEntity: ReservationDetailEntityProtocol {
 
     let reservationID: Int
     let concertPosterImageURLPath: String
@@ -120,14 +119,14 @@ struct TicketReservationDetailEntity {
     let totalPaymentAmount: String
     let reservationStatus: ReservationStatus
     let ticketingDate: String?
-    let purchaseName: String
-    let purchaserPhoneNumber: String
-    let depositorName: String
-    let depositorPhoneNumber: String
     let salesEndTime: String
     let csReservationID: String
     let easyPayProvider: String?
     let accountTransferBank: String?
     let paymentCardDetail: PaymentCardDetail?
     let showDate: Date
+    let purchaseName: String
+    let purchaserPhoneNumber: String
+    let depositorName: String
+    let depositorPhoneNumber: String
 }

Boolti/Boolti/Sources/Entities/Ticket/TicketReservationItemEntity.swift

@@ -10,18 +10,21 @@ import UIKit
 enum ReservationStatus: String {
     case reservationCompleted = "RESERVATION_COMPLETED"
     case refundCompleted = "CANCELLED"
+    case waitingForReceipt = "WAITING_FOR_GIFT_RECEIPT"
 
     var description: String {
         switch self {
         case .reservationCompleted: return "발권 완료"
         case .refundCompleted: return "취소 완료"
+        case .waitingForReceipt: return "등록 대기"
         }
     }
 
     var color: UIColor {
         switch self {
         case .reservationCompleted: return .success
         case .refundCompleted: return .error
+        case .waitingForReceipt: return .grey30
         }
     }
 }
@@ -35,5 +38,8 @@ struct TicketReservationItemEntity {
     let ticketName: String
     let ticketCount: Int
     let ticketPrice: Int
+    let isGiftReservation: Bool
+    let recipientName: String?
+    let giftId: Int
     let csReservationID: String
 }

Boolti/Boolti/Sources/Entities/Ticketing/GiftCardImageEntity.swift

@@ -0,0 +1,14 @@
+//
+//  GiftCardImageEntity.swift
+//  Boolti
+//
+//  Created by Juhyeon Byun on 7/10/24.
+//
+
+import Foundation
+
+struct GiftCardImageEntity {
+    let id: Int
+    let path: String
+    let thumbnailPath: String
+}