ish_models 3.1.0.13 → 3.1.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c46fe1a3c912f44bfea7b3c8860504d9e43dc58ac5c61d2b78f54d9b3604d5df
-  data.tar.gz: 24db6889ed4f929a9efb76f8ecb583923468902b49b41a189c2552d0d68ecfa9
+  metadata.gz: 878db6bcfd78a87582b23a3edf1fae48aba69227e3147867bb72dc27cf6e4fee
+  data.tar.gz: 6dd6d2b220b3c5ee8898cbe0801ccadc4f76a1a4247e5086fd825bb1d7988cd1
 SHA512:
-  metadata.gz: 47ad49ab1c7a3890c57da215dbdc261d0d04d55b61d8c1f1e286bccbed161f445f69a73e9fee8ad2a4c6e24be2b1d18fc9ebffdd61df085f78e00779799893be
-  data.tar.gz: 89322ee3df01c880d551299c79f13015fb80e25fb31d9e3a73f09e8d7ed34ebc74e550d33acee70680484f38cf14d94e59dcc9b7e05802592436fcdb1e226f37
+  metadata.gz: c1cdd9e7fa1872d4af5df0aefe4af23edd0f8a00a6e6acbf6feccd0298f4a61d1b3a522a31f8de134c0174adfc62b5625b06cf7aba2635a89d7788a05431d557
+  data.tar.gz: 6a6d9e6467c0eb65a982bda906e83cfd628577a7f24fe6d04bebb5a3349bbf77eae1abf38e4b44e69dc911e93dd9ef19516cf191b5eb82ec504b79b0ba43137d

data/lib/wco/leadset.rb

@@ -13,8 +13,8 @@ class Wco::Leadset
   index({ email: 1 }, { name: 'email' })
   validates :email, presence: true, uniqueness: true
 
-  has_many :profiles,   class_name: 'Wco::Profile',          inverse_of: :leadset
-  has_many :appliances, class_name: 'WcoHosting::Appliance', inverse_of: :leadset
+  has_many :profiles,    class_name: 'Wco::Profile',           inverse_of: :leadset
+  has_many :appliances,  class_name: 'WcoHosting::Appliance',  inverse_of: :leadset
 
   has_many :serverhosts, class_name: 'WcoHosting::Serverhost', inverse_of: :leadset
   def next_serverhost

data/lib/wco/profile.rb

@@ -12,4 +12,8 @@ class Wco::Profile
 
   belongs_to :leadset, class_name: 'Wco::Leadset', inverse_of: :profile, optional: true
 
+  def self.list
+    all.map { |p| [ p.email, p.id ] }
+  end
+
 end

data/lib/wco_hosting/appliance.rb

@@ -27,13 +27,12 @@ class WcoHosting::Appliance
     "#{subdomain}.#{domain}"
   end
 
-  belongs_to :appliance_tmpl, class_name: 'Wco::ApplianceTmpl'
+  belongs_to :appliance_tmpl, class_name: 'WcoHosting::ApplianceTmpl'
   def tmpl
     appliance_tmpl
   end
 
-  belongs_to :serverhost,     class_name: 'Wco::Serverhost'
-  belongs_to :wco_leadset, class_name: 'Wco::Leadset', inverse_of: :appliances
+  belongs_to :serverhost,  class_name: 'WcoHosting::Serverhost'
 
   # field :ip
   field :port

data/lib/wco_hosting/appliance_tmpl.rb

@@ -47,7 +47,7 @@ class WcoHosting::ApplianceTmpl
     KIND_JENKINS, KIND_MATOMO, KIND_MOODLE, KIND_PRESTASHOP, KIND_SMT,
     KIND_WORDPRESS ]
 
-  has_many :appliances, class_name: 'Wco::Appliance'
+  has_many :appliances, class_name: 'WcoHosting::Appliance'
 
   def self.latest_of kind
     where({ kind: kind }).order_by({ version: :desc }).first

data/lib/wco_hosting/serverhost.rb

@@ -7,13 +7,10 @@ class WcoHosting::Serverhost
   # include Mongoid::Autoinc
   store_in collection: 'wco_serverhosts'
 
-  field :name, type: :string
-  # validates :name, uniqueness: { scope: :leadset_id }, presence: true
-  validates :name, uniqueness: { scope: :wco_leadset }, presence: true
+  field     :name, type: :string
+  validates :name, uniqueness: { scope: :leadset }, presence: true
 
-  # field :leadset_id, type: :integer
-  # has_and_belongs_to_many :leadsets, class_name: 'Wco::Leadset', inverse_of: :serverhosts
-  belongs_to :wco_leadset, class_name: 'Wco::Leadset'
+  belongs_to :leadset, class_name: 'Wco::Leadset'
 
   field :next_port, type: :integer, default: 8000
 
@@ -136,5 +133,9 @@ class WcoHosting::Serverhost
     puts 'ok #create_volume'
   end
 
+  def self.list
+    [[nil,nil]] + all.map { |s| [s.name, s.id] }
+    # all.map { |s| [s.name, s.id] }
+  end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.13
+  version: 3.1.0.15
 platform: ruby
 authors:
 - mac_a2141
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-17 00:00:00.000000000 Z
+date: 2023-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails