Massive Cleanup

[cs356-p2-videostore.git] / app / models / video.rb

diff --git a/app/models/video.rb b/app/models/video.rb
index b20602a..7739aeb 100644 (file)
--- a/app/models/video.rb
+++ b/app/models/video.rb
@@ -1,17 +1,17 @@
 class Video < Rentable
   has_many :video_genres
-  has_many :medias
+  has_many :video_medias
 
   validates_presence_of :director
-  validates_presence_of :video_genre
-  validates_presence_of :media
+  validates_presence_of :video_genre_id
+  validates_presence_of :video_media_id
 
   def genre
-    return Videogenre.find(video_genre).name
+    VideoGenre.find_by_id(video_genre_id)
   end
 
-  def media_name
-    return Media.find(media).name
+  def media
+    VideoMedia.find_by_id(video_media_id)
   end
 
   def calculated_price
@@ -39,6 +39,6 @@ class Video < Rentable
   protected
   def validate
     errors.add(:video_genre, "does not exist in the database") if video_genre.nil?
-    errors.add(:media, "does not exist in the database") if media.nil?
+    errors.add(:video_media, "does not exist in the database") if video_media.nil?
   end
 end