Refactor: remove kits

Gemfile

@@ -8,7 +8,6 @@ gem 'doorkeeper', '~> 5'
 # To resize active storage images:
 # Revise if this is needed after Rails 6.0
 gem 'image_processing'
-
 gem 'ancestry'
 gem 'api-pagination'
 gem 'api_cache'
@@ -87,6 +86,7 @@ end
 
 group :development, :test do
   # gem 'rspec_api_blueprint', require: false
+  gem "pry"
   gem 'brakeman', github: 'presidentbeef/brakeman', require: false
   gem 'byebug'
   gem 'cane'

Gemfile.lock

@@ -572,6 +572,7 @@ DEPENDENCIES
   pg
   pg_search
   premailer-rails
+  pry
   pry-rails
   puma
   pundit
@@ -615,4 +616,4 @@ RUBY VERSION
    ruby 3.0.6p216
 
 BUNDLED WITH
-   2.4.13
+   2.5.6

app/controllers/v0/application_controller.rb

@@ -6,6 +6,7 @@ class ApplicationController < ActionController::API
     include ActionController::HttpAuthentication::Token::ControllerMethods
     include ActionController::Helpers
     include ActionController::ImplicitRender
+    include ActionController::Caching
 
     include Pundit::Authorization
     include PrettyJSON

app/controllers/v0/components_controller.rb

@@ -7,18 +7,16 @@ def index
     end
 
     def show
-      @component = Component.includes(:board, :sensor).find(params[:id])
+      @component = Component.includes(:device, :sensor).find(params[:id])
       authorize @component
     end
 
 private
 
     def component_params
       params.permit(
-        :board_id,
-        :board_type,
-        :sensor_id,
-        :equation
+        :device_id,
+        :sensor_id
       )
     end
 

app/controllers/v0/devices_controller.rb

@@ -1,22 +1,22 @@
 module V0
   class DevicesController < ApplicationController
-
     before_action :check_if_authorized!, only: [:create]
     after_action :verify_authorized,
       except: [:index, :world_map, :fresh_world_map]
 
     def show
       @device = Device.includes(
-        :kit, :owner, :sensors,:tags).find(params[:id])
+        :owner,:tags, {sensors: :measurement}).find(params[:id])
       authorize @device
       @device
     end
 
     def index
       raise_ransack_errors_as_bad_request do
         @q = policy_scope(Device)
-          .includes(:owner, :tags, kit: [:components, :sensors])
+          .includes(:owner, :tags, :components, {sensors: :measurement})
           .ransack(params[:q], auth_object: (current_user&.is_admin? ? :admin : nil))
+
         # We are here customly adding multiple tags into the Ransack query.
         # Ransack supports this, but how do we add multiple tag names in URL string? Which separator to use?
         # See Issue #186 https://github.com/fablabbcn/smartcitizen-api/issues/186
@@ -75,36 +75,9 @@ def destroy
 
     # debug method, must be refactored
     def fresh_world_map
-      @devices = Device.where.not(latitude: nil).where.not(data: nil).includes(:owner,:tags).map do |device|
-        {
-          id: device.id,
-          name: device.name,
-          description: (device.description.present? ? device.description : nil),
-          owner_id: device.owner_id,
-          owner_username: device.owner_id ? device.owner_username : nil,
-          latitude: device.latitude,
-          longitude: device.longitude,
-          city: device.city,
-          country_code: device.country_code,
-          is_private: device.is_private,
-          kit_id: device.kit_id,
-          state: device.state,
-          system_tags: device.system_tags,
-          user_tags: device.user_tags,
-          added_at: device.added_at,
-          updated_at: device.updated_at,
-          last_reading_at: (device.last_reading_at.present? ? device.last_reading_at : nil)
-        }
-      end
-      render json: @devices
     end
 
     def world_map
-      unless params[:cachebuster]
-        expires_in 30.seconds, public: true # CRON cURL every 60 seconds to cache
-      end
-
-      render json: Device.for_world_map
     end
 
 private
@@ -113,6 +86,10 @@ def device_params
       params_to_permit = [
         :name,
         :description,
+        :hardware_name_override,
+        :hardware_version_override,
+        :hardware_type_override,
+        :hardware_slug_override,
         :mac_address,
         :latitude,
         :longitude,
@@ -122,7 +99,6 @@ def device_params
         :notify_stopped_publishing,
         :exposure,
         :meta,
-        :kit_id,
         :user_tags,
         postprocessing_attributes: [:blueprint_url, :hardware_url, :latest_postprocessing, :meta, :forwarding_params],
       ]

app/controllers/v0/onboarding/orphan_devices_controller.rb

@@ -43,7 +43,7 @@ def update
       private
 
       def orphan_device_params
-        params.permit(:name, :description, :kit_id, :exposure, :latitude, :longitude, :user_tags)
+        params.permit(:name, :description, :exposure, :latitude, :longitude, :user_tags)
       end
 
       def set_orphan_device

app/controllers/v0/readings_controller.rb

@@ -57,11 +57,6 @@ def csv_archive
       @device = Device.find(params[:id])
       authorize @device, :update?
 
-      if @device.kit.nil?
-        render json: { id: "error", message: "Device does not have a kit", url: "", errors: "" }, status: 420
-        return
-      end
-
       if [email protected]_export_requested_at or (@device.csv_export_requested_at < 15.minutes.ago)
         @device.update_column(:csv_export_requested_at, Time.now.utc)
         if Rails.env.test?

app/controllers/v0/static_controller.rb

@@ -15,7 +15,6 @@ def home
         current_user_url: [request.base_url, v0_me_index_path].join,
         components_url: [request.base_url, v0_components_path].join,
         devices_url: [request.base_url, v0_devices_path].join,
-        kits_url: [request.base_url, v0_kits_path].join,
         measurements_url: [request.base_url, v0_measurements_path].join,
         sensors_url: [request.base_url, v0_sensors_path].join,
         users_url: [request.base_url, v0_users_path].join,
@@ -32,12 +31,12 @@ def metrics
           private: Device.where(is_private: true).count,
           test: Device.where(is_test: true).count,
           online: {
-            now: Device.where('last_recorded_at > ?', 10.minutes.ago).count,
-            last_hour: Device.where('last_recorded_at > ?', 1.hour.ago).count,
-            today: Device.where('last_recorded_at > ?', Time.now.beginning_of_day).count,
-            this_month: Device.where('last_recorded_at > ?', Time.now.beginning_of_month).count,
-            this_year: Device.where('last_recorded_at > ?', Time.now.beginning_of_year).count,
-            all_time: Device.where.not(last_recorded_at: nil).count
+            now: Device.where('last_reading_at > ?', 10.minutes.ago).count,
+            last_hour: Device.where('last_reading_at > ?', 1.hour.ago).count,
+            today: Device.where('last_reading_at > ?', Time.now.beginning_of_day).count,
+            this_month: Device.where('last_reading_at > ?', Time.now.beginning_of_month).count,
+            this_year: Device.where('last_reading_at > ?', Time.now.beginning_of_year).count,
+            all_time: Device.where.not(last_reading_at: nil).count
           },
           readings: {
             good: {

app/jobs/check_battery_level_below_job.rb

@@ -18,7 +18,7 @@ def perform(*args)
           if device.data["10"].to_i < 15 && device.data["10"].to_i > 1
             #p "Sending email to: #{device.owner.email} - device: #{device}"
 
-            device.update(notify_low_battery_timestamp: Time.now)
+            device.update_column(:notify_low_battery_timestamp,  Time.now)
 
             UserMailer.device_battery_low(device.id).deliver_now
           end

app/jobs/check_device_stopped_publishing_job.rb

@@ -4,12 +4,12 @@ class CheckDeviceStoppedPublishingJob < ApplicationJob
   def perform(*args)
     # Do something later
 
-    devices = Device.where(notify_stopped_publishing: true).where("last_recorded_at < ?", 60.minutes.ago)
+    devices = Device.where(notify_stopped_publishing: true).where("last_reading_at < ?", 60.minutes.ago)
     CheckupNotifyJob.perform_now("#{devices.count} devices with notification on: stopped_publishing at least an hour ago. Ids: #{devices.pluck(:id)}")
 
     devices.each do |device|
       if device.notify_stopped_publishing_timestamp < 24.hours.ago
-        device.update notify_stopped_publishing_timestamp: Time.now
+        device.update_column(:notify_stopped_publishing_timestamp, Time.now)
         UserMailer.device_stopped_publishing(device.id).deliver_now
       end
     end

app/lib/mqtt_messages_handler.rb

@@ -11,14 +11,11 @@ def self.handle_topic(topic, message)
 
     return if topic.nil?
 
+    handshake_device(topic)
+
     # The following do NOT need a device
     if topic.to_s.include?('inventory')
       DeviceInventory.create({ report: (message rescue nil) })
-    elsif topic.to_s.include?('hello')
-      orphan_device = OrphanDevice.find_by(device_token: device_token(topic))
-      return if orphan_device.nil?
-
-      handle_hello(orphan_device)
     end
 
     device = Device.find_by(device_token: device_token(topic))
@@ -41,7 +38,7 @@ def self.handle_topic(topic, message)
         }
       )
       Sentry.add_breadcrumb(crumb)
-      device.update hardware_info: json_message
+      device.update_column(:hardware_info, json_message)
     end
   end
 
@@ -55,6 +52,7 @@ def self.handle_readings(device, message)
     end
   rescue Exception => e
     Sentry.capture_exception(e)
+    raise e if Rails.env.test?
     #puts e.inspect
     #puts message
   end
@@ -88,11 +86,13 @@ def self.parse_raw_readings(message, device_id=nil)
     JSON[reading]
   end
 
-  def self.handle_hello(orphan_device)
-    payload = {}
-    orphan_device.update(device_handshake: true)
-    payload[:onboarding_session] = orphan_device.onboarding_session
-    Redis.current.publish('token-received', payload.to_json)
+  def self.handshake_device(topic)
+    orphan_device = OrphanDevice.find_by(device_token: device_token(topic))
+    return if orphan_device.nil?
+    orphan_device.update!(device_handshake: true)
+    Redis.current.publish('token-received',  {
+      onboarding_session: orphan_device.onboarding_session
+    }.to_json)
   end
 
   # takes a packet and returns 'device token' from topic

app/models/component.rb

@@ -1,11 +1,16 @@
 # This joins a device with its sensors.
 
 class Component < ActiveRecord::Base
-  belongs_to :board, polymorphic: true
+  belongs_to :device
   belongs_to :sensor
 
-  validates_presence_of :board, :sensor
-  validates :sensor_id, :uniqueness => { :scope => [:board_id, :board_type] }
+  validates_presence_of :device, :sensor
+  validates :sensor_id, :uniqueness => { :scope => [:device_id] }
+  validates :key, :uniqueness => { :scope =>  [:device_id] }
+
+  before_validation :set_key, on: :create
+
+  delegate :equation, :reverse_equation, to: :sensor
 
   # Accepts a raw sensor reading and uses its equation to process and return
   # a calibrated version
@@ -19,4 +24,19 @@ def normalized_value x
     reverse_equation ? eval( ['->x{',reverse_equation,'}'].join ).call(x) : x
   end
 
+  def get_unique_key(default_key, other_keys)
+    matching_keys = other_keys.select { |k| k =~ /^#{default_key}/ }
+    ix = matching_keys.length
+    ix == 0 ? default_key : "#{default_key}_#{ix}"
+  end
+
+  private
+
+  def set_key
+    if sensor && device && !key
+      default_key = sensor.default_key
+      other_component_keys = device.components.map(&:key)
+      self.key = get_unique_key(default_key, other_component_keys)
+    end
+  end
 end

app/models/concerns/data_parser/storer.rb

@@ -54,22 +54,12 @@ def timestamp_parse(timestamp)
       end
 
       def sensor_reading(device, sensor)
-        begin
-          id = Integer(sensor['id'])
-          key = device.find_sensor_key_by_id(id)
-        rescue
-          key = sensor['id']
-          id = device.find_sensor_id_by_key(key)
-        end
-        component = device.components.detect{ |c| c["sensor_id"] == id }
-
-        #raise "This component does not have sensor_id: #{id}" if component.nil?
+        component = device.find_or_create_component_for_sensor_reading(sensor)
         return nil if component.nil?
-
         value = component.normalized_value( (Float(sensor['value']) rescue sensor['value']) )
         {
-          id: id,
-          key: key,
+          id: component.sensor_id,
+          key: component.key,
           component: component,
           value: value
         }