update feedingExpiration logic

animeal/src/Business/Networking/NetworkRequestModels.swift

@@ -47,55 +47,40 @@ public struct CancelFeedingMutation: CustomMutation {
     }
 }
 
-public struct RejectFeedingMutation: CustomMutation {
-    public typealias ResponseType = RejectFeeding
+public struct CancelFeeding: Codable {
+    let cancelFeeding: String
+}
 
-    static let defaultRejectReason = "Feeding time has expired"
+// MARK: - Custom Expration mutation
 
+public struct ExpireFeedingMutation: CustomMutation {
+    public typealias ResponseType = ExpireFeeding
+
+    static let defaultExpirationReason = "Feeding time has expired"
+
     let id: String
     let reason: String
-    let feeding: Feeding
-
-    init(
-        id: String,
-        reason: String = Self.defaultRejectReason,
-        feeding: Feeding
+
+    init(id: String,
+         reason: String = Self.defaultExpirationReason
     ) {
         self.id = id
         self.reason = reason
-        self.feeding = feeding
     }
-
+    
     public var document: String {
         """
-        mutation RejectFeeding {
-            rejectFeeding(
-                feedingId: "\(id)",
-                reason: "\(reason)",
-                feeding: {
-                    createdAt: "\(feeding.createdAt.iso8601String)",
-                    feedingPointFeedingsId: "\(feeding.id)",
-                    createdBy: "\(feeding.createdBy.orNull)",
-                    id: "\(feeding.id)",
-                    images: "\(feeding.images)",
-                    owner: "\(feeding.owner.orNull)",
-                    updatedAt: "\(feeding.updatedAt.iso8601String)",
-                    updatedBy: "\(feeding.updatedBy.orNull)",
-                    userId: "\(feeding.userId)"
-                }
-            )
+        mutation ExpireFeeding {
+           expireFeeding(feedingId: "\(id)", reason: "\(reason)")
         }
         """
     }
 }
 
-public struct CancelFeeding: Codable {
-    let cancelFeeding: String
+public struct ExpireFeeding: Codable {
+    let expireFeeding: String
 }
 
-public struct RejectFeeding: Codable {
-    let rejectFeeding: String
-}
 
 // MARK: - UpdateFeedingPoint
 

animeal/src/Flows/Main/Modules/Home/Main/HomeContract.swift

@@ -31,7 +31,7 @@ protocol HomeModelProtocol: AnyObject {
     func processFinishFeeding(imageKeys: [String]) async throws -> FeedingResponse
     func fetchFeedingSnapshot() -> FeedingSnapshot?
     @discardableResult
-    func processRejectFeeding() async throws -> FeedingResponse
+    func processFeedingExpiration() async throws -> FeedingResponse
     func fetchActiveFeeding() async throws -> Feeding?
 }
 

animeal/src/Flows/Main/Modules/Home/Main/HomeViewModel.swift

@@ -117,7 +117,7 @@ final class HomeViewModel: HomeViewModelLifeCycle, HomeViewInteraction, HomeView
             let action = model.fetchFeedingAction(request: .cancelFeeding)
             onFeedingActionHaveBeenPrepared?(feedingActionMapper.mapFeedingAction(action))
         case .autoCancelFeeding:
-            handleRejectFeeding()
+            handleFeedingExpiration()
         case .confirmCancelFeeding:
             handleConfirmCancelFeeding()
         case .getCameraPermission:
@@ -287,11 +287,11 @@ private extension HomeViewModel {
         onLocationPermissionRequired?()
     }
 
-    func handleRejectFeeding() {
+    func handleFeedingExpiration() {
         coordinator.displayActivityIndicator { [weak self] in
             guard let self else { return }
             do {
-                let result = try await self.model.processRejectFeeding()
+                let result = try await self.model.processFeedingExpiration()
                 self.feedingStatus = result.feedingStatus
             } catch {
                 logError("[APP] \(#function) failed to reject feeding: \(error.localizedDescription)")

animeal/src/Flows/Main/Modules/Home/Main/Model/HomeModel.swift

@@ -133,25 +133,17 @@ final class HomeModel: HomeModelProtocol {
     }
 
     @discardableResult
-    func processRejectFeeding() async throws -> FeedingResponse {
+    func processFeedingExpiration() async throws -> FeedingResponse {
         do {
-            let feedingId = snapshotStore.snaphot?.pointId ?? .empty
-            guard let feeding = try await context.networkService.query(
-                request: .get(Feeding.self, byId: feedingId)
-            ) else {
-                throw L10n.Errors.somethingWrong.asBaseError()
-            }
+            let feedingPointId = snapshotStore.snaphot?.pointId ?? .empty
             let result = try await context.networkService.query(
                 request: .customMutation(
-                    RejectFeedingMutation(
-                        id: feedingId,
-                        feeding: feeding
-                    )
+                    ExpireFeedingMutation(id: feedingPointId)
                 )
             )
             snapshotStore.removeStoredSnaphot()
             return FeedingResponse(
-                feedingPoint: result.rejectFeeding,
+                feedingPoint: result.expireFeeding,
                 feedingStatus: .none
             )
         } catch {