labimotion 1.3.0.rc3 → 1.3.0.rc5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef750ee91a207edde617086a1dadc141b83613584810eba9435836fe59b2f745
-  data.tar.gz: b68dfa74b8701fbd73598d8a2b67109680a70c31b92e780acef89aa968923108
+  metadata.gz: 1544df427f4bbeeac189991d5dba50f8759e4ccc869b864edcee7479ba455bac
+  data.tar.gz: 5113e6ceffe6908efb4767cdffc3721131903d07668722e22e6503197bafc181
 SHA512:
-  metadata.gz: 8fe68edfe62dc71133d5340b6242d43a3d4a6dab50ccb77531bb32898f84635d8794b16ac1185672b453dc9a8965782f7c1545ab4f556ab0d744087d7559ff24
-  data.tar.gz: 0ed4f34cf80aef0200681e45103ae22bf4b9fe6e02ca6772ee146aee989a40939143b3370b16b787c678c4329990491dabe331394bca851f473a573405c42a11
+  metadata.gz: c1111378004a5bea4f3ac3a1e2056eb3003db3f21dc8887813d97d4a73ffa8df0473b72bd2c3c6450c50ce9b1a30d736303b34c156bb50124ca58ee09e43b151
+  data.tar.gz: 8ced73f30bea84693d46de94398e621badda9419d77432da3f81eb6d0aef0fc64c06e41cb80d18859936eeb773fdb77a5a6bc623aff0d6a0effd6132fa603042

data/lib/labimotion/apis/generic_element_api.rb

@@ -13,6 +13,7 @@ module Labimotion
     helpers Labimotion::SampleAssociationHelpers
     helpers Labimotion::GenericHelpers
     helpers Labimotion::ElementHelpers
+    helpers Labimotion::ParamHelpers
 
     resource :generic_elements do
       namespace :klass do
@@ -46,12 +47,19 @@ module Labimotion
       namespace :export do
         desc 'export element'
         params do
-          optional :id, type: Integer, desc: 'element id'
+          requires :id, type: Integer, desc: 'element id'
+          requires :klass, type: String, desc: 'Klass', values: %w[Element Segment Dataset]
           optional :export_format, type: String, desc: 'export format'
         end
         get do
-          element = Labimotion::Element.find(params[:id])
-          ## byebug
+          case params[:klass]
+          when 'Element'
+            element = Labimotion::Element.find(params[:id])
+          when 'Segment'
+            element = Labimotion::Segment.find(params[:id])
+          when 'Dataset'
+            element = Labimotion::Dataset.find(params[:id])
+          end
           export = Labimotion::ExportElement.new current_user, element, params[:export_format]
           env['api.format'] = :binary
           content_type 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'
@@ -70,12 +78,7 @@ module Labimotion
       namespace :create_element_klass do
         desc 'create Generic Element Klass'
         params do
-          requires :name, type: String, desc: 'Element Klass Name'
-          requires :label, type: String, desc: 'Element Klass Label'
-          requires :klass_prefix, type: String, desc: 'Element Klass Short Label Prefix'
-          optional :icon_name, type: String, desc: 'Element Klass Icon Name'
-          optional :desc, type: String, desc: 'Element Klass Desc'
-          optional :properties_template, type: Hash, desc: 'Element Klass properties template'
+          use :create_element_klass_params
         end
         post do
           authenticate_admin!('elements')
@@ -89,12 +92,7 @@ module Labimotion
       namespace :update_element_klass do
         desc 'update Generic Element Klass'
         params do
-          requires :id, type: Integer, desc: 'Element Klass ID'
-          optional :label, type: String, desc: 'Element Klass Label'
-          optional :klass_prefix, type: String, desc: 'Element Klass Short Label Prefix'
-          optional :icon_name, type: String, desc: 'Element Klass Icon Name'
-          optional :desc, type: String, desc: 'Element Klass Desc'
-          optional :place, type: String, desc: 'Element Klass Place'
+          use :update_element_klass_params
         end
         post do
           authenticate_admin!('elements')
@@ -298,6 +296,39 @@ module Labimotion
         end
       end
 
+      namespace :upload_klass do
+        desc 'upload Generic Klass'
+        params do
+          use :upload_element_klass_params
+        end
+        post do
+          declared_params = declared(params, include_missing: false)
+          attributes = declared_params.merge(
+              created_by: current_user.id,
+              released_by: current_user.id,
+              updated_by: current_user.id,
+              is_active: false
+            )
+            validate_klass(attributes)
+        rescue StandardError => e
+          Labimotion.log_exception(e, current_user)
+          raise e
+        end
+      end
+
+      namespace :split do
+        desc 'split elements'
+        params do
+          requires :ui_state, type: Hash, desc: 'Selected elements from the UI'
+        end
+        post do
+          split_elements(params[:ui_state], current_user)
+        rescue StandardError => e
+          Labimotion.log_exception(e, current_user)
+          { error: e.message }
+        end
+      end      
+
       desc 'Return serialized elements of current user'
       params do
         optional :collection_id, type: Integer, desc: 'Collection id'
@@ -311,7 +342,6 @@ module Labimotion
       paginate per_page: 7, offset: 0, max_per_page: 100
       get do
         scope = list_serialized_elements(params, current_user)
-
         reset_pagination_page(scope)
         generic_elements = paginate(scope).map do |element|
           Labimotion::ElementEntity.represent(
@@ -340,21 +370,14 @@ module Labimotion
 
         get do
           element = Labimotion::Element.find(params[:id])
-          if Labimotion::IS_RAILS5 == true
-            {
-              element: ElementPermissionProxy.new(current_user, element, user_ids).serialized,
-              attachments: attach_thumbnail(element&.attachments)
-            }
-          else
-            {
-              element: Labimotion::ElementEntity.represent(
-                element,
-                detail_levels: ElementDetailLevelCalculator.new(user: current_user, element: element).detail_levels,
-                policy: @element_policy
-              ),
-              attachments: attach_thumbnail(element&.attachments)
-            }
-          end
+          {
+            element: Labimotion::ElementEntity.represent(
+              element,
+              detail_levels: ElementDetailLevelCalculator.new(user: current_user, element: element).detail_levels,
+              policy: @element_policy
+            ),
+            attachments: attach_thumbnail(element&.attachments)
+          }
         rescue StandardError => e
           Labimotion.log_exception(e, current_user)
         end
@@ -362,13 +385,7 @@ module Labimotion
 
       desc 'Create a element'
       params do
-        requires :element_klass, type: Hash
-        requires :name, type: String
-        optional :properties, type: Hash
-        optional :properties_release, type: Hash
-        optional :collection_id, type: Integer
-        requires :container, type: Hash
-        optional :segments, type: Array, desc: 'Segments'
+        use :create_element_params
       end
       post do
         begin
@@ -387,12 +404,7 @@ module Labimotion
 
       desc 'Update element by id'
       params do
-        requires :id, type: Integer, desc: 'element id'
-        optional :name, type: String
-        requires :properties, type: Hash
-        optional :properties_release, type: Hash
-        requires :container, type: Hash
-        optional :segments, type: Array, desc: 'Segments'
+        use :update_element_params
       end
       route_param :id do
         before do
@@ -414,20 +426,7 @@ module Labimotion
             raise e
           end
         end
-      end
-
-      namespace :split do
-        desc 'split elements'
-        params do
-          requires :ui_state, type: Hash, desc: 'Selected elements from the UI'
-        end
-        post do
-          split_elements(params[:ui_state], current_user)
-        rescue StandardError => e
-          Labimotion.log_exception(e, current_user)
-          { error: e.message }
-        end
-      end
+      end      
     end
   end
 end

data/lib/labimotion/apis/generic_klass_api.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'labimotion/version'
+require 'labimotion/libs/export_element'
+
+module Labimotion
+  # Generic Element API
+  class GenericKlassAPI < Grape::API
+    
+    resource :generic_klass do
+      namespace :download_klass do
+        desc 'export klass'
+        params do
+          requires :id, type: Integer, desc: 'element id'
+          requires :klass, type: String, desc: 'Klass', values: %w[ElementKlass SegmentKlass DatasetKlass]
+        end
+        get do
+          entity = "Labimotion::#{params[:klass]}".constantize.find_by(id: params[:id])
+          entity.update_columns(identifier: SecureRandom.uuid) if entity&.identifier.nil?
+          env['api.format'] = :binary
+          content_type('application/json')
+          filename = URI.escape("LabIMotion_#{params[:klass]}_#{entity.label}-#{Time.new.strftime("%Y%m%d%H%M%S")}.json")
+          # header['Content-Disposition'] = "attachment; filename=abc.docx"
+          header('Content-Disposition', "attachment; filename=\"#{filename}\"")
+          "Labimotion::#{params[:klass]}Entity".constantize.represent(entity)
+          # klass.as_json
+        rescue StandardError => e
+          Labimotion.log_exception(e, current_user)
+          {}
+        end
+      end      
+    end
+  end
+end

data/lib/labimotion/apis/segment_api.rb

@@ -3,6 +3,7 @@ module Labimotion
     include Grape::Kaminari
     helpers Labimotion::GenericHelpers
     helpers Labimotion::SegmentHelpers
+    helpers Labimotion::ParamHelpers
 
     resource :segments do
       namespace :klasses do
@@ -30,11 +31,7 @@ module Labimotion
       namespace :create_segment_klass do
         desc 'create Generic Segment Klass'
         params do
-          requires :label, type: String, desc: 'Segment Klass Label'
-          requires :element_klass, type: Integer, desc: 'Element Klass Id'
-          optional :desc, type: String, desc: 'Segment Klass Desc'
-          optional :place, type: String, desc: 'Segment Klass Place', default: '100'
-          optional :properties_template, type: Hash, desc: 'Element Klass properties template'
+          use :create_segment_klass_params
         end
         after_validation do
           authenticate_admin!('segments')
@@ -50,11 +47,7 @@ module Labimotion
       namespace :update_segment_klass do
         desc 'update Generic Segment Klass'
         params do
-          requires :id, type: Integer, desc: 'Segment Klass ID'
-          optional :label, type: String, desc: 'Segment Klass Label'
-          optional :desc, type: String, desc: 'Segment Klass Desc'
-          optional :place, type: String, desc: 'Segment Klass Place', default: '100'
-          optional :identifier, type: String, desc: 'Segment Identifier'
+          use :update_segment_klass_params
         end
         after_validation do
           authenticate_admin!('segments')
@@ -140,6 +133,28 @@ module Labimotion
           raise e
         end
       end
+
+      namespace :upload_klass do
+        desc 'upload Generic Klass'
+        params do
+          use :upload_segment_klass_params
+        end
+        post do
+          declared_params = declared(params, include_missing: false)
+          attributes = declared_params.merge(
+              created_by: current_user.id,
+              released_by: current_user.id,
+              updated_by: current_user.id,
+              is_active: false
+            )
+          attr_klass = params['element_klass'] || {}
+          attributes.delete(:element_klass)
+          validate_klass(attributes, attr_klass)
+        rescue StandardError => e
+          Labimotion.log_exception(e, current_user)
+          raise e
+        end
+      end
     end
   end
 end

data/lib/labimotion/helpers/element_helpers.rb

@@ -176,11 +176,6 @@ module Labimotion
         )
       end
       (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_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
       Labimotion.log_exception(e, current_user)
@@ -299,37 +294,44 @@ module Labimotion
       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']
-      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
-
+    def validate_klass(attributes)
       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!" }
+          return { 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']}!" }
+          return { status: 'success', message: "This element: [#{attributes['name']}] has been upgraded to the version: #{attributes['version']}!" }
         end
       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." }
+          return { 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']}!" }
+          return { status: 'success', message: "The element: #{attributes['name']} has been created using version: #{attributes['version']}!" }
         end
       end
+      
+    rescue StandardError => e
+      Labimotion.log_exception(e, current_user)
+      return { status: 'error', message: e.message }
+    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']
+      attributes['place'] = ((Labimotion::ElementKlass.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
+      validate_klass(attributes)
     rescue StandardError => e
       Labimotion.log_exception(e, current_user)
       # { error: e.message }

data/lib/labimotion/helpers/param_helpers.rb

@@ -0,0 +1,97 @@
+# frozen_string_literal: true
+require 'grape'
+require 'labimotion/utils/utils'
+# Helper for associated sample
+module Labimotion
+  ## Generic Helpers
+  module ParamHelpers
+    extend Grape::API::Helpers
+       ## Element Klass Params
+      params :upload_element_klass_params do
+        requires :name, type: String, desc: 'Klass Name'
+        optional :label, type: String, desc: 'Klass label'
+        optional :desc, type: String, desc: 'Klass desc'
+        optional :klass_prefix, type: String, desc: 'Klass klass_prefix'
+        optional :icon_name, type: String, desc: 'Klass icon_name'
+        requires :properties_template, type: Hash, desc: 'Klass template'
+        optional :properties_release, type: Hash, desc: 'Klass release'
+        optional :released_at, type: DateTime, desc: 'Klass released_at'
+        requires :uuid, type: String, desc: 'Klass uuid'
+        requires :place, type: Integer, desc: 'Klass place'
+        requires :identifier, type: String, desc: 'Klass identifier'
+        optional :sync_time, type: DateTime, desc: 'Klass sync_time'
+        optional :version, type: String, desc: 'Klass version'
+      end
+      
+      params :create_element_klass_params do
+        requires :name, type: String, desc: 'Element Klass Name'
+        requires :label, type: String, desc: 'Element Klass Label'
+        requires :klass_prefix, type: String, desc: 'Element Klass Short Label Prefix'
+        optional :icon_name, type: String, desc: 'Element Klass Icon Name'
+        optional :desc, type: String, desc: 'Element Klass Desc'
+        optional :properties_template, type: Hash, desc: 'Element Klass properties template'
+      end
+
+      params :update_element_klass_params do
+        requires :id, type: Integer, desc: 'Element Klass ID'
+        optional :label, type: String, desc: 'Element Klass Label'
+        optional :klass_prefix, type: String, desc: 'Element Klass Short Label Prefix'
+        optional :icon_name, type: String, desc: 'Element Klass Icon Name'
+        optional :desc, type: String, desc: 'Element Klass Desc'
+        optional :place, type: String, desc: 'Element Klass Place'
+      end
+      
+      ## Element Params
+      params :create_element_params do
+        requires :element_klass, type: Hash
+        requires :name, type: String
+        optional :properties, type: Hash
+        optional :properties_release, type: Hash
+        optional :collection_id, type: Integer
+        requires :container, type: Hash
+        optional :segments, type: Array, desc: 'Segments'
+      end
+      
+      params :update_element_params do
+        requires :id, type: Integer, desc: 'element id'
+        optional :name, type: String
+        requires :properties, type: Hash
+        optional :properties_release, type: Hash
+        requires :container, type: Hash
+        optional :segments, type: Array, desc: 'Segments'
+      end
+      
+      ## Segment Klass Params
+      params :upload_segment_klass_params do
+        requires :label, type: String, desc: 'Klass label'
+        optional :desc, type: String, desc: 'Klass desc'
+        requires :properties_template, type: Hash, desc: 'Klass template'
+        optional :properties_release, type: Hash, desc: 'Klass release'
+        optional :released_at, type: DateTime, desc: 'Klass released_at'
+        requires :uuid, type: String, desc: 'Klass uuid'
+        requires :place, type: Integer, desc: 'Klass place'
+        requires :identifier, type: String, desc: 'Klass identifier'
+        optional :sync_time, type: DateTime, desc: 'Klass sync_time'
+        optional :version, type: String, desc: 'Klass version'
+        requires :element_klass, type: Hash do
+          use :upload_element_klass_params
+        end
+      end
+
+      params :update_segment_klass_params do
+        requires :id, type: Integer, desc: 'Segment Klass ID'
+        optional :label, type: String, desc: 'Segment Klass Label'
+        optional :desc, type: String, desc: 'Segment Klass Desc'
+        optional :place, type: String, desc: 'Segment Klass Place', default: '100'
+        optional :identifier, type: String, desc: 'Segment Identifier'
+      end
+
+      params :create_segment_klass_params do
+        requires :label, type: String, desc: 'Segment Klass Label'
+        requires :element_klass, type: Integer, desc: 'Element Klass Id'
+        optional :desc, type: String, desc: 'Segment Klass Desc'
+        optional :place, type: String, desc: 'Segment Klass Place', default: '100'
+        optional :properties_template, type: Hash, desc: 'Element Klass properties template'
+      end
+  end
+end

data/lib/labimotion/helpers/segment_helpers.rb

@@ -63,45 +63,53 @@ module Labimotion
       raise e
     end
 
-    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']
-      attributes['place'] = ((Labimotion::SegmentKlass.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
-      element_klass = Labimotion::ElementKlass.find_by(identifier: response['element_klass']['identifier']) if response.dig('element_klass','identifier').present?
-      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?
+    def validate_klass(attributes, attr_klass)
+      element_klass = Labimotion::ElementKlass.find_by(identifier: attr_klass['identifier']) if attr_klass.dig('identifier').present?
+      element_klass = Labimotion::ElementKlass.find_by(name: attr_klass['name'], is_generic: false) if element_klass.nil?
+      return { status: 'error', message: "The element [#{attr_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']
       # Labimotion::ElementKlass.create!(el_attributes)
-
       attributes['element_klass_id'] = element_klass.id
       segment_klass = Labimotion::SegmentKlass.find_by(identifier: attributes['identifier'])
       if segment_klass.present?
         if segment_klass['uuid'] == attributes['uuid'] && segment_klass['version'] == attributes['version']
-          { status: 'success', message: "This segment: #{attributes['label']} has the latest version!" }
+          return { 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']}!" }
+          return { status: 'success', message: "This segment: [#{attributes['label']}] has been upgraded to the version: #{attributes['version']}!" }
         end
       else
         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." }
+          return { 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']}!" }
+          return { status: 'success', message: "The segment: #{attributes['label']} has been created using version: #{attributes['version']}!" }
         end
       end
+    rescue StandardError => e
+      Labimotion.log_exception(e, current_user)
+      return { status: 'error', message: e.message }
+    end
+
+    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']
+      attributes['place'] = ((Labimotion::SegmentKlass.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
+      attr_klass = response.dig('element_klass', {})        # response['element_klass']
+      validate_klass(attributes, attr_klass)
+      
     rescue StandardError => e
       Labimotion.log_exception(e, current_user)
       raise e

data/lib/labimotion/libs/converter.rb

@@ -27,18 +27,10 @@ module Labimotion
 
       dsr = []
       ols = nil
-      if Labimotion::IS_RAILS5 == true
-        Zip::File.open(att.store.path) do |zip_file|
-          res = Labimotion::Converter.collect_metadata(zip_file) if att.filename.split('.')&.last == 'zip'
-          ols = res[:o] unless res&.dig(:o).nil?
-          dsr.push(res[:d]) unless res&.dig(:d).nil?
-        end
-      else
-        Zip::File.open(att.attachment_attacher.file.url) do |zip_file|
-          res = Labimotion::Converter.collect_metadata(zip_file) if att.filename.split('.')&.last == 'zip'
-          ols = res[:o] unless res&.dig(:o).nil?
-          dsr.push(res[:d]) unless res&.dig(:d).nil?
-        end
+      Zip::File.open(att.attachment_attacher.file.url) do |zip_file|
+        res = Labimotion::Converter.collect_metadata(zip_file) if att.filename.split('.')&.last == 'zip'
+        ols = res[:o] unless res&.dig(:o).nil?
+        dsr.push(res[:d]) unless res&.dig(:d).nil?
       end
       dsr.flatten!
       dataset = build_ds(att.attachable_id, ols)
@@ -145,16 +137,9 @@ module Labimotion
           created_by: oat.created_by,
           created_for: oat.created_for,
         )
-        # att.attachment_attacher.attach(tmp_file)
-        if att.valid? && Labimotion::IS_RAILS5 == false
-          ## att.attachment_attacher.create_derivatives
-          att.save!
-        end
-        if att.valid? && Labimotion::IS_RAILS5 == true
-          att.save!
-          primary_store = Rails.configuration.storage.primary_store
-          att.update!(storage: primary_store)
-        end
+
+        att.save! if att.valid?
+
         process_ds(att.id)
       rescue StandardError => e
         raise e
@@ -168,11 +153,7 @@ module Labimotion
       response = nil
       begin
         ofile = Rails.root.join(data[:f], data[:a].filename)
-        if Labimotion::IS_RAILS5 == true
-          FileUtils.cp(data[:a].store.path, ofile)
-        else
-          FileUtils.cp(data[:a].attachment_url, ofile)
-        end
+        FileUtils.cp(data[:a].attachment_url, ofile)
 
         File.open(ofile, 'r') do |f|
           body = { file: f }

data/lib/labimotion/libs/export_dataset.rb

@@ -145,18 +145,9 @@ module Labimotion
         sheet_name = "Sheet#{idx+1}"
         sheet = @xfile.workbook.add_worksheet(name: sheet_name)
         name_mapping.push([sheet_name, att.filename])
-
-        if Labimotion::IS_RAILS5 == true
-          File.open(att.store.path) do |fi|
-            fi.each_line do |line|
-              sheet.add_row(line.split(','))
-            end
-          end
-        else
-          File.open(att.attachment_url) do |fi|
-            fi.each_line do |line|
-              sheet.add_row(line.split(','))
-            end
+        File.open(att.attachment_url) do |fi|
+          fi.each_line do |line|
+            sheet.add_row(line.split(','))
           end
         end
       end