chore(place/demo/lockers): metadata changes

Author: stakach

drivers/place/demo/lockers.cr

@@ -21,22 +21,55 @@ class Place::Demo::Lockers < PlaceOS::Driver
   end
 
   getter locker_banks : Hash(String, LockerBank) do
+    # Grab bank details
+    banks = staff_api.metadata(building_id, "locker_banks").get.dig?("locker_banks", "details")
+    return Hash(String, LockerBank).new unless banks
+
+    banks = begin
+      Array(LockerBank).from_json(banks.to_json)
+    rescue error
+      message = "error parsing banks json on building #{building_id}:\n#{banks.to_pretty_json}"
+      logger.warn(exception: error) { message }
+      raise message
+    end
+
     lookup = {} of String => LockerBank
-    levels.flat_map { |level_id|
-      banks = lockers_details(level_id)
-      banks.try(&.each { |bank|
-        bank.level_id = level_id
-      })
-      banks
-    }.each { |bank| lookup[bank.id] = bank }
+    banks.each do |bank|
+      bank.level_id = (levels & bank.zones).first?
+      lookup[bank.id] = bank
+    end
+
+    # Grab locker details:
+    lockers = staff_api.metadata(building_id, "lockers").get.dig?("lockers", "details")
+    return lookup unless lockers
+
+    lockers = begin
+      Array(Locker).from_json(lockers.to_json)
+    rescue error
+      message = "error parsing locker json on building #{building_id}:\n#{lockers.to_pretty_json}"
+      logger.warn(exception: error) { message }
+      raise message
+    end
+
+    lockers.each do |locker|
+      begin
+        bank = lookup[locker.bank_id]
+        locker.level_id = bank.level_id
+        bank.lockers << locker
+      rescue error
+        logger.warn(exception: error) { "config issue with locker #{locker.id} on bank #{locker.bank_id}" }
+      end
+    end
+
     lookup
   end
 
   class Locker
     include JSON::Serializable
 
     getter id : String
-    getter name : String
+    getter name : String { id }
+    getter bank_id : String
     getter bookable : Bool { false }
 
     # for tracking, not part of metadata
@@ -74,9 +107,11 @@ class Place::Demo::Lockers < PlaceOS::Driver
     include JSON::Serializable
 
     getter id : String
-    getter name : String
-    getter lockers : Array(Locker)
+    getter name : String { id }
+    getter zones : Array(String)
 
+    property level_id : String? = nil
+    getter lockers : Array(Locker) = [] of Locker
     getter locker_hash : Hash(String, Locker) do
       lookup = {} of String => Locker
       level = self.level_id
@@ -86,20 +121,6 @@ class Place::Demo::Lockers < PlaceOS::Driver
       end
       lookup
     end
-
-    property level_id : String? = nil
-  end
-
-  def lockers_details(level_id : String) : Array(LockerBank)
-    lockers = staff_api.metadata(level_id, "lockers").get.dig?("lockers", "details")
-    return [] of LockerBank unless lockers
-    begin
-      Array(LockerBank).from_json(lockers.to_json)
-    rescue error
-      message = "error parsing locker json on level #{level_id}:\n#{lockers.to_pretty_json}"
-      logger.warn(exception: error) { message }
-      raise message
-    end
   end
 
   class ::PlaceOS::Driver::Interface::Lockers::PlaceLocker