Merge branch 'develop' into feature/89_MypageViewModel

Makefile

@@ -0,0 +1,3 @@
+generate:
+	tuist generate
+	arch -x86_64 pod install

Project.swift

@@ -34,9 +34,6 @@ let project = Project(
                     outputPaths: [Path.init("$SRCROOT/Supporting Files/R.generated.swift")],
                     outputFileListPaths: []
                 )
-            ],
-            dependencies: [
-                .cocoapods(path: ".")
             ]
         )
     ],

Sources/Model/Networking/EmptyModel.swift

@@ -0,0 +1,13 @@
+//
+//  EmptyModel.swift
+//  SSGP
+//
+//  Created by 장서영 on 2021/11/29.
+//  Copyright © 2021 com.ssgp. All rights reserved.
+//
+
+import Foundation
+
+struct EmptyModel: Codable {
+
+}

Sources/Model/Networking/SSGPAPI.swift

@@ -120,7 +120,7 @@ extension SSGPAPI: TargetType {
 
     var headers: [String: String]? {
         switch self {
-        case .login, .signUp, .findNearbyStore:
+        case .login, .signUp:
             return ["Content-Type": "application/json"]
         case .tokenRefresh:
             return [
@@ -149,4 +149,14 @@ extension SSGPAPI: TargetType {
         return keychain.get("REFRESH-TOKEN") ?? ""
     }
 
+    private var id: String {
+        let keychain = KeychainSwift()
+        return keychain.get("ID") ?? ""
+    }
+
+    private var password: String {
+        let keychain = KeychainSwift()
+        return keychain.get("PASSWORD") ?? ""
+    }
+
 }

Sources/View/Map/MapViewController.swift

@@ -12,6 +12,7 @@ import CoreLocation
 import RxSwift
 import RxCocoa
 import FloatingPanel
+import RxViewController
 
 class MapViewController: UIViewController {
 
@@ -74,6 +75,7 @@ class MapViewController: UIViewController {
 
     private func bind() {
         let input = MapViewModel.Input(
+            viewWillApear: self.rx.viewWillAppear.map { _ in () }.asDriver(onErrorJustReturn: ()),
             userLocationIsEnabled: self.locationManager.userLocation(),
             mapViewDidFinishLoadingMap: mapViewDidFinishLoadingMap.asDriver(onErrorJustReturn: ()),
             annotaationIsSelected: annotaationIsSelected.asDriver(onErrorJustReturn: nil),
@@ -83,8 +85,9 @@ class MapViewController: UIViewController {
         )
         let output = viewModel.transform(input)
 
-        output.setAnnotataion.subscribe(onNext: { [weak self] annotations in
-            self?.mapView.addAnnotations(annotations)
+        output.setAnnotataion.subscribe(onNext: { annotations in
+            self.mapView.removeAnnotations(self.mapView.annotations)
+            self.mapView.addAnnotations(annotations)
         })
         .disposed(by: disposeBag)
 

Sources/ViewModel/Auth/LoginViewModel.swift

@@ -34,6 +34,8 @@ class LoginViewModel: ViewModel {
             ).subscribe(onSuccess: { token in
                 self.keychain.set(token.access_token, forKey: "ACCESS-TOKEN")
                 self.keychain.set(token.refresh_token, forKey: "REFRESH-TOKEN")
+                self.keychain.set(id, forKey: "ID")
+                self.keychain.set(pwd, forKey: "PASSWORD")
                 self.output.loginResult.accept(true)
             }, onFailure: { _ in
                 self.output.loginResult.accept(false)

Sources/ViewModel/Map/MapViewModel.swift

@@ -20,6 +20,7 @@ class MapViewModel: ViewModel {
     private var isMapFirstLoad = true
 
     struct Input {
+        let viewWillApear: Driver<Void>
         let userLocationIsEnabled: Single<CLLocationCoordinate2D>
         let mapViewDidFinishLoadingMap: Driver<Void>
         let annotaationIsSelected: Driver<MKAnnotationView?>
@@ -39,7 +40,13 @@ class MapViewModel: ViewModel {
 
     func transform(_ input: Input) -> Output {
 
-        input.userLocationIsEnabled.subscribe(onSuccess: {
+        Observable.combineLatest(
+            input.userLocationIsEnabled.asObservable(),
+            input.viewWillApear.asObservable(),
+            resultSelector: { location, _ in
+                return location
+            }
+        ).subscribe(onNext: {
             HTTPClient.shared.networking(api: .findNearbyStore(
                 String($0.longitude),
                 String($0.latitude)