refactor: Use implicit snake case conversion

Signed-off-by: Philippe Weidmann <[email protected]>
Infomaniak · Jul 11, 2024 · 5600390 · 5600390
1 parent 910da27
commit 5600390
Show file tree

Hide file tree

Showing 25 changed files with 80 additions and 239 deletions.
diff --git a/kDriveCore/Data/MQService/IPSToken.swift b/kDriveCore/Data/MQService/IPSToken.swift
@@ -21,9 +21,4 @@ import Foundation
 public class IPSToken: Codable {
     let uuid: String
     let validUntil: Int
-
-    enum CodingKeys: String, CodingKey {
-        case uuid
-        case validUntil = "valid_until"
-    }
 }
diff --git a/kDriveCore/Data/Models/CancelableResponse.swift b/kDriveCore/Data/Models/CancelableResponse.swift
@@ -21,6 +21,7 @@ import Foundation
 public class CancelableResponse: Codable {
     public let id: String
     public let validUntil: Int
+
     public var offline: Bool {
         return id.isEmpty
     }
@@ -31,7 +32,7 @@ public class CancelableResponse: Codable {
     }
 
     enum CodingKeys: String, CodingKey {
-        case id = "cancel_id"
-        case validUntil = "valid_until"
+        case id = "cancelId"
+        case validUntil
     }
 }
diff --git a/kDriveCore/Data/Models/Category.swift b/kDriveCore/Data/Models/Category.swift
@@ -48,11 +48,11 @@ public class Category: EmbeddedObject, Codable {
     enum CodingKeys: String, CodingKey {
         case id
         case name
-        case isPredefined = "is_predefined"
+        case isPredefined
         case colorHex = "color"
-        case createdBy = "created_by"
-        case createdAt = "created_at"
-        case userUsageCount = "user_usage_count"
+        case createdBy
+        case createdAt
+        case userUsageCount
     }
 }
 

diff --git a/kDriveCore/Data/Models/CategoryRights.swift b/kDriveCore/Data/Models/CategoryRights.swift
@@ -25,12 +25,4 @@ public class CategoryRights: EmbeddedObject, Codable {
     @Persisted public var canDelete: Bool
     @Persisted public var canReadOnFile: Bool
     @Persisted public var canPutOnFile: Bool
-
-    enum CodingKeys: String, CodingKey {
-        case canCreate = "can_create"
-        case canEdit = "can_edit"
-        case canDelete = "can_delete"
-        case canReadOnFile = "can_read_on_file"
-        case canPutOnFile = "can_put_on_file"
-    }
 }
diff --git a/kDriveCore/Data/Models/Comment.swift b/kDriveCore/Data/Models/Comment.swift
@@ -35,14 +35,14 @@ public class Comment: Codable {
 
     enum CodingKeys: String, CodingKey {
         case id
-        case parentId = "parent_id"
+        case parentId
         case body
-        case isResolved = "is_resolved"
-        case createdAt = "created_at"
-        case updatedAt = "updated_at"
+        case isResolved
+        case createdAt
+        case updatedAt
         case liked
-        case likesCount = "likes_count"
-        case responsesCount = "responses_count"
+        case likesCount
+        case responsesCount
         case user
         case responses
         case likes

diff --git a/kDriveCore/Data/Models/Drive/Drive.swift b/kDriveCore/Data/Models/Drive/Drive.swift
@@ -25,13 +25,6 @@ public final class DriveResponse: Codable {
     public let users: [DriveUser]
     public let teams: [Team]
     public let ips: IPSToken
-
-    enum CodingKeys: String, CodingKey {
-        case drives
-        case users
-        case teams
-        case ips
-    }
 }
 
 public final class DriveUsersCategories: EmbeddedObject, Codable {
@@ -54,9 +47,9 @@ public final class DriveTeamsCategories: EmbeddedObject, Codable {
 }
 
 public enum MaintenanceReason: String, PersistableEnum, Codable {
-    case notRenew = "not_renew"
-    case demoEnd = "demo_end"
-    case invoiceOverdue = "invoice_overdue"
+    case notRenew
+    case demoEnd
+    case invoiceOverdue
     case technical
 }
 
@@ -198,26 +191,26 @@ public final class Drive: Object, Codable {
     }
 
     enum CodingKeys: String, CodingKey {
-        case accountId = "account_id"
+        case accountId
         case id
         case name
         case _pack = "pack"
         case role
         case _preferences = "preferences"
         case size
-        case usedSize = "used_size"
+        case usedSize
         case _users = "users"
         case _teams = "teams"
         case categories
-        case _categoryRights = "categories_permissions"
+        case _categoryRights = "categoriesPermissions"
         case rights
         case _capabilities = "capabilities"
-        case inMaintenance = "in_maintenance"
-        case maintenanceReason = "maintenance_reason"
-        case updatedAt = "updated_at"
+        case inMaintenance
+        case maintenanceReason
+        case updatedAt
         case _account = "account"
-        case accountAdmin = "account_admin"
-        case isInAppSubscription = "is_in_app_subscription"
+        case accountAdmin
+        case isInAppSubscription
     }
 
     public static func == (lhs: Drive, rhs: Drive) -> Bool {

diff --git a/kDriveCore/Data/Models/Drive/DriveAccount.swift b/kDriveCore/Data/Models/Drive/DriveAccount.swift
@@ -39,6 +39,6 @@ public class DriveAccount: EmbeddedObject, Codable {
     enum CodingKeys: String, CodingKey {
         case id
         case name
-        case _legalEntityType = "legal_entity_type"
+        case _legalEntityType = "legalEntityType"
     }
 }
diff --git a/kDriveCore/Data/Models/Drive/DriveCapabilities.swift b/kDriveCore/Data/Models/Drive/DriveCapabilities.swift
@@ -27,14 +27,4 @@ public class DriveCapabilities: EmbeddedObject, Codable {
     @Persisted public var canSeeStats = false
     @Persisted public var canUpgradeToKsuite = false
     @Persisted public var canRewind = false
-
-    enum CodingKeys: String, CodingKey {
-        case useVersioning = "use_versioning"
-        case useUploadCompression = "use_upload_compression"
-        case useTeamSpace = "use_team_space"
-        case canAddUser = "can_add_user"
-        case canSeeStats = "can_see_stats"
-        case canUpgradeToKsuite = "can_upgrade_to_ksuite"
-        case canRewind = "can_rewind"
-    }
 }
diff --git a/kDriveCore/Data/Models/Drive/DrivePackCapabilities.swift b/kDriveCore/Data/Models/Drive/DrivePackCapabilities.swift
@@ -30,17 +30,4 @@ public class DrivePackCapabilities: EmbeddedObject, Codable {
     @Persisted public var canSetSharelinkPassword = false
     @Persisted public var canSetSharelinkExpiration = false
     @Persisted public var canSetSharelinkCustomUrl = false
-
-    enum CodingKeys: String, CodingKey {
-        case useVault = "use_vault"
-        case useManageRight = "use_manage_right"
-        case canSetTrashDuration = "can_set_trash_duration"
-        case useDropbox = "use_dropbox"
-        case canRewind = "can_rewind"
-        case useFolderCustomColor = "use_folder_custom_color"
-        case canAccessDashboard = "can_access_dashboard"
-        case canSetSharelinkPassword = "can_set_sharelink_password"
-        case canSetSharelinkExpiration = "can_set_sharelink_expiration"
-        case canSetSharelinkCustomUrl = "can_set_sharelink_custom_url"
-    }
 }
diff --git a/kDriveCore/Data/Models/DriveUser.swift b/kDriveCore/Data/Models/DriveUser.swift
@@ -77,8 +77,8 @@ public final class DriveUser: Object, Codable, InfomaniakUser {
         case id
         case email
         case _avatar = "avatar"
-        case _avatarUrl = "avatar_url"
-        case displayName = "display_name"
+        case _avatarUrl = "avatarUrl"
+        case displayName
         case role
     }
 

diff --git a/kDriveCore/Data/Models/DropBox.swift b/kDriveCore/Data/Models/DropBox.swift
@@ -32,25 +32,11 @@ public class DropBoxCapabilities: EmbeddedObject, Codable {
     @Persisted public var hasSizeLimit: Bool
     @Persisted public var validity: DropBoxValidity!
     @Persisted public var size: DropBoxSize!
-
-    enum CodingKeys: String, CodingKey {
-        case hasPassword = "has_password"
-        case hasNotification = "has_notification"
-        case hasValidity = "has_validity"
-        case hasSizeLimit = "has_size_limit"
-        case validity
-        case size
-    }
 }
 
 public class DropBoxValidity: EmbeddedObject, Codable {
     @Persisted public var date: Date?
     @Persisted public var hasExpired: Bool?
-
-    enum CodingKeys: String, CodingKey {
-        case date
-        case hasExpired = "has_expired"
-    }
 }
 
 public class DropBoxSize: EmbeddedObject, Codable {

diff --git a/kDriveCore/Data/Models/File.swift b/kDriveCore/Data/Models/File.swift
@@ -282,7 +282,7 @@ public enum FileStatus: String {
 }
 
 public enum FileImportStatus: String, PersistableEnum, Codable {
-    case waiting, inProgress = "in_progress", done, failed, canceling, canceled
+    case waiting, inProgress, done, failed, canceling, canceled
 }
 
 public final class FileExternalImport: EmbeddedObject, Codable {
@@ -297,20 +297,6 @@ public final class FileExternalImport: EmbeddedObject, Codable {
     @Persisted public var countFailedFiles: Int
     @Persisted public var countSuccessFiles: Int
     @Persisted public var hasSharedFiles: String
-
-    private enum CodingKeys: String, CodingKey {
-        case id
-        case directoryId = "directory_id"
-        case accountName = "account_name"
-        case application
-        case createdAt = "created_at"
-        case updatedAt = "updated_at"
-        case path
-        case status
-        case countFailedFiles = "count_failed_files"
-        case countSuccessFiles = "count_success_files"
-        case hasSharedFiles = "has_shared_files"
-    }
 }
 
 public final class FileConversion: EmbeddedObject, Codable {
@@ -324,10 +310,10 @@ public final class FileConversion: EmbeddedObject, Codable {
     @Persisted public var onylofficeExtension: String?
 
     private enum CodingKeys: String, CodingKey {
-        case whenDownload = "when_downloading"
-        case downloadExtensions = "download_extensions"
-        case whenOnlyoffice = "when_onlyoffice_opening"
-        case onylofficeExtension = "onlyoffice_extension"
+        case whenDownload = "whenDownloading"
+        case downloadExtensions
+        case whenOnlyoffice = "whenOnlyofficeOpening"
+        case onylofficeExtension
     }
 }
 
@@ -338,12 +324,6 @@ public final class FileVersion: EmbeddedObject, Codable {
     @Persisted public var number: Int
     /// Size of the file with all version (byte unit)
     @Persisted public var totalSize: Int
-
-    private enum CodingKeys: String, CodingKey {
-        case isMultiple = "is_multiple"
-        case number
-        case totalSize = "total_size"
-    }
 }
 
 public enum FileSupportedBy: String, PersistableEnum, Codable {
@@ -443,35 +423,35 @@ public final class File: Object, Codable {
 
     private enum CodingKeys: String, CodingKey {
         case id
-        case parentId = "parent_id"
-        case driveId = "drive_id"
+        case parentId
+        case driveId
         case name
-        case sortedName = "sorted_name"
+        case sortedName
         case path
         case rawType = "type"
         case rawStatus = "status"
         case rawVisibility = "visibility"
-        case createdBy = "created_by"
-        case createdAt = "created_at"
-        case addedAt = "added_at"
-        case updatedAt = "updated_at"
-        case lastModifiedAt = "last_modified_at"
-        case revisedAt = "revised_at"
-        case deletedBy = "deleted_by"
-        case deletedAt = "deleted_at"
+        case createdBy
+        case createdAt
+        case addedAt
+        case updatedAt
+        case lastModifiedAt
+        case revisedAt
+        case deletedBy
+        case deletedAt
         case users
-        case isFavorite = "is_favorite"
+        case isFavorite
         case sharelink
         case _capabilities = "capabilities"
         case categories
         case color
         case dropbox
         case size
-        case extensionType = "extension_type"
-        case externalImport = "external_import"
+        case extensionType
+        case externalImport
         case version
-        case conversion = "conversion_capabilities"
-        case supportedBy = "supported_by"
+        case conversion = "conversionCapabilities"
+        case supportedBy
     }
 
     public var parent: File? {

diff --git a/kDriveCore/Data/Models/FileAccess.swift b/kDriveCore/Data/Models/FileAccess.swift
@@ -112,8 +112,7 @@ public class UserFileAccess: FileAccessElement {
 }
 
 public enum UserFileAccessStatus: String, Codable {
-    case active, deletedKept = "deleted_kept", deletedRemoved = "deleted_removed", deletedTransferred = "deleted_transferred",
-         locked, pending
+    case active, deletedKept, deletedRemoved, deletedTransferred, locked, pending
 }
 
 public class TeamFileAccess: FileAccessElement {
@@ -165,16 +164,6 @@ public class ExternInvitationFileAccess: FileAccessElement {
     public var user: DriveUser?
     public var invitationDriveId: Int?
 
-    enum CodingKeys: String, CodingKey {
-        case id
-        case name
-        case right
-        case status
-        case email
-        case user
-        case invitationDriveId = "invitation_drive_id"
-    }
-
     public var shareable: Shareable? {
         return nil
     }
@@ -218,11 +207,4 @@ public class CheckChangeAccessFeedbackResource: Codable {
     public var currentRight: String
     public var needChange: Bool
     public var message: String
-
-    enum CodingKeys: String, CodingKey {
-        case userId = "user_id"
-        case currentRight = "current_right"
-        case needChange = "need_change"
-        case message
-    }
 }
diff --git a/kDriveCore/Data/Models/FileAction.swift b/kDriveCore/Data/Models/FileAction.swift
@@ -21,9 +21,4 @@ import Foundation
 public struct FileAction: Codable {
     public let action: FileActivityType
     public let fileId: Int
-
-    enum CodingKeys: String, CodingKey {
-        case action
-        case fileId = "file_id"
-    }
 }
diff --git a/kDriveCore/Data/Models/FileActivity.swift b/kDriveCore/Data/Models/FileActivity.swift
@@ -147,11 +147,11 @@ public class FileActivity: Object, Decodable {
 
     private enum CodingKeys: String, CodingKey {
         case id
-        case createdAt = "created_at"
+        case createdAt
         case action
-        case newPath = "new_path"
-        case oldPath = "old_path"
-        case fileId = "file_id"
+        case newPath
+        case oldPath
+        case fileId
         case user
         case file
     }