From f68ac528e4366db8d7427dd018c4773ad8bd91e2 Mon Sep 17 00:00:00 2001
From: Michael Housh <mhoush@houshhomeenergy.com>
Date: Sun, 10 Nov 2024 22:27:59 -0500
Subject: [PATCH] feat: Working on sensor client dependency

---
 Sources/SensorsService/SensorsService.swift   |  8 +++--
 .../SensorsClientTests.swift                  | 32 ++++++++++++-------
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/Sources/SensorsService/SensorsService.swift b/Sources/SensorsService/SensorsService.swift
index 9b5df72..828cfd5 100644
--- a/Sources/SensorsService/SensorsService.swift
+++ b/Sources/SensorsService/SensorsService.swift
@@ -12,9 +12,9 @@ import ServiceLifecycle
 @DependencyClient
 public struct SensorsClient: Sendable {
 
-  public var listen: @Sendable (_ topics: [String]) async throws -> AsyncStream<MQTTPublishInfo>
+  public var listen: @Sendable ([String]) async throws -> AsyncStream<MQTTPublishInfo>
   public var logger: Logger?
-  public var publish: @Sendable (_ value: Double, _ topic: String) async throws -> Void
+  public var publish: @Sendable (Double, String) async throws -> Void
   public var shutdown: @Sendable () -> Void = {}
 
   public func listen(to topics: [String]) async throws -> AsyncStream<MQTTPublishInfo> {
@@ -45,7 +45,9 @@ public actor SensorsService2: Service {
 
   private var sensors: [TemperatureAndHumiditySensor]
 
-  public init(sensors: [TemperatureAndHumiditySensor]) {
+  public init(
+    sensors: [TemperatureAndHumiditySensor]
+  ) {
     self.sensors = sensors
   }
 
diff --git a/Tests/SensorsServiceTests/SensorsClientTests.swift b/Tests/SensorsServiceTests/SensorsClientTests.swift
index 917a0e6..d9bdc75 100755
--- a/Tests/SensorsServiceTests/SensorsClientTests.swift
+++ b/Tests/SensorsServiceTests/SensorsClientTests.swift
@@ -143,7 +143,12 @@ final class SensorsClientTests: XCTestCase {
     let capturedValues = CapturedValues()
 
     try await withDependencies {
-      $0.sensorsClient = .testing { value, topic in
+      $0.sensorsClient = .testing(
+        yielding: [
+          (value: 76, to: "not-listening"),
+          (value: 75, to: "test")
+        ]
+      ) { value, topic in
         capturedValues.values.append((value, topic))
       } captureShutdownEvent: {
         capturedValues.didShutdown = $0
@@ -151,18 +156,21 @@ final class SensorsClientTests: XCTestCase {
     } operation: {
       @Dependency(\.sensorsClient) var client
       let stream = try await client.listen(to: ["test"])
+
       for await value in stream {
         var buffer = value.payload
         guard let double = Double(buffer: &buffer) else {
           XCTFail("Failed to decode double")
           return
         }
+
         XCTAssertEqual(double, 75)
         XCTAssertEqual(value.topicName, "test")
         try await client.publish(26, to: "publish")
         try await Task.sleep(for: .milliseconds(100))
         client.shutdown()
       }
+
       XCTAssertEqual(capturedValues.values.count, 1)
       XCTAssertEqual(capturedValues.values.first?.value, 26)
       XCTAssertEqual(capturedValues.values.first?.topic, "publish")
@@ -253,6 +261,7 @@ class PublishInfoContainer {
 extension SensorsClient {
 
   static func testing(
+    yielding: [(value: Double, to: String)],
     capturePublishedValues: @escaping (Double, String) -> Void,
     captureShutdownEvent: @escaping (Bool) -> Void
   ) -> Self {
@@ -261,18 +270,17 @@ extension SensorsClient {
 
     return .init(
       listen: { topics in
-        guard let topic = topics.randomElement() else {
-          throw TopicNotFoundError()
-        }
-        continuation.yield(
-          MQTTPublishInfo(
-            qos: .atLeastOnce,
-            retain: true,
-            topicName: topic,
-            payload: ByteBuffer(string: "75"),
-            properties: MQTTProperties()
+        for (value, topic) in yielding where topics.contains(topic) {
+          continuation.yield(
+            MQTTPublishInfo(
+              qos: .atLeastOnce,
+              retain: true,
+              topicName: topic,
+              payload: ByteBuffer(string: "\(value)"),
+              properties: MQTTProperties()
+            )
           )
-        )
+        }
         return stream
       },
       logger: logger,