update schema

nerdgeschoss · Jan 14, 2025 · c98eabc · c98eabc
1 parent 11126bc
commit c98eabc
Show file tree

Hide file tree

Showing 13 changed files with 61 additions and 234 deletions.
diff --git a/app/models/awesome_form.rb b/app/models/awesome_form.rb
diff --git a/app/models/sprint.rb b/app/models/sprint.rb
@@ -5,9 +5,9 @@
 # Table name: sprints
 #
 #  id            :uuid             not null, primary key
-#  title         :string           not null
 #  sprint_during :daterange        not null
-#  working_days  :integer          not null
+#  title         :string           not null
+#  working_days  :integer          default(0), not null
 #  created_at    :datetime         not null
 #  updated_at    :datetime         not null
 #

diff --git a/app/models/sprint_feedback.rb b/app/models/sprint_feedback.rb
@@ -5,16 +5,16 @@
 # Table name: sprint_feedbacks
 #
 #  id                     :uuid             not null, primary key
-#  billable_hours         :decimal(, )
+#  billable_hours         :decimal(, )      default(0.0), not null
 #  costs                  :decimal(, )
-#  daily_nerd_count       :integer
+#  daily_nerd_count       :integer          default(0), not null
 #  daily_nerd_entry_dates :datetime         default([]), not null, is an Array
 #  finished_storypoints   :integer          default(0), not null
 #  retro_rating           :integer
 #  retro_text             :string
 #  review_notes           :string
-#  skip_retro             :boolean          default(FALSE)
-#  tracked_hours          :decimal(, )
+#  skip_retro             :boolean          default(FALSE), not null
+#  tracked_hours          :decimal(, )      default(0.0), not null
 #  turnover               :decimal(, )
 #  created_at             :datetime         not null
 #  updated_at             :datetime         not null

diff --git a/app/models/user.rb b/app/models/user.rb
@@ -4,26 +4,24 @@
 #
 # Table name: users
 #
-#  id                     :uuid             not null, primary key
-#  born_on                :date
-#  email                  :string           default(""), not null
-#  encrypted_password     :string           default(""), not null
-#  first_name             :string
-#  github_handle          :string
-#  hired_on               :date
-#  last_name              :string
-#  nick_name              :string
-#  remember_created_at    :datetime
-#  reset_password_sent_at :datetime
-#  reset_password_token   :string
-#  roles                  :string           default([]), not null, is an Array
-#  yearly_holidays        :integer          default(30), not null
-#  created_at             :datetime         not null
-#  updated_at             :datetime         not null
-#  slack_id               :string
+#  id              :uuid             not null, primary key
+#  born_on         :date
+#  email           :string           default(""), not null
+#  first_name      :string
+#  github_handle   :string
+#  hired_on        :date
+#  last_name       :string
+#  nick_name       :string
+#  roles           :string           default([]), not null, is an Array
+#  yearly_holidays :integer          default(30), not null
+#  created_at      :datetime         not null
+#  updated_at      :datetime         not null
+#  slack_id        :string
 #
 
 class User < ApplicationRecord
+  self.ignored_columns = ["encrypted_password", "reset_password_sent_at", "reset_password_token", "remember_created_at"]
+
   scope :alphabetically, -> { order(first_name: :asc) }
   scope :with_role, ->(role) { where("? = ANY(users.roles)", role) }
   scope :sprinter, -> { with_role("sprinter") }

diff --git a/app/policies/user_policy.rb b/app/policies/user_policy.rb
@@ -22,7 +22,7 @@ def unpaid_vacation?
   end
 
   def permitted_attributes
-    [:first_name, :last_name, :nick_name, :password, :password_confirmation]
+    [:first_name, :last_name, :nick_name]
   end
 
   class Scope < Scope

diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml
diff --git a/db/seeds.rb b/db/seeds.rb
@@ -30,8 +30,6 @@
     born_on: Faker::Date.birthday(min_age: 18, max_age: 65),
     hired_on: Faker::Date.between(from: "2010-01-01", to: "2023-12-31"),
     slack_id: Faker::Alphanumeric.alphanumeric(number: 10),
-    password: "password",
-    password_confirmation: "password",
     github_handle: ["JensRavens"][i]
   )
 
@@ -78,4 +76,4 @@
 end
 
 logger.debug "Creating admin user..."
-User.create!(email: "admin@nerdgeschoss.de", password: "password", roles: [:hr, :sprinter])
+User.create!(email: "admin@nerdgeschoss.de", roles: [:hr, :sprinter])
diff --git a/spec/fixtures/sprint_feedbacks.yml b/spec/fixtures/sprint_feedbacks.yml
@@ -3,16 +3,16 @@
 # Table name: sprint_feedbacks
 #
 #  id                     :uuid             not null, primary key
-#  billable_hours         :decimal(, )
+#  billable_hours         :decimal(, )      default(0.0), not null
 #  costs                  :decimal(, )
-#  daily_nerd_count       :integer
+#  daily_nerd_count       :integer          default(0), not null
 #  daily_nerd_entry_dates :datetime         default([]), not null, is an Array
 #  finished_storypoints   :integer          default(0), not null
 #  retro_rating           :integer
 #  retro_text             :string
 #  review_notes           :string
-#  skip_retro             :boolean          default(FALSE)
-#  tracked_hours          :decimal(, )
+#  skip_retro             :boolean          default(FALSE), not null
+#  tracked_hours          :decimal(, )      default(0.0), not null
 #  turnover               :decimal(, )
 #  created_at             :datetime         not null
 #  updated_at             :datetime         not null

diff --git a/spec/fixtures/sprints.yml b/spec/fixtures/sprints.yml
@@ -3,9 +3,9 @@
 # Table name: sprints
 #
 #  id            :uuid             not null, primary key
-#  title         :string           not null
 #  sprint_during :daterange        not null
-#  working_days  :integer          not null
+#  title         :string           not null
+#  working_days  :integer          default(0), not null
 #  created_at    :datetime         not null
 #  updated_at    :datetime         not null
 #

diff --git a/spec/fixtures/users.yml b/spec/fixtures/users.yml
@@ -2,23 +2,19 @@
 #
 # Table name: users
 #
-#  id                     :uuid             not null, primary key
-#  born_on                :date
-#  email                  :string           default(""), not null
-#  encrypted_password     :string           default(""), not null
-#  first_name             :string
-#  github_handle          :string
-#  hired_on               :date
-#  last_name              :string
-#  nick_name              :string
-#  remember_created_at    :datetime
-#  reset_password_sent_at :datetime
-#  reset_password_token   :string
-#  roles                  :string           default([]), not null, is an Array
-#  yearly_holidays        :integer          default(30), not null
-#  created_at             :datetime         not null
-#  updated_at             :datetime         not null
-#  slack_id               :string
+#  id              :uuid             not null, primary key
+#  born_on         :date
+#  email           :string           default(""), not null
+#  first_name      :string
+#  github_handle   :string
+#  hired_on        :date
+#  last_name       :string
+#  nick_name       :string
+#  roles           :string           default([]), not null, is an Array
+#  yearly_holidays :integer          default(30), not null
+#  created_at      :datetime         not null
+#  updated_at      :datetime         not null
+#  slack_id        :string
 #
 john: &john
   email: john@example.com

diff --git a/spec/models/sprint_feedback_spec.rb b/spec/models/sprint_feedback_spec.rb
@@ -5,16 +5,16 @@
 # Table name: sprint_feedbacks
 #
 #  id                     :uuid             not null, primary key
-#  billable_hours         :decimal(, )
+#  billable_hours         :decimal(, )      default(0.0), not null
 #  costs                  :decimal(, )
-#  daily_nerd_count       :integer
+#  daily_nerd_count       :integer          default(0), not null
 #  daily_nerd_entry_dates :datetime         default([]), not null, is an Array
 #  finished_storypoints   :integer          default(0), not null
 #  retro_rating           :integer
 #  retro_text             :string
 #  review_notes           :string
-#  skip_retro             :boolean          default(FALSE)
-#  tracked_hours          :decimal(, )
+#  skip_retro             :boolean          default(FALSE), not null
+#  tracked_hours          :decimal(, )      default(0.0), not null
 #  turnover               :decimal(, )
 #  created_at             :datetime         not null
 #  updated_at             :datetime         not null

diff --git a/spec/models/sprint_spec.rb b/spec/models/sprint_spec.rb
@@ -5,9 +5,9 @@
 # Table name: sprints
 #
 #  id            :uuid             not null, primary key
-#  title         :string           not null
 #  sprint_during :daterange        not null
-#  working_days  :integer          not null
+#  title         :string           not null
+#  working_days  :integer          default(0), not null
 #  created_at    :datetime         not null
 #  updated_at    :datetime         not null
 #