From 8a01ae2a4118d5320415e1647290dc174bda232b Mon Sep 17 00:00:00 2001 From: Andrew S Date: Fri, 7 Feb 2025 08:44:04 +0000 Subject: [PATCH] updates confirmation enum values: from 'true' to 'correct'; from 'false' to 'incorrect' --- app/models/verification.rb | 4 ++-- db/migrate/20250120064731_create_verifications.rb | 2 +- db/structure.sql | 4 ++-- spec/api/verifications_spec.rb | 4 ++-- spec/permissions/verifications_spec.rb | 4 ++-- spec/requests/verifications_spec.rb | 10 +++++----- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/models/verification.rb b/app/models/verification.rb index 71198d88..879ec0b6 100755 --- a/app/models/verification.rb +++ b/app/models/verification.rb @@ -37,8 +37,8 @@ class Verification < ApplicationRecord belongs_to :updater, class_name: 'User', inverse_of: :updated_verifications, optional: true # Defines the possible values for confirmation - CONFIRMATION_TRUE = 'true' - CONFIRMATION_FALSE = 'false' + CONFIRMATION_TRUE = 'correct' + CONFIRMATION_FALSE = 'incorrect' CONFIRMATION_UNSURE = 'unsure' CONFIRMATION_SKIP = 'skip' diff --git a/db/migrate/20250120064731_create_verifications.rb b/db/migrate/20250120064731_create_verifications.rb index 075bc7da..158e2b65 100644 --- a/db/migrate/20250120064731_create_verifications.rb +++ b/db/migrate/20250120064731_create_verifications.rb @@ -2,7 +2,7 @@ class CreateVerifications < ActiveRecord::Migration[7.2] def change - create_enum :confirmation, ['true', 'false', 'unsure', 'skip'] + create_enum :confirmation, ['correct', 'incorrect', 'unsure', 'skip'] create_table :verifications do |t| t.references :audio_event, null: false, foreign_key: { on_delete: :cascade } diff --git a/db/structure.sql b/db/structure.sql index a2cb6efe..77a95135 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -90,8 +90,8 @@ CREATE TYPE public.analysis_jobs_item_transition AS ENUM ( -- CREATE TYPE public.confirmation AS ENUM ( - 'true', - 'false', + 'correct', + 'incorrect', 'unsure', 'skip' ); diff --git a/spec/api/verifications_spec.rb b/spec/api/verifications_spec.rb index 55a9a49c..39b4b8e8 100644 --- a/spec/api/verifications_spec.rb +++ b/spec/api/verifications_spec.rb @@ -70,7 +70,7 @@ send_model do { 'verification' => { - confirmed: 'false' + confirmed: Verification::CONFIRMATION_FALSE } } end @@ -87,7 +87,7 @@ send_model do { 'verification' => { - confirmed: 'false' + confirmed: Verification::CONFIRMATION_FALSE } } end diff --git a/spec/permissions/verifications_spec.rb b/spec/permissions/verifications_spec.rb index a95cf7b1..80258c20 100644 --- a/spec/permissions/verifications_spec.rb +++ b/spec/permissions/verifications_spec.rb @@ -69,7 +69,7 @@ send_update_body do [{ 'verification' => { - confirmed: 'false' + confirmed: Verification::CONFIRMATION_FALSE } }, :json] end @@ -77,7 +77,7 @@ send_create_body do [{ 'verification' => { - confirmed: 'true', + confirmed: Verification::CONFIRMATION_TRUE, audio_event_id: audio_event.id, tag_id: create(:tag).id } diff --git a/spec/requests/verifications_spec.rb b/spec/requests/verifications_spec.rb index b328aa36..db447771 100644 --- a/spec/requests/verifications_spec.rb +++ b/spec/requests/verifications_spec.rb @@ -5,21 +5,21 @@ create_entire_hierarchy before do - create(:verification, audio_event:, creator: owner_user, confirmed: 'true') - create(:verification, audio_event:, creator: writer_user, confirmed: 'false') + create(:verification, audio_event:, creator: owner_user, confirmed: Verification::CONFIRMATION_TRUE) + create(:verification, audio_event:, creator: writer_user, confirmed: Verification::CONFIRMATION_FALSE) end it 'can filter verifications by confirmed status' do filter = { filter: { - confirmed: { eq: 'true' } + confirmed: { eq: Verification::CONFIRMATION_TRUE } } } get '/verifications/filter', params: filter, **api_headers(writer_token) expect(response).to have_http_status(:ok) expect_number_of_items(2) - expect(api_data).to include(a_hash_including(confirmed: 'true')) + expect(api_data).to include(a_hash_including(confirmed: Verification::CONFIRMATION_TRUE)) end it 'can filter verifications by creator' do @@ -56,7 +56,7 @@ verification: { tag_id: tag.id, audio_event_id: audio_event.id, - confirmed: 'true' + confirmed: Verification::CONFIRMATION_TRUE } } }