Skip to content

Commit

Permalink
Resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
allthesignals committed Feb 12, 2025
1 parent 5f110fa commit cb32bd9
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 12 deletions.
11 changes: 1 addition & 10 deletions app/app/controllers/cbv/employer_searches_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,13 @@ def show
private

def provider_search(query = "")
ProviderSearchService.new(@cbv_flow.site_id).search(query)
ProviderSearchService.new(@cbv_flow.client_agency_id).search(query)
end

def search_params
params.slice(:query, :type)
end

def fetch_employers(query = "")
request_params = {
q: query,
supported_jobs: [ "paystubs" ]
}

pinwheel.fetch_items(request_params)["data"]
end

def track_clicked_popular_payroll_providers_event
event_logger.track("ApplicantClickedPopularPayrollProviders", request, {
timestamp: Time.now.to_i,
Expand Down
2 changes: 1 addition & 1 deletion app/app/services/provider_search_service.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ def search(query = "")
private

def site_config
Rails.application.config.sites
Rails.application.config.client_agencies
end
end
2 changes: 1 addition & 1 deletion app/db/schema.rb
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@
t.string "client_agency_id"
t.string "confirmation_code"
t.datetime "transmitted_at"
t.datetime "redacted_at"
t.datetime "consented_to_authorized_use_at"
t.datetime "redacted_at"
t.bigint "cbv_client_id"
t.index ["cbv_client_id"], name: "index_cbv_flows_on_cbv_client_id"
t.index ["cbv_flow_invitation_id"], name: "index_cbv_flows_on_cbv_flow_invitation_id"
Expand Down

0 comments on commit cb32bd9

Please sign in to comment.