Merge pull request #104 from OlegEremenko991/feature/update-journals

easydev991 · web-flow · commit 6b6b93df4a44 · 2023-09-09T16:52:21.000+03:00
Обновление дневников
diff --git a/SwiftUI-WorkoutApp.xcodeproj/project.pbxproj b/SwiftUI-WorkoutApp.xcodeproj/project.pbxproj
@@ -1216,7 +1216,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.2.2;
+				MARKETING_VERSION = 3.3.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.FGU.WorkOut;
 				PRODUCT_NAME = WorkoutApp;
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -1252,7 +1252,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.2.2;
+				MARKETING_VERSION = 3.3.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.FGU.WorkOut;
 				PRODUCT_NAME = WorkoutApp;
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
diff --git a/SwiftUI-WorkoutApp/SWModels/Sources/SWModels/Journal/JournalAccess.swift b/SwiftUI-WorkoutApp/SWModels/Sources/SWModels/Journal/JournalAccess.swift
@@ -20,23 +20,22 @@ public enum JournalAccess: Int, CaseIterable, CustomStringConvertible {
         }
     }
 
-    #warning("Сервер возвращает ошибку 404, ждем от Антона уточнений по API")
     /// Проверяет возможность создания записи в дневнике
     /// - Parameters:
-    ///   - journalOwnerUserId: `id` владельца дневника
+    ///   - journalOwnerId: `id` владельца дневника
     ///   - journalCommentAccess: Тип доступа для создания записей в дневнике.
     ///   Настраивается владельцем дневника
     ///   - mainUserId: `id` авторизованного пользователя в мобильном приложении
     ///   - mainUserFriendsIds: Список идентификаторов друзей авторизованного пользователя
     /// - Returns: `true` - можно создать запись в дневнике, `false` - нельзя
     public static func canCreateEntry(
-        journalOwnerUserId: Int,
+        journalOwnerId: Int,
         journalCommentAccess: Self,
         mainUserId: Int?,
         mainUserFriendsIds: [Int]
     ) -> Bool {
-        let isOwner = journalOwnerUserId == mainUserId
-        let isFriend = mainUserFriendsIds.contains(journalOwnerUserId)
+        let isOwner = journalOwnerId == mainUserId
+        let isFriend = mainUserFriendsIds.contains(journalOwnerId)
         switch journalCommentAccess {
         case .all:
             return mainUserId != nil
diff --git a/SwiftUI-WorkoutApp/SWModels/Sources/SWModels/TextEntryOption.swift b/SwiftUI-WorkoutApp/SWModels/Sources/SWModels/TextEntryOption.swift
@@ -4,5 +4,8 @@ public enum TextEntryOption {
     /// Комментарий к мероприятию
     case event(id: Int)
     /// Запись в дневнике
-    case journal(id: Int)
+    ///
+    /// - `ownerId` - `id` владельца дневника
+    /// - `journalId` - `id` дневника
+    case journal(ownerId: Int, journalId: Int)
 }
diff --git a/SwiftUI-WorkoutApp/Screens/Common/TextEntry/TextEntryView.swift b/SwiftUI-WorkoutApp/Screens/Common/TextEntry/TextEntryView.swift
@@ -22,7 +22,7 @@ struct TextEntryView: View {
         switch mode {
         case let .editGround(info),
              let .editEvent(info),
-             let .editJournalEntry(info):
+             let .editJournalEntry(_, info):
             self.oldEntryText = info.oldEntry
         default: break
         }
@@ -44,10 +44,10 @@ extension TextEntryView {
     enum Mode {
         case newForGround(id: Int)
         case newForEvent(id: Int)
-        case newForJournal(id: Int)
+        case newForJournal(ownerId: Int, journalId: Int)
         case editGround(EditInfo)
         case editEvent(EditInfo)
-        case editJournalEntry(EditInfo)
+        case editJournalEntry(ownerId: Int, editInfo: EditInfo)
 
         struct EditInfo {
             let parentObjectID, entryID: Int
diff --git a/SwiftUI-WorkoutApp/Screens/Common/TextEntry/TextEntryViewModel.swift b/SwiftUI-WorkoutApp/Screens/Common/TextEntry/TextEntryViewModel.swift
@@ -19,9 +19,10 @@ final class TextEntryViewModel: ObservableObject {
                 isSuccess = try await APIService(with: defaults).addNewEntry(
                     to: .event(id: id), entryText: entryText
                 )
-            case let .newForJournal(id):
+            case let .newForJournal(ownerId, journalId):
                 isSuccess = try await APIService(with: defaults).addNewEntry(
-                    to: .journal(id: id), entryText: entryText
+                    to: .journal(ownerId: ownerId, journalId: journalId),
+                    entryText: entryText
                 )
             default: break
             }
@@ -48,9 +49,9 @@ final class TextEntryViewModel: ObservableObject {
                     entryID: info.entryID,
                     newEntryText: entryText
                 )
-            case let .editJournalEntry(info):
+            case let .editJournalEntry(ownerId, info):
                 isSuccess = try await APIService(with: defaults).editEntry(
-                    for: .journal(id: info.parentObjectID),
+                    for: .journal(ownerId: ownerId, journalId: info.parentObjectID),
                     entryID: info.entryID,
                     newEntryText: entryText
                 )
diff --git a/SwiftUI-WorkoutApp/Screens/Journals/EntriesList/JournalEntriesList.swift b/SwiftUI-WorkoutApp/Screens/Journals/EntriesList/JournalEntriesList.swift
@@ -40,7 +40,8 @@ struct JournalEntriesList: View {
                             deleteClbk: { initiateDeletion(for: item.id) }
                         ),
                         isNetworkConnected: network.isConnected,
-                        mainUserID: defaults.mainUserInfo?.userID
+                        mainUserID: defaults.mainUserInfo?.userID,
+                        isJournalOwner: viewModel.userID == defaults.mainUserInfo?.userID
                     )
                 }
             }
@@ -51,7 +52,8 @@ struct JournalEntriesList: View {
         .sheet(item: $editEntry) {
             TextEntryView(
                 mode: .editJournalEntry(
-                    .init(
+                    ownerId: viewModel.userID,
+                    editInfo: .init(
                         parentObjectID: viewModel.currentJournal.id,
                         entryID: $0.id,
                         oldEntry: $0.formattedMessage
@@ -99,15 +101,23 @@ private extension JournalEntriesList {
 
     @ViewBuilder
     var addEntryButtonIfNeeded: some View {
-        let isMainUser = viewModel.userID == defaults.mainUserInfo?.userID
-        if isMainUser {
+        let canCreateEntry = JournalAccess.canCreateEntry(
+            journalOwnerId: viewModel.userID,
+            journalCommentAccess: viewModel.currentJournal.commentAccessType,
+            mainUserId: defaults.mainUserInfo?.userID,
+            mainUserFriendsIds: defaults.friendsIdsList
+        )
+        if canCreateEntry {
             Button(action: showNewEntry) {
                 Image(systemName: Icons.Regular.plus.rawValue)
             }
             .disabled(viewModel.isLoading || !network.isConnected)
             .sheet(isPresented: $showEntrySheet) {
                 TextEntryView(
-                    mode: .newForJournal(id: viewModel.currentJournal.id),
+                    mode: .newForJournal(
+                        ownerId: viewModel.userID,
+                        journalId: viewModel.currentJournal.id
+                    ),
                     refreshClbk: updateEntries
                 )
             }
diff --git a/SwiftUI-WorkoutApp/Screens/Journals/EntriesList/JournalEntriesListViewModel.swift b/SwiftUI-WorkoutApp/Screens/Journals/EntriesList/JournalEntriesListViewModel.swift
@@ -43,7 +43,10 @@ final class JournalEntriesListViewModel: ObservableObject {
         guard let entryID, !isLoading else { return }
         isLoading.toggle()
         do {
-            if try await APIService(with: defaults).deleteEntry(from: .journal(id: currentJournal.id), entryID: entryID) {
+            if try await APIService(with: defaults).deleteEntry(
+                from: .journal(ownerId: userID, journalId: currentJournal.id),
+                entryID: entryID
+            ) {
                 list.removeAll(where: { $0.id == entryID })
             }
         } catch {
diff --git a/SwiftUI-WorkoutApp/Screens/Journals/JournalCell.swift b/SwiftUI-WorkoutApp/Screens/Journals/JournalCell.swift
@@ -8,6 +8,7 @@ struct JournalCell: View {
     let mode: Mode
     let isNetworkConnected: Bool
     let mainUserID: Int?
+    let isJournalOwner: Bool
 
     var body: some View {
         JournalRowView(
@@ -46,22 +47,24 @@ private extension JournalCell {
         case let .root(setupClbk, deleteClbk):
             if isEntryByMainUser {
                 var array = [OptionButton]()
-                array.append(OptionButton(.setup, action: setupClbk))
-                array.append(OptionButton(.delete, action: deleteClbk))
+                array.append(.init(.setup, action: setupClbk))
+                array.append(.init(.delete, action: deleteClbk))
                 return array
             } else {
                 return []
             }
         case let .entry(editClbk, reportClbk, canDelete, deleteClbk):
             if isEntryByMainUser {
                 var array = [OptionButton]()
-                array.append(OptionButton(.edit, action: editClbk))
+                array.append(.init(.edit, action: editClbk))
                 if canDelete {
-                    array.append(OptionButton(.delete, action: deleteClbk))
+                    array.append(.init(.delete, action: deleteClbk))
                 }
                 return array
+            } else if isJournalOwner {
+                return canDelete ? [.init(.delete, action: deleteClbk)] : []
             } else {
-                return [OptionButton(.report, action: reportClbk)]
+                return [.init(.report, action: reportClbk)]
             }
         }
     }
@@ -74,7 +77,8 @@ struct JournalCell_Previews: PreviewProvider {
             model: .init(journalEntryResponse: .preview),
             mode: .root(setupClbk: {}, deleteClbk: {}),
             isNetworkConnected: true,
-            mainUserID: nil
+            mainUserID: nil,
+            isJournalOwner: true
         )
         .previewLayout(.sizeThatFits)
     }
diff --git a/SwiftUI-WorkoutApp/Screens/Journals/JournalsList/JournalsListView.swift b/SwiftUI-WorkoutApp/Screens/Journals/JournalsList/JournalsListView.swift
@@ -104,7 +104,8 @@ private extension JournalsListView {
                                 deleteClbk: { initiateDeletion(for: journal.id) }
                             ),
                             isNetworkConnected: network.isConnected,
-                            mainUserID: defaults.mainUserInfo?.userID
+                            mainUserID: defaults.mainUserInfo?.userID,
+                            isJournalOwner: journal.ownerID == defaults.mainUserInfo?.userID
                         )
                     }
                 }
diff --git a/SwiftUI-WorkoutApp/Services/APIService.swift b/SwiftUI-WorkoutApp/Services/APIService.swift
@@ -290,9 +290,8 @@ struct APIService {
             endpoint = .addCommentToSportsGround(groundID: id, comment: entryText)
         case let .event(id):
             endpoint = .addCommentToEvent(eventID: id, comment: entryText)
-        case let .journal(id):
-            guard let mainUserID = await defaults.mainUserInfo?.userID else { throw APIError.invalidUserID }
-            endpoint = .saveJournalEntry(userID: mainUserID, journalID: id, message: entryText)
+        case let .journal(ownerId, journalId):
+            endpoint = .saveJournalEntry(userID: ownerId, journalID: journalId, message: entryText)
         }
         return try await makeStatus(for: endpoint.urlRequest(with: baseUrlString))
     }
@@ -318,13 +317,10 @@ struct APIService {
                 commentID: entryID,
                 newComment: newEntryText
             )
-        case let .journal(id):
-            guard let mainUserID = await defaults.mainUserInfo?.userID else {
-                throw APIError.invalidUserID
-            }
+        case let .journal(ownerId, journalId):
             endpoint = .editEntry(
-                userID: mainUserID,
-                journalID: id,
+                userID: ownerId,
+                journalID: journalId,
                 entryID: entryID,
                 newEntryText: newEntryText
             )
@@ -344,11 +340,8 @@ struct APIService {
             endpoint = .deleteGroundComment(id, commentID: entryID)
         case let .event(id):
             endpoint = .deleteEventComment(id, commentID: entryID)
-        case let .journal(id):
-            guard let mainUserID = await defaults.mainUserInfo?.userID else {
-                throw APIError.invalidUserID
-            }
-            endpoint = .deleteEntry(userID: mainUserID, journalID: id, entryID: entryID)
+        case let .journal(ownerId, journalId):
+            endpoint = .deleteEntry(userID: ownerId, journalID: journalId, entryID: entryID)
         }
         return try await makeStatus(for: endpoint.urlRequest(with: baseUrlString))
     }

Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,10 @@ final class TextEntryViewModel: ObservableObject {`
`19`	`19`	`isSuccess = try await APIService(with: defaults).addNewEntry(`
`20`	`20`	`to: .event(id: id), entryText: entryText`
`21`	`21`	`)`
`22`		`- case let .newForJournal(id):`
	`22`	`+ case let .newForJournal(ownerId, journalId):`
`23`	`23`	`isSuccess = try await APIService(with: defaults).addNewEntry(`
`24`		`- to: .journal(id: id), entryText: entryText`
	`24`	`+ to: .journal(ownerId: ownerId, journalId: journalId),`
	`25`	`+ entryText: entryText`
`25`	`26`	`)`
`26`	`27`	`default: break`
`27`	`28`	`}`
`@@ -48,9 +49,9 @@ final class TextEntryViewModel: ObservableObject {`
`48`	`49`	`entryID: info.entryID,`
`49`	`50`	`newEntryText: entryText`
`50`	`51`	`)`
`51`		`- case let .editJournalEntry(info):`
	`52`	`+ case let .editJournalEntry(ownerId, info):`
`52`	`53`	`isSuccess = try await APIService(with: defaults).editEntry(`
`53`		`- for: .journal(id: info.parentObjectID),`
	`54`	`+ for: .journal(ownerId: ownerId, journalId: info.parentObjectID),`
`54`	`55`	`entryID: info.entryID,`
`55`	`56`	`newEntryText: entryText`
`56`	`57`	`)`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,8 @@ private extension JournalsListView {`
`104`	`104`	`deleteClbk: { initiateDeletion(for: journal.id) }`
`105`	`105`	`),`
`106`	`106`	`isNetworkConnected: network.isConnected,`
`107`		`- mainUserID: defaults.mainUserInfo?.userID`
	`107`	`+ mainUserID: defaults.mainUserInfo?.userID,`
	`108`	`+ isJournalOwner: journal.ownerID == defaults.mainUserInfo?.userID`
`108`	`109`	`)`
`109`	`110`	`}`
`110`	`111`	`}`