reusing RequestManager.addDatapoint (#613)

## Summary
Commit 3be26e8 introduced an addDatapoint to RequestManager. This MR
consolidates the places in code adding datapoints directly by using the
method in RequestManager.


## Validation
ran app in simulator
added datapoint using the timer

Author: krugerk

BeeKit/Managers/DataPointManager.swift

@@ -46,8 +46,8 @@ public actor DataPointManager {
         let _ = try await requestManager.delete(url: "api/v1/users/{username}/goals/\(goal.slug)/datapoints/\(datapoint.id)")
     }
 
-    private func postDatapoint(goal : Goal, params : [String : String]) async throws {
-        let _ = try await requestManager.post(url: "api/v1/users/{username}/goals/\(goal.slug)/datapoints.json", parameters: params)
+    private func postDatapoint(goal : Goal, urText: String, requestId: String) async throws {
+        let _ = try await requestManager.addDatapoint(urtext: urText, slug: goal.slug, requestId: requestId)
     }
 
     private func fetchDatapoints(goal: Goal, sort: String, per: Int, page: Int) async throws -> [DataPoint] {
@@ -118,11 +118,12 @@ public actor DataPointManager {
                 return
             }
 
-            let params = ["urtext": "\(newDataPoint.daystamp.day) \(newDataPoint.value) \"\(newDataPoint.comment)\"", "requestid": newDataPoint.requestid]
+            let urText = "\(newDataPoint.daystamp.day) \(newDataPoint.value) \"\(newDataPoint.comment)\""
+            let requestId = newDataPoint.requestid
 
             logger.notice("Creating new datapoint for \(goal.id, privacy: .public) on \(newDataPoint.daystamp, privacy: .public): \(newDataPoint.value, privacy: .private)")
 
-            try await postDatapoint(goal: goal, params: params)
+            try await postDatapoint(goal: goal, urText: urText, requestId: requestId)
         } else if matchingDatapoints.count >= 1 {
             let firstDatapoint = matchingDatapoints.remove(at: 0)
             for datapoint in matchingDatapoints {

BeeKit/Managers/RequestManager.swift

@@ -105,10 +105,15 @@ public class RequestManager {
         ])
     }
 
-    public func addDatapoint(urtext: String, slug: String) async throws -> Any? {
-        let params = ["urtext": urtext, "requestid": UUID().uuidString]
+    public func addDatapoint(urtext: String, slug: String, requestId: String? = nil) async throws -> Any? {
+        let params = [
+            "urtext": urtext,
+            "requestid": requestId
+        ]
+            .compactMapValues { $0 }
 
-        return try await post(url: "api/v1/users/{username}/goals/\(slug)/datapoints.json", parameters: params)
+        return try await post(url: "api/v1/users/{username}/goals/\(slug)/datapoints.json",
+                              parameters: params)
     }
 }
 

BeeSwift/TimerViewController.swift

@@ -165,8 +165,7 @@ class TimerViewController: UIViewController {
 
         Task { @MainActor in
             do {
-                let params = ["urtext": self.urtext(), "requestid": UUID().uuidString]
-                let _ = try await ServiceLocator.requestManager.post(url: "api/v1/users/{username}/goals/\(self.goal.slug)/datapoints.json", parameters: params)
+                let _ = try await ServiceLocator.requestManager.addDatapoint(urtext: self.urtext(), slug: self.goal.slug)
                 hud.mode = .text
                 hud.label.text = "Added!"
                 DispatchQueue.main.asyncAfter(deadline: .now() + 2, execute: {