diff --git a/app/models/coordinator_fee.rb b/app/models/coordinator_fee.rb index b308c611b1..4a69085e03 100644 --- a/app/models/coordinator_fee.rb +++ b/app/models/coordinator_fee.rb @@ -1,6 +1,8 @@ # frozen_string_literal: true class CoordinatorFee < ApplicationRecord + self.belongs_to_required_by_default = true + belongs_to :order_cycle belongs_to :enterprise_fee end diff --git a/db/migrate/20230516052547_require_order_cycle_and_enterprise_fee_on_coordinator_fees.rb b/db/migrate/20230516052547_require_order_cycle_and_enterprise_fee_on_coordinator_fees.rb new file mode 100644 index 0000000000..6cef109289 --- /dev/null +++ b/db/migrate/20230516052547_require_order_cycle_and_enterprise_fee_on_coordinator_fees.rb @@ -0,0 +1,8 @@ +# frozen_string_literal: true + +class RequireOrderCycleAndEnterpriseFeeOnCoordinatorFees < ActiveRecord::Migration[7.0] + def change + change_column_null :coordinator_fees, :order_cycle_id, false + change_column_null :coordinator_fees, :enterprise_fee_id, false + end +end diff --git a/db/schema.rb b/db/schema.rb index 1e7f7ef0aa..a7e99573f2 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -64,8 +64,8 @@ ActiveRecord::Schema[7.0].define(version: 2023_05_22_120633) do end create_table "coordinator_fees", id: :serial, force: :cascade do |t| - t.integer "order_cycle_id" - t.integer "enterprise_fee_id" + t.integer "order_cycle_id", null: false + t.integer "enterprise_fee_id", null: false t.index ["enterprise_fee_id"], name: "index_coordinator_fees_on_enterprise_fee_id" t.index ["order_cycle_id"], name: "index_coordinator_fees_on_order_cycle_id" end diff --git a/spec/models/coordinator_fee_spec.rb b/spec/models/coordinator_fee_spec.rb new file mode 100644 index 0000000000..5e3a8765b8 --- /dev/null +++ b/spec/models/coordinator_fee_spec.rb @@ -0,0 +1,8 @@ +# frozen_string_literal: true + +require 'spec_helper' + +describe CoordinatorFee do + it { is_expected.to belong_to(:order_cycle).required } + it { is_expected.to belong_to(:enterprise_fee).required } +end