Deployment week5

Escaper/Escaper/Application/SceneDelegate.swift

@@ -13,14 +13,10 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
 
     func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) {
         guard let windowScene = (scene as? UIWindowScene) else { return }
-
-//        DataInjection.shared.run(storeRegion: .extra)
-//        DataInjection.shared.run(storeRegion: .sinlim)
         let viewController = MainTabBarController()
         window = UIWindow(frame: UIScreen.main.bounds)
         window?.windowScene = windowScene
         window?.rootViewController = viewController
         window?.makeKeyAndVisible()
     }
-
 }

Escaper/Escaper/Common/Extensions/UISearchBar+SetTextFieldColor.swift

@@ -10,6 +10,7 @@ import UIKit
 extension UISearchBar {
     func setTextFieldColor(color: UIColor?) {
         guard let textField = self.value(forKey: "searchField") as? UITextField else { return }
+        textField.font = UIFont.systemFont(ofSize: 14, weight: .regular)
         switch self.searchBarStyle {
         case .minimal:
             textField.layer.backgroundColor = color?.cgColor

Escaper/Escaper/Common/Extensions/UIView+RoundCorners.swift → Escaper/Escaper/Common/Extensions/UIView+Extension.swift

@@ -1,5 +1,5 @@
 //
-//  UIView+ScaledSize.swift
+//  UIView+Extension.swift
 //  Escaper
 //
 //  Created by TakHyun Jung on 2021/11/13.
@@ -14,4 +14,14 @@ extension UIView {
         mask.path = path.cgPath
         self.layer.mask = mask
     }
+
+    func transformToImage() -> UIImage? {
+        UIGraphicsBeginImageContextWithOptions(self.bounds.size, self.isOpaque, 0.0)
+        defer {
+            UIGraphicsEndImageContext()
+        }
+        guard let context = UIGraphicsGetCurrentContext() else { return nil }
+        self.layer.render(in: context)
+        return UIGraphicsGetImageFromCurrentImageContext()
+    }
 }

Escaper/Escaper/Common/Library/EDSKit.swift

@@ -66,6 +66,24 @@ enum EDSKit {
             label.font = UIFont.systemFont(ofSize: 10, weight: .regular)
             return label
         }
+
+        static func b01L(text: String = "", color: Color) -> UILabel {
+            let label = Label.makeLabel(text: text, color: color)
+            label.font = UIFont.systemFont(ofSize: 14, weight: .light)
+            return label
+        }
+
+        static func b02L(text: String = "", color: Color) -> UILabel {
+            let label = Label.makeLabel(text: text, color: color)
+            label.font = UIFont.systemFont(ofSize: 12, weight: .light)
+            return label
+        }
+
+        static func b03L(text: String = "", color: Color) -> UILabel {
+            let label = Label.makeLabel(text: text, color: color)
+            label.font = UIFont.systemFont(ofSize: 10, weight: .light)
+            return label
+        }
     }
 
     enum Color {
@@ -74,14 +92,15 @@ enum EDSKit {
         case bloodyDarkBurgundy
         case bloodyRed
         case charcoal
+        case gloomyBrown
+        case gloomyLightBrown
         case gloomyPink
         case gloomyPurple
         case gloomyRed
-        case gloomyBrown
         case pumpkin
+        case skullGrey
         case skullLightWhite
         case skullWhite
-        case skullGrey
         case zombiePurple
 
         var value: UIColor? {
@@ -91,17 +110,31 @@ enum EDSKit {
 
     enum Image {
         case chevronDown
-        case recordCard
-        case plus
-        case loginPumpkin
-        case signupGhost
+        case comedyPreview
+        case crown
+        case distanceIcon
         case emailIcon
-        case pwIcon
         case eyeIcon
+        case fearPreview
+        case genreIcon
+        case keyMarker
+        case loginPumpkin
+        case mappin
+        case passwordIcon
+        case plus
+        case recordBook
+        case recordCard
+        case recordCandle
+        case romancePreview
+        case share
+        case signupGhost
         case signupPlus
+        case signupSkull
+        case starfilled
+        case starunfilled
 
         var value: UIImage? {
-            return UIImage(named: String(describing: self))
+            return self == .mappin ? UIImage(systemName: "mappin.and.ellipse") : UIImage(named: String(describing: self))
         }
     }
 }

Escaper/Escaper/Common/Library/Error.swift

@@ -0,0 +1,13 @@
+//
+//  Error.swift
+//  Escaper
+//
+//  Created by shinheeRo on 2021/11/24.
+//
+
+import Foundation
+
+enum UserError: Error {
+    case networkUnconneted
+    case notExist
+}

Escaper/Escaper/Common/Library/Observable.swift

@@ -26,7 +26,6 @@ final class Observable<T> {
 
     func observe(on observer: AnyObject, observerBlock: @escaping (T) -> Void) {
         self.observers.append(Observer(observer: observer, block: observerBlock))
-        observerBlock(self.value)
     }
 
     func remove(observer: AnyObject) {

Escaper/Escaper/Common/Library/ViewType.swift → Escaper/Escaper/Common/Library/TextFieldType.swift

@@ -7,7 +7,7 @@
 
 import Foundation
 
-enum ViewType {
+enum TextFieldType {
     case email
     case password
     case passwordCheck

Escaper/Escaper/Common/Library/Validator.swift

@@ -0,0 +1,44 @@
+//
+//  Validater.swift
+//  Escaper
+//
+//  Created by shinheeRo on 2021/11/23.
+//
+
+import Foundation
+
+enum Validator {
+    enum State: String {
+        case normal = ""
+        case numberOfDigitsError = "8자리 이상 입력해주세요."
+        case discordanceError = "비밀번호와 일치하지 않습니다."
+        case alreadyExistError = "이미 등록된 이메일입니다."
+        case notConfirmedError = "아이디와 비밀번호를 다시 확인해주세요."
+
+        var value: String {
+            return self.rawValue
+        }
+    }
+
+    static var notConfirmedErrorString: String {
+        return State.notConfirmedError.value
+    }
+
+    static var alreadyExistErrorString: String {
+        return State.alreadyExistError.value
+    }
+
+    static func checkNumberOfDigits(text: String) -> String {
+        if text.count < 8 {
+            return State.numberOfDigitsError.value
+        }
+        return State.normal.value
+    }
+
+    static func checkDiscordance(text1: String, text2: String) -> String {
+        if text1 != text2 {
+            return State.discordanceError.value
+        }
+        return State.normal.value
+    }
+}

Escaper/Escaper/DataInjection/DataInjection.swift

@@ -51,6 +51,10 @@ class DataInjection {
                                           genre: room.genre,
                                           geoLocation: geoLocation,
                                           district: district,
+                                          activity: room.activity,
+                                          description: room.description,
+                                          maxParty: room.maxParty,
+                                          timeLimit: room.timeLimit,
                                           records: [])
 
                     FirebaseService.shared.addRoom(room: roomDTO)

Escaper/Escaper/DataInjection/InjectionDTOs.swift

@@ -19,6 +19,6 @@ struct StoreInjectionDTO: Codable {
 }
 
 struct RoomInjectionDTO: Codable {
-    let title, genre: String
-    let difficulty: Int
+    let title, genre, activity, description: String
+    let difficulty, maxParty, timeLimit: Int
 }

Escaper/Escaper/Domain/Entities/RecordCard.swift

@@ -10,7 +10,7 @@ import Foundation
 struct RecordCard: Hashable {
     var username: String
     var createdTime: Date
-    var imageURLString: String
+    var recordImageURLString: String
     var roomTitle: String
     var storeName: String
     var isSuccess: Bool
@@ -23,14 +23,13 @@ struct RecordCard: Hashable {
     init(record: Record, room: Room) {
         self.username = Helper.parseUsername(email: record.userEmail) ?? "Unknown"
         self.createdTime = record.createdTime
-        self.imageURLString = record.imageURLString
+        self.recordImageURLString = record.imageURLString
         self.roomTitle = room.title
         self.storeName = room.storeName
         self.isSuccess = record.isSuccess
         self.satisfaction = record.satisfaction
         self.difficulty = room.difficulty
         self.numberOfTotalPlayers = room.records.count
-        // TODO: - 확인할 것
         self.rank = Helper.binarySearch(value: record.escapingTime, sortedValues: room.records.map({ $0.escapingTime }).sorted()) ?? room.records.count
         self.time = record.escapingTime
     }

Escaper/Escaper/Domain/Entities/Room.swift

@@ -17,8 +17,12 @@ struct Room: Hashable {
     var genre: Genre
     var geoLocation: CLLocation
     var district: District
+    var activity: String
+    var description: String
+    var maxParty: Int
+    var timeLimit: Int
     var records: [Record]
-    var distance: Double // TODO: - 이러다 다죽어
+    var distance: Double
 
     func hash(into hasher: inout Hasher) {
         hasher.combine(self.roomId)

Escaper/Escaper/Domain/Entities/Store.swift

@@ -8,7 +8,7 @@
 import Foundation
 import CoreLocation
 
-struct Store {
+struct Store: Hashable {
     var name: String
     var homePage: String
     var telephone: String
@@ -17,4 +17,9 @@ struct Store {
     var geoLocation: CLLocation
     var district: District
     var roomIds: [String]
+    var distance: Double
+
+    mutating func updateDistance(_ distance: Double) {
+        self.distance = distance
+    }
 }

Escaper/Escaper/Domain/Entities/Supplementary/Feedback.swift

@@ -0,0 +1,16 @@
+//
+//  Feedback.swift
+//  Escaper
+//
+//  Created by 최완식 on 2021/11/26.
+//
+
+import Foundation
+
+struct Feedback {
+    let content: String
+
+    func toDTO() -> FeedbackDTO {
+        return FeedbackDTO(content: self.content)
+    }
+}

Escaper/Escaper/Domain/Entities/Supplementary/Rating.swift

@@ -9,7 +9,7 @@ import Foundation
 
 enum Rating: Int {
     static let maxRating: Int = 5
-    
+
     case zero = 0
     case one = 1
     case two = 2

Escaper/Escaper/Domain/Entities/User.swift

@@ -7,10 +7,21 @@
 
 import Foundation
 
-struct User {
+struct User: Decodable {
     let email: String
     let name: String
     let password: String
     let imageURL: String
     let score: Int
+
+    func toDictionary() -> [String: Any] {
+        let dictionary: [String: Any] = [
+            "email": self.email,
+            "name": self.name,
+            "password": self.password,
+            "imageURL": self.imageURL,
+            "score": self.score
+        ]
+        return dictionary
+    }
 }

Escaper/Escaper/Domain/Interface/Repositories/FeedbackRepositoryInterface.swift

@@ -0,0 +1,12 @@
+//
+//  FeedbackRepositoryInterface.swift
+//  Escaper
+//
+//  Created by 최완식 on 2021/11/26.
+//
+
+import Foundation
+
+protocol FeedbackRepositoryInterface {
+    func addFeedback(feedback: Feedback)
+}

Escaper/Escaper/Domain/Interface/Repositories/LeaderBoardRepositoryInterface.swift

@@ -0,0 +1,12 @@
+//
+//  LeaderBoardRepositoryInterface.swift
+//  Escaper
+//
+//  Created by 박영광 on 2021/11/22.
+//
+
+import Foundation
+
+protocol LeaderBoardRepositoryInterface {
+    func fetch(completion: @escaping  (Result<[User], Error>) -> Void)
+}

Escaper/Escaper/Domain/Interface/Repositories/RoomListRepositoryInterface.swift

@@ -7,7 +7,7 @@
 
 import Foundation
 
-protocol RoomListRepositroyInterface {
+protocol RoomListRepositoryInterface {
     func query(genre: Genre, district: District, completion: @escaping (Result<[Room], Error>) -> Void)
     func fetch(roomId: String, completion: @escaping (Result<Room, Error>) -> Void)
     func fetch(name: String, completion: @escaping (Result<[Room], Error>) -> Void)

Escaper/Escaper/Domain/Interface/Repositories/StoreRepositoryInterface.swift

@@ -0,0 +1,12 @@
+//
+//  StoreRepositoryInterface.swift
+//  Escaper
+//
+//  Created by TakHyun Jung on 2021/11/23.
+//
+
+import Foundation
+
+protocol StoreRepositoryInterface {
+    func query(name: String, completion: @escaping (Result<[Store], Error>) -> Void)
+}

Escaper/Escaper/Domain/Interface/Repositories/UserRepositoryInterface.swift

@@ -0,0 +1,14 @@
+//
+//  UserRepositoryInterface.swift
+//  Escaper
+//
+//  Created by shinheeRo on 2021/11/22.
+//
+
+import Foundation
+
+protocol UserRepositoryInterface {
+    func query(userEmail: String, completion: @escaping (Result<Bool, Error>) -> Void)
+    func confirm(userEmail: String, userPassword: String, completion: @escaping (Result<User, UserError>) -> Void)
+    func add(user: User)
+}