Skip to content

Commit

Permalink
Conflicting linters
Browse files Browse the repository at this point in the history
  • Loading branch information
Jamie committed Dec 22, 2023
1 parent 1605eef commit 06df3db
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def filter_providers(providers, query)
provider.dig("attributes", "name"),
provider.dig("attributes", "postcode"),
provider.dig("attributes", "urn"),
provider.dig("attributes", "ukprn"),
provider.dig("attributes", "ukprn")
].any? { |attribute| attribute&.downcase&.include?(downcase_query) }
end
end
Expand All @@ -31,7 +31,7 @@ def formatted_provider(provider)
{
id: provider.fetch("id"),
name: provider.dig("attributes", "name"),
code: provider.dig("attributes", "code"),
code: provider.dig("attributes", "code")
}
end
end
4 changes: 2 additions & 2 deletions app/helpers/routes_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ module RoutesHelper
def root_path
{
claims: claims_root_path,
placements: placements_root_path,
placements: placements_root_path
}.fetch current_service
end

def support_root_path
{
claims: root_path, # TODO: claims support path in another PR
placements: placements_support_root_path,
placements: placements_support_root_path
}.fetch current_service
end
end
4 changes: 2 additions & 2 deletions app/models/dfe_sign_in_user.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def self.begin_session!(session, omniauth_payload)
"email" => omniauth_payload["info"]["email"],
# "dfe_sign_in_uid" => omniauth_payload["uid"],
"first_name" => omniauth_payload["info"]["first_name"],
"last_name" => omniauth_payload["info"]["last_name"],
"last_name" => omniauth_payload["info"]["last_name"]
# "last_active_at" => Time.zone.now,
# "id_token" => omniauth_payload["credentials"]["id_token"],
# "provider" => omniauth_payload["provider"],
Expand All @@ -39,7 +39,7 @@ def self.load_from_session(session)
last_name: dfe_sign_in_session["last_name"],
# id_token: dfe_sign_in_session["id_token"],
# provider: dfe_sign_in_session["provider"],
service: session["service"],
service: session["service"]
)
end

Expand Down
2 changes: 1 addition & 1 deletion app/models/provider.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ class Provider < ApplicationRecord
validates :provider_code,
uniqueness: {
case_sensitive: false,
message: "Provider already exists!",
message: "Provider already exists!"
}
end
2 changes: 1 addition & 1 deletion app/services/gias_csv_importer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def call
address2: school["Locality"].presence,
address3: school["Address3"].presence,
website: school["SchoolWebsite"].presence,
telephone: school["TelephoneNum"].presence,
telephone: school["TelephoneNum"].presence
}
end

Expand Down

0 comments on commit 06df3db

Please sign in to comment.