Refactoring Models CoursesSubject and UsersCourse 49513

zenith19 · Dec 24, 2015 · 928293f · 928293f
1 parent 92a25a3
commit 928293f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 22 deletions.
diff --git a/app/models/courses_subject.rb b/app/models/courses_subject.rb
@@ -1,10 +1,7 @@
 class CoursesSubject < ActiveRecord::Base
   acts_as_paranoid
-  STATUS = {
-    new: 0,
-    started: 1,
-    finished: 2
-  }
+
+  enum status: [:created, :started, :finished]
 
   attr_accessor :update_status
 
@@ -14,16 +11,4 @@ class CoursesSubject < ActiveRecord::Base
   has_many :users, through: :users_subjects
   has_many :courses_subjects_tasks, dependent: :destroy
   has_many :tasks, through: :courses_subjects_tasks
-
-  def new?
-    status == STATUS[:new]
-  end
-
-  def started?
-    status == STATUS[:started]
-  end
-
-  def finished?
-    status == STATUS[:finished]
-  end
 end
diff --git a/app/models/users_course.rb b/app/models/users_course.rb
@@ -3,11 +3,6 @@ class UsersCourse < ActiveRecord::Base
   tracked owner: ->(controller, model) {controller && controller.current_user}
   acts_as_paranoid
 
-  ASSIGN_TYPE = {
-    supervisor: "supervisor",
-    trainee: "trainee"
-  }
-
   after_create :appened_assigned_users
   after_destroy :appened_removed_users