From db6ca87ac2e8f915be8049001df868cf529c906e Mon Sep 17 00:00:00 2001
From: Alsey Coleman Miller <alseycmiller@gmail.com>
Date: Mon, 4 Mar 2024 06:23:38 -0500
Subject: [PATCH] Renamed `AccessoryInformation.type`

---
 Example/Sources/TemperatureSensorAccessory/Server.swift    | 7 ++++---
 .../AppIntents/Entity/AccessoryAppEntity.swift             | 2 +-
 .../AppIntents/EntityQuery/AccessoryEntityQuery.swift      | 4 ++--
 .../BluetoothAccessoryKit/Model/AccessoryInformation.swift | 2 +-
 .../Model/AccessoryManagerBluetooth.swift                  | 2 +-
 .../Model/CoreModel/AccessoryEntity.swift                  | 2 +-
 6 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Example/Sources/TemperatureSensorAccessory/Server.swift b/Example/Sources/TemperatureSensorAccessory/Server.swift
index aad62c2..08f3d86 100644
--- a/Example/Sources/TemperatureSensorAccessory/Server.swift
+++ b/Example/Sources/TemperatureSensorAccessory/Server.swift
@@ -110,7 +110,8 @@ public actor BluetoothServer <Peripheral: AccessoryPeripheralManager, Authentica
         self.server = try await BluetoothAccessoryServer(
             peripheral: peripheral,
             delegate: self,
-            id: id,
+            id: id, 
+            type: accessoryType,
             rssi: rssi,
             name: name,
             advertised: advertisedService,
@@ -238,7 +239,7 @@ extension BluetoothServer: BluetoothAccessoryServerDelegate {
                     assertionFailure()
                     return
                 }
-                log("Did identify with key \(key.name)")
+                log("Did identify with key \(key.id)")
                 lastIdentify = (key.id, Date())
                 // clear value
                 await self.server.update(InformationService.self) {
@@ -258,7 +259,7 @@ extension BluetoothServer: BluetoothAccessoryServerDelegate {
                 assertionFailure()
                 return
             }
-            log("Setup owner key for \(request.name)")
+            log("Setup owner key for \(request.id)")
             // clear value
             let newKeysValue = await self.authenticationDelegate.allKeys
             await self.server.update(AuthenticationService.self) {
diff --git a/Xcode/BluetoothAccessory/AppIntents/Entity/AccessoryAppEntity.swift b/Xcode/BluetoothAccessory/AppIntents/Entity/AccessoryAppEntity.swift
index 0ebbfa2..4cfa7ba 100644
--- a/Xcode/BluetoothAccessory/AppIntents/Entity/AccessoryAppEntity.swift
+++ b/Xcode/BluetoothAccessory/AppIntents/Entity/AccessoryAppEntity.swift
@@ -46,7 +46,7 @@ extension AccessoryAppEntity {
     init(_ value: AccessoryInformation) {
         self.id = value.id
         self.name = value.name
-        self.type = .init(value.accessory)
+        self.type = .init(value.type)
         self.service = .init(value.service)
         self.manufacturer = value.manufacturer
         self.serialNumber = value.serialNumber
diff --git a/Xcode/BluetoothAccessory/AppIntents/EntityQuery/AccessoryEntityQuery.swift b/Xcode/BluetoothAccessory/AppIntents/EntityQuery/AccessoryEntityQuery.swift
index 4876926..3a676fc 100644
--- a/Xcode/BluetoothAccessory/AppIntents/EntityQuery/AccessoryEntityQuery.swift
+++ b/Xcode/BluetoothAccessory/AppIntents/EntityQuery/AccessoryEntityQuery.swift
@@ -48,7 +48,7 @@ extension AccessoryEntityQuery: EntityStringQuery {
             .map { $0.information }
             .filter {
                 $0.name.localizedCaseInsensitiveContains(query)
-                || $0.accessory.description.localizedCaseInsensitiveContains(query)
+                || $0.type.description.localizedCaseInsensitiveContains(query)
                 || $0.service.description.localizedCaseInsensitiveContains(query)
                 || $0.manufacturer.description.localizedCaseInsensitiveContains(query)
                 || $0.model.description.localizedCaseInsensitiveContains(query)
@@ -154,7 +154,7 @@ enum AccessoryEntityQueryPredicate {
         case .serialNumberEqualTo(let string):
             return value.serialNumber.lowercased() == string.lowercased()
         case .accessoryTypeEqualTo(let accessoryType):
-            return value.accessory == accessoryType
+            return value.type == accessoryType
         case .serviceTypeEqualTo(let serviceType):
             return value.service == serviceType
         case .manufacturerEqualTo(let string):
diff --git a/Xcode/BluetoothAccessoryKit/Model/AccessoryInformation.swift b/Xcode/BluetoothAccessoryKit/Model/AccessoryInformation.swift
index 374a9e9..d5f3488 100644
--- a/Xcode/BluetoothAccessoryKit/Model/AccessoryInformation.swift
+++ b/Xcode/BluetoothAccessoryKit/Model/AccessoryInformation.swift
@@ -35,7 +35,7 @@ public struct AccessoryInformation: Equatable, Hashable, Codable, Identifiable,
     public let name: String
     
     /// Accessory type
-    public let accessory: AccessoryType
+    public let type: AccessoryType
     
     /// Accessory advertised service
     public let service: ServiceType
diff --git a/Xcode/BluetoothAccessoryKit/Model/AccessoryManagerBluetooth.swift b/Xcode/BluetoothAccessoryKit/Model/AccessoryManagerBluetooth.swift
index 195d17f..c0d6f5b 100644
--- a/Xcode/BluetoothAccessoryKit/Model/AccessoryManagerBluetooth.swift
+++ b/Xcode/BluetoothAccessoryKit/Model/AccessoryManagerBluetooth.swift
@@ -420,7 +420,7 @@ internal extension AccessoryManager {
         let information = AccessoryInformation(
             id: id,
             name: name,
-            accessory: accessoryType,
+            type: accessoryType,
             service: scanResponse.service,
             manufacturer: manufacturer,
             serialNumber: serialNumber,
diff --git a/Xcode/BluetoothAccessoryKit/Model/CoreModel/AccessoryEntity.swift b/Xcode/BluetoothAccessoryKit/Model/CoreModel/AccessoryEntity.swift
index 4dcf829..6fce02a 100644
--- a/Xcode/BluetoothAccessoryKit/Model/CoreModel/AccessoryEntity.swift
+++ b/Xcode/BluetoothAccessoryKit/Model/CoreModel/AccessoryEntity.swift
@@ -66,7 +66,7 @@ public extension AccessoryEntity {
     ) {
         self.id = value.id
         self.name = value.name
-        self.type = value.accessory
+        self.type = value.type
         self.service = value.service
         self.manufacturer = value.manufacturer
         self.serialNumber = value.serialNumber