fix: fetch fail

[pettanr/pettanr.git] / app / models / demander.rb

diff --git a/app/models/demander.rb b/app/models/demander.rb
index 0e0afe7..c1d6fd0 100644 (file)
--- a/app/models/demander.rb
+++ b/app/models/demander.rb
@@ -118,24 +118,34 @@ class Demander < ActiveRecord::Base
     self.demander_status.stop
   end
   
-  def licenses_export date_str = nil
+  def licenses_export date = nil
     raise ActiveRecord::Forbidden unless self.status == 3
-    License.export date_str
+    License.export date
   end
   
-  def artists_export date_str = nil
+  def artists_export date = nil
     raise ActiveRecord::Forbidden unless self.status == 3
-    Artist.export date_str
+    Artist.export date
   end
   
-  def original_pictures_export date_str = nil
+  def original_pictures_export date = nil
     raise ActiveRecord::Forbidden unless self.status == 3
-    OriginalPicture.export date_str
+    OriginalPicture.export date
   end
   
-  def pictures_export date_str = nil
+  def pictures_export date = nil
     raise ActiveRecord::Forbidden unless self.status == 3
-    Picture.export date_str
+    Picture.export date
+  end
+  
+  def export date
+    raise ActiveRecord::Forbidden unless self.status == 3
+    {
+      :licenses => self.licenses_export(date), 
+      :artists => self.artists_export(date), 
+      :original_pictures => self.original_pictures_export(date), 
+      :pictures => self.pictures_export(date)
+    }
   end
   
 end