labimotion 0.1.18 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1656db6477e67ec4c028d478acd989e0f8616c765d5455a098d8119bf41d9d3
-  data.tar.gz: 4eec2bdfee9ed0c15ab7b804d076c0c7c4011df853b98f1b864a3f43e0f63ec5
+  metadata.gz: d5939fc9b6467ddec95df7cffac59fa06737aabcf4109fbbae1a4bd1a7200e48
+  data.tar.gz: dc5447449a8d3370da9d22363ab589ed1e4cef25f2c2826825982d8673ca0315
 SHA512:
-  metadata.gz: 6c1f49548317152dd92f69360440d454c29686a508136e1e905723cf3763590e156848e1c035a48ea3160e540e152ab8add68f1fb2bed37d236a467775d11d56
-  data.tar.gz: 734ef5c969db235796e4b777101664930027e58b1fa0df718ab1901fcef9dc8501e44e07ce18cab519b81062206fe51d12101687741b61026127d6bfbbaf0c10
+  metadata.gz: 63d70a575a715b95296cd8fdd658dbce44b6000f8fa32de507a008a8ffecaa4a4616dc4991115e3645ba2463b6800d9622ac3ab7b201fbe2b7ff30ccd16fedb6
+  data.tar.gz: 6151278c9d2afe3e970138d635cb16411733290f4f80c9353baec576c0717e1e73fe9fe53c25a135d201fe5f86b809918f0ae5f721233309f4ab9b02e7681e51

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', current_user)
+          fetch_repo('DatasetKlass')
         end
       end
 
@@ -40,9 +40,8 @@ module Labimotion
           requires :identifier, type: String, desc: 'Identifier'
         end
         post do
-          msg = create_repo_klass(params, current_user, request.headers['Origin'])
-          klass = Labimotion::DatasetKlassEntity.represent(DatasetKlass.all)
-          { status: msg[:status], message: msg[:message], klass: klass }
+          create_repo_klass(params, current_user)
+          present DatasetKlass.all, with: Labimotion::DatasetKlassEntity, root: 'klass'
         rescue StandardError => e
           Labimotion.log_exception(e, current_user)
           { error: e.message }

data/lib/labimotion/apis/generic_element_api.rb

@@ -21,9 +21,6 @@ module Labimotion
         get do
           ek = Labimotion::ElementKlass.find_by(name: params[:name])
           present ek, with: Labimotion::ElementKlassEntity, root: 'klass'
-        rescue StandardError => e
-          Labimotion.log_exception(e, current_user)
-          { klass: [] }
         end
       end
 
@@ -35,9 +32,6 @@ module Labimotion
         get do
           list = klass_list(params[:generic_only])
           present list, with: Labimotion::ElementKlassEntity, root: 'klass'
-        rescue StandardError => e
-          Labimotion.log_exception(e, current_user)
-          { klass: [] }
         end
       end
 
@@ -73,9 +67,6 @@ module Labimotion
         post do
           authenticate_admin!('elements')
           update_element_klass(current_user, params)
-        rescue StandardError => e
-          Labimotion.log_exception(e, current_user)
-          raise e
         end
       end
 
@@ -88,9 +79,6 @@ module Labimotion
         get do
           list = list_klass_revisions(params)
           present list, with: Labimotion::KlassRevisionEntity, root: 'revisions'
-        rescue StandardError => e
-          Labimotion.log_exception(e, current_user)
-          []
         end
       end
 
@@ -102,9 +90,6 @@ module Labimotion
         get do
           list = element_revisions(params)
           present list, with: Labimotion::ElementRevisionEntity, root: 'revisions'
-        rescue StandardError => e
-          Labimotion.log_exception(e, current_user)
-          []
         end
       end
 
@@ -119,9 +104,6 @@ module Labimotion
           authenticate_admin!(params[:klass].gsub(/(Klass)/, 's').downcase)
           delete_klass_revision(params)
           status 201
-        rescue StandardError => e
-          Labimotion.log_exception(e, current_user)
-          raise e
         end
       end
 
@@ -135,9 +117,6 @@ module Labimotion
         post do
           delete_revision(params)
           status 201
-        rescue StandardError => e
-          Labimotion.log_exception(e, current_user)
-          raise e
         end
       end
 
@@ -150,9 +129,6 @@ module Labimotion
           klass = Labimotion::Segment.find(params[:id])
           list = klass.segments_revisions unless klass.nil?
           present list&.sort_by(&:created_at).reverse, with: Labimotion::SegmentRevisionEntity, root: 'revisions'
-        rescue StandardError => e
-          Labimotion.log_exception(e, current_user)
-          []
         end
       end
 
@@ -176,9 +152,6 @@ module Labimotion
         post do
           upload_generics_files(current_user, params)
           true
-        rescue StandardError => e
-          Labimotion.log_exception(e, current_user)
-          raise e
         end
       end
 
@@ -187,19 +160,13 @@ module Labimotion
         get do
           list = Labimotion::ElementKlass.all.sort_by { |e| e.place }
           present list, with: Labimotion::ElementKlassEntity, root: 'klass'
-        rescue StandardError => e
-          Labimotion.log_exception(e, current_user)
-          []
         end
       end
 
       namespace :fetch_repo do
         desc 'fetch Generic Element Klass from Chemotion Repository'
         get do
-          fetch_repo('ElementKlass', current_user)
-        rescue StandardError => e
-          Labimotion.log_exception(e, current_user)
-          []
+          fetch_repo('ElementKlass')
         end
       end
 
@@ -209,9 +176,8 @@ module Labimotion
           requires :identifier, type: String, desc: 'Identifier'
         end
         post do
-          msg = create_repo_klass(params, current_user, request.headers['Origin'])
-          klass = Labimotion::ElementKlassEntity.represent(ElementKlass.all)
-          { status: msg[:status], message: msg[:message], klass: klass }
+          create_repo_klass(params, current_user)
+          present ElementKlass.all, with: Labimotion::ElementKlassEntity, root: 'klass'
         rescue StandardError => e
           Labimotion.log_exception(e, current_user)
           { error: e.message }
@@ -231,9 +197,6 @@ module Labimotion
         end
         post do
           deactivate_klass(params)
-        rescue StandardError => e
-          Labimotion.log_exception(e, current_user)
-          raise e
         end
       end
 
@@ -246,9 +209,6 @@ module Labimotion
         delete ':id' do
           delete_klass(params)
           status 201
-        rescue StandardError => e
-          Labimotion.log_exception(e, current_user)
-          raise e
         end
       end
 
@@ -265,10 +225,7 @@ module Labimotion
           @klz = fetch_klass(params[:klass], params[:id])
         end
         post do
-          update_template(params, current_user)
-        rescue StandardError => e
-          Labimotion.log_exception(e, current_user)
-          raise e
+          update_template(params)
         end
       end
 
@@ -280,10 +237,10 @@ module Labimotion
         optional :from_date, type: Integer, desc: 'created_date from in ms'
         optional :to_date, type: Integer, desc: 'created_date to in ms'
         optional :filter_created_at, type: Boolean, desc: 'filter by created at or updated at'
-        optional :sort_column, type: String, desc: 'sort by updated_at or selected layers property'
       end
       paginate per_page: 7, offset: 0, max_per_page: 100
       get do
+
         scope = list_serialized_elements(params, current_user)
 
         reset_pagination_page(scope)
@@ -299,9 +256,6 @@ module Labimotion
           end
         end
         { generic_elements: generic_elements }
-      rescue StandardError => e
-        Labimotion.log_exception(e, current_user)
-        { generic_elements: [] }
       end
 
       desc 'Return serialized element by id'
@@ -329,8 +283,6 @@ module Labimotion
               attachments: Entities::AttachmentEntity.represent(element.attachments),
             }
           end
-        rescue StandardError => e
-          Labimotion.log_exception(e, current_user)
         end
       end
 

data/lib/labimotion/apis/labimotion_hub_api.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'open-uri'
-require 'labimotion/models/hub_log'
 
 # Belong to Chemotion module
 module Labimotion
@@ -20,25 +19,20 @@ module Labimotion
           list = "Labimotion::#{params[:klass]}".constantize.where(is_active: true).where.not(released_at: nil)
           list = list.where(is_generic: true) if params[:klass] == 'ElementKlass'
           entities = Labimotion::GenericPublicEntity.represent(list, displayed: params[:with_props])
-        rescue StandardError => e
-          Labimotion.log_exception(e, current_user)
-          []
+          # entities.length > 1 ? de_encode_json(entities) : []
         end
       end
       namespace :fetch do
         desc "get active generic templates"
         params do
           requires :klass, type: String, desc: 'Klass', values: %w[ElementKlass SegmentKlass DatasetKlass]
-          requires :origin, type: String, desc: 'origin'
+          # requires :fqdn, type: Integer, desc: 'FQDN'
           requires :identifier, type: String, desc: 'Identifier'
         end
-        post do
+        get do
           entity = "Labimotion::#{params[:klass]}".constantize.find_by(identifier: params[:identifier])
-          Labimotion::HubLog.create(klass: entity, origin: params[:origin], uuid: entity.uuid, version: entity.version)
           "Labimotion::#{params[:klass]}Entity".constantize.represent(entity)
-        rescue StandardError => e
-          Labimotion.log_exception(e, current_user)
-          raise e
+          # entities.length > 1 ? de_encode_json(entities) : []
         end
       end
 
@@ -51,9 +45,6 @@ module Labimotion
           list = Labimotion::ElementKlass.where(is_active: true) if params[:generic_only].present? && params[:generic_only] == true
           list = Labimotion::ElementKlass.where(is_active: true) unless params[:generic_only].present? && params[:generic_only] == true
           list.pluck(:name)
-        rescue StandardError => e
-          Labimotion.log_exception(e, current_user)
-          []
         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', current_user)
+          fetch_repo('SegmentKlass')
         rescue StandardError => e
           Labimotion.log_exception(e, current_user)
           { error: e.message }
@@ -131,9 +131,8 @@ module Labimotion
           requires :identifier, type: String, desc: 'Identifier'
         end
         post do
-          msg = create_repo_klass(params, current_user, request.headers['Origin'])
-          klass = Labimotion::SegmentKlassEntity.represent(SegmentKlass.all)
-          { status: msg[:status], message: msg[:message], klass: klass }
+          create_repo_klass(params, current_user)
+          present SegmentKlass.all, with: Labimotion::SegmentKlassEntity, root: 'klass'
         rescue StandardError => e
           Labimotion.log_exception(e, current_user)
           ## { error: e.message }

data/lib/labimotion/entities/generic_public_entity.rb

@@ -5,7 +5,6 @@ require 'labimotion/entities/application_entity'
 # Entity module
 module Labimotion
   class GenericPublicEntity < Labimotion::ApplicationEntity
-    expose! :uuid
     expose! :name
     expose! :desc
     expose! :icon_name
@@ -13,7 +12,6 @@ module Labimotion
     expose! :klass_name
     expose! :label
     expose! :identifier
-    expose! :version
     expose! :released_at
     expose! :properties_release, if: :displayed
     expose :element_klass do |obj|

data/lib/labimotion/helpers/dataset_helpers.rb

@@ -13,31 +13,21 @@ module Labimotion
       end
     end
 
-    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']
+    def create_repo_klass(params, current_user)
+      response = Labimotion::TemplateHub.fetch_identifier('DatasetKlass', params[:identifier])
+      attributes = response.slice('ols_term_id', 'label', 'desc', 'uuid', 'identifier') # .except(:id, :is_active, :place, :created_by, :created_at, :updated_at)
+      attributes['properties_template'] = response['properties_release']
       attributes['place'] = ((Labimotion::DatasetKlass.all.length * 10) || 0) + 10
       attributes['is_active'] = false
       attributes['updated_by'] = current_user.id
       attributes['sync_by'] = current_user.id
       attributes['sync_time'] = DateTime.now
-      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
+      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)
       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']}!" }
+        Labimotion::DatasetKlass.create!(attributes)
       end
     rescue StandardError => e
       Labimotion.log_exception(e, current_user)

data/lib/labimotion/helpers/element_helpers.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'grape'
-require 'labimotion/utils/utils'
+require 'labimotion/version'
 # require 'labimotion/models/element_klass'
 module Labimotion
   ## ElementHelpers
@@ -20,10 +20,11 @@ module Labimotion
       uuid = SecureRandom.uuid
       template = { uuid: uuid, layers: {}, select_options: {} }
       attributes = declared(params, include_missing: false)
-      attributes[:properties_template] = template if attributes[:properties_template].nil?
-      attributes[:properties_template]['uuid'] = uuid
-      attributes[:properties_template]['pkg'] = Labimotion::Utils.pkg(attributes[:properties_template]['pkg'])
-      attributes[:properties_template]['klass'] = 'ElementKlass'
+      attributes[:properties_template]['uuid'] = uuid if attributes[:properties_template].present?
+      attributes[:properties_template] = template unless attributes[:properties_template].present?
+      attributes[:properties_template]['eln'] = Chemotion::Application.config.version if attributes[:properties_template].present?
+      attributes[:properties_template]['labimotion'] = Labimotion::VERSION if attributes[:properties_template].present?
+      attributes[:properties_template]['klass'] = 'ElementKlass' if attributes[:properties_template].present?
       attributes[:is_active] = false
       attributes[:uuid] = uuid
       attributes[:released_at] = DateTime.now
@@ -32,8 +33,8 @@ module Labimotion
 
       new_klass = Labimotion::ElementKlass.create!(attributes)
       new_klass.reload
-      new_klass.create_klasses_revision(current_user)
-      klass_names_file = Rails.root.join('app/packs/klasses.json')
+      new_klass.create_klasses_revision(current_user.id)
+      klass_names_file = Rails.root.join('config', 'klasses.json')
       klasses = Labimotion::ElementKlass.where(is_active: true)&.pluck(:name) || []
       File.write(klass_names_file, klasses)
       klasses
@@ -67,12 +68,11 @@ module Labimotion
       uuid = SecureRandom.uuid
       params[:properties]['uuid'] = uuid
       params[:properties]['klass_uuid'] = klass[:uuid]
-      params[:properties]['pkg'] = Labimotion::Utils.pkg(params[:properties]['pkg'])
+      params[:properties]['eln'] = Chemotion::Application.config.version
+      params[:properties]['labimotion'] = Labimotion::VERSION
       params[:properties]['klass'] = 'Element'
-      params[:properties]['identifier'] = klass[:identifier]
       properties = params[:properties]
       properties.delete('flow') unless properties['flow'].nil?
-      properties.delete('flowObject') unless properties['flowObject'].nil?
       properties.delete('select_options') unless properties['select_options'].nil?
       attributes = {
         name: params[:name],
@@ -109,14 +109,14 @@ module Labimotion
       params.delete(:container)
       params.delete(:properties)
       attributes = declared(params.except(:segments), include_missing: false)
-      properties['pkg'] = Labimotion::Utils.pkg(properties['pkg'])
+      properties['eln'] = Chemotion::Application.config.version
+      properties['labimotion'] = Labimotion::VERSION
       if element.klass_uuid != properties['klass_uuid'] || element.properties != properties || element.name != params[:name]
         properties['klass'] = 'Element'
         uuid = SecureRandom.uuid
         properties['uuid'] = uuid
 
         properties.delete('flow') unless properties['flow'].nil?
-        properties.delete('flowObject') unless properties['flowObject'].nil?
         properties.delete('select_options') unless properties['select_options'].nil?
 
         attributes['properties'] = properties
@@ -174,7 +174,8 @@ module Labimotion
       true
     rescue StandardError => e
       Labimotion.log_exception(e, current_user)
-      false
+      ## false
+      raise e
     end
 
     def element_revisions(params)
@@ -245,7 +246,7 @@ module Labimotion
           .where(
             element_klasses: { name: params[:el_type] },
             collections_elements: { collection_id: collection_id },
-          ).includes(:tag, collections: :sync_collections_users)
+          ).includes(:tag, collections: :sync_collections_users).order('created_at DESC')
       else
         Labimotion::Element.none
       end
@@ -254,46 +255,20 @@ module Labimotion
       from = params[:from_date]
       to = params[:to_date]
       by_created_at = params[:filter_created_at] || false
-      if params[:sort_column]&.include?('.')
-        layer, field = params[:sort_column].split('.')
-
-        element_klass = Labimotion::ElementKlass.find_by(name: params[:el_type])
-        allowed_fields = element_klass.properties_release.dig('layers', layer, 'fields')&.pluck('field') || []
-
-        if field.in?(allowed_fields)
-          query = ActiveRecord::Base.sanitize_sql(
-            [
-              "LEFT JOIN LATERAL(
-                SELECT field->'value' AS value
-                FROM jsonb_array_elements(properties->'layers'->:layer->'fields') a(field)
-                WHERE field->>'field' = :field
-              ) a ON true",
-              { layer: layer, field: field },
-            ],
-          )
-          scope = scope.joins(query).order('value ASC NULLS FIRST')
-        else
-          scope = scope.order(updated_at: :desc)
-        end
-      else
-        scope = scope.order(updated_at: :desc)
-      end
-
-      scope = scope.elements_created_time_from(Time.at(from)) if from && by_created_at
-      scope = scope.elements_created_time_to(Time.at(to) + 1.day) if to && by_created_at
-      scope = scope.elements_updated_time_from(Time.at(from)) if from && !by_created_at
-      scope = scope.elements_updated_time_to(Time.at(to) + 1.day) if to && !by_created_at
+      scope = scope.created_time_from(Time.at(from)) if from && by_created_at
+      scope = scope.created_time_to(Time.at(to) + 1.day) if to && by_created_at
+      scope = scope.updated_time_from(Time.at(from)) if from && !by_created_at
+      scope = scope.updated_time_to(Time.at(to) + 1.day) if to && !by_created_at
       scope
     rescue StandardError => e
       Labimotion.log_exception(e, current_user)
       raise e
     end
 
-    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']
+    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') # .except(:id, :is_active, :place, :created_by, :created_at, :updated_at)
+      attributes['properties_template'] = response['properties_release']
       attributes['place'] = ((Labimotion::DatasetKlass.all.length * 10) || 0) + 10
       attributes['is_active'] = false
       attributes['updated_by'] = current_user.id
@@ -302,23 +277,10 @@ module Labimotion
 
       element_klass = Labimotion::ElementKlass.find_by(identifier: attributes['identifier'])
       if element_klass.present?
-        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
+        element_klass.update!(attributes)
       else
-        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
+        attributes['created_by'] = current_user.id
+        Labimotion::ElementKlass.create!(attributes)
       end
     rescue StandardError => e
       Labimotion.log_exception(e, current_user)

data/lib/labimotion/helpers/generic_helpers.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 require 'grape'
-require 'labimotion/utils/utils'
+require 'labimotion/version'
 # Helper for associated sample
 module Labimotion
   ## Generic Helpers
@@ -41,22 +41,43 @@ module Labimotion
       raise e
     end
 
-    def update_template(params, current_user)
+    def update_template(params)
       klz = fetch_klass(params[:klass], params[:id])
       uuid = SecureRandom.uuid
       properties = params[:properties_template]
-      properties['uuid'] = uuid
-      klz.version = Labimotion::Utils.next_version(params[:release], klz.version)
+      if Labimotion::IS_RAILS5 == false
+        properties['uuid'] = uuid unless params[:release] != 'draft' && @klz.identifier.present?
+      else
+        properties['uuid'] = uuid
+      end
+
+      klz.version =
+        case params[:release]
+        when 'draft'
+          klz.version
+        when 'major'
+          if klz.version.nil? || klz.version&.split('.').length < 2
+            '1.0'
+          else
+            "#{klz.version&.split('.').first.to_i + 1}.0"
+          end
+        when 'minor'
+          if klz.version.nil? || klz.version&.split('.').length < 2
+            '0.1'
+          else
+            "#{klz.version.split('.').first.to_i.to_s}.#{klz.version.split('.').last.to_i + 1}"
+          end
+        end
+
       properties['version'] = klz.version
-      properties['pkg'] = Labimotion::Utils.pkg(params['pkg'] || (klz.properties_template && klz.properties_template['pkg']))
-      properties['klass'] = klz.class.name.split('::').last
-      properties['identifier'] = klz.identifier
-      properties.delete('eln') if properties['eln'].present?
+      properties['eln'] = Chemotion::Application.config.version
+      properties['labimotion'] = Labimotion::VERSION
+      properties['klass'] = @klz.class.name.split('::').last
       klz.updated_by = current_user.id
       klz.properties_template = properties
       klz.save!
       klz.reload
-      klz.create_klasses_revision(current_user) if params[:release] != 'draft'
+      klz.create_klasses_revision(current_user.id) if params[:release] != 'draft'
       klz
     rescue StandardError => e
       Labimotion.log_exception(e, current_user)
@@ -96,8 +117,12 @@ module Labimotion
 
 
     ###############
+
+
     def generate_klass_file
-      klass_names_file = Rails.root.join('app/packs/klasses.json')
+      klass_dir = File.join(Rails.root, 'data')
+      !File.directory?(klass_dir) && FileUtils.mkdir_p(klass_dir)
+      klass_names_file = File.join(klass_dir, 'klasses.json')
       klasses = Labimotion::ElementKlass.where(is_active: true)&.pluck(:name) || []
       File.write(klass_names_file, klasses)
     rescue StandardError => e
@@ -188,37 +213,37 @@ module Labimotion
       raise e
     end
 
-    def create_attachments(files, del_files, type, id, identifier, user_id)
+    def create_attachments(files, del_files, type, id, user_id)
       attach_ary = []
-      (files || []).each_with_index do |file, index|
+      (files || []).each do |file|
         next unless (tempfile = file[:tempfile])
 
-        att = Attachment.new(
+        a = Attachment.new(
           bucket: file[:container_id],
           filename: file[:filename],
           con_state: Labimotion::ConState::NONE,
           file_path: file[:tempfile],
           created_by: user_id,
           created_for: user_id,
-          identifier: identifier[index],
           content_type: file[:type],
           attachable_type: type,
           attachable_id: id,
         )
         begin
-          att.save!
-          attach_ary.push(att.id)
+          a.save!
+          attach_ary.push(a.id)
         ensure
           tempfile.close
           tempfile.unlink
         end
       end
       unless (del_files || []).empty?
-        Attachment.where('id IN (?) AND attachable_type = (?)', del_files.map!(&:to_i), type).update_all(attachable_id: nil)
+        Attachment.where('id IN (?) AND attachable_type = (?)', del_files.map!(&:to_i),
+                        type).update_all(attachable_id: nil)
       end
       attach_ary
     rescue StandardError => e
-      Labimotion.log_exception(e)
+      Labimotion.log_exception(e, current_user)
       raise e
     end
 
@@ -230,19 +255,18 @@ module Labimotion
       Chemotion::Generic::Fetch::Template.list(API::TARGET, name)
     end
 
-    def fetch_repo(name, current_user)
-      # current_klasses = "Labimotion::#{name}".constantize.where.not(identifier: nil)&.pluck(:identifier) || []
+    def fetch_repo(name)
+      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 || []
-      (response && response['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 || []
     rescue StandardError => e
       Labimotion.log_exception(e, current_user)
-      { error: 'Cannot connect to Chemotion Repository' }
+      raise e
     end
   end
 end