labimotion 0.1.14 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4462059ccf7843ed6aee9d493e2fcadf9cb6675fd2e71652eb8ce670cd3e3630
-  data.tar.gz: bf3f3b3c664117b679b19ba27171ed37f45371e267a44988e0a709c98b9b66e7
+  metadata.gz: 95752e2c3001d5de57f899a05dc5e348611cd3408a7fe1a1448ee426edf56437
+  data.tar.gz: b8715b44806c7586c71c05534e83147ec33a0648f771bd3867b0212440cdaa69
 SHA512:
-  metadata.gz: ec3bfa245f202a31bb6e1a46104296b7ed7eab6500eabc7832adcaf0ded162492d46403459a476f89468ae8a513af83e5f8d23e057efd0820829be745c150e55
-  data.tar.gz: 04f4c1e4856c2a9909a487dfa4e2764aac737ac76379e892d07fd66da5347be2c55ec94281b7241bae57736c2667fe03250c945930295285b447850b9039fd92
+  metadata.gz: 45faeec9d12b78dec9838b47ac863f4492ae1808f84e4777f38d9a3137e60b74c238827ceff45639a003535906e6ec9a339d669cbc935eba62bbcb0e1157533f
+  data.tar.gz: a19c0cd0422952d57e1151ffe87ddc032e1e18f2029ab860284a094f6ad5d645665771f7705dd7a39bfd139d524ab67a0635c936f1a46f981f55ef16b7188ed1

data/lib/labimotion/apis/generic_dataset_api.rb

@@ -30,7 +30,7 @@ module Labimotion
       namespace :fetch_repo do
         desc 'fetch Generic Dataset Klass from Chemotion Repository'
         get do
-          fetch_repo('DatasetKlass')
+          fetch_repo('DatasetKlass', current_user)
         end
       end
 
@@ -40,8 +40,9 @@ module Labimotion
           requires :identifier, type: String, desc: 'Identifier'
         end
         post do
-          create_repo_klass(params, current_user)
-          present DatasetKlass.all, with: Labimotion::DatasetKlassEntity, root: 'klass'
+          msg = create_repo_klass(params, current_user, request.headers['Origin'])
+          klass = Labimotion::DatasetKlassEntity.represent(DatasetKlass.all)
+          { status: msg[:status], message: msg[:message], klass: klass }
         rescue StandardError => e
           Labimotion.log_exception(e, current_user)
           { error: e.message }

data/lib/labimotion/apis/generic_element_api.rb

@@ -23,6 +23,7 @@ module Labimotion
           present ek, with: Labimotion::ElementKlassEntity, root: 'klass'
         rescue StandardError => e
           Labimotion.log_exception(e, current_user)
+          { klass: [] }
         end
       end
 
@@ -36,6 +37,7 @@ module Labimotion
           present list, with: Labimotion::ElementKlassEntity, root: 'klass'
         rescue StandardError => e
           Labimotion.log_exception(e, current_user)
+          { klass: [] }
         end
       end
 
@@ -176,6 +178,7 @@ module Labimotion
           true
         rescue StandardError => e
           Labimotion.log_exception(e, current_user)
+          raise e
         end
       end
 
@@ -193,7 +196,10 @@ module Labimotion
       namespace :fetch_repo do
         desc 'fetch Generic Element Klass from Chemotion Repository'
         get do
-          fetch_repo('ElementKlass')
+          fetch_repo('ElementKlass', current_user)
+        rescue StandardError => e
+          Labimotion.log_exception(e, current_user)
+          []
         end
       end
 
@@ -203,8 +209,9 @@ module Labimotion
           requires :identifier, type: String, desc: 'Identifier'
         end
         post do
-          create_repo_klass(params, current_user)
-          present ElementKlass.all, with: Labimotion::ElementKlassEntity, root: 'klass'
+          msg = create_repo_klass(params, current_user, request.headers['Origin'])
+          klass = Labimotion::ElementKlassEntity.represent(ElementKlass.all)
+          { status: msg[:status], message: msg[:message], klass: klass }
         rescue StandardError => e
           Labimotion.log_exception(e, current_user)
           { error: e.message }
@@ -226,6 +233,7 @@ module Labimotion
           deactivate_klass(params)
         rescue StandardError => e
           Labimotion.log_exception(e, current_user)
+          raise e
         end
       end
 

data/lib/labimotion/apis/segment_api.rb

@@ -118,7 +118,7 @@ module Labimotion
       namespace :fetch_repo do
         desc 'fetch Generic Segment Klass from Chemotion Repository'
         get do
-          fetch_repo('SegmentKlass')
+          fetch_repo('SegmentKlass', current_user)
         rescue StandardError => e
           Labimotion.log_exception(e, current_user)
           { error: e.message }
@@ -131,8 +131,9 @@ module Labimotion
           requires :identifier, type: String, desc: 'Identifier'
         end
         post do
-          create_repo_klass(params, current_user)
-          present SegmentKlass.all, with: Labimotion::SegmentKlassEntity, root: 'klass'
+          msg = create_repo_klass(params, current_user, request.headers['Origin'])
+          klass = Labimotion::SegmentKlassEntity.represent(SegmentKlass.all)
+          { status: msg[:status], message: msg[:message], klass: klass }
         rescue StandardError => e
           Labimotion.log_exception(e, current_user)
           ## { error: e.message }

data/lib/labimotion/helpers/dataset_helpers.rb

@@ -13,8 +13,8 @@ module Labimotion
       end
     end
 
-    def create_repo_klass(params, current_user)
-      response = Labimotion::TemplateHub.fetch_identifier('DatasetKlass', params[:identifier])
+    def create_repo_klass(params, current_user, origin)
+      response = Labimotion::TemplateHub.fetch_identifier('DatasetKlass', params[:identifier], origin)
       attributes = response.slice('ols_term_id', 'label', 'desc', 'uuid', 'identifier', 'properties_release', 'version') # .except(:id, :is_active, :place, :created_by, :created_at, :updated_at)
       attributes['properties_release']['identifier'] = attributes['identifier']
       attributes['properties_template'] = attributes['properties_release']
@@ -23,14 +23,22 @@ module Labimotion
       attributes['updated_by'] = current_user.id
       attributes['sync_by'] = current_user.id
       attributes['sync_time'] = DateTime.now
-      if Labimotion::DatasetKlass.find_by(ols_term_id: attributes['ols_term_id']).present?
-        ds = Labimotion::DatasetKlass.find_by(ols_term_id: attributes['ols_term_id'])
-        ds.update!(attributes)
+      dataset_klass = Labimotion::DatasetKlass.find_by(ols_term_id: attributes['ols_term_id'])
+      if dataset_klass.present?
+        if dataset_klass['uuid'] == attributes['uuid'] && dataset_klass['version'] == attributes['version']
+          { status: 'success', message: "This dataset: #{attributes['label']} has the latest version!" }
+        else
+          ds = Labimotion::DatasetKlass.find_by(ols_term_id: attributes['ols_term_id'])
+          ds.update!(attributes)
+          ds.create_klasses_revision(current_user)
+          { status: 'success', message: "This dataset: [#{attributes['label']}] has been upgraded to the version: #{attributes['version']}!" }
+        end
       else
         attributes['created_by'] = current_user.id
         ds = Labimotion::DatasetKlass.create!(attributes)
+        ds.create_klasses_revision(current_user)
+        { status: 'success', message: "The dataset: #{attributes['label']} has been created using version: #{attributes['version']}!" }
       end
-      ds.create_klasses_revision(current_user)
     rescue StandardError => e
       Labimotion.log_exception(e, current_user)
       # { error: e.message }

data/lib/labimotion/helpers/element_helpers.rb

@@ -168,8 +168,8 @@ module Labimotion
       (attach_ary << att_ary).flatten! unless att_ary&.empty?
 
       if Labimotion::IS_RAILS5 == true
-        TransferThumbnailToPublicJob.set(queue: "transfer_thumbnail_to_public_#{current_user.id}").perform_later(attach_ary) unless attach_ary.empty?
-        TransferFileFromTmpJob.set(queue: "transfer_file_from_tmp_#{current_user.id}").perform_later(attach_ary) unless attach_ary.empty?
+        TransferThumbnailToPublicJob.set(queue: "transfer_thumbnail_to_public_#{current_user.id}").perform_now(attach_ary) unless attach_ary.empty?
+        TransferFileFromTmpJob.set(queue: "transfer_file_from_tmp_#{current_user.id}").perform_now(attach_ary) unless attach_ary.empty?
       end
       true
     rescue StandardError => e
@@ -289,9 +289,9 @@ module Labimotion
       raise e
     end
 
-    def create_repo_klass(params, current_user)
-      response = Labimotion::TemplateHub.fetch_identifier('ElementKlass', params[:identifier])
-      attributes = response.slice('name', 'label', 'desc', 'icon_name', 'klass_prefix', 'is_generic', 'identifier', 'properties_release', 'version')
+    def create_repo_klass(params, current_user, origin)
+      response = Labimotion::TemplateHub.fetch_identifier('ElementKlass', params[:identifier], origin)
+      attributes = response.slice('name', 'label', 'desc', 'icon_name', 'uuid', 'klass_prefix', 'is_generic', 'identifier', 'properties_release', 'version')
       attributes['properties_release']['identifier'] = attributes['identifier']
       attributes['properties_template'] = attributes['properties_release']
       attributes['place'] = ((Labimotion::DatasetKlass.all.length * 10) || 0) + 10
@@ -302,12 +302,24 @@ module Labimotion
 
       element_klass = Labimotion::ElementKlass.find_by(identifier: attributes['identifier'])
       if element_klass.present?
-        element_klass.update!(attributes)
+        if element_klass['uuid'] == attributes['uuid'] && element_klass['version'] == attributes['version']
+          { status: 'success', message: "This element: #{attributes['name']} has the latest version!" }
+        else
+          element_klass.update!(attributes)
+          element_klass.create_klasses_revision(current_user)
+          { status: 'success', message: "This element: [#{attributes['name']}] has been upgraded to the version: #{attributes['version']}!" }
+        end
       else
-        attributes['created_by'] = current_user.id
-        element_klass = Labimotion::ElementKlass.create!(attributes)
+        exist_klass = Labimotion::ElementKlass.find_by(name: attributes['name'])
+        if exist_klass.present?
+          { status: 'error', message: "The name [#{attributes['name']}] is already in use." }
+        else
+          attributes['created_by'] = current_user.id
+          element_klass = Labimotion::ElementKlass.create!(attributes)
+          element_klass.create_klasses_revision(current_user)
+          { status: 'success', message: "The element: #{attributes['name']} has been created using version: #{attributes['version']}!" }
+        end
       end
-      element_klass.create_klasses_revision(current_user)
     rescue StandardError => e
       Labimotion.log_exception(e, current_user)
       # { error: e.message }

data/lib/labimotion/helpers/generic_helpers.rb

@@ -230,15 +230,16 @@ module Labimotion
       Chemotion::Generic::Fetch::Template.list(API::TARGET, name)
     end
 
-    def fetch_repo(name)
-      current_klasses = "Labimotion::#{name}".constantize.where.not(identifier: nil)&.pluck(:identifier) || []
+    def fetch_repo(name, current_user)
+      # current_klasses = "Labimotion::#{name}".constantize.where.not(identifier: nil)&.pluck(:identifier) || []
       response = Labimotion::TemplateHub.list(name)
-      if response && response['list'].present? && response['list'].length.positive?
-        filter_list = response['list']&.reject do |ds|
-          current_klasses.include?(ds['identifier'])
-        end || []
-      end
-      filter_list || []
+      # if response && response['list'].present? && response['list'].length.positive?
+        # filter_list = response['list']&.reject do |ds|
+        #   current_klasses.include?(ds['identifier'])
+        # end || []
+      # end
+      # filter_list || []
+      (response && response['list']) || []
     rescue StandardError => e
       Labimotion.log_exception(e, current_user)
       { error: 'Cannot connect to Chemotion Repository' }

data/lib/labimotion/helpers/segment_helpers.rb

@@ -63,8 +63,8 @@ module Labimotion
       raise e
     end
 
-    def create_repo_klass(params, current_user)
-      response = Labimotion::TemplateHub.fetch_identifier('SegmentKlass', params[:identifier])
+    def create_repo_klass(params, current_user, origin)
+      response = Labimotion::TemplateHub.fetch_identifier('SegmentKlass', params[:identifier], origin)
       attributes = response.slice('label', 'desc', 'uuid', 'identifier', 'released_at', 'properties_release', 'version')
       attributes['properties_release']['identifier'] = attributes['identifier']
       attributes['properties_template'] = attributes['properties_release']
@@ -75,8 +75,8 @@ module Labimotion
       attributes['sync_time'] = DateTime.now
 
       element_klass = Labimotion::ElementKlass.find_by(identifier: response['element_klass']['identifier'])
-      element_klass = Labimotion::ElementKlass.find_by(name: response['element_klass']['name']) if element_klass.nil?
-      return { error: 'ElementKlass not found' } if element_klass.nil?
+      element_klass = Labimotion::ElementKlass.find_by(name: response['element_klass']['name'], is_generic: false) if element_klass.nil?
+      return { status: 'error', message: "The element [#{response['element_klass']['name']}] does not exist in this instance" } if element_klass.nil?
 
       # el_attributes = response['element_klass'].slice('name', 'label', 'desc', 'uuid', 'identifier', 'icon_name', 'klass_prefix', 'is_generic', 'released_at')
       # el_attributes['properties_template'] = response['element_klass']['properties_release']
@@ -85,12 +85,24 @@ module Labimotion
       attributes['element_klass_id'] = element_klass.id
       segment_klass = Labimotion::SegmentKlass.find_by(identifier: attributes['identifier'])
       if segment_klass.present?
-        segment_klass.update!(attributes)
+        if segment_klass['uuid'] == attributes['uuid'] && segment_klass['version'] == attributes['version']
+          { status: 'success', message: "This segment: #{attributes['label']} has the latest version!" }
+        else
+          segment_klass.update!(attributes)
+          segment_klass.create_klasses_revision(current_user)
+          { status: 'success', message: "This segment: [#{attributes['label']}] has been upgraded to the version: #{attributes['version']}!" }
+        end
       else
-        attributes['created_by'] = current_user.id
-        segment_klass = Labimotion::SegmentKlass.create!(attributes)
+        exist_klass = Labimotion::SegmentKlass.find_by(label: attributes['label'], element_klass_id: element_klass.id)
+        if exist_klass.present?
+          { status: 'error', message: "The segment [#{attributes['label']}] is already in use." }
+        else
+          attributes['created_by'] = current_user.id
+          segment_klass = Labimotion::SegmentKlass.create!(attributes)
+          segment_klass.create_klasses_revision(current_user)
+          { status: 'success', message: "The segment: #{attributes['label']} has been created using version: #{attributes['version']}!" }
+        end
       end
-      segment_klass.create_klasses_revision(current_user)
     rescue StandardError => e
       Labimotion.log_exception(e, current_user)
       raise e

data/lib/labimotion/libs/template_hub.rb

@@ -43,11 +43,15 @@ module Labimotion
       error!('Cannot connect to Chemotion Repository', 401)
     end
 
-    def self.fetch_identifier(klass, identifier)
-      # body = { klass: klass, identifier: identifier }
-      response = HTTParty.get("#{uri('fetch')}?klass=#{klass}&identifier=#{identifier}", timeout: 10)
+    def self.fetch_identifier(klass, identifier, origin)
+      body = { klass: klass, identifier: identifier, origin: origin }
+      response = HTTParty.post(
+        uri('fetch'),
+        body: body,
+        timeout: 10
+      )
       # response.parsed_response if response.code == 200
-      JSON.parse(response.body) if response.code == 200
+      JSON.parse(response.body) if response.code == 201
     rescue StandardError => e
       Labimotion.log_exception(e)
       error!('Cannot connect to Chemotion Repository', 401)

data/lib/labimotion/version.rb

@@ -2,6 +2,6 @@
 
 module Labimotion
   IS_RAILS5 = true
-  VERSION = '0.1.14' if Labimotion::IS_RAILS5 == true
+  VERSION = '0.1.16' if Labimotion::IS_RAILS5 == true
   VERSION = '1.0.1' if Labimotion::IS_RAILS5 == false
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: labimotion
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.16
 platform: ruby
 authors:
 - Chia-Lin Lin