🐛 워케이션 끝내기 오류 수정

Author: DevLuce

Workade/Views&ViewModels/MyPage/StickerCollectionViewCell.swift

@@ -22,6 +22,7 @@ class StickerCollectionViewCell: UICollectionViewCell {
 
     let stickerImage: UIImageView = {
         let image = UIImageView()
+        image.contentMode = .scaleAspectFit
         image.translatesAutoresizingMaskIntoConstraints = false
 
         return image
@@ -106,6 +107,6 @@ class StickerCollectionViewCell: UICollectionViewCell {
 
         let labelsHeight = nameLabelHeight + dataLabelHeight + locationLabelHeight
 
-        return labelsHeight + 6 + stickerImageWidth
+        return labelsHeight + 32 + stickerImageWidth
     }
 }

Workade/Views&ViewModels/Workation/StickerSheet/StickerSheetViewController.swift

@@ -66,9 +66,18 @@ class StickerSheetViewController: UIViewController {
     }()
 
     @objc private func backgroundViewTapped(_ tapRecognizer: UITapGestureRecognizer) {
-        if step < stickers.count {
+        if step < stickers.count-1 {
             step += 1
         } else {
+            Task {
+                guard var user = UserManager.shared.user.value else { return }
+                if user.stickers == nil {
+                    user.stickers = stickers
+                } else {
+                    user.stickers?.append(contentsOf: stickers)
+                }
+                try await FirestoreDAO.shared.createUser(user: user)
+            }
             presentingViewController?.dismiss(animated: true)
             self.viewDidDismiss?()
         }

Workade/Views&ViewModels/Workation/WorkationViewController.swift

@@ -15,6 +15,7 @@ final class WorkationViewController: UIViewController {
     var dismissAction: (() -> Void)?
 
     var cancellable = Set<AnyCancellable>()
+    var activeUserCancellable: AnyCancellable? = nil
 
     let canGetStickers: [StickerTitle] = [
         .halLaBong, .dolHaReuBang, .horse, .halLaSan
@@ -200,8 +201,9 @@ final class WorkationViewController: UIViewController {
             alert.addAction(UIAlertAction(title: "종료", style: .destructive, handler: { [weak self] _ in
                 Task { [weak self] in
                     guard let self = self, var user = UserManager.shared.user.value else { return }
-                    try await FirestoreDAO.shared.deleteActiveUser(userID: user.id, region: self.region)
-                    try await FirestoreDAO.shared.createUser(user: User(id: user.id, name: user.name, email: user.email, job: user.job, stickers: user.stickers, activeRegion: nil))
+                    self.activeUserCancellable?.cancel()
+                    try? await FirestoreDAO.shared.deleteActiveUser(userID: user.id, region: self.region)
+                    try? await FirestoreDAO.shared.createUser(user: User(id: user.id, name: user.name, email: user.email, job: user.job, stickers: user.stickers, activeRegion: nil))
                 }
 
                 UIView.animate(withDuration: 0.3, delay: 0) { [weak self] in
@@ -453,14 +455,17 @@ extension WorkationViewController {
                 DispatchQueue.main.async {
                     let offsetDate = Date().timeIntervalSince(user.startDate)
                     let day = Int(ceil(offsetDate/86400))
+                    if let storedDay = user.progressDay {
+                        self.compareProgressDay(presentDay: day, storedDay: storedDay)
+                    }
                     user.progressDay = day
                     self.updateActiveUser(user: user)
                     self.dayLabel.text = "\(day)일째"
                 }
             }
             .store(in: &cancellable)
 
-        UserManager.shared.$activeMyInfo
+        activeUserCancellable = UserManager.shared.$activeMyInfo
             .sink { [weak self] user in
                 guard let self = self, var user = user else { return }
                 DispatchQueue.main.async {
@@ -477,12 +482,11 @@ extension WorkationViewController {
                     self.loginPaneView.isHidden = true
                 }
             }
-            .store(in: &cancellable)
     }
 
     private func updateActiveUser(user: ActiveUser) {
         Task {
-            try await FirestoreDAO.shared.updateActiveUser(user: user)
+            try await FirestoreDAO.shared.createActiveUser(user: user)
         }
     }