Revert "CP-11289 - Change external_account_group_id from integer to string"

This reverts commit f0fdf2d2ef35df294174b143f1fac56468ea78ca.
pull/544/head
Bernardo Anderson 2 months ago
parent 0470f1a48e
commit d73b7e573f

@ -8,7 +8,7 @@
# name :string not null # name :string not null
# created_at :datetime not null # created_at :datetime not null
# updated_at :datetime not null # updated_at :datetime not null
# external_account_group_id :string not null # external_account_group_id :integer not null
# #
# Indexes # Indexes
# #

@ -13,7 +13,7 @@
# Indexes # Indexes
# #
# index_document_generation_events_on_submitter_id (submitter_id) # index_document_generation_events_on_submitter_id (submitter_id)
# index_document_generation_events_on_submitter_id_and_event_name (submitter_id,event_name) UNIQUE WHERE ((event_name)::text = ANY (ARRAY[('start'::character varying)::text, ('complete'::character varying)::text])) # index_document_generation_events_on_submitter_id_and_event_name (submitter_id,event_name) UNIQUE WHERE ((event_name)::text = ANY ((ARRAY['start'::character varying, 'complete'::character varying])::text[]))
# #
# Foreign Keys # Foreign Keys
# #

@ -20,7 +20,7 @@
# #
# index_email_events_on_account_id_and_event_datetime (account_id,event_datetime) # index_email_events_on_account_id_and_event_datetime (account_id,event_datetime)
# index_email_events_on_email (email) # index_email_events_on_email (email)
# index_email_events_on_email_event_types (email) WHERE ((event_type)::text = ANY (ARRAY[('bounce'::character varying)::text, ('soft_bounce'::character varying)::text, ('complaint'::character varying)::text, ('soft_complaint'::character varying)::text])) # index_email_events_on_email_event_types (email) WHERE ((event_type)::text = ANY ((ARRAY['bounce'::character varying, 'soft_bounce'::character varying, 'complaint'::character varying, 'soft_complaint'::character varying])::text[]))
# index_email_events_on_emailable (emailable_type,emailable_id) # index_email_events_on_emailable (emailable_type,emailable_id)
# index_email_events_on_message_id (message_id) # index_email_events_on_message_id (message_id)
# #

@ -36,7 +36,7 @@ class ExternalAuthService
def find_or_create_user_with_account_group def find_or_create_user_with_account_group
account_group = AccountGroup.find_or_create_by_external_id( account_group = AccountGroup.find_or_create_by_external_id(
@params[:account_group][:external_id]&.to_s, @params[:account_group][:external_id],
name: @params[:account_group][:name] name: @params[:account_group][:name]
) )

@ -10,8 +10,9 @@
# #
# It's strongly recommended that you check this file into your version control system. # It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema[8.0].define(version: 2025_09_30_175543) do ActiveRecord::Schema[8.0].define(version: 2025_09_10_191227) do
# These are extensions that must be enabled in order to support this database # These are extensions that must be enabled in order to support this database
enable_extension "btree_gin"
enable_extension "pg_catalog.plpgsql" enable_extension "pg_catalog.plpgsql"
create_table "access_tokens", force: :cascade do |t| create_table "access_tokens", force: :cascade do |t|
@ -43,7 +44,7 @@ ActiveRecord::Schema[8.0].define(version: 2025_09_30_175543) do
end end
create_table "account_groups", force: :cascade do |t| create_table "account_groups", force: :cascade do |t|
t.string "external_account_group_id", null: false t.integer "external_account_group_id", null: false
t.string "name", null: false t.string "name", null: false
t.datetime "created_at", null: false t.datetime "created_at", null: false
t.datetime "updated_at", null: false t.datetime "updated_at", null: false
@ -114,9 +115,7 @@ ActiveRecord::Schema[8.0].define(version: 2025_09_30_175543) do
t.string "sha256", null: false t.string "sha256", null: false
t.datetime "created_at", null: false t.datetime "created_at", null: false
t.datetime "updated_at", null: false t.datetime "updated_at", null: false
t.string "storage_location", default: "secured"
t.index ["sha256"], name: "index_completed_documents_on_sha256" t.index ["sha256"], name: "index_completed_documents_on_sha256"
t.index ["storage_location"], name: "index_completed_documents_on_storage_location"
t.index ["submitter_id"], name: "index_completed_documents_on_submitter_id" t.index ["submitter_id"], name: "index_completed_documents_on_submitter_id"
end end
@ -173,7 +172,7 @@ ActiveRecord::Schema[8.0].define(version: 2025_09_30_175543) do
t.string "event_name", null: false t.string "event_name", null: false
t.datetime "created_at", null: false t.datetime "created_at", null: false
t.datetime "updated_at", null: false t.datetime "updated_at", null: false
t.index ["submitter_id", "event_name"], name: "index_document_generation_events_on_submitter_id_and_event_name", unique: true, where: "((event_name)::text = ANY (ARRAY[('start'::character varying)::text, ('complete'::character varying)::text]))" t.index ["submitter_id", "event_name"], name: "index_document_generation_events_on_submitter_id_and_event_name", unique: true, where: "((event_name)::text = ANY ((ARRAY['start'::character varying, 'complete'::character varying])::text[]))"
t.index ["submitter_id"], name: "index_document_generation_events_on_submitter_id" t.index ["submitter_id"], name: "index_document_generation_events_on_submitter_id"
end end
@ -190,7 +189,7 @@ ActiveRecord::Schema[8.0].define(version: 2025_09_30_175543) do
t.datetime "created_at", null: false t.datetime "created_at", null: false
t.index ["account_id", "event_datetime"], name: "index_email_events_on_account_id_and_event_datetime" t.index ["account_id", "event_datetime"], name: "index_email_events_on_account_id_and_event_datetime"
t.index ["email"], name: "index_email_events_on_email" t.index ["email"], name: "index_email_events_on_email"
t.index ["email"], name: "index_email_events_on_email_event_types", where: "((event_type)::text = ANY (ARRAY[('bounce'::character varying)::text, ('soft_bounce'::character varying)::text, ('complaint'::character varying)::text, ('soft_complaint'::character varying)::text]))" t.index ["email"], name: "index_email_events_on_email_event_types", where: "((event_type)::text = ANY ((ARRAY['bounce'::character varying, 'soft_bounce'::character varying, 'complaint'::character varying, 'soft_complaint'::character varying])::text[]))"
t.index ["emailable_type", "emailable_id"], name: "index_email_events_on_emailable" t.index ["emailable_type", "emailable_id"], name: "index_email_events_on_emailable"
t.index ["message_id"], name: "index_email_events_on_message_id" t.index ["message_id"], name: "index_email_events_on_message_id"
end end
@ -283,6 +282,19 @@ ActiveRecord::Schema[8.0].define(version: 2025_09_30_175543) do
t.index ["uid"], name: "index_oauth_applications_on_uid", unique: true t.index ["uid"], name: "index_oauth_applications_on_uid", unique: true
end end
create_table "search_entries", force: :cascade do |t|
t.string "record_type", null: false
t.bigint "record_id", null: false
t.bigint "account_id", null: false
t.tsvector "tsvector", null: false
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.index ["account_id", "tsvector"], name: "index_search_entries_on_account_id_tsvector_submission", where: "((record_type)::text = 'Submission'::text)", using: :gin
t.index ["account_id", "tsvector"], name: "index_search_entries_on_account_id_tsvector_submitter", where: "((record_type)::text = 'Submitter'::text)", using: :gin
t.index ["account_id", "tsvector"], name: "index_search_entries_on_account_id_tsvector_template", where: "((record_type)::text = 'Template'::text)", using: :gin
t.index ["record_id", "record_type"], name: "index_search_entries_on_record_id_and_record_type", unique: true
end
create_table "submission_events", force: :cascade do |t| create_table "submission_events", force: :cascade do |t|
t.integer "submission_id", null: false t.integer "submission_id", null: false
t.integer "submitter_id" t.integer "submitter_id"

@ -8,7 +8,7 @@
# name :string not null # name :string not null
# created_at :datetime not null # created_at :datetime not null
# updated_at :datetime not null # updated_at :datetime not null
# external_account_group_id :string not null # external_account_group_id :integer not null
# #
# Indexes # Indexes
# #

@ -51,7 +51,7 @@ RSpec.describe ExternalAuthService do
token = described_class.new(params).authenticate_user token = described_class.new(params).authenticate_user
expect(token).to be_present expect(token).to be_present
expect(AccountGroup.last.external_account_group_id).to eq('789') expect(AccountGroup.last.external_account_group_id).to eq(789)
expect(User.last.external_user_id).to eq(123) expect(User.last.external_user_id).to eq(123)
end end
end end

Loading…
Cancel
Save