ish_models 3.1.0.16 → 3.1.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9979bc99e29824d443826f24d71e64f31bc868419515883b43574b4a3754e6c9
-  data.tar.gz: d467751ef81aaf1572fe8f510be942f2355b1d20b7964769145c319d912fdb94
+  metadata.gz: b697e15fa3600c6da649b862c536b7acfc36670075e5afc236982dbdd932b378
+  data.tar.gz: 92615b9c83accdc281029599e92cdd17aad4a6bc510663d4f590b25314daeeb5
 SHA512:
-  metadata.gz: 3cf5af678f0b416eee707ecfe4b539523b6628b4bdd6566b089ea319a925cc3742c117f91a11539ad5661d2cfad22535e28e1424e58a5ea7471ed7da99d5e1fb
-  data.tar.gz: df8e575d99195b7a8fff8d41ab7647fbddc1cadfef51dfa27885d5f95fcfb0e29c997ce074cce0e5d5daac9d59d26c95120b513f87489f93277b55a15ec994e9
+  metadata.gz: ca7d47294b41367f1c12828b325a76aa5ef4481f0ebbd4698834a9a622d48ff5dba420aafa57e4f5f7f6ace1de1712236c05ea1c78eba0a8ee46089c3dd980be
+  data.tar.gz: d4b87a0122efe2328406d064687f9620b1f3410daf4ce57ad0fe47eaab06297f5d40b57e6a1ea92b36c0ccb0af2fa02db082664a96f557c64e45681b650465d9

data/app/models/wco/leadset.rb

@@ -5,18 +5,18 @@ class Wco::Leadset
   store_in collection: 'wco_leadsets'
 
   field :company_url
-  def domain; company_url; end
+  def domain; company_url; end ## @TODO: remove
   validates :company_url, presence: true, uniqueness: true
   index({ company_url: 1 }, { name: 'company_url' })
 
   field :email
   index({ email: 1 }, { name: 'email' })
-  validates :email, presence: true, uniqueness: true
+  validates :email, presence: true # , uniqueness: true ## @TODO: should it be unique? _vp_ 2023-12-22
 
   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
+  has_and_belongs_to_many :serverhosts, class_name: 'WcoHosting::Serverhost' # , inverse_of: :leadset
   def next_serverhost
     serverhosts.first
   end

data/app/models/wco/newsitem.rb

@@ -0,0 +1,9 @@
+
+
+class Wco::Newsitem
+  include Mongoid::Document
+  include Mongoid::Timestamps
+  store_in collection: 'wco_newsitems'
+
+  belongs_to :profile, class_name: 'Wco::Profile', optional: true
+end

data/app/models/wco/profile.rb

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

data/app/models/wco_hosting/serverhost.rb

@@ -13,7 +13,7 @@ class WcoHosting::Serverhost
   field     :name, type: :string
   validates :name, uniqueness: { scope: :leadset }, presence: true
 
-  belongs_to :leadset, class_name: 'Wco::Leadset'
+  has_and_belongs_to_many :leadsets, class_name: 'Wco::Leadset'
 
   field :next_port, type: :integer, default: 8000
 
@@ -34,28 +34,28 @@ class WcoHosting::Serverhost
     add_docker_service( app )
     add_nginx_site(     app )
     # load_database( app )
+    add_subdomain(      app )
 
-    ##
-    ## DNS add_subdomain
-    ##
-    # ac   = ActionController::Base.new
-    # ac.instance_variable_set( :@app, app )
-    # rendered_str = ac.render_to_string("wco_hosting/scripts/create_subdomain.json")
-    # # puts '+++ add_subdomain rendered_str:'; print rendered_str
+    update({ next_port: app.serverhost.next_port + 1 })
+  end
 
-    # file = Tempfile.new('prefix')
-    # file.write rendered_str
-    # file.close
+  def add_subdomain app
+    ac   = ActionController::Base.new
+    ac.instance_variable_set( :@app, app )
+    rendered_str = ac.render_to_string("wco_hosting/scripts/create_subdomain.json")
+    # puts '+++ add_subdomain rendered_str:'; print rendered_str
 
-    # cmd = "aws route53 change-resource-record-sets \
-    #   --hosted-zone-id <%= app.route53_zone %> \
-    #   --change-batch file://<%= file.path %> "
-    # puts! cmd, 'cmd'
-    # `#{cmd}`
+    file = Tempfile.new('prefix')
+    file.write rendered_str
+    file.close
 
-    update({ next_port: app.serverhost.next_port + 1 })
+    cmd = "aws route53 change-resource-record-sets \
+      --hosted-zone-id <%= app.route53_zone %> \
+      --change-batch file://<%= file.path %> "
+    do_exec( cmd )
   end
 
+
   def add_nginx_site app
     ac   = ActionController::Base.new
     ac.instance_variable_set( :@app, app )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.16
+  version: 3.1.0.18
 platform: ruby
 authors:
 - mac_a2141
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-22 00:00:00.000000000 Z
+date: 2023-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -139,6 +139,7 @@ files:
 - app/mailers/ish_models/application_mailer.rb
 - app/models/wco/lead.rb
 - app/models/wco/leadset.rb
+- app/models/wco/newsitem.rb
 - app/models/wco/office_action.rb
 - app/models/wco/profile.rb
 - app/models/wco/tag.rb