From 187faacf3ed5868f6e7a3b85f1b463daaf47d29c Mon Sep 17 00:00:00 2001
From: Tyler Lemburg <trlemburg@gmail.com>
Date: Wed, 29 Jun 2016 11:46:33 -0500
Subject: [PATCH] images
---
app.rb | 9 ---------
models/service_space_request.rb | 3 ++-
routes/images.rb | 21 +++++++++++++++++++++
3 files changed, 23 insertions(+), 10 deletions(-)
create mode 100644 routes/images.rb
diff --git a/app.rb b/app.rb
index f0e81d8..a3714ee 100644
--- a/app.rb
+++ b/app.rb
@@ -132,13 +132,4 @@ get '/' do
}
end
-get '/images/:event_id/?' do
- event = Event.find_by(:id => params[:event_id])
- if event.nil? || event.imagedata.nil?
- raise Sinatra::NotFound
- end
-
- return event.imagedata
-end
-
Dir.glob("#{ROOT}/routes/*.rb") { |file| require file }
\ No newline at end of file
diff --git a/models/service_space_request.rb b/models/service_space_request.rb
index cf954f2..227ae13 100644
--- a/models/service_space_request.rb
+++ b/models/service_space_request.rb
@@ -1,5 +1,6 @@
require 'active_record'
+require 'models/user'
class ServiceSpaceRequest < ActiveRecord::Base
-
+ belongs_to :user
end
\ No newline at end of file
diff --git a/routes/images.rb b/routes/images.rb
new file mode 100644
index 0000000..6f9e52b
--- /dev/null
+++ b/routes/images.rb
@@ -0,0 +1,21 @@
+require 'sinatra'
+require 'models/event'
+require 'models/service_space'
+
+get '/images/:event_id/?' do
+ event = Event.find_by(:id => params[:event_id])
+ if event.nil? || event.imagedata.nil?
+ raise Sinatra::NotFound
+ end
+
+ return event.imagedata
+end
+
+get '/service_space/images/:space_id/?' do
+ space = ServiceSpace.find_by(:id => params[:space_id])
+ if space.nil? || space.imagedata.nil?
+ raise Sinatra::NotFound
+ end
+
+ return space.imagedata
+end
\ No newline at end of file
--
GitLab