fix: fetch fail

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

diff --git a/app/models/artist.rb b/app/models/artist.rb
index 0fe9667..6c97a5e 100644 (file)
--- a/app/models/artist.rb
+++ b/app/models/artist.rb
@@ -1,90 +1,39 @@
-class Artist < ActiveRecord::Base
-  belongs_to :author
+class Artist < Peta::Owner
+  load_manifest
+  belongs_to :user
   has_many :original_pictures
+  has_many :pictures
+  has_many :resource_pictures
   
   validates :name, :presence => true, :length => {:maximum => 30}
-#  validates :default_license_id, :presence => true, :numericality => true, :existence => true
-  \r
-  before_save do |r|
-    r.supply_default
+  validates :user_id, :numericality => true, :existence => {:both => false}
+  validates :provider_id, :numericality => {:allow_nil => true}
+  
+  scope :find_index, -> do
+    self
   end
   
   def supply_default
+    self.name = 'no name' if self.name.blank?
+    self.user_id = nil
   end
   
   def self.find_by_author author
-    Artist.find( :first, :conditions => ['author_id = ?', author.id])
-  end
-  
-  def self.default_page_size
-    25
-  end
-  
-  def self.max_page_size
-    100
-  end
-  
-  def self.default_panel_size
-    30
-  end
-  
-  def self.max_panel_size
-    200
-  end
-  
-  def self.page prm = nil
-    page = prm.to_i
-    page = 1 if page < 1
-    page
-  end
-  
-  def self.page_size prm = self.default_page_size
-    page_size = prm.to_i
-    page_size = self.max_page_size if page_size > self.max_page_size
-    page_size = self.default_page_size if page_size < 1
-    page_size
-  end
-  
-  def self.offset cnt, prm = nil
-    offset = prm.to_i
-    offset = cnt - 1 if offset >= cnt
-    offset = cnt - offset.abs if offset < 0
-    offset = 0 if offset < 0
-    offset
-  end
-  
-  def self.list opt = {}, page = 1, page_size = self.default_page_size
-    opt.merge!(self.list_opt) unless opt[:include]
-    opt.merge!({:order => 'updated_at desc', :limit => page_size, :offset => (page -1) * page_size})
-    Artist.find(:all, opt)
-  end
-  
-  def self.list_opt
-    {:include => :author}
-  end
-  
-  def self.list_json_opt
-    {:include => :author}
-  end
-  
-  def self.show aid, opt = {}
-    a = Artist.find(aid, :include => self.show_include_opt(opt))
-#    raise ActiveRecord::Forbidden unless c.visible?(au)
-    a
+    Artist.where(author_id: author.id).first
   end
   
-  def self.show_include_opt opt = {}
-    res = [:author]
-    res.push(opt[:include]) if opt[:include]
-    res
+  def self.index_list_where list
+    'artists.provider_id is null'
   end
   
-  def self.show_json_include_opt
-    {:include => :author}
+  def self.show_opt
+    {:include => {:user => {:author => {}}} }
   end
   
-  def self.visible_count
-    Artist.count
+  def self.export(dt = nil)
+    artists = Artist.where('artists.provider = 0')
+    artists = artists.where(['artists.updated_at >= ?', dt]) if dt
+    artists.order(:id)
   end
   
 end