More cleanup

app/admin/observation_report.rb

@@ -112,7 +112,7 @@ def apply_filtering(chain)
     end
     column :observers do |o|
       links = []
-      o.observers.joins(:translations).each do |observer|
+      o.observers.joins(:translations).find_each do |observer|
         links << link_to(observer.name, admin_monitor_path(observer.id))
       end
       links.reduce(:+)

app/admin/observation_reports_dashboard.rb

@@ -18,7 +18,7 @@
     as: :select,
     multiple: true,
     label: -> { I18n.t("activerecord.models.observer") },
-    collection: -> { Observer.where(id: ObservationReportStatistic.all.select(:observer_id).distinct).order(:name) }
+    collection: -> { Observer.where(id: ObservationReportStatistic.select(:observer_id).distinct).order(:name) }
   filter :date
 
   dependent_filters do

app/admin/required_gov_document.rb

@@ -14,7 +14,6 @@
 
   filter :required_gov_document_group, collection: -> {
     RequiredGovDocumentGroup
-      .all
       .left_joins(:parent)
       .order(Arel.sql("coalesce(parents_required_gov_document_groups.position, required_gov_document_groups.position)"))
   }
@@ -60,7 +59,6 @@ def scoped_collection
     f.inputs "Required Gov Document Details" do
       editing = !object.new_record?
       f.input :required_gov_document_group, collection: RequiredGovDocumentGroup
-        .all
         .left_joins(:parent)
         .order(Arel.sql("coalesce(parents_required_gov_document_groups.position, required_gov_document_groups.position)"))
       f.input :country, input_html: {disabled: editing}

app/controllers/api_controller.rb

@@ -98,11 +98,11 @@ def api_auth
   end
 
   def api_key_present?
-    !!request.env.fetch("HTTP_OTP_API_KEY", "").scan(/Bearer/).flatten.first
+    !!request.env.fetch("HTTP_OTP_API_KEY", "").scan("Bearer").flatten.first
   end
 
   def auth_present?
-    !!request.env.fetch("HTTP_AUTHORIZATION", "").scan(/Bearer/).flatten.first
+    !!request.env.fetch("HTTP_AUTHORIZATION", "").scan("Bearer").flatten.first
   end
 
   def bad_auth_key

app/models/gov_document.rb

@@ -45,8 +45,10 @@ class GovDocument < ApplicationRecord
 
   after_update :move_previous_attachment_to_private_directory, if: :saved_change_to_attachment?
 
+  skip_callback :commit, :after, :remove_attachment!
   after_destroy :move_attachment_to_private_directory
   after_restore :move_attachment_to_public_directory
+  after_real_destroy :remove_attachment!
 
   scope :with_archived, -> { unscope(where: :deleted_at) }
   scope :to_expire, ->(date) { where("expire_date < ?", date).where(status: EXPIRABLE_STATUSES) }

app/models/government.rb

@@ -41,16 +41,6 @@ class Government < ApplicationRecord
 
   default_scope { includes(:translations) }
 
-  class << self
-    def fetch_all(options)
-      country_id = options["country"] if options.present? && options["country"].present?
-
-      governments = includes(:country)
-      governments = governments.filter_by_country(country_id) if country_id.present?
-      governments
-    end
-  end
-
   alias_method :to_s, :government_entity
 
   def cache_key

app/models/observation.rb

@@ -109,7 +109,6 @@ class Observation < ApplicationRecord
   has_many :observation_operators, dependent: :destroy
   has_many :relevant_operators, through: :observation_operators, source: :operator
 
-  has_many :comments, as: :commentable, dependent: :destroy
   has_many :observation_documents, dependent: :destroy
 
   accepts_nested_attributes_for :observation_documents, allow_destroy: true

app/models/observation_document.rb

@@ -25,6 +25,8 @@ class ObservationDocument < ApplicationRecord
   belongs_to :user, inverse_of: :observation_documents, touch: true, optional: true
   belongs_to :observation, inverse_of: :observation_documents, touch: true
 
+  skip_callback :commit, :after, :remove_attachment!
   after_destroy :move_attachment_to_private_directory
   after_restore :move_attachment_to_public_directory
+  after_real_destroy :remove_attachment!
 end

app/models/observation_report.rb

@@ -28,8 +28,10 @@ class ObservationReport < ApplicationRecord
   has_many :observers, through: :observation_report_observers
   has_many :observations, dependent: :destroy
 
+  skip_callback :commit, :after, :remove_attachment!
   after_destroy :move_attachment_to_private_directory
   after_restore :move_attachment_to_public_directory
+  after_real_destroy :remove_attachment!
 
   scope :bigger_date, ->(date) { where("observation_reports.created_at <= ?", date + 1.day) }
 

app/models/observer.rb

@@ -72,10 +72,6 @@ class Observer < ApplicationRecord
   default_scope { includes(:translations) }
 
   class << self
-    def fetch_all(options)
-      includes(:countries, :users)
-    end
-
     def observer_select
       by_name_asc.map { |c| ["#{c.name} (#{c.observer_type})", c.id] }
     end

app/models/operator.rb

@@ -109,14 +109,6 @@ class Operator < ApplicationRecord
   }
 
   class << self
-    def fetch_all(options)
-      country_ids = options["country_ids"] if options.present? && options["country_ids"].present?
-
-      operators = includes(:country, :users)
-      operators = operators.filter_by_country_ids(country_ids) if country_ids.present?
-      operators
-    end
-
     def operator_select
       by_name_asc.map { |c| [c.name, c.id] }
     end
@@ -156,8 +148,8 @@ def recalculate_scores
 
   def clean_document_cache
     # TODO: try different technique for jsonapi cache invalidation, this is undocumented way for cleaning cache of jsonapi resources
-    Rails.cache.delete_matched(/operator_documents\/(#{operator_document_ids.join('|')})\//)
-    Rails.cache.delete_matched(/operator_document_histories\/(#{operator_document_history_ids.join('|')})\//)
+    Rails.cache.delete_matched(/operator_documents\/(#{operator_document_ids.join("|")})\//)
+    Rails.cache.delete_matched(/operator_document_histories\/(#{operator_document_history_ids.join("|")})\//)
   end
 
   def refresh_ranking

app/models/species.rb

@@ -34,12 +34,6 @@ class Species < ApplicationRecord
 
   default_scope { includes(:translations) }
 
-  class << self
-    def fetch_all(options)
-      includes(:countries)
-    end
-  end
-
   def cache_key
     super + "-" + Globalize.locale.to_s
   end

app/models/user.rb

@@ -46,7 +46,6 @@ class User < ApplicationRecord
   has_one :api_key, dependent: :destroy
   has_one :user_permission
   has_many :observations, inverse_of: :user
-  has_many :comments, inverse_of: :user, dependent: :destroy
   has_many :observation_documents, inverse_of: :user
   has_many :observation_reports, inverse_of: :user
   has_many :operator_document_annexes, inverse_of: :user
@@ -79,12 +78,6 @@ class User < ApplicationRecord
   scope :inactive, -> { where(is_active: false) }
   scope :with_user_role, ->(role) { joins(:user_permission).where(user_permission: {user_role: role}) }
 
-  class << self
-    def fetch_all(options)
-      includes(:user_permission, :comments, :country)
-    end
-  end
-
   def is_government(country_id)
     self&.user_permission&.user_role == "government" && self.country_id == country_id
   end
@@ -210,7 +203,7 @@ def notify_user
   end
 
   # Devise ActiveJob integration
-  def send_devise_notification(notification, *args)
-    devise_mailer.send(notification, self, *args).deliver_later
+  def send_devise_notification(notification, *)
+    devise_mailer.send(notification, self, *).deliver_later
   end
 end

app/resources/v1/base_resource.rb

@@ -1,5 +1,14 @@
 module V1
   class BaseResource < JSONAPI::Resource
     abstract
+
+    def observations_tool_user?
+      context[:app] == "observations-tool" && context[:current_user].present? &&
+        ["ngo", "ngo_manager", "admin"].include?(context[:current_user].user_permission.user_role)
+    end
+
+    def admin_user?
+      context[:current_user].present? && context[:current_user].user_permission.user_role == "admin"
+    end
   end
 end

app/resources/v1/observation_document_resource.rb

@@ -7,8 +7,7 @@ class ObservationDocumentResource < BaseResource
     attributes :name, :attachment, :created_at, :updated_at
 
     has_one :observation
-    has_one :user
 
-    filters :observation_id, :name, :user_id
+    filters :observation_id, :name
   end
 end

app/resources/v1/observation_report_resource.rb

@@ -7,7 +7,6 @@ class ObservationReportResource < BaseResource
     attributes :title, :publication_date, :created_at, :updated_at, :attachment
 
     has_many :observers
-    has_one :user
     has_many :observations
 
     after_create :add_observers
@@ -19,5 +18,11 @@ class ObservationReportResource < BaseResource
     def add_observers
       @model.update_observers if @model.observations.any?
     end
+
+    def fetchable_fields
+      return super if observations_tool_user?
+
+      super - [:created_at, :updated_at, :user]
+    end
   end
 end

app/resources/v1/observation_resource.rb

@@ -13,7 +13,6 @@ class ObservationResource < BaseResource
       :is_physical_place, :complete, :hidden, :admin_comment, :monitor_comment
 
     has_many :species
-    has_many :comments
     has_many :observation_documents
     has_many :observers
     has_many :relevant_operators, class_name: "Operator"
@@ -70,6 +69,12 @@ class ObservationResource < BaseResource
       records.where(id: records.joins(:observers).where(observers: {id: value}).pluck(:id))
     }
 
+    def fetchable_fields
+      return super if observations_tool_user?
+
+      super - [:admin_comment, :monitor_comment, :created_at, :updated_at, :user, :modified_user]
+    end
+
     def self.sortable_fields(context)
       super + [:"country.iso", :"severity.level", :"subcategory.name",
         :"operator.name", :"country.name", :"law.written_infraction",

app/resources/v1/observer_resource.rb

@@ -10,7 +10,6 @@ class ObserverResource < BaseResource
       :data_email, :data_phone, :organization_type, :delete_logo, :public_info
 
     has_many :countries
-    has_many :users
     has_many :observations
 
     filters :countries, :is_active

app/resources/v1/operator_document_annex_resource.rb

@@ -10,7 +10,6 @@ class OperatorDocumentAnnexResource < BaseResource
       :uploaded_by, :created_at, :updated_at
 
     has_one :operator_document, foreign_key_on: :related
-    has_one :user
 
     filters :status
 

app/resources/v1/operator_document_history_resource.rb

@@ -43,7 +43,7 @@ def self.records(options = {})
 
       OperatorDocumentHistory.from_operator_at_date(operator, date).non_signature
     rescue
-      return OperatorDocumentHistory.where("true = false") unless operator && date
+      OperatorDocumentHistory.where("true = false") unless operator && date
     end
   end
 end

app/resources/v1/operator_resource.rb

@@ -13,7 +13,6 @@ class OperatorResource < BaseResource
 
     has_one :country
     has_many :fmus
-    has_many :users
     has_many :observations
     has_many :sawmills
 

app/resources/v1/user_resource.rb

@@ -9,7 +9,6 @@ class UserResource < BaseResource
 
     has_one :country
     has_one :user_permission, foreign_key_on: :related
-    has_many :comments
     has_many :managed_observers, class_name: "Observer"
     has_one :observer
     has_one :operator
@@ -19,5 +18,22 @@ def self.fields
     end
 
     filters :is_active, :email, :name
+
+    def fetchable_fields
+      return super if owner? || admin_user?
+      return [:id, :name, :email] if password_reset_action?
+
+      [:id, :name]
+    end
+
+    private
+
+    def password_reset_action?
+      context[:action] == "update" && context[:controller] == "v1/passwords"
+    end
+
+    def owner?
+      context[:current_user].present? && context[:current_user].id == @model.id
+    end
   end
 end

app/uploaders/application_uploader.rb

@@ -17,7 +17,7 @@ def cache_dir
   end
 
   def url(*args)
-    return "/private#{super}" if private_upload?
+    return super.gsub("/uploads/", "/private/uploads/") if private_upload?
 
     super
   end

config/initializers/enum_attributes_validation.rb

@@ -44,8 +44,8 @@ def validate_enum_attributes(*attributes, **opts)
       end
     end
 
-    def validate_enum_attribute(*attributes)
-      validate_enum_attributes(*attributes)
+    def validate_enum_attribute(*)
+      validate_enum_attributes(*)
     end
   end
 end