eivid 1.0.7 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b995a651b9c7d8ae829041db1b2dcb8bd272ff646687db1b714d4c71f01f4892
-  data.tar.gz: e9142b432d08eb85f21217965af5ddca7a5ba4962401a219e0c4f236980072a4
+  metadata.gz: 1c2573ee732c9660e3c9b52490c88794016a64f6ccd7a8c6597bc268b43a80ce
+  data.tar.gz: 0f64fccb5e8bfff65937a883fc6c1a35540744379d3dcad007a42e450759dc1c
 SHA512:
-  metadata.gz: 9b48dadeee80c0bee563b30e5852016b7e23184d08a494ceca635aa3f160721c5ba8b0e41e9d32bb9be7a0eafc9c61273d1bc1c8a07b89985b8a5f96de4b40c4
-  data.tar.gz: 67500bcd2c6723eaa6900aaef6a6b31786c0adb64b6fcd12ccdf11962d77f8d388058dc170957ef68020d89f448c1a20f9dbdb8cef4f7236dfb1270fd5a186d3
+  metadata.gz: bc28ea6273a2bdbe73813ef3010cf38f21923374c30e07aceeb41a0ccb0e23e6f322e28aff970ceea8163ffaa8ce83d84d7b99ba87932d5a509763ad8af580d4
+  data.tar.gz: d352dc738178f1cb2f154d2f95fcf0b46c3dce8eff280f6bca9721ff0e58c68f5725e5ff21161d64251ebad8495f2f34db53e3757a3f2cbd7a462fbdab7a8ceb

data/app/jobs/eivid/request_folder_id_job.rb

@@ -0,0 +1,14 @@
+module Eivid
+  class RequestFolderIdJob < ApplicationJob
+
+    def perform(eivid_owner_id)
+
+      owner     = Owner.find(eivid_owner_id) 
+      folder_id = RequestService.create_folder(namespace: Eivid.owner_model, id: owner.id)
+
+      owner.update!(folder_id: folder_id)
+
+    end
+
+  end
+end

data/app/models/eivid/concerns/main_app/owner.rb

@@ -7,7 +7,7 @@ module Eivid::Concerns::MainApp::Owner
 
     include Eivid::Concerns::MainApp::VideoConcerns
 
-    after_create :create_eivid_owner
+    after_commit :create_eivid_owner, on: :create
 
     def create_eivid_owner
       Eivid::Owner.create(external_id: self.id)

data/app/models/eivid/concerns/main_app/video_concerns.rb

@@ -12,5 +12,7 @@ module Eivid::Concerns::MainApp::VideoConcerns
     scope :has_processed_video,   -> { joins(:videos).where('eivid_videos.uploaded': true).distinct }
     scope :has_unprocessed_video, -> { joins(:videos).where('eivid_videos.uploaded' => false).distinct }
 
+    scope :has_video_from_user,   -> (user_id) { joins(:videos).where('eivid_videos.user_id = ?', user_id) }
+    
   end
 end

data/app/models/eivid/concerns/request_service/manage_folder.rb

@@ -6,7 +6,7 @@ module Eivid::Concerns::RequestService::ManageFolder
   end
 
   def create_folder(namespace:, id:)
-    body = { "name" => "#{Rails.env}_#{namespace}_#{id}" }
+    body = { "name" => "#{rails_environment}_#{namespace}_#{id}" }
     
     @response = HTTParty.post Eivid::RequestService::FOLDER_URL, body: body.to_json, headers: default_headers
     get_folder_id
@@ -20,6 +20,11 @@ module Eivid::Concerns::RequestService::ManageFolder
     HTTParty.put endpoint, headers: default_headers
   end
 
+  def rails_environment
+    return "test" if Figaro.env.IS_TEST_SERVER
+    Rails.env
+  end
+
   private
 
   def get_folder_id

data/app/models/eivid/owner.rb

@@ -5,16 +5,16 @@ module Eivid
 
     validates :external_id, presence: true, uniqueness: true
 
-    before_create :get_folder_id
+    after_commit :get_folder_id, unless: :folder_id
 
-    belongs_to :"#{Eivid.owner_model}", foreign_key: "external_id"
+    belongs_to :"#{Eivid.owner_model}", foreign_key: "external_id", optional: true
 
     def external_owner
       send Eivid.owner_model
     end
 
     def get_folder_id
-      self.folder_id = RequestService.create_folder(namespace: Eivid.owner_model, id: self.external_id)
+      RequestFolderIdJob.perform_later(self.id)
     end
 
   end

data/lib/eivid/version.rb

@@ -1,3 +1,3 @@
 module Eivid
-  VERSION = '1.0.7'
+  VERSION = '1.0.11'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eivid
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.11
 platform: ruby
 authors:
 - Jurriaan Schrofer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-19 00:00:00.000000000 Z
+date: 2021-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -80,6 +80,7 @@ files:
 - app/jobs/eivid/get_vimeo_hd_url_job.rb
 - app/jobs/eivid/get_vimeo_urls_job.rb
 - app/jobs/eivid/get_vimeo_urls_mixin.rb
+- app/jobs/eivid/request_folder_id_job.rb
 - app/jobs/eivid/upload_vimeo_job.rb
 - app/mailers/eivid/application_mailer.rb
 - app/models/eivid/application_record.rb