wco_models 3.1.0.269 → 3.1.0.271

data/app/models/iro/position.rb

@@ -5,7 +5,9 @@ class Iro::Position
   include Mongoid::Paranoia
   store_in collection: 'iro_positions'
 
-  field :next_gain_loss_amount, type: :float
+  field :next_gain_loss_amount,     type: :float
+  field :realized_gain_loss_amount, type: :float, default: 0.0 ## for diagonals only
+  def realized_gl; realized_gain_loss_amount; end
 
   STATUS_ACTIVE   = 'active'
   STATUS_CLOSED   = 'closed'
@@ -29,6 +31,12 @@ class Iro::Position
 
   belongs_to :purse, class_name: 'Iro::Purse',    inverse_of: :positions
   index({ purse_id: 1, ticker: 1 })
+  index({ deleted_at: 1,
+          status: 1,
+          expires_on: 1,
+          ticker: 1,
+          long_or_short: 1,
+          inner_strike: 1 })
 
   belongs_to :stock, class_name: 'Iro::Stock',    inverse_of: :positions
   field :ticker
@@ -41,8 +49,13 @@ class Iro::Position
   end
 
   belongs_to :strategy, class_name: 'Iro::Strategy', inverse_of: :positions
-  delegate :long_or_short,   to: :strategy
-  delegate :credit_or_debit, to: :strategy
+  field :long_or_short, type: String
+  before_save do
+    self.long_or_short = strategy.long_or_short
+  end
+
+  # delegate :credit_or_debit, to: :strategy
+  field :credit_or_debit, type: String # , default: 'credit'
 
   field :put_call, type: :string
   validates :put_call, presence: true
@@ -67,9 +80,11 @@ class Iro::Position
 
   belongs_to :inner, class_name: 'Iro::Option', inverse_of: :pos_of_inner
   validates_associated :inner
+  has_many :inners, class_name: 'Iro::Option', inverse_of: :poss_of_inner ## for history and diagonals
 
   belongs_to :outer, class_name: 'Iro::Option', inverse_of: :pos_of_outer, optional: true
   validates_associated :outer
+  has_many :outers, class_name: 'Iro::Option', inverse_of: :poss_of_outer ## for history and diagonals
 
   accepts_nested_attributes_for :inner, :outer
 
@@ -79,8 +94,12 @@ class Iro::Position
   field     :inner_strike, type: :float
   validates :inner_strike, presence: true ## 2026-02-24 only to make finding easier.
 
-  field :expires_on
+  field :expires_on, type: :string
   validates :expires_on, presence: true
+  before_save :trim_expires_on
+  def trim_expires_on
+    self.expires_on = expires_on.to_s[0, 10] if expires_on.present?
+  end
 
   field :quantity, type: :integer
   validates :quantity, presence: true
@@ -93,11 +112,18 @@ class Iro::Position
   field :schwab_order_id, type: :integer
   field :schwab_status
 
+  def diag_weeks
+    pos = self
+    ((pos.outer.expires_on - pos.inner.expires_on)/7).to_i
+  end
+
   def begin_delta
-    strategy.send("begin_delta_#{strategy.kind}", self)
+    # strategy.send("begin_delta_#{strategy.kind}", self)
+    strategy.begin_delta self
   end
   def end_delta
-    strategy.send("end_delta_#{strategy.kind}", self)
+    # strategy.send("end_delta_#{strategy.kind}", self)
+    strategy.end_delta self
   end
 
   def breakeven
@@ -116,11 +142,23 @@ class Iro::Position
     p = self
     p.inner.strike + p.max_gain
   end
+  def breakeven_short_debit_put_spread
+    p = self
+    p.inner.strike - p.inner.begin_price + p.outer.begin_price
+  end
   ## 2026-02-23
   def breakeven_long_credit_put_spread
     p = self
     p.inner.strike - p.max_gain
   end
+  def breakeven_diag_long_call_spread
+    p = self
+    realized_gl + p.outer.strike + p.outer.begin_price - p.inner.begin_price
+  end
+  def breakeven_diag_short_put_spread
+    p = self
+    p.inner.strike + p.max_gain + p.realized_gl
+  end
 
 
   def current_underlying_strike
@@ -142,7 +180,7 @@ class Iro::Position
   end
 
 
-  field :pending_price
+  field :pending_price, type: :float
 
   ## credit spread only
   def close_price
@@ -151,8 +189,8 @@ class Iro::Position
     return out.round(2)
   end
 
-  ## place2 = credit-spread
-  def place2_price
+  ## credit-spread
+  def open_price
     pos = self
     out = pos.inner.begin_price - pos.outer.begin_price
     return out.round(2)
@@ -182,6 +220,15 @@ class Iro::Position
   def net_amount_short_credit_call_spread
     return net_amount_long_credit_put_spread
   end
+  def net_amount_short_debit_put_spread
+    inner.end_price - inner.begin_price + outer.begin_price - outer.end_price
+  end
+  def net_amount_diag_long_call_spread
+    inner.begin_price - outer.begin_price + outer.end_price - inner.end_price + realized_gl
+  end
+  def net_amount_diag_short_put_spread
+    net_amount_diag_long_call_spread
+  end
 
   def max_gain # each
     strategy.send("max_gain_#{strategy.kind}", self)
@@ -208,6 +255,19 @@ class Iro::Position
     outer.sync
   end
 
+  def schwab_query
+    pos = self
+    case pos.intent
+    when Iro::Strategy::INTENT_OPEN
+      the_q = Tda::Order.credit_spread_q pos
+    when Iro::Strategy::INTENT_ROLL
+      the_q = Tda::Order.roll_credit_call_spread_q pos
+    else
+      throw "prp - #schwab_query undefined for position #{pos.inspect}"
+    end
+    return the_q
+  end
+
   def self.sync_all
     @positions = Iro::Position.where( :status.in => [ 'active', 'pending' ] )
     expiration_dates = @positions.map { |p| p.expires_on.to_s }.sort
@@ -215,7 +275,7 @@ class Iro::Position
 
     count = 1
     @positions.each do |pos|
-      # puts! pos.to_s, 'pos TMP'
+      # puts! pos.id.to_s, '#sync_all.pos'
 
       quotes_h = Tda::Option.get_quotes_h({
         contractType: 'ALL',
@@ -224,12 +284,17 @@ class Iro::Position
         toDate: expiration_dates.last,
       })
 
-      pos.inner.end_price = quotes_h[pos.expires_on.to_s][pos.put_call][pos.inner.strike][:price]
-      pos.inner.end_delta = quotes_h[pos.expires_on.to_s][pos.put_call][pos.inner.strike][:delta]
+      pos.inner.end_price = quotes_h[pos.expires_on.to_date.to_s][pos.put_call][pos.inner.strike][:price]
+      pos.inner.end_delta = quotes_h[pos.expires_on.to_date.to_s][pos.put_call][pos.inner.strike][:delta]
       pos.inner.save ? print("#{count}^") : print("#{count}X")
-      if [ Iro::Strategy::KIND_LONG_CREDIT_PUT_SPREAD, Iro::Strategy::KIND_SHORT_CREDIT_CALL_SPREAD ].include?( pos.strategy.kind )
-        pos.outer.end_price = quotes_h[pos.expires_on.to_s][pos.put_call][pos.outer.strike][:price]
-        pos.outer.end_delta = quotes_h[pos.expires_on.to_s][pos.put_call][pos.outer.strike][:delta]
+
+      # if [ Iro::Strategy::KIND_LONG_CREDIT_PUT_SPREAD,
+      #      Iro::Strategy::KIND_SHORT_CREDIT_CALL_SPREAD,
+      #      Iro::Strategy::KIND_DIAG_LONG_CALL_SPREAD,
+      #      Iro::Strategy::KIND_DIAG_SHORT_PUT_SPREAD ].include?( pos.strategy.kind )
+      if pos.outer
+        pos.outer.end_price = quotes_h[pos.expires_on.to_date.to_s][pos.put_call][pos.outer.strike][:price]
+        pos.outer.end_delta = quotes_h[pos.expires_on.to_date.to_s][pos.put_call][pos.outer.strike][:delta]
         pos.outer.save ? print('^') : print('X')
       end
       count = count+1
@@ -274,6 +339,11 @@ class Iro::Position
     # puts! outs, 'outs'
     outs_bk = outs.dup
 
+    ## cleanup mid-increments
+    outs = outs.select do |out|
+      ( out[:strikePrice] - pos.inner.strike ) % strategy.stock.options_price_increment == 0
+    end
+
     outs = outs.select do |out|
       out[:bidSize] + out[:askSize] > 0
     end
@@ -319,15 +389,8 @@ class Iro::Position
 
     ## next_inner_delta
     outs = outs.select do |out|
-      if 'CALL' == pos.put_call
-        out_delta  = out[:delta] rescue 1
-        out_delta <= strategy.next_inner_delta
-      elsif 'PUT' == pos.put_call
-        out_delta  = out[:delta] rescue 0
-        out_delta <= strategy.next_inner_delta
-      else
-        raise 'zt5 - this cannot happen'
-      end
+      out_delta  = out[:delta].abs rescue 0
+      out_delta <= strategy.next_inner_delta
     end
     # puts! outs[0][:strikePrice], 'after calc next_inner_delta'
     # puts! outs, 'outs'
@@ -422,15 +485,17 @@ class Iro::Position
 
   def to_s
     out = "#{stock} (#{q}) #{expires_on.to_datetime.strftime('%b %d')} #{strategy.long_or_short} ["
-    if Iro::Strategy::LONG == long_or_short
+    if Iro::Strategy::KIND_SHORT_DEBIT_PUT_SPREAD == strategy.kind
+      out = out + "$#{outer.strike} << $#{inner.strike}"
+    elsif Iro::Strategy::LONG == long_or_short
       if outer&.strike
-        out = out + "$#{outer.strike} <- "
+        out = out + "$#{outer.strike} << "
       end
       out = out + "$#{inner.strike}"
     else
       out = out + "$#{inner.strike}"
       if outer&.strike
-        out = out + " -> $#{outer.strike}"
+        out = out + " >> $#{outer.strike}"
       end
     end
     out += "] "

data/app/models/iro/purse.rb

@@ -24,8 +24,7 @@ class Iro::Purse
   ## with unit 100, .0001
   field :summary_unit,    type: :float, default: 0.001
 
-  ## for rolling only:
-  field :height,           type: :integer, default: 100
+  field :height,           type: :integer, default: 100 ## px/q, units modal
 
   field :mark_every_n_usd, type: :float, default: 1
   field :n_next_positions, type: :integer, default: 5

data/app/models/iro/stock.rb

@@ -32,6 +32,26 @@ class ::Iro::Stock
 
   field :descr, type: :string
 
+  ## for charting:
+  field :min,  type: :integer
+  field :max,  type: :integer
+  field :step, type: :integer, default: 1.0 ## for histograms. I liked 50 bars, that's $1-3 bucket size.
+
+  validate :step_must_fit_range
+  def step_must_fit_range
+    return if min.blank? || max.blank? || step.blank?
+
+    range = max. - min.to_i
+    step_val = step.to_i
+
+
+    if !((max - min) % step).zero?
+      errors.add(:step, "must evenly divide (max-min)/step")
+    end
+  end
+
+
+
   has_many :positions,  class_name: '::Iro::Position', inverse_of: :stock
   has_many :strategies, class_name: '::Iro::Strategy', inverse_of: :stock
   # has_many :purses,     class_name: '::Iro::Purse',    inverse_of: :stock

data/app/models/iro/strategy.rb

@@ -24,6 +24,8 @@ class Iro::Strategy
   belongs_to :purse, class_name: 'Iro::Purse',    inverse_of: :strategies
 
   KIND_COVERED_CALL             = 'covered_call'
+  KIND_DIAG_LONG_CALL_SPREAD    = 'diag_long_call_spread'
+  KIND_DIAG_SHORT_PUT_SPREAD    = 'diag_short_put_spread'
   KIND_IRON_CONDOR              = 'iron_condor'
   KIND_LONG_CREDIT_PUT_SPREAD   = 'long_credit_put_spread'
   KIND_LONG_DEBIT_CALL_SPREAD   = 'long_debit_call_spread'
@@ -36,6 +38,8 @@ class Iro::Strategy
   KIND_WHEEL  = 'wheel'  ## @deprecated, use covered_call
   KINDS = [ nil,
     KIND_COVERED_CALL,
+    KIND_DIAG_LONG_CALL_SPREAD,
+    KIND_DIAG_SHORT_PUT_SPREAD,
     KIND_IRON_CONDOR,
     KIND_LONG_CREDIT_PUT_SPREAD,
     KIND_LONG_DEBIT_CALL_SPREAD,
@@ -49,6 +53,12 @@ class Iro::Strategy
 
   def put_call
     case kind
+    when Iro::Strategy::KIND_COVERED_CALL
+      put_call = 'CALL'
+    when Iro::Strategy::KIND_DIAG_LONG_CALL_SPREAD
+      put_call = 'CALL'
+    when Iro::Strategy::KIND_DIAG_SHORT_PUT_SPREAD
+      put_call = 'PUT'
     when Iro::Strategy::KIND_LONG_CREDIT_PUT_SPREAD
       put_call = 'PUT'
     when Iro::Strategy::KIND_LONG_DEBIT_CALL_SPREAD
@@ -57,8 +67,7 @@ class Iro::Strategy
       put_call = 'CALL'
     when Iro::Strategy::KIND_SHORT_DEBIT_PUT_SPREAD
       put_call = 'PUT'
-    when Iro::Strategy::KIND_COVERED_CALL
-      put_call = 'CALL'
+
     when Iro::Strategy::KIND_SPREAD
       if credit_or_debit == CREDIT
         if long_or_short == LONG
@@ -77,11 +86,11 @@ class Iro::Strategy
   end
 
 
-  field     :threshold_usd_above_mark, type: :float
+  field     :threshold_usd_above_mark, type: :float, default: 1.00
   validates :threshold_usd_above_mark, presence: true
 
   field :threshold_pos_delta, type: :float # offensive: roll b/c markets are going my way
-  field :threshold_neg_delta, type: :float # defensive: roll b/c markets are going against me
+  field :threshold_neg_delta, type: :float, default: 0.8 # defensive: roll b/c markets are going against me
   field :threshold_netp,      type: :float
   field :threshold_dte,       type: :integer, default: 1
 
@@ -91,7 +100,7 @@ class Iro::Strategy
   field :next_outer_strike,       type: :float
   field :next_spread_amount,      type: :float # e.g. $20 for a $2000 NVDA spread
 
-  field     :next_usd_above_mark, type: :float
+  field     :next_usd_above_mark, type: :float, default: 1.00
   validates :next_usd_above_mark, presence: true
 
 
@@ -108,12 +117,12 @@ class Iro::Strategy
   field :tgt_exposure, type: :float
 
 
+  def begin_delta p
+    _begin_delta_spread p
+  end
   def begin_delta_covered_call p
     p.inner.begin_delta
   end
-  # def begin_delta_wheel p
-  #   p.inner.begin_delta
-  # end
   def _begin_delta_spread p
     p.inner.begin_delta - p.outer.begin_delta
   end
@@ -123,13 +132,19 @@ class Iro::Strategy
   def begin_delta_short_credit_call_spread p
     _begin_delta_spread p
   end
+  def begin_delta_diag_long_call_spread p
+    _begin_delta_spread p
+  end
+  def begin_delta_diag_short_put_spread p
+    _begin_delta_spread p
+  end
 
+  def end_delta p
+    _end_delta_spread p
+  end
   def end_delta_covered_call p
     p.inner.end_delta
   end
-  # def end_delta_wheel p
-  #   p.inner.end_delta
-  # end
   def _end_delta_spread p
     p.inner.end_delta - p.outer.end_delta
   end
@@ -139,7 +154,21 @@ class Iro::Strategy
   def end_delta_short_credit_call_spread p
     _end_delta_spread p
   end
+  def end_delta_diag_long_call_spread p
+    _end_delta_spread p
+  end
+  def end_delta_diag_short_put_spread p
+    _end_delta_spread p
+  end
+
 
+  def max_gain_diag_long_call_spread p ## each
+    # p.outer.strike - p.inner.strike + p.outer.begin_price - p.inner.begin_price
+    p.inner.strike - p.outer.strike - p.outer.begin_price + p.inner.begin_price
+  end
+  def max_gain_diag_short_put_spread p ## each
+    p.outer.strike - p.inner.strike - p.outer.begin_price + p.inner.begin_price
+  end
 
   def max_gain_covered_call p ## each
     p.inner.begin_price # - 0.66
@@ -168,21 +197,31 @@ class Iro::Strategy
   end
 
 
+  def max_loss_diag_long_call_spread p
+    # p.inner.strike - p.outer.strike + p.inner.begin_price + p.outer.begin_price
+    p.outer.begin_price - p.inner.begin_price - p.realized_gl
+  end
+  def max_loss_diag_short_put_spread p
+    p.outer.begin_price - p.inner.begin_price - p.realized_gl ## same as above, max_loss_diag_long_call_spread
+  end
   def max_loss_covered_call p
     p.inner.begin_price*10 # just suppose 10,000%
   end
   def max_loss_long_credit_put_spread p
     out = p.inner.strike - p.outer.strike
   end
-  def max_loss_long_debit_call_spread p
-    out = p.outer.strike - p.inner.strike
-  end
-  def max_loss_short_debit_put_spread p # different
-    out = p.inner.strike - p.outer.strike
-  end
+  # def max_loss_long_debit_call_spread p
+  #   out = p.outer.strike - p.inner.strike
+  # end
+  # def max_loss_short_debit_put_spread p # different
+  #   out = p.inner.strike - p.outer.strike
+  # end
   def max_loss_short_credit_call_spread p
     out = p.outer.strike - p.inner.strike
   end
+  def max_loss_short_debit_put_spread p
+    p.inner.begin_price - p.outer.begin_price
+  end
   def max_loss_spread p
     ( p.outer.strike - p.inner.strike ).abs
   end
@@ -193,26 +232,9 @@ class Iro::Strategy
 
 
   def net_amount_spread p
-    p.inner.begin_price - p.inner.end_price
+    p.inner.begin_price - p.inner.end_price - p.outer.begin_price + p.outer.end_price
   end
-  # def net_amount_long_credit_put_spread p
-  #   p.inner.begin_price - p.inner.end_price
-  # end
-
 
-  ## 2024-05-09 _TODO
-  ## 2025-10-11 _TODO
-  ## 2026-02-23 trash, makes no sense.
-=begin
-  def next_inner_strike_on expires_on
-    outs = ::Tda::Option.get_quotes({
-      contractType: put_call,
-      expirationDate: expires_on,
-      ticker: stock.ticker,
-    })
-    puts! outs, 'next_inner_strike_on -> outs'
-  end
-=end
 
 
   ##
@@ -277,11 +299,6 @@ class Iro::Strategy
   def calc_rollp_long_credit_put_spread p
     stock.reload
 
-    # puts! p, '#calc_rollp_long_credit_put_spread'
-    # puts! p.inner, 'p.inner'
-    # puts! stock, 'stock'
-    # puts! attributes, 'strategy attributes'
-
     if ( p.expires_on.to_date - Time.now.to_date ).to_i < 1
       return [ 0.99, '0 DTE, must exit' ]
     end

data/app/models/tda/option.rb

@@ -178,7 +178,7 @@ class Tda::Option
 
   ## 2026-02-23 use this instead.
   def self.get_quotes_h params
-    # puts! params, 'Tda::Option#get_quotes_h ...'
+    # puts! params, 'Tda::Option#get_quotes_h params ...'
 
     profile = Wco::Profile.find_by email: 'piousbox@gmail.com'
     opts = {}

data/app/models/tda/order.rb

@@ -98,10 +98,10 @@ class Tda::Order
     return query
   end
 
-  ## open credit spread?!
+  ## open credit spread
   def self.credit_spread_q pos
     query = {
-      orderType: pos.place2_price > 0 ? "NET_CREDIT" : "NET_DEBIT",
+      orderType: pos.pending_price > 0 ? "NET_CREDIT" : "NET_DEBIT",
       session: "NORMAL",
       duration: "DAY",
       price: pos.pending_price,
@@ -190,10 +190,10 @@ class Tda::Order
 
   def self.roll_credit_call_spread_q pos
     query = {
-      orderType: pos.roll_price > 0 ? "NET_CREDIT" : "NET_DEBIT",
+      orderType: pos.pending_price > 0 ? "NET_CREDIT" : "NET_DEBIT",
       session: "NORMAL",
       duration: "DAY",
-      price: pos.roll_price.abs.to_s,
+      price: pos.pending_price.abs.to_s,
       orderStrategyType: "SINGLE",
       orderLegCollection: [
         ## close

data/app/models/wco/lead.rb

@@ -28,11 +28,6 @@ class Wco::Lead
   field :memory, type: Hash, default: {}
 
   belongs_to :leadset, class_name: 'Wco::Leadset'
-  before_validation :set_leadset, on: :create
-  def set_leadset
-    domain         = email.split('@')[1]
-    self.leadset ||= Wco::Leadset.find_or_create_by({ company_url: domain })
-  end
   before_validation :normalize_email, on: :create
   def normalize_email
     self[:email] = email.downcase
@@ -49,6 +44,12 @@ class Wco::Lead
     end
     return a
   end
+  before_validation :set_leadset, on: :create
+  def set_leadset
+    domain         = email.split('@')[1]
+    self.leadset ||= Wco::Leadset.find_or_create_by({ company_url: domain })
+  end
+
   def self.find_or_create_by_email email
     email = self.normalize_email email
     out = where( email: email ).first

data/app/models/wco/newspartial.rb

@@ -92,12 +92,17 @@ class Wco::Newspartial
     return out
   end
 
+  ##
+  ## Can I make do without puppet driver? Probably not: I need the audio worklet.
+  ##
   def generate_video
     cmd = "cd #{ISHLIB3JS_ROOT} ;
       node ./src/talking_head/example_puppeteer_wired.js \
-        --api_key=#{SIMPLE_API_KEY} \
-        --api_secret=#{SIMPLE_API_SECRET} \
+        --api_key=#{WCO_SIMPLE_API_KEY} \
+        --api_secret=#{WCO_SIMPLE_API_SECRET} \
         --wco_origin=#{WCO_ORIGIN} \
+        --w_px=#{newsvideo.w_px} \
+        --h_px=#{newsvideo.h_px} \
         --newspartial_id=#{self[:id]} ";
 
     puts "+++ cmd:"

data/app/models/wco/newsvideo.rb

@@ -26,6 +26,8 @@ class Wco::Newsvideo
   field :config_json, type: :string
   field :duration_ms, type: :integer
 
+  field :w_px, type: Integer
+  field :h_px, type: Integer
   field :x, :type => Float
   field :y, :type => Float
   field :z, :type => Float

data/app/models/wco/photo.rb

@@ -15,6 +15,8 @@ class Wco::Photo
   belongs_to :gallery,        class_name: 'Wco::Gallery',      optional: true
   belongs_to :lead,           class_name: 'Wco::Lead',         optional: true
 
+  belongs_to :report,        class_name: 'Wco::Report',      optional: true
+
   has_many :email_templates, class_name: 'WcoEmail::EmailTemplate'
   # belongs_to :newsitem,      :optional => true
 

data/app/models/wco/profile.rb

@@ -10,6 +10,7 @@ class Wco::Profile
   validates :email, presence: true, uniqueness: true
 
   field :name
+  field :descr
 
 
   field :per_page, type: :integer, default: 25
@@ -31,10 +32,15 @@ class Wco::Profile
   field :smtp_password
   field :smtp_port
 
+  field :linkedin_client_id
+  field :linkedin_client_secret
+  field :linkedin_access_token
+
 
   has_many :newsvideos, class_name: 'Wco::Newsvideo'
   has_many :reports, class_name: 'Wco::Report'
   has_many :stocks, class_name: 'Iro::Stock'
+  has_many :sidebar_tags, class_name: 'Wco::Tag', inverse_of: :sidebar_profile
 
   belongs_to :leadset, class_name: 'Wco::Leadset', inverse_of: :profile
   has_many :newsitems, class_name: 'Wco::Newsitem'

data/app/models/wco/publisher.rb

@@ -28,13 +28,13 @@ class Wco::Publisher
     @headers = {}
     @ctx     = OpenStruct.new
 
-    puts! context_eval, 'context_eval'
+    # puts! context_eval, 'context_eval'
     eval( context_eval )
-    puts! @ctx, '@ctx'
+    # puts! @ctx, '@ctx'
 
     tmpl = ERB.new post_body_tmpl
     body = JSON.parse tmpl.result(binding)
-    puts! body, 'body'
+    # puts! body, 'body'
 
     out = Wco::HTTParty.post( "#{@site.origin}#{post_path}", {
       body: body.to_json,

data/app/models/wco/report.rb

@@ -13,7 +13,7 @@ class Wco::Report
 
   field :title
   validates :title, presence: true # , uniqueness: true
-  index({ title: 1 }, { unique: true })
+  index({ title: 1 })
   def name ; title ; end
 
   field :subtitle
@@ -25,6 +25,9 @@ class Wco::Report
   before_validation :set_slug, on: :create
 
   field :body
+  def body_json
+    body.gsub(/\r/, '').gsub(/\n\n+/, '<br /><br />').to_json
+  end
 
   field :x, :type => Float
   field :y, :type => Float
@@ -32,8 +35,8 @@ class Wco::Report
 
   belongs_to :author, class_name: 'Wco::Profile'
 
-  # has_one :image_thumb
-  # has_one :image_hero
+  has_one :image_thumb, class_name: 'Wco::Photo', inverse_of: :report, dependent: :destroy
+  accepts_nested_attributes_for :image_thumb
 
   has_and_belongs_to_many :tags
 

data/app/models/wco/site.rb

@@ -25,7 +25,7 @@ class Wco::Site
   validates :slug, presence: true, uniqueness: true
 
   field :origin # http://pi.local
-  validates :origin, presence: true, uniqueness: true
+  # validates :origin, presence: true, uniqueness: true
 
   field :post_path # /node?_format=hal_json
   field :username
@@ -39,7 +39,7 @@ class Wco::Site
   end
 
   def self.list
-    [[nil,nil]] + all.map { |s| [ s.origin, s.id ] }
+    [[nil,nil]] + all.map { |s| [ s.slug, s.id ] }
   end
 
   def body

data/app/models/wco/tag.rb

@@ -9,10 +9,13 @@ class Wco::Tag
   validates :slug, presence: true, uniqueness: true
   index({ slug: -1 })
 
+  field :weight, type: :string, default: 'jjj'
+
   belongs_to :parent, class_name: '::Wco::Tag', inverse_of: :sons, optional: true
   has_many :sons,     class_name: '::Wco::Tag', inverse_of: :parent
 
   belongs_to :site,          class_name: '::Wco::Site', optional: true
+  belongs_to :sidebar_profile, class_name: 'Wco::Profile', optional: true
   has_many :email_filters,   class_name: '::WcoEmail::EmailFilter',   inverse_of: :tag
   has_many :email_templates, class_name: '::WcoEmail::EmailTemplate', inverse_of: :tag
   has_many :ajects,         class_name: '::WcoEmail::EmailFilterAction', inverse_of: :aject