labimotion 0.3.3 → 1.0.0

data/lib/labimotion/libs/converter.rb

@@ -14,38 +14,11 @@ require 'labimotion/utils/utils'
 
 module Labimotion
   class Converter
+
     def self.logger
       @@converter_logger ||= Logger.new(Rails.root.join('log/converter.log')) # rubocop:disable Style/ClassVars
     end
 
-    def self.process_ds(id, current_user = {})
-      att = Attachment.find_by(id: id, con_state: Labimotion::ConState::CONVERTED)
-      return if att.nil? || att.attachable_id.nil? || att.attachable_type != 'Container'
-
-      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
-      end
-      dsr.flatten!
-      dataset = build_ds(att.attachable_id, ols)
-      update_ds(dataset, dsr, current_user) if dataset.present?
-      att.update_column(:con_state, Labimotion::ConState::COMPLETED)
-    rescue StandardError => e
-      Labimotion::Converter.logger.error ["Att ID: #{att&.id}, OLS: #{ols}", "DSR: #{dsr}", e.message, *e.backtrace].join($INPUT_RECORD_SEPARATOR)
-      raise e
-    end
-
     def self.uri(api_name)
       url = Rails.configuration.converter.url
       "#{url}#{api_name}"
@@ -152,7 +125,17 @@ module Labimotion
           primary_store = Rails.configuration.storage.primary_store
           att.update!(storage: primary_store)
         end
-        process_ds(att.id)
+
+        Zip::File.open(tmp_file.path) do |zip_file|
+          res = Labimotion::Converter.collect_metadata(zip_file) if name.split('.')&.last == 'zip'
+          ols = res[:o] unless res&.dig(:o).nil?
+          dsr.push(res[:d]) unless res&.dig(:d).nil?
+        end
+
+        dsr.flatten!
+        if dsr.length.positive? && name.split('.')&.last == 'zip'
+          Labimotion::Converter.ts('write', att.attachable_id, ols: ols, info: dsr)
+        end
       rescue StandardError => e
         raise e
       ensure
@@ -161,7 +144,8 @@ module Labimotion
     end
 
     def self.process(data)
-      return data[:a].con_state if data[:a]&.attachable_type != 'Container'
+      return if data[:a]&.attachable_type != 'Container'
+
       response = nil
       begin
         ofile = Rails.root.join(data[:f], data[:a].filename)
@@ -182,36 +166,37 @@ module Labimotion
         end
         if response.ok?
           Labimotion::Converter.handle_response(data[:a], response)
-          Labimotion::ConState::PROCESSED
         else
           Labimotion::Converter.logger.error ["Converter Response Error: id: [#{data[:a]&.id}], filename: [#{data[:a]&.filename}], response: #{response}"].join($INPUT_RECORD_SEPARATOR)
-          Labimotion::ConState::ERROR
         end
+        response
       rescue StandardError => e
-        Labimotion::Converter.logger.error ["process fail: #{id}", e.message, *e.backtrace].join($INPUT_RECORD_SEPARATOR)
-        Labimotion::ConState::ERROR
+        raise e
       ensure
         FileUtils.rm_f(ofile)
       end
     end
 
     def self.jcamp_converter(id)
-      data = Labimotion::Converter.vor_conv(id)
-      return if data.nil?
+      resp = nil
+      begin
+        data = Labimotion::Converter.vor_conv(id)
+        return if data.nil?
 
-      Labimotion::Converter.process(data)
-    rescue StandardError => e
-      Labimotion::Converter.logger.error ["jcamp_converter fail: #{id}", e.message, *e.backtrace].join($INPUT_RECORD_SEPARATOR)
-      Labimotion::ConState::ERROR
+        resp = Labimotion::Converter.process(data)
+        resp&.success? ? Labimotion::ConState::PROCESSED : Labimotion::ConState::ERROR
+      rescue StandardError => e
+        Labimotion::ConState::ERROR
+        Labimotion::Converter.logger.error ["jcamp_converter fail: #{id}", e.message, *e.backtrace].join($INPUT_RECORD_SEPARATOR)
+      end
     end
 
     def self.generate_ds(att_id, current_user = {})
       dsr_info = Labimotion::Converter.fetch_dsr(att_id)
       begin
         return unless dsr_info && dsr_info[:info]&.length.positive?
-
         dataset = Labimotion::Converter.build_ds(att_id, dsr_info[:ols])
-        Labimotion::Converter.update_ds(dataset, dsr_info[:info], current_user) if dataset.present?
+        Labimotion::Converter.update_ds(dataset, dsr_info[:info], current_user)
       rescue StandardError => e
         Labimotion::Converter.logger.error ["Att ID: #{att_id}, OLS: #{dsr_info[:ols]}", "DSR: #{dsr_info[:info]}", e.message, *e.backtrace].join($INPUT_RECORD_SEPARATOR)
       ensure
@@ -248,8 +233,6 @@ module Labimotion
       new_prop = dataset.properties
       dsr.each do |ds|
         layer = layers[ds[:layer]]
-        next if layer.nil? || layer['fields'].nil?
-
         fields = layer['fields'].select{ |f| f['field'] == ds[:field] }
         fi = fields&.first
         idx = layer['fields'].find_index(fi)
@@ -339,15 +322,6 @@ module Labimotion
       end
       res
     end
-
-    def self.metadata(id)
-      att = Attachment.find(id)
-      return if att.nil? || att.attachable_id.nil? || att.attachable_type != 'Container'
-
-      ds = Labimotion::Dataset.find_by(element_type: 'Container', element_id: att.attachable_id)
-      att.update_column(:con_state, Labimotion::ConState::COMPLETED) if ds.present?
-      process_ds(att.id) if ds.nil?
-    end
   end
 end
 

data/lib/labimotion/libs/export_dataset.rb

@@ -27,7 +27,7 @@ module Labimotion
       name = ds.dataset_klass.label
 
       match = name.match(/\((.*?)\)/)
-      name = match && match.length > 1 ? match[1] : name
+      name = match && match.length > 2 ? match[1] : name
 
       name = '1H NMR' if ds.dataset_klass.ols_term_id == 'CHMO:0000593'
       name = '13C NMR' if ds.dataset_klass.ols_term_id == 'CHMO:0000595'
@@ -99,14 +99,9 @@ module Labimotion
       wb = @xfile.workbook
       gds = Labimotion::Dataset.find_by(element_id: id, element_type: 'Container')
       cds = Container.find(id)
-      cds_csv = cds.attachments.where(aasm_state: 'csv')
-      csv_length = cds_csv.length
-      return if csv_length.zero?
-      cds_csv.each_with_index do |att, idx|
+      cds.attachments.where(aasm_state: 'csv').each do |att|
         name = File.basename(att.filename, '.csv')
-        name = name.slice(0, (25 - csv_length.to_s.length - 1))
-        sheet_name = "#{name}_#{idx}"
-        sheet = @xfile.workbook.add_worksheet(name: sheet_name)
+        sheet = @xfile.workbook.add_worksheet(name: name)
 
         if Labimotion::IS_RAILS5 == true
           File.open(att.store.path) do |fi|

data/lib/labimotion/libs/nmr_mapper.rb

@@ -6,24 +6,8 @@ require 'labimotion/utils/utils'
 module Labimotion
   ## NmrMapper
   class NmrMapper
-    def self.process_ds(id, current_user = {})
-      att = Attachment.find_by(id: id, con_state: Labimotion::ConState::NMR)
-      return if att.nil?
-
-      content = is_brucker_binary(id)
-      if content.nil?
-        Labimotion::ConState::NONE
-      else
-        data = process(att, id, content)
-        generate_ds(id, att.attachable_id, data, current_user)
-        Labimotion::ConState::COMPLETED
-      end
-    end
-
     def self.is_brucker_binary(id)
-      att = Attachment.find_by(id: id, con_state: Labimotion::ConState::NMR)
-      return if att.nil?
-
+      att = Attachment.find(id)
       if Labimotion::IS_RAILS5 == true
         Zip::File.open(att.store.path) do |zip_file|
           zip_file.each do |entry|
@@ -48,9 +32,8 @@ module Labimotion
       nil
     end
 
-    def self.process(att, id, content)
-      return if att.nil? || content.nil?
-
+    def self.process(id, content)
+      att = Attachment.find(id)
       lines = content.split("\n").reject(&:empty?)
       metadata = {}
       lines.map do |ln|
@@ -59,33 +42,26 @@ module Labimotion
       end
       ols = 'CHMO:0000593' if metadata['NUC1'] == '1H'
       ols = 'CHMO:0000595' if metadata['NUC1'] == '13C'
-
-      { content: { metadata: metadata, ols: ols } }
-      # if content.present? && att.present?
-      #   Labimotion::NmrMapper.ts('write', att.attachable_id,
-      #                         content: { metadata: metadata, ols: ols })
-      # end
+      if content.present? && att.present?
+        Labimotion::NmrMapper.ts('write', att.attachable_id,
+                              content: { metadata: metadata, ols: ols })
+      end
     end
 
     def self.fetch_content(id)
-      atts = Attachment.where(attachable_id: id)
-      return if atts.nil?
-
-      atts.each do |att|
-        content = Labimotion::NmrMapper.ts('read', att.id)
-        return content if content.present?
-      end
+      Labimotion::NmrMapper.ts('read', id)
     end
 
+    def self.generate_ds(id, current_user = {})
+      data = Labimotion::NmrMapper.fetch_content(id)
+      return if data.nil?
 
-    def self.generate_ds(id, cid, data, current_user = {})
-      return if data.nil? || cid.nil?
-
-      obj = Labimotion::NmrMapper.build_ds(cid, data[:content])
+      obj = Labimotion::NmrMapper.build_ds(id, data[:content])
       return if obj.nil? || obj[:ols].nil?
 
-      Labimotion::NmrMapper.update_ds_1h(cid, obj, current_user) if obj[:ols] == 'CHMO:0000593'
-      Labimotion::NmrMapper.update_ds_1h(cid, obj, current_user) if obj[:ols] == 'CHMO:0000595'
+      Labimotion::NmrMapper.update_ds_1h(id, obj, current_user) if obj[:ols] == 'CHMO:0000593'
+      Labimotion::NmrMapper.update_ds_1h(id, obj, current_user) if obj[:ols] == 'CHMO:0000595'
+      Labimotion::NmrMapper.clean(id)
     end
 
     def self.update_ds_13c(id, obj)

data/lib/labimotion/libs/nmr_mapper_repo.rb

@@ -0,0 +1,278 @@
+# frozen_string_literal: true
+require 'labimotion/version'
+require 'labimotion/utils/utils'
+
+module Labimotion
+  class NmrMapperRepo
+    def self.is_brucker_binary(id)
+      att = Attachment.find(id)
+      if Labimotion::IS_RAILS5 == true
+        Zip::File.open(att.store.path) do |zip_file|
+          zip_file.each do |entry|
+            if entry.name.include?('/pdata/') && entry.name.include?('parm.txt')
+              metadata = entry.get_input_stream.read.force_encoding('UTF-8')
+              return metadata
+            end
+          end
+        end
+      else
+        if att&.attachment_attacher&.file&.url
+          Zip::File.open(att.attachment_attacher.file.url) do |zip_file|
+            zip_file.each do |entry|
+              if entry.name.include?('/pdata/') && entry.name.include?('parm.txt')
+                metadata = entry.get_input_stream.read.force_encoding('UTF-8')
+                return metadata
+              end
+            end
+          end
+        end
+      end
+
+      nil
+    end
+
+    def self.process(id, content)
+      att = Attachment.find(id)
+      lines = content.split("\n").reject(&:empty?)
+      metadata = {}
+      lines.map do |ln|
+        arr = ln.split(/\s+/)
+        metadata[arr[0]] = arr[1..-1].join(' ') if arr.length > 1
+      end
+      ols = 'CHMO:0000593' if metadata['NUC1'] == '1H'
+      ols = 'CHMO:0000595' if metadata['NUC1'] == '13C'
+      if content.present? && att.present?
+        Labimotion::NmrMapper.ts('write', att.attachable_id,
+                              content: { metadata: metadata, ols: ols })
+      end
+    end
+
+    def self.fetch_content(id)
+      Labimotion::NmrMapper.ts('read', id)
+    end
+
+    def self.generate_ds(id, current_user = {})
+      data = Labimotion::NmrMapper.fetch_content(id)
+      return if data.nil?
+
+      obj = Labimotion::NmrMapper.build_ds(id, data[:content])
+      return if obj.nil? || obj[:ols].nil?
+
+      Labimotion::NmrMapper.update_ds_1h(id, obj, current_user) if obj[:ols] == 'CHMO:0000593'
+      Labimotion::NmrMapper.update_ds_1h(id, obj, current_user) if obj[:ols] == 'CHMO:0000595'
+      Labimotion::NmrMapper.clean(id)
+    end
+
+    def self.update_ds_13c(id, obj)
+      # dataset = obj[:dataset]
+      # metadata = obj[:metadata]
+      # new_prop = dataset.properties
+
+      # dataset.properties = new_prop
+      # dataset.save!
+    end
+
+    def self.set_data(prop, field, idx, layer_name, field_name, value)
+      return if field['field'] != field_name || value&.empty?
+
+      field['value'] = value
+      prop['layers'][layer_name]['fields'][idx] = field
+      prop
+    end
+
+    def self.update_ds_1h(id, obj, current_user)
+      dataset = obj[:dataset]
+      metadata = obj[:metadata]
+      new_prop = dataset.properties
+      new_prop.dig('layers', 'general', 'fields')&.each_with_index do |fi, idx|
+      #  new_prop = set_data(new_prop, fi, idx, 'general', 'title', metadata['NAME'])
+        if fi['field'] == 'title' && metadata['NAME'].present?
+          ## fi['label'] = fi['label']
+          fi['value'] = metadata['NAME']
+          fi['device'] = metadata['NAME']
+          fi['dkey'] = 'NAME'
+          new_prop['layers']['general']['fields'][idx] = fi
+        end
+
+        if fi['field'] == 'date' && metadata['Date_'].present?
+          ## fi['label'] = fi['label']
+          fi['value'] = metadata['Date_']
+          fi['device'] = metadata['Date_']
+          fi['dkey'] = 'Date_'
+          new_prop['layers']['general']['fields'][idx] = fi
+        end
+
+        if fi['field'] == 'time' && metadata['Time'].present?
+          ## fi['label'] = fi['label']
+          fi['value'] = metadata['Time']
+          fi['device'] = metadata['Time']
+          fi['dkey'] = 'Time'
+          new_prop['layers']['general']['fields'][idx] = fi
+        end
+
+        if fi['field'] == 'creator' && current_user.present?
+          ## fi['label'] = fi['label']
+          fi['value'] = current_user.name
+          new_prop['layers']['general']['fields'][idx] = fi
+        end
+      end
+      element = Container.find(id)&.root_element
+      element.present? && element&.class&.name == 'Sample' && new_prop.dig('layers', 'sample_details', 'fields')&.each_with_index do |fi, idx|
+        if fi['field'] == 'label'
+          fi['value'] = element.short_label
+          new_prop['layers']['sample_details']['fields'][idx] = fi
+        end
+        if fi['field'] == 'id'
+          fi['value'] = element.id
+          new_prop['layers']['sample_details']['fields'][idx] = fi
+        end
+      end
+
+      new_prop.dig('layers', 'instrument', 'fields')&.each_with_index do |fi, idx|
+        if fi['field'] == 'instrument' && metadata['INSTRUM'].present?
+          # fi['label'] = fi['label']
+          fi['value'] = metadata['INSTRUM']
+          fi['device'] = metadata['INSTRUM']
+          fi['dkey'] = 'INSTRUM'
+          new_prop['layers']['instrument']['fields'][idx] = fi
+        end
+      end
+
+
+      new_prop.dig('layers', 'equipment', 'fields')&.each_with_index do |fi, idx|
+        if fi['field'] == 'probehead' && metadata['PROBHD'].present?
+          # fi['label'] = fi['label']
+          fi['value'] = metadata['PROBHD']
+          fi['device'] = metadata['PROBHD']
+          fi['dkey'] = 'PROBHD'
+          new_prop['layers']['equipment']['fields'][idx] = fi
+        end
+      end
+
+      new_prop.dig('layers', 'sample_preparation', 'fields')&.each_with_index do |fi, idx|
+        if fi['field'] == 'solvent' && metadata['SOLVENT'].present?
+          # fi['label'] = fi['label']
+          fi['value'] = metadata['SOLVENT']
+          fi['device'] = metadata['SOLVENT']
+          fi['dkey'] = 'SOLVENT'
+          fi['value'] = 'chloroform-D1 (CDCl3)' if metadata['SOLVENT'] == 'CDCl3'
+          new_prop['layers']['sample_preparation']['fields'][idx] = fi
+        end
+      end
+
+
+      new_prop.dig('layers', 'set', 'fields')&.each_with_index do |fi, idx|
+        if fi['field'] == 'temperature' && metadata['TE'].present?
+          # fi['label'] = fi['label']
+          fi['value'] = metadata['TE'].split(/\s+/).first
+          fi['device'] = metadata['TE']
+          fi['dkey'] = 'TE'
+          fi['value_system'] = metadata['TE'].split(/\s+/).last
+          new_prop['layers']['set']['fields'][idx] = fi
+        end
+        if fi['field'] == 'ns' && metadata['NS'].present?
+          # fi['label'] = fi['label']
+          fi['value'] = metadata['NS']
+          fi['device'] = metadata['NS']
+          fi['dkey'] = 'NS'
+          new_prop['layers']['set']['fields'][idx] = fi
+        end
+        if fi['field'] == 'PULPROG' && metadata['PULPROG'].present?
+          # fi['label'] = fi['label']
+          fi['value'] = metadata['PULPROG']
+          fi['device'] = metadata['PULPROG']
+          fi['dkey'] = 'PULPROG'
+          new_prop['layers']['set']['fields'][idx] = fi
+        end
+        if fi['field'] == 'td' && metadata['TD'].present?
+          # fi['label'] = fi['label']
+          fi['value'] = metadata['TD']
+          fi['device'] = metadata['TD']
+          fi['dkey'] = 'TD'
+          new_prop['layers']['set']['fields'][idx] = fi
+        end
+        if fi['field'] == 'done' && metadata['D1'].present?
+          # fi['label'] = fi['label']
+          fi['value'] = metadata['D1']
+          fi['device'] = metadata['D1']
+          fi['dkey'] = 'D1'
+          new_prop['layers']['set']['fields'][idx] = fi
+        end
+        if fi['field'] == 'sf' && metadata['SF'].present?
+          ## fi['label'] = fi['label']
+          fi['value'] = metadata['SF']
+          fi['device'] = metadata['SF']
+          fi['dkey'] = 'SF'
+          new_prop['layers']['set']['fields'][idx] = fi
+        end
+        if fi['field'] == 'sfoone' && metadata['SFO1'].present?
+          ## fi['label'] = fi['label']
+          fi['value'] = metadata['SFO1']
+          fi['device'] = metadata['SFO1']
+          fi['dkey'] = 'SFO1'
+          new_prop['layers']['set']['fields'][idx] = fi
+        end
+        if fi['field'] == 'sfotwo' && metadata['SFO2'].present?
+          ## fi['label'] = fi['label']
+          fi['value'] = metadata['SFO2']
+          fi['device'] = metadata['SFO2']
+          fi['dkey'] = 'SFO2'
+          new_prop['layers']['set']['fields'][idx] = fi
+        end
+        if fi['field'] == 'nucone' && metadata['NUC1'].present?
+          ## fi['label'] = fi['label']
+          fi['value'] = metadata['NUC1']
+          fi['device'] = metadata['NUC1']
+          fi['dkey'] = 'NUC1'
+          new_prop['layers']['set']['fields'][idx] = fi
+        end
+        if fi['field'] == 'nuctwo' && metadata['NUC2'].present?
+          ## fi['label'] = fi['label']
+          fi['value'] = metadata['NUC2']
+          fi['device'] = metadata['NUC2']
+          fi['dkey'] = 'NUC2'
+          new_prop['layers']['set']['fields'][idx] = fi
+        end
+      end
+      dataset.properties = new_prop
+      dataset.save!
+    end
+
+
+    def self.ts(method, identifier, params = nil)
+      Rails.cache.send(method, "#{Labimotion::NmrMapper.new.class.name}#{identifier}", params)end
+
+    def self.clean(id)
+      Labimotion::NmrMapper.ts('delete', id)
+    end
+
+    def self.build_ds(id, content)
+      ds = Container.find_by(id: id)
+      return if ds.nil? || content.nil?
+
+      ols = content[:ols]
+      metadata = content[:metadata]
+
+      return if ols.nil? || metadata.nil?
+
+      klass = Labimotion::DatasetKlass.find_by(ols_term_id: ols)
+      return if klass.nil?
+
+      uuid = SecureRandom.uuid
+      props = klass.properties_release
+      props['uuid'] = uuid
+      props['pkg'] = Labimotion::Utils.pkg(props['pkg'])
+      props['klass'] = 'Dataset'
+      dataset = Labimotion::Dataset.create!(
+        uuid: uuid,
+        dataset_klass_id: klass.id,
+        element_type: 'Container',
+        element_id: ds.id,
+        properties: props,
+        properties_release: klass.properties_release,
+        klass_uuid: klass.uuid
+      )
+      { dataset: dataset, metadata: metadata, ols: ols }
+    end
+  end
+end

data/lib/labimotion/libs/template_hub.rb

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

data/lib/labimotion/models/concerns/attachment_converter.rb

@@ -10,7 +10,6 @@ module Labimotion
       after_update :exec_converter
       def init_converter
         return if self.has_attribute?(:con_state) == false || con_state.present?
-
         if Rails.configuration.try(:converter).try(:url) && ACCEPTED_FORMATS.include?(File.extname(filename&.downcase))
           self.con_state = Labimotion::ConState::WAIT
         end
@@ -23,19 +22,19 @@ module Labimotion
       end
 
       def exec_converter
-        return if self.has_attribute?(:con_state) == false || self.con_state.nil? || self.con_state == Labimotion::ConState::NONE
-
-        return if attachable_id.nil? && self.con_state != Labimotion::ConState::WAIT
-
+        #return if attachable_id.nil?
+        return if self.has_attribute?(:con_state) == false || con_state.nil? || con_state == Labimotion::ConState::NONE
         case con_state
         when Labimotion::ConState::NMR
-          self.con_state = Labimotion::NmrMapper.process_ds(id)
-          update_column(:con_state, con_state)
+          content = Labimotion::NmrMapperRepo.is_brucker_binary(id)
+          if content.nil?
+            self.con_state = Labimotion::ConState::NONE
+          else
+            Labimotion::NmrMapperRepo.process(id, content)
+            self.con_state = Labimotion::ConState::PROCESSED
+          end
         when Labimotion::ConState::WAIT
           self.con_state = Labimotion::Converter.jcamp_converter(id)
-          update_column(:con_state, con_state)
-        when Labimotion::ConState::CONVERTED
-          Labimotion::Converter.metadata(id)
         end
       end
     end

data/lib/labimotion/models/concerns/datasetable.rb

@@ -23,7 +23,7 @@ module Labimotion
       uuid = SecureRandom.uuid
       props = args[:properties]
       props['pkg'] = Labimotion::Utils.pkg(props['pkg'])
-      props['identifier'] = klass.identifier if klass.identifier.present?
+      props['identifier'] = klass.identifier
       props['uuid'] = uuid
       props['klass'] = 'Dataset'
 

data/lib/labimotion/models/concerns/segmentable.rb

@@ -41,13 +41,14 @@ module Labimotion
 
     def save_segments(**args) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
       return if args[:segments].nil?
+
       segments = []
-      args[:segments]&.each do |seg|
+      args[:segments].each do |seg|
         klass = Labimotion::SegmentKlass.find_by(id: seg['segment_klass_id'])
         uuid = SecureRandom.uuid
         props = seg['properties']
         props['pkg'] = Labimotion::Utils.pkg(props['pkg'])
-        props['identifier'] = klass.identifier if klass.identifier.present?
+        props['identifier'] = identifier
         props['uuid'] = uuid
         props['klass'] = 'Segment'
         segment = Labimotion::Segment.find_by(element_type: Labimotion::Utils.element_name(self.class.name), element_id: self.id, segment_klass_id: seg['segment_klass_id'])
@@ -58,7 +59,7 @@ module Labimotion
         next if segment.present?
 
         props['klass_uuid'] = klass.uuid
-        segment = Labimotion::Segment.create!(properties_release: klass.properties_release, segment_klass_id: seg['segment_klass_id'], element_type: self.class.name, element_id: self.id, properties: props, created_by: args[:current_user_id], uuid: uuid, klass_uuid: klass.uuid)
+        segment = Labimotion::Segment.create!(properties_release: klass.properties_release, segment_klass_id: seg['segment_klass_id'], element_type: Labimotion::Utils.element_name(self.class.name), element_id: self.id, properties: props, created_by: args[:current_user_id], uuid: uuid, klass_uuid: klass.uuid)
         segments.push(segment)
       end
       segments

data/lib/labimotion/models/concerns/workflow.rb

@@ -23,14 +23,5 @@ module Labimotion
       end
       properties
     end
-
-    def migrate_workflow
-      return if properties_template.nil? || properties_release.nil?
-
-      return if properties_template['flow'].nil? && properties_release['flow'].nil?
-
-      update_column(:properties_template, split_workflow(properties_template)) if properties_template['flow']
-      update_column(:properties_release, split_workflow(properties_release)) if properties_release['flow']
-    end
   end
 end