Merge pull request #335 from fablabbcn/remove-deprecated-avatars-v2

Remove deprecated avatars and uploads implementation

app/controllers/v0/me_controller.rb

@@ -39,8 +39,6 @@ def user_params
         :country_code,
         :profile_picture,
         :url,
-        :avatar,
-        :avatar_url
       )
     end
 

app/controllers/v0/static_controller.rb

@@ -116,7 +116,6 @@ def search
             h['url'] = v0_device_url(s.searchable_id)
           elsif s.searchable_type == 'User'
             h['username'] = s.searchable.username
-            h['avatar'] = s.searchable.avatar
             h['profile_picture'] = profile_picture_url(s.searchable)
             h['city'] = s.searchable.city
             h['url'] = v0_user_url(s.searchable_id)

app/controllers/v0/users_controller.rb

@@ -62,8 +62,6 @@ def user_params
         :city,
         :country_code,
         :url,
-        :avatar,
-        :avatar_url
       )
     end
 

app/models/user.rb

@@ -33,7 +33,6 @@ class User < ActiveRecord::Base
 
   has_many :devices, foreign_key: 'owner_id', after_add: :update_cached_device_ids!, after_remove: :update_cached_device_ids!
   has_many :sensors, through: :devices
-  has_many :uploads, dependent: :destroy
   has_many :oauth_applications, class_name: 'Doorkeeper::Application', as: :owner
   has_one_attached :profile_picture
 
@@ -50,7 +49,7 @@ def self.ransackable_attributes(auth_object = nil)
   end
 
   def self.ransackable_associations(auth_object = nil)
-    ["devices", "sensors", "uploads"]
+    ["devices", "sensors"]
   end
 
   def archive
@@ -69,10 +68,6 @@ def access_token
     Doorkeeper::AccessToken.find_or_initialize_by(application_id: 4, resource_owner_id: id)
   end
 
-  def avatar
-    avatar_url || "https://smartcitizen.s3.amazonaws.com/avatars/default.svg"
-  end
-
   def access_token!
     access_token.expires_in = 2.days.from_now
     access_token.save
@@ -142,14 +137,6 @@ def update_all_device_ids!
     update_column(:cached_device_ids, device_ids.try(:sort))
   end
 
-  def self.check_bad_avatar_urls
-    User.where.not(avatar_url: nil).each do |user|
-      unless `curl -I #{user.avatar_url} 2>/dev/null | head -n 1`.split(' ')[1] == "200"
-        puts [user.id, user.avatar_url].join(' - ')
-      end
-    end
-  end
-
   def forward_device_readings?
     !!forwarding_token
   end

app/views/v0/devices/_device.jbuilder

@@ -45,7 +45,6 @@ if local_assigns[:with_owner] && device.owner
     json.url device.owner.url
 
     unless local_assigns[:slim_owner]
-      json.avatar device.owner.avatar
       json.profile_picture profile_picture_url(device.owner)
       json.location device.owner.location
       json.device_ids device.owner.cached_device_ids

app/views/v0/users/_user.jbuilder

@@ -3,7 +3,6 @@ json.(user,
   :uuid,
   :role,
   :username,
-  :avatar,
   :profile_picture,
   :url,
   :location,

config/routes.rb

@@ -27,10 +27,6 @@
     resources :sessions, only: :create
     resources :experiments
 
-    resources :uploads, path: 'avatars' do
-      post 'uploaded' => 'uploads#uploaded', on: :collection
-    end
-
     resources :tag_sensors
     resources :tags
     resources :measurements
@@ -40,8 +36,6 @@
     get :forward, to: "forwarding#authorize"
 
     resources :me, only: [:index] do
-      patch 'avatar' => 'uploads#create', on: :collection
-      post 'avatar' => 'uploads#create', on: :collection
       patch '/' => 'me#update', on: :collection
       put '/' => 'me#update', on: :collection
       delete '/' => 'me#destroy', on: :collection

db/migrate/20240704062854_remove_avatars_and_uploads.rb

@@ -0,0 +1,4 @@
+class RemoveAvatarsAndUploads < ActiveRecord::Migration[6.1]
+  def change
+  end
+end

db/schema.rb

@@ -11,7 +11,6 @@
 # It's strongly recommended that you check this file into your version control system.
 
 ActiveRecord::Schema.define(version: 2024_08_12_081108) do
-
   # These are extensions that must be enabled in order to support this database
   enable_extension "adminpack"
   enable_extension "hstore"

spec/controllers/v0/me_controller_spec.rb

@@ -1,5 +1,5 @@
 require 'rails_helper'
 
 RSpec.describe V0::MeController do
-  skip { is_expected.to permit(:email,:username,:password,:city,:country_code,:url,:avatar,:avatar_url).for(:update) }
+  skip { is_expected.to permit(:email,:username,:password,:city,:country_code,:url).for(:update) }
 end

spec/controllers/v0/users_controller_spec.rb

@@ -1,5 +1,5 @@
 require 'rails_helper'
 
 RSpec.describe V0::UsersController do
-  it { is_expected.to permit(:email,:username,:password,:city,:country_code,:url,:avatar,:avatar_url).for(:create) }
+  it { is_expected.to permit(:email,:username,:password,:city,:country_code,:url).for(:create) }
 end