Disable measurements for multiple session's endpoint

HabitatMap · Jul 6, 2017 · a7deb09 · a7deb09
1 parent 792413c
commit a7deb09
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 28 deletions.
diff --git a/app/controllers/api/measurement_sessions_controller.rb b/app/controllers/api/measurement_sessions_controller.rb
@@ -69,7 +69,7 @@ def create
     def show
       session = MobileSession.find(params[:id])
 
-      respond_with session, :sensor_id => params[:sensor_id], :methods => [:measurements, :notes]
+      respond_with session, :sensor_id => params[:sensor_id], :methods => [:notes], :stream_measurements => true
     end
 
     def export

diff --git a/app/models/fixed_session.rb b/app/models/fixed_session.rb
@@ -69,18 +69,7 @@ def as_json(opts=nil)
 
     methods = opts[:methods] || [:notes, :calibration]
     methods << :type
-    sensor_id = opts.delete(:sensor_id)
 
     res = super(opts.merge(methods: methods))
-
-    map_of_streams = {}
-    strs = sensor_id ? streams.where(sensor_name: sensor_id) : streams.all
-    strs.each do |stream|
-      map_of_streams[stream.sensor_name] = stream.as_json
-    end
-
-    res.merge!(streams: map_of_streams)
-
-    res
   end
 end
diff --git a/app/models/session.rb b/app/models/session.rb
@@ -213,9 +213,10 @@ def as_json(opts=nil)
 
     map_of_streams = {}
     strs = sensor_id ? streams.where(sensor_name: sensor_id) : streams.all
+
     strs.each do |stream|
-      if with_measurements
-        map_of_streams[stream.sensor_name] = stream.as_json(:methods => [:measurements])
+      if opts[:stream_measurements]
+        map_of_streams[stream.sensor_name] = stream.as_json(methods: [:measurements])
       else
         map_of_streams[stream.sensor_name] = stream.as_json
       end

diff --git a/doc/api.md b/doc/api.md
@@ -4,6 +4,9 @@ Every response is returned in JSON format.
 
 ## GET /api/sessions
 
+**Remember:** this call will not return measurements data for requested sessions. To do that, use the single session
+endpoint below, i.e. `/api/sessions/:id`
+
 ### Parameters
 
 | name           | type              | default value |
@@ -26,7 +29,6 @@ Every response is returned in JSON format.
 | q[west]        | number, -180..180 |               |
 | q[north]       | number, -90..90   |               |
 | q[south]       | number, -90..90   |               |
-| q[measurements]| true,false        | false         |
 
 ### Example URL
 
@@ -65,19 +67,6 @@ curl http://aircasting.org/api/sessions.json?page=0&page_size=50&q[measurements]
         "threshold_very_low": 0,
         "unit_name": "micrograms per cubic meter",
         "unit_symbol": "µg/m³",
-        "measurements": [
-          {
-            "id": 56292378,
-            "latitude": "39.68352651",
-            "longitude": "-104.89157664",
-            "measured_value": 2.69,
-            "milliseconds": 31,
-            "stream_id": 26343,
-            "time": "2015-09-09T17:19:18Z",
-            "timezone_offset": 0,
-            "value": 2.69
-          }
-        ],
         "size": 1814
       }
     }