Moving spaceapi endpoint and OAC door status checking here
This commit is contained in:
@@ -26,6 +26,7 @@ class DoorLogsController < ApplicationController
|
||||
# GET /door_logs/auto_download
|
||||
def auto_download
|
||||
@results = DoorLog.download_from_door
|
||||
@status = DoorLog.download_status # for space_api
|
||||
|
||||
respond_to do |format|
|
||||
format.html # show.html.erb
|
||||
|
||||
31
app/controllers/space_api_controller.rb
Normal file
31
app/controllers/space_api_controller.rb
Normal file
@@ -0,0 +1,31 @@
|
||||
class SpaceApiController < ApplicationController
|
||||
authorize_resource :except => :index
|
||||
before_filter :authenticate_user!, :except => :index
|
||||
|
||||
def index
|
||||
@json = JSON.parse(Setting.space_api_json_template)
|
||||
door_status = DoorLog.show_status # Expect {:unlocked => boolean, :door_1_locked => boolean, :door_2_locked => boolean}
|
||||
|
||||
@json["open"] = door_status[:unlocked]
|
||||
|
||||
if( door_status[:unlocked] )
|
||||
@json["status"] = "doors_open=both"
|
||||
elsif( !door_status[:door_1_locked] )
|
||||
@json["status"] = "doors_open=door1"
|
||||
elsif( !door_status[:door_2_locked] )
|
||||
@json["status"] = "doors_open=door2"
|
||||
else
|
||||
@json["status"] = "doors_open=none"
|
||||
end
|
||||
|
||||
respond_to do |format|
|
||||
format.html
|
||||
format.json {
|
||||
response.headers['Access-Control-Allow-Origin'] = '*'
|
||||
response.headers["Cache-Control"] = "no-cache, no-store, max-age=0, must-revalidate"
|
||||
render :json => @json
|
||||
}
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
@@ -2,6 +2,42 @@ class DoorLog < ActiveRecord::Base
|
||||
attr_accessible :data, :key
|
||||
require 'open-uri'
|
||||
|
||||
def self.show_status
|
||||
door_logs = DoorLog.where(key: ["door_1_locked","door_2_locked"]).order('created_at DESC').take(2)
|
||||
door_1_locked = parse_locked_status(door_logs, "door_1_locked")
|
||||
door_2_locked = parse_locked_status(door_logs, "door_2_locked")
|
||||
|
||||
# Doors are unlocked if 1 AND 2 are NOT locked
|
||||
status = {:unlocked => (!door_1_locked && !door_2_locked), :door_1_locked => door_1_locked, :door_2_locked => door_2_locked }
|
||||
end
|
||||
|
||||
def self.parse_locked_status(door_logs, door_key)
|
||||
door_logs_selected = door_logs.select{|s| s.key == door_key }
|
||||
if door_logs_selected.present?
|
||||
door_data = door_logs_selected.first.data
|
||||
if door_data == 0 # 0 = unlocked
|
||||
return false
|
||||
else
|
||||
return true # 1 = locked
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def self.download_status
|
||||
# load config values
|
||||
door_access_url = APP_CONFIG['door_access_url']
|
||||
door_access_password = APP_CONFIG['door_access_password']
|
||||
|
||||
# query for status
|
||||
source = open("#{door_access_url}?9").read
|
||||
# expect {"armed"=>255, "activated"=>255, "alarm_3"=>1, "alarm_2"=>1, "door_1_locked"=>1, "door_2_locked"=>1}
|
||||
# See https://github.com/heatsynclabs/Open_Access_Control_Ethernet for more info
|
||||
@status = JSON.parse(source)
|
||||
@status.each do |key,value|
|
||||
DoorLog.create!({:key => key, :data => value})
|
||||
end
|
||||
end
|
||||
|
||||
def self.download_from_door
|
||||
# load config values
|
||||
door_access_url = APP_CONFIG['door_access_url']
|
||||
|
||||
@@ -4,3 +4,8 @@
|
||||
<%= !@results.nil? %>
|
||||
</p>
|
||||
|
||||
<p>
|
||||
<b>Door status:</b>
|
||||
<%= @status %>
|
||||
</p>
|
||||
|
||||
|
||||
11
app/views/space_api/index.html.erb
Normal file
11
app/views/space_api/index.html.erb
Normal file
@@ -0,0 +1,11 @@
|
||||
<h2>Space Status API
|
||||
<%= link_to 'JSON', space_api_path( :format => :json ), :class => 'btn' %>
|
||||
</h2>
|
||||
|
||||
<dl>
|
||||
<% @json.each do |key,value| %>
|
||||
<dt><%= key.humanize.capitalize %>:</dt>
|
||||
<dd><%= value %></dd>
|
||||
<% end %>
|
||||
</dl>
|
||||
|
||||
Reference in New Issue
Block a user