Поправил удаление фотографий (#251)

- Теперь при удалении фотографий для площадки/мероприятия наш список фото создается заново с учетом корректировки идентификаторов
- Судя по всему, после каждого удаления фотографии на сервере там происходит обновление идентификаторов в коллекции фото: всем фоткам присваиваются номера, начиная с `1`
- Добавил `unit`-тесты

Author: easydev991

SwiftUI-WorkoutApp.xcodeproj/project.pbxproj

@@ -846,7 +846,7 @@
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CLANG_WARN_SEMICOLON_BEFORE_METHOD_BODY = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 7;
 				DEVELOPMENT_ASSET_PATHS = "SwiftUI-WorkoutApp/Preview\\ Content/PreviewContent.swift SwiftUI-WorkoutApp/Preview\\ Content";
 				DEVELOPMENT_TEAM = CR68PP2Z3F;
 				ENABLE_PREVIEWS = YES;
@@ -896,7 +896,7 @@
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CLANG_WARN_SEMICOLON_BEFORE_METHOD_BODY = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 7;
 				DEVELOPMENT_ASSET_PATHS = "SwiftUI-WorkoutApp/Preview\\ Content/PreviewContent.swift SwiftUI-WorkoutApp/Preview\\ Content";
 				DEVELOPMENT_TEAM = CR68PP2Z3F;
 				ENABLE_PREVIEWS = YES;

SwiftUI-WorkoutApp/Libraries/SWModels/Sources/SWModels/EventResponse.swift

@@ -165,6 +165,10 @@ public extension EventResponse {
         set { photosOptional = newValue }
     }
 
+    func removePhotoById(_ id: Int) -> [Photo] {
+        PhotoRemover(initialPhotos: photos, removeId: id).photosAfterRemoval
+    }
+
     var hasParticipants: Bool { !participants.isEmpty }
 
     /// Список участников мероприятия

SwiftUI-WorkoutApp/Libraries/SWModels/Sources/SWModels/Park.swift

@@ -156,20 +156,24 @@ public struct Park: Codable, Identifiable, Hashable, Sendable {
 }
 
 public struct Photo: Codable, Identifiable, Hashable, Sendable {
-    public let id: Int
+    public var id: String {
+        "\(serverId)-\(stringURL ?? "")"
+    }
+
+    public let serverId: Int
     public let stringURL: String?
 
     public var imageURL: URL? {
         stringURL.queryAllowedURL
     }
 
     public enum CodingKeys: String, CodingKey {
-        case id
+        case serverId = "id"
         case stringURL = "photo"
     }
 
-    public init(id: Int, stringURL: String? = nil) {
-        self.id = id
+    public init(id: Int, stringURL: String?) {
+        self.serverId = id
         self.stringURL = stringURL
     }
 }
@@ -208,6 +212,10 @@ public extension Park {
         set { photosOptional = newValue }
     }
 
+    func removePhotoById(_ id: Int) -> [Photo] {
+        PhotoRemover(initialPhotos: photos, removeId: id).photosAfterRemoval
+    }
+
     var hasComments: Bool { !comments.isEmpty }
 
     var comments: [CommentResponse] {

SwiftUI-WorkoutApp/Libraries/SWModels/Sources/SWModels/PhotoRemover.swift

@@ -0,0 +1,29 @@
+import Foundation
+
+/// Удаляет фото по идентификатору и составляет актуальный список фото
+struct PhotoRemover {
+    private let initialPhotos: [Photo]
+    private let removeId: Int
+
+    /// Инициализатор
+    /// - Parameters:
+    ///   - initialPhotos: Первоначальный массив фотографий
+    ///   - removeId: Идентификатор фотографии для удаления
+    init(initialPhotos: [Photo], removeId: Int) {
+        self.initialPhotos = initialPhotos
+        self.removeId = removeId
+    }
+
+    /// Актуальный список фотографий после процедуры удаления
+    ///
+    /// На сервере идентификаторы фотографий начинаются с цифры `1`,
+    /// при изменении набора фотографий их идентификаторы тоже обновляются
+    var photosAfterRemoval: [Photo] {
+        initialPhotos
+            .filter { $0.serverId != removeId }
+            .enumerated()
+            .map { index, photo in
+                Photo(id: index + 1, stringURL: photo.stringURL)
+            }
+    }
+}

SwiftUI-WorkoutApp/Libraries/SWModels/Tests/SWModelsTest/PhotoRemoverTests.swift

@@ -0,0 +1,46 @@
+@testable import SWModels
+import Testing
+
+struct PhotoRemoverTests {
+    @Test
+    func removesCorrectPhoto() {
+        let photos = makeTestPhotos(count: 4)
+        let removeId = 2
+        let photoRemover = PhotoRemover(initialPhotos: photos, removeId: removeId)
+        let expectedPhotos = [
+            Photo(id: 1, stringURL: "http://example.com/photo1.jpg"),
+            Photo(id: 2, stringURL: "http://example.com/photo3.jpg"),
+            Photo(id: 3, stringURL: "http://example.com/photo4.jpg")
+        ]
+        #expect(photoRemover.photosAfterRemoval == expectedPhotos)
+    }
+
+    @Test
+    func noPhotosRemoved_wrongId() {
+        let photos = makeTestPhotos(count: 3)
+        let removeId = 4
+        let photoRemover = PhotoRemover(initialPhotos: photos, removeId: removeId)
+        let expectedPhotos = [
+            Photo(id: 1, stringURL: "http://example.com/photo1.jpg"),
+            Photo(id: 2, stringURL: "http://example.com/photo2.jpg"),
+            Photo(id: 3, stringURL: "http://example.com/photo3.jpg")
+        ]
+        #expect(photoRemover.photosAfterRemoval == expectedPhotos)
+    }
+
+    @Test
+    func emptyPhotosBeforeAndAfter() {
+        let photos = [Photo]()
+        let removeId = 1
+        let photoRemover = PhotoRemover(initialPhotos: photos, removeId: removeId)
+        let expectedPhotos = [Photo]()
+        #expect(photoRemover.photosAfterRemoval == expectedPhotos)
+    }
+}
+
+private func makeTestPhotos(count: Int) -> [Photo] {
+    Array(0 ..< count).map { id in
+        let serverId = id + 1
+        return Photo(id: serverId, stringURL: "http://example.com/photo\(serverId).jpg")
+    }
+}

SwiftUI-WorkoutApp/Screens/Common/PhotoSection/PhotoSectionView.swift

@@ -92,7 +92,7 @@ private extension PhotoSectionView {
             ResizableCachedImage(
                 url: photo.imageURL,
                 didTapImage: { uiImage in
-                    fullscreenImageInfo = .init(uiImage: uiImage, id: photo.id)
+                    fullscreenImageInfo = .init(uiImage: uiImage, id: photo.serverId)
                 }
             )
             .scaledToFill()

SwiftUI-WorkoutApp/Screens/Events/EventDetailsView.swift

@@ -365,7 +365,7 @@ private extension EventDetailsView {
                 if try await SWClient(with: defaults).deletePhoto(
                     from: .event(.init(containerID: event.id, photoID: id))
                 ) {
-                    event.photos.removeAll(where: { $0.id == id })
+                    event.photos = event.removePhotoById(id)
                 }
             } catch {
                 setupErrorAlert(ErrorFilter.message(from: error))

SwiftUI-WorkoutApp/Screens/Parks/ParkDetailScreen.swift

@@ -339,7 +339,7 @@ private extension ParkDetailScreen {
                 if try await SWClient(with: defaults).deletePhoto(
                     from: .park(.init(containerID: park.id, photoID: id))
                 ) {
-                    park.photos.removeAll(where: { $0.id == id })
+                    park.photos = park.removePhotoById(id)
                 }
             } catch {
                 process(error)