remove google id database constraint

codelittinc · Jan 25, 2024 · e07cdc7 · e07cdc7
1 parent 5d26d99
commit e07cdc7
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 11 deletions.
diff --git a/app/models/retainer_contract_model.rb b/app/models/retainer_contract_model.rb
@@ -6,7 +6,7 @@
 #
 #  id                        :bigint           not null, primary key
 #  charge_upfront            :boolean          default(FALSE), not null
-#  expected_hours_per_period :float
+#  expected_hours_per_period :float            default(0.0)
 #  revenue_per_period        :float
 #  created_at                :datetime         not null
 #  updated_at                :datetime         not null

diff --git a/app/models/user.rb b/app/models/user.rb
@@ -23,7 +23,6 @@
 # Indexes
 #
 #  index_users_on_email          (email) UNIQUE
-#  index_users_on_google_id      (google_id) UNIQUE
 #  index_users_on_profession_id  (profession_id)
 #  index_users_on_slug           (slug) UNIQUE
 #

diff --git a/app/utils/analytics/finances/calculators/retainer_calculator.rb b/app/utils/analytics/finances/calculators/retainer_calculator.rb
@@ -35,7 +35,7 @@ def assigned_expected_income(_assignment)
 
         def expected_hours(assignment)
           statement_of_work_total_hours = assignment.requirement.statement_of_work.contract_model.expected_hours_per_period
-          return super if statement_of_work_total_hours.nil?
+          return super if statement_of_work_total_hours.nil? || statement_of_work_total_hours.zero?
 
           statement_of_work_total_hours * assignment.coverage
         end

diff --git a/db/migrate/20240125200817_remove_index_users_on_google_id.rb b/db/migrate/20240125200817_remove_index_users_on_google_id.rb
@@ -0,0 +1,5 @@
+class RemoveIndexUsersOnGoogleId < ActiveRecord::Migration[7.0]
+  def change
+    remove_index :users, name: :index_users_on_google_id
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
diff --git a/spec/factories/retainer_contract_models.rb b/spec/factories/retainer_contract_models.rb
@@ -6,7 +6,7 @@
 #
 #  id                        :bigint           not null, primary key
 #  charge_upfront            :boolean          default(FALSE), not null
-#  expected_hours_per_period :float
+#  expected_hours_per_period :float            default(0.0)
 #  revenue_per_period        :float
 #  created_at                :datetime         not null
 #  updated_at                :datetime         not null

diff --git a/spec/factories/users.rb b/spec/factories/users.rb
@@ -23,7 +23,6 @@
 # Indexes
 #
 #  index_users_on_email          (email) UNIQUE
-#  index_users_on_google_id      (google_id) UNIQUE
 #  index_users_on_profession_id  (profession_id)
 #  index_users_on_slug           (slug) UNIQUE
 #

diff --git a/spec/models/retainer_contract_model_spec.rb b/spec/models/retainer_contract_model_spec.rb
@@ -6,7 +6,7 @@
 #
 #  id                        :bigint           not null, primary key
 #  charge_upfront            :boolean          default(FALSE), not null
-#  expected_hours_per_period :float
+#  expected_hours_per_period :float            default(0.0)
 #  revenue_per_period        :float
 #  created_at                :datetime         not null
 #  updated_at                :datetime         not null

diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
@@ -23,7 +23,6 @@
 # Indexes
 #
 #  index_users_on_email          (email) UNIQUE
-#  index_users_on_google_id      (google_id) UNIQUE
 #  index_users_on_profession_id  (profession_id)
 #  index_users_on_slug           (slug) UNIQUE
 #