AVIRO-official · Jeon0976 · Dec 31, 2023 · Dec 31, 2023
diff --git a/AVIRO.xcodeproj/project.pbxproj b/AVIRO.xcodeproj/project.pbxproj
@@ -206,7 +206,6 @@
 		C5DBF8382B3A5FEC00668B0D /* AVIROTabBarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C5DBF8372B3A5FEC00668B0D /* AVIROTabBarController.swift */; };
 		C5DBF83F2B3A6E1000668B0D /* TabBarButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = C5DBF83E2B3A6E1000668B0D /* TabBarButton.swift */; };
 		C5DBF8412B3A787800668B0D /* CGFloat+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = C5DBF8402B3A787800668B0D /* CGFloat+Extension.swift */; };
-		C5DBF8432B3A822900668B0D /* AVIROViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C5DBF8422B3A822900668B0D /* AVIROViewController.swift */; };
 		C5E143A72AB43B8F007AC8C9 /* AVIROResult+DTO.swift in Sources */ = {isa = PBXBuildFile; fileRef = C5E143A62AB43B8F007AC8C9 /* AVIROResult+DTO.swift */; };
 		C5E306E72A6FB4ED00C11CF7 /* MenuField.swift in Sources */ = {isa = PBXBuildFile; fileRef = C5E306E62A6FB4ED00C11CF7 /* MenuField.swift */; };
 		C5E430B32A5DADBE00CB67EC /* SecondRegistrationPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = C5E430B22A5DADBE00CB67EC /* SecondRegistrationPresenter.swift */; };
@@ -459,7 +458,6 @@
 		C5DBF8372B3A5FEC00668B0D /* AVIROTabBarController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AVIROTabBarController.swift; sourceTree = "<group>"; };
 		C5DBF83E2B3A6E1000668B0D /* TabBarButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabBarButton.swift; sourceTree = "<group>"; };
 		C5DBF8402B3A787800668B0D /* CGFloat+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CGFloat+Extension.swift"; sourceTree = "<group>"; };
-		C5DBF8422B3A822900668B0D /* AVIROViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AVIROViewController.swift; sourceTree = "<group>"; };
 		C5E143A62AB43B8F007AC8C9 /* AVIROResult+DTO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AVIROResult+DTO.swift"; sourceTree = "<group>"; };
 		C5E306E62A6FB4ED00C11CF7 /* MenuField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuField.swift; sourceTree = "<group>"; };
 		C5E430B22A5DADBE00CB67EC /* SecondRegistrationPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecondRegistrationPresenter.swift; sourceTree = "<group>"; };
@@ -1104,7 +1102,6 @@
 			isa = PBXGroup;
 			children = (
 				C5DBF8372B3A5FEC00668B0D /* AVIROTabBarController.swift */,
-				C5DBF8422B3A822900668B0D /* AVIROViewController.swift */,
 			);
 			path = Base;
 			sourceTree = "<group>";
@@ -2188,7 +2185,6 @@
 				C505C1E22B3ACEC00058F115 /* Reactive+Extension.swift in Sources */,
 				C5166E4D2A945228003495AA /* MyData.swift in Sources */,
 				C58B9AAE2A5675B9008AEAC3 /* TutorialViewController.swift in Sources */,
-				C5DBF8432B3A822900668B0D /* AVIROViewController.swift in Sources */,
 				C5FF13552A42C88D0026981D /* AVIROPlaceMenus+DTO.swift in Sources */,
 				C56E7A112A971504009CCAF2 /* ReportCellView.swift in Sources */,
 				C52066332A7E80350038ECCD /* MatchedPlaceCellModel.swift in Sources */,
@@ -2428,7 +2424,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = AVIRO/AVIRO.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 10;
+				CURRENT_PROJECT_VERSION = 11;
 				DEVELOPMENT_TEAM = C4K2HXA435;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = AVIRO/App/Info.plist;
@@ -2463,7 +2459,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = AVIRO/AVIRO.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 10;
+				CURRENT_PROJECT_VERSION = 11;
 				DEVELOPMENT_TEAM = C4K2HXA435;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = AVIRO/App/Info.plist;

diff --git a/AVIRO/App/LaunchScreenViewController.swift b/AVIRO/App/LaunchScreenViewController.swift
@@ -115,8 +115,8 @@ final class LaunchScreenViewController: UIViewController {
 
     private func checkVersion() {
         DispatchQueue.global().async { [weak self] in
-            let latestVersion = SystemUtility().latestVersion() ?? "0.0"
-            let currentVersion = SystemUtility.appVersion ?? "0.0"
+            let latestVersion = SystemUtility().latestVersion() ?? "0.0.0"
+            let currentVersion = SystemUtility.appVersion ?? "0.0.0"
 
             let splitLatestVersion = latestVersion.split(separator: ".").map { $0 }
             let splitCurrentVersion = currentVersion.split(separator: ".").map { $0 }

diff --git a/AVIRO/Custom/Utility/TimeUtility.swift b/AVIRO/Custom/Utility/TimeUtility.swift
@@ -14,7 +14,7 @@ final class TimeUtility {
         let formatter = DateFormatter()
 
         formatter.dateFormat = "yyyy.MM.dd"
-        
+
         let formattedDate = formatter.string(from: date)
 
         return formattedDate
@@ -25,10 +25,11 @@ final class TimeUtility {
         let date = Date()
         let formatter = DateFormatter()
 
-        formatter.dateFormat = "YYYY-MM-dd HH:mm:ss"
-
+        formatter.dateFormat = "yyyy-MM-dd HH:mm:ss"
+        
         let formattedDateTime = formatter.string(from: date)
 
+        print(formattedDateTime)
         return formattedDateTime
     }
 

diff --git a/AVIRO/Manager/FacadeManager/MarkerModelManager.swift b/AVIRO/Manager/FacadeManager/MarkerModelManager.swift
@@ -75,7 +75,7 @@ final class MarkerModelManager: MarkerModelManagerProtocol {
             time: updateTime
         )
 
-        AVIROAPI.manager.loadNerbyPlaceModels(with: mapModel) { result in
+        AVIROAPI.manager.loadNerbyPlaceModels(with: mapModel) { [weak self] result in
             switch result {
             case .success(let success):
                 if success.statusCode == 200 {
@@ -111,6 +111,7 @@ final class MarkerModelManager: MarkerModelManagerProtocol {
                     let updatedDataRaw = realm.objects(MarkerModelFromRealm.self)
                     let updatedDataArray = Array(updatedDataRaw).map { $0.toAVIROMarkerModel() }
 
+                    self?.updateTime = TimeUtility.nowDateAndTime()
                     completionHandler(.success(updatedDataArray))
                 } else {
                     completionHandler(.failure(.badRequest))

diff --git a/AVIRO/Model/LocalDataModel/MarkerModelCache.swift b/AVIRO/Model/LocalDataModel/MarkerModelCache.swift
@@ -60,10 +60,9 @@ final class MarkerModelCache: MarkerModelCacheProtocol {
     /// 앱이 실행 중일때 Marker Model 업데이트 하는 경우 가공된 데이터로 저장
     func updateMarkerModel(_ markerModel: MarkerModel) {
         if let index = markers.firstIndex(where: { $0.placeId == markerModel.placeId }) {
-
             var updateMarker = markerModel
 
-            DispatchQueue.main.async { [weak self] in
+            DispatchQueue.main.sync { [weak self] in
                 self?.markers[index].marker.position = updateMarker.marker.position
 
                 self?.markers[index].marker.changeIcon(
@@ -86,7 +85,7 @@ final class MarkerModelCache: MarkerModelCacheProtocol {
     }
 
     private func adjustMarkerCoordinatesWhenOverlapping(for markerModel: MarkerModel) {
-        DispatchQueue.main.async { [weak self] in
+        DispatchQueue.main.sync { [weak self] in
             guard let self = self else { return }
 
             let samePositionMarkers = self.markers.filter { $0.marker.position == markerModel.marker.position }
@@ -114,7 +113,7 @@ final class MarkerModelCache: MarkerModelCacheProtocol {
     // MARK: DeleteMarkerModel
     /// update간 삭제된 마커데이터 삭제하기
     func deleteMarkerModel(with placeId: String) {
-        DispatchQueue.main.async { [weak self] in
+        DispatchQueue.main.sync { [weak self] in
             guard let markerModel = self?.markers.first(where: { $0.placeId == placeId })  else { return }
 
             markerModel.marker.mapView = nil

diff --git a/AVIRO/Scene/Base/AVIROTabBarController.swift b/AVIRO/Scene/Base/AVIROTabBarController.swift
@@ -101,7 +101,7 @@ final class AVIROTabBarController: UIViewController, TabBarDelegate {
 
         return view
     }()
-
+            
     var selectedIndex: Int = 0 {
         willSet {
             previousIndex = selectedIndex
@@ -241,8 +241,6 @@ final class AVIROTabBarController: UIViewController, TabBarDelegate {
     private func deleteView() {
         let previousVC = viewControllers[previousIndex]
 
-//        selectedVCBottomUponViewBottom = nil
-//        selectedVCBottomUponTabViewConstraint = nil
         previousVC.remove()
     }
 

diff --git a/AVIRO/Scene/Base/AVIROViewController.swift b/AVIRO/Scene/Base/AVIROViewController.swift
diff --git a/AVIRO/Scene/Feature/Challenge/ChallengeInfoView/SubView/ChallengeInfoGreenView.swift b/AVIRO/Scene/Feature/Challenge/ChallengeInfoView/SubView/ChallengeInfoGreenView.swift
@@ -29,18 +29,6 @@ final class ChallengeInfoGreenView: UIView {
         return label
     }()
 
-    private lazy var subLabel: UILabel = {
-        let label = UILabel()
-
-        label.text = "* 시즌 한정 보상은 시즌 내에만 볼 수 있어요"
-        label.numberOfLines = 1
-        label.textColor = .gray2
-        label.font = .pretendard(size: 12, weight: .regular)
-        label.textAlignment = .left
-
-        return label
-    }()
-
     override init(frame: CGRect) {
         super.init(frame: frame)
 
@@ -55,8 +43,7 @@ final class ChallengeInfoGreenView: UIView {
     private func setupLayout() {
         [
             explainImage,
-            explainLabel,
-            subLabel
+            explainLabel
         ].forEach {
             $0.translatesAutoresizingMaskIntoConstraints = false
             self.addSubview($0)
@@ -69,13 +56,9 @@ final class ChallengeInfoGreenView: UIView {
             explainImage.widthAnchor.constraint(equalToConstant: 60),
             explainImage.heightAnchor.constraint(equalToConstant: 60),
 
-            explainLabel.topAnchor.constraint(equalTo: self.topAnchor, constant: 11),
+            explainLabel.centerYAnchor.constraint(equalTo: self.centerYAnchor),
             explainLabel.leadingAnchor.constraint(equalTo: explainImage.trailingAnchor, constant: 10),
-            explainLabel.trailingAnchor.constraint(equalTo: self.trailingAnchor, constant: -10),
-
-            subLabel.topAnchor.constraint(equalTo: explainLabel.bottomAnchor, constant: 4),
-            subLabel.leadingAnchor.constraint(equalTo: explainLabel.leadingAnchor),
-            subLabel.trailingAnchor.constraint(equalTo: explainLabel.trailingAnchor)
+            explainLabel.trailingAnchor.constraint(equalTo: self.trailingAnchor, constant: -10)
         ])
     }
 

diff --git a/AVIRO/Scene/Feature/Enroll/ViewController/EnrollPlaceViewController.swift b/AVIRO/Scene/Feature/Enroll/ViewController/EnrollPlaceViewController.swift
@@ -11,7 +11,7 @@ private enum Text: String {
     case error = "에러"
 }
 
-final class EnrollPlaceViewController: UIViewController, AVIROViewController {
+final class EnrollPlaceViewController: UIViewController {
     weak var tabBarDelegate: TabBarDelegate?
     weak var homeViewDelegate: AfterHomeViewControllerProtocol?
 

diff --git a/AVIRO/Scene/Feature/Enroll/ViewPresenter/EnrollPlacePresenter.swift b/AVIRO/Scene/Feature/Enroll/ViewPresenter/EnrollPlacePresenter.swift
@@ -125,6 +125,7 @@ final class EnrollPlacePresenter {
         AVIROAPI.manager.createPlaceModel(with: veganModel) { [weak self] result in
             switch result {
             case .success(let resultModel):
+                print(resultModel)
                 if resultModel.statusCode == 200 {
                     self?.amplitude.uploadPlace(with: veganModel.title)
 
@@ -141,6 +142,7 @@ final class EnrollPlacePresenter {
                     self?.viewController?.pushAlertController()
                 }
             case .failure(let error):
+                print(error)
                 if let error = error.errorDescription {
                     self?.viewController?.showErrorAlert(with: error, title: nil)
                 }

diff --git a/AVIRO/Scene/Feature/Home/ReviewWriteView/ViewModel/ReviewWriteViewModel.swift b/AVIRO/Scene/Feature/Home/ReviewWriteView/ViewModel/ReviewWriteViewModel.swift
@@ -130,7 +130,6 @@ final class ReviewWriteViewModel: ViewModel {
                     content: content
                 )
 
-                // TODO: 수정 업데이트
                 if let editCommentId = editCommentId {
                     model.commentId = editCommentId
 
@@ -166,13 +165,10 @@ final class ReviewWriteViewModel: ViewModel {
         )
     }
 
-    private var test = 0
     private func updateReview(with reviewModel: AVIROEnrollReviewDTO) -> Single<(AfterWriteReviewModel, Bool)> {
-        test += 1
-        print(test)
+
         return Single.create { single in
             AVIROAPI.manager.createReview(with: reviewModel) { [weak self] result in
-                print(result)
                 switch result {
                 case .success(let model):
                     if model.statusCode == 200 {