Рефактор

easydev991 · easydev991 · commit 760363f685da · 2025-02-07T10:10:11.000+03:00
- Убрал лишние public-модификаторы доступа
- Доработал логирование ошибок в сетевом слое
- Добавил комментарий про баг с NavigationView + searchable
- Добавил тесты
diff --git a/SwiftUI-WorkoutApp.xcodeproj/project.pbxproj b/SwiftUI-WorkoutApp.xcodeproj/project.pbxproj
@@ -856,7 +856,7 @@
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CLANG_WARN_SEMICOLON_BEFORE_METHOD_BODY = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 10;
+				CURRENT_PROJECT_VERSION = 11;
 				DEVELOPMENT_ASSET_PATHS = "SwiftUI-WorkoutApp/Preview\\ Content/PreviewContent.swift SwiftUI-WorkoutApp/Preview\\ Content";
 				DEVELOPMENT_TEAM = CR68PP2Z3F;
 				ENABLE_PREVIEWS = YES;
@@ -907,7 +907,7 @@
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CLANG_WARN_SEMICOLON_BEFORE_METHOD_BODY = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 10;
+				CURRENT_PROJECT_VERSION = 11;
 				DEVELOPMENT_ASSET_PATHS = "SwiftUI-WorkoutApp/Preview\\ Content/PreviewContent.swift SwiftUI-WorkoutApp/Preview\\ Content";
 				DEVELOPMENT_TEAM = CR68PP2Z3F;
 				ENABLE_PREVIEWS = YES;
diff --git a/SwiftUI-WorkoutApp/Libraries/SWNetwork/Sources/SWNetwork/Data+.swift b/SwiftUI-WorkoutApp/Libraries/SWNetwork/Sources/SWNetwork/Data+.swift
@@ -7,7 +7,7 @@ extension Data {
            let json = String(data: jsonData, encoding: .utf8) {
             json
         } else {
-            ""
+            "отсутствует"
         }
     }
 
diff --git a/SwiftUI-WorkoutApp/Libraries/SWNetwork/Sources/SWNetwork/ErrorResponse.swift b/SwiftUI-WorkoutApp/Libraries/SWNetwork/Sources/SWNetwork/ErrorResponse.swift
@@ -1,12 +1,12 @@
 import Foundation
 
-public struct ErrorResponse: Codable {
-    public let errors: [String]?
-    public let name, message: String?
-    public let code, status: Int?
-    public let type: String?
+struct ErrorResponse: Codable {
+    let errors: [String]?
+    let name, message: String?
+    let code, status: Int?
+    let type: String?
 
-    public var realCode: Int {
+    var realCode: Int {
         if let code, code != 0 {
             code
         } else {
diff --git a/SwiftUI-WorkoutApp/Libraries/SWNetwork/Sources/SWNetwork/HTTPHeaderField.swift b/SwiftUI-WorkoutApp/Libraries/SWNetwork/Sources/SWNetwork/HTTPHeaderField.swift
@@ -1,8 +1,8 @@
-public struct HTTPHeaderField: Equatable {
+struct HTTPHeaderField: Equatable {
     let key: String
     let value: String
 
-    public init(key: String, value: String) {
+    init(key: String, value: String) {
         self.key = key
         self.value = value
     }
diff --git a/SwiftUI-WorkoutApp/Libraries/SWNetwork/Sources/SWNetwork/SWNetwork.swift b/SwiftUI-WorkoutApp/Libraries/SWNetwork/Sources/SWNetwork/SWNetwork.swift
@@ -42,7 +42,6 @@ extension SWNetworkService: SWNetworkProtocol {
                 guard let decodedResult = try? decoder.decode(T.self, from: data) else {
                     throw log(
                         APIError.decodingError,
-                        code: response.statusCode,
                         request: request,
                         data: data,
                         response: response
@@ -52,10 +51,8 @@ extension SWNetworkService: SWNetworkProtocol {
                 return decodedResult
             default:
                 let errorInfo = try decoder.decode(ErrorResponse.self, from: data)
-                let apiError = APIError(errorInfo, response.statusCode)
                 throw log(
-                    apiError,
-                    code: response.statusCode,
+                    APIError(errorInfo, response.statusCode),
                     request: request,
                     data: data,
                     response: response
@@ -80,15 +77,12 @@ extension SWNetworkService: SWNetworkProtocol {
                 return true
             }
             if let errorInfo = try? decoder.decode(ErrorResponse.self, from: data) {
-                let apiError = APIError(errorInfo, response.statusCode)
-                log(
-                    apiError,
-                    code: response.statusCode,
+                throw log(
+                    APIError(errorInfo, response.statusCode),
                     request: request,
                     data: data,
                     response: response
                 )
-                throw apiError
             }
             return false
         } catch {
@@ -135,19 +129,18 @@ private extension SWNetworkService {
         return error
     }
 
-    @discardableResult
     func log(
         _ error: Error,
-        code: Int,
         request: URLRequest,
         data: Data,
-        response _: HTTPURLResponse?
+        response: HTTPURLResponse
     ) -> Error {
         logger.error(
             """
-            Код ответа: \(code, privacy: .public)
+            Код ответа: \(response.statusCode, privacy: .public)
             \(error.localizedDescription, privacy: .public)
             \nURL запроса: \(request.urlString, privacy: .public)
+            \nответ (response): \(response)
             \nJSON в ответе: \(data.prettyJson, privacy: .public)
             """
         )
@@ -161,22 +154,21 @@ private extension SWNetworkService {
     ///   - error: Исходная ошибка
     ///   - request: Запрос, упавший в ошибку
     /// - Returns: Новая ошибка
-    @discardableResult
     func handleUrlSession(_ error: Error, _ request: URLRequest) -> Error {
         let errorCode = (error as NSError).code
-        if errorCode == -999 {
+        guard errorCode != -999 else {
             let message = "Запрос отменён! Код ошибки: -999. URL запроса: \(request.urlString)"
             logger.error("\(message)")
-        } else {
-            logger.error(
-                """
-                Ошибка!
-                \(error.localizedDescription, privacy: .public)
-                Код ошибки: \(errorCode, privacy: .public)
-                \nURL запроса: \(request.urlString, privacy: .public)
-                """
-            )
+            return CancellationError()
         }
+        logger.error(
+            """
+            Ошибка!
+            \(error.localizedDescription, privacy: .public)
+            Код ошибки: \(errorCode, privacy: .public)
+            \nURL запроса: \(request.urlString, privacy: .public)
+            """
+        )
         guard let urlError = error as? URLError else {
             return error
         }
diff --git a/SwiftUI-WorkoutApp/Libraries/SWNetwork/Tests/SWNetworkTests/DataTests.swift b/SwiftUI-WorkoutApp/Libraries/SWNetwork/Tests/SWNetworkTests/DataTests.swift
@@ -16,6 +16,32 @@ struct DataTests {
         #expect(prettyJson == expectedResult)
     }
 
+    @Test
+    func validJSON_producesFormattedString() throws {
+        let jsonObject = ["name": "Test", "value": 42] as [String: Any]
+        let data = try JSONSerialization.data(withJSONObject: jsonObject)
+        let result = data.prettyJson
+        #expect(!result.isEmpty)
+        #expect(result != "отсутствует")
+        #expect(result.contains("\n"))
+        #expect(result.contains("  "))
+    }
+
+    @Test(arguments: [Data(), Data([0x00, 0x01, 0x02])])
+    func emptyOrInvalidData(_ data: Data) {
+        #expect(data.prettyJson == "отсутствует")
+    }
+
+    @Test
+    func minimalValidJSON_keepsContentIntegrity() throws {
+        let originalJson = "{\"key\":\"value\"}"
+        let data = try #require(originalJson.data(using: .utf8))
+        let prettyJson = data.prettyJson
+        #expect(prettyJson.contains("\"key\" : \"value\""))
+        #expect(prettyJson.contains("{"))
+        #expect(prettyJson.contains("}"))
+    }
+
     @Test
     func appendString() throws {
         var data = Data()
diff --git a/SwiftUI-WorkoutApp/Libraries/SWNetwork/Tests/SWNetworkTests/HTTPStatusCodeGroupTests.swift b/SwiftUI-WorkoutApp/Libraries/SWNetwork/Tests/SWNetworkTests/HTTPStatusCodeGroupTests.swift
@@ -2,21 +2,15 @@
 import Testing
 
 struct StatusCodeGroupTests {
-    @Test
-    func isSuccess() {
-        let notSuccessCodes: [StatusCodeGroup] = [
-            .info, .redirect, .clientError, .serverError, .unknown
-        ]
-        notSuccessCodes.forEach { #expect(!$0.isSuccess) }
+    @Test(arguments: [StatusCodeGroup.info, .redirect, .clientError, .serverError, .unknown])
+    func isSuccess(notSuccessCode: StatusCodeGroup) {
+        #expect(!notSuccessCode.isSuccess)
         #expect(StatusCodeGroup.success.isSuccess)
     }
 
-    @Test
-    func isError() {
-        let notErrorCodes: [StatusCodeGroup] = [
-            .success, .info, .redirect, .unknown
-        ]
-        notErrorCodes.forEach { #expect(!$0.isError) }
+    @Test(arguments: [StatusCodeGroup.success, .info, .redirect, .unknown])
+    func isError(notErrorCode: StatusCodeGroup) {
+        #expect(!notErrorCode.isError)
         #expect(StatusCodeGroup.clientError.isError)
         #expect(StatusCodeGroup.serverError.isError)
     }
diff --git a/SwiftUI-WorkoutApp/Libraries/SWUtils/Sources/SWUtils/SWAlert.swift b/SwiftUI-WorkoutApp/Libraries/SWUtils/Sources/SWUtils/SWAlert.swift
@@ -38,7 +38,13 @@ public final class SWAlert {
     ///
     /// Игнорирует `CancellationError`
     public func presentDefaultUIKit(_ error: Error) {
-        guard (error as NSError).code != -999 else { return }
+        guard type(of: error) != CancellationError.self else {
+            // Баг в NavigationView + searchable приводит к ошибке отмены,
+            // если сначала нажать на поле поиска, а следующий модальный
+            // экран закрыть свайпом вниз. Будет исправлено переходом
+            // на iOS 16 min + NavigationStack
+            return
+        }
         presentDefaultUIKit(message: error.localizedDescription)
     }
 
diff --git a/SwiftUI-WorkoutApp/Screens/Profile/UserDetailsScreen.swift b/SwiftUI-WorkoutApp/Screens/Profile/UserDetailsScreen.swift
@@ -198,7 +198,6 @@ private extension UserDetailsScreen {
         do {
             user = try await SWClient(with: defaults).getUserByID(user.id)
         } catch {
-            guard (error as NSError).code != -999 else { return }
             SWAlert.shared.presentDefaultUIKit(error)
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ extension Data {`
`7`	`7`	`let json = String(data: jsonData, encoding: .utf8) {`
`8`	`8`	`json`
`9`	`9`	`} else {`
`10`		`- ""`
	`10`	`+ "отсутствует"`
`11`	`11`	`}`
`12`	`12`	`}`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,6 @@ private extension UserDetailsScreen {`
`198`	`198`	`do {`
`199`	`199`	`user = try await SWClient(with: defaults).getUserByID(user.id)`
`200`	`200`	`} catch {`
`201`		`- guard (error as NSError).code != -999 else { return }`
`202`	`201`	`SWAlert.shared.presentDefaultUIKit(error)`
`203`	`202`	`}`
`204`	`203`	`}`