diff --git a/app.rb b/app.rb index f0e81d85109c25e78eeea379f75f2dbb063f4ae9..a3714ee7a8e4008528a99662adf465edc05bd149 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 cf954f20f310c4e47ddbef2508bd55813b8bd174..227ae1344281e4cb68cf3d69eeed73bab05e5dfe 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 0000000000000000000000000000000000000000..6f9e52b02387b116ceb134cf528e123828babbca --- /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