labimotion 1.1.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c374697be6dd59785865b85ea34a92de6d9e87d8d0fe9d5416b5b58c5f18f11
-  data.tar.gz: 11b8842141477f92d08e50c0fc55c29f82c7a098dc8c08ed9be610b9d037c0ae
+  metadata.gz: a6f7936de192e1d9fe1f8bacc78699fc0bf97ac70a8527ef82401b58822e3c34
+  data.tar.gz: 419291e71d602c493841fd560abb7c3fabd1959e6fa5217b71eb40f0ff15ef38
 SHA512:
-  metadata.gz: 0ebbb6edd334c5f13bbf3196cc7f5b56510019925f516abb35404b0943c9546e21fd16227ffebe5365955d9202b7201b795fac019c72050d0a59f902d4aa70ca
-  data.tar.gz: eded51a9e589660b0a6dcf20187eb715e946448fa9a047263176212c0136d0a648c9015d50a3de0ae06ea39ba6942fcfc23e00b085aecaa583e8faa57e67f1ee
+  metadata.gz: 1bfd9d6c59caabdeb559230074000e3e79ffb7bf30699a70b94358bbf7551c31652c4cd85ab20dda6fc902e556e7440ad7243b4452752cf543e462b0ac9dd721
+  data.tar.gz: ba6e063f02f5930c687d23d857ddc71446889d19ae9461b4bfc5600ebdbdac4c39bc1d36196041e0f3bbdb6c9b95502c76639ce2e5c05ff1752dd366ba35cf0b

data/lib/labimotion/libs/nmr_mapper.rb

@@ -18,7 +18,7 @@ module Labimotion
       elsif result[:metadata] == nil
         Labimotion::ConState::NONE
       else
-        data = process(att, id, content)
+        data = process(att, id, result[:metadata])
         generate_ds(id, att.attachable_id, data, current_user)
         Labimotion::ConState::COMPLETED
       end

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

@@ -7,7 +7,7 @@ module Labimotion
   module Segmentable
     extend ActiveSupport::Concern
     included do
-      has_many :segments, as: :element, dependent: :destroy, class_name: 'Labimotion::Segment'
+      has_many :segments, -> { select('DISTINCT ON (element_type, segment_klass_id) *').order(element_type: :asc, segment_klass_id: :asc, id: :desc) }, as: :element, dependent: :destroy, class_name: 'Labimotion::Segment'
     end
 
     def copy_segments(**args)
@@ -52,10 +52,11 @@ module Labimotion
         props['uuid'] = uuid
         props['klass'] = 'Segment'
         props = Labimotion::SampleAssociation.update_sample_association(props, args[:current_user_id])
-        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'])
+        segment = Labimotion::Segment.where(element_type: self.class.name, element_id: self.id, segment_klass_id: seg['segment_klass_id']).order(id: :desc).first
         if segment.present? && (segment.klass_uuid != props['klass_uuid'] || segment.properties != props)
           segment.update!(properties_release: klass.properties_release, properties: props, uuid: uuid, klass_uuid: props['klass_uuid'])
           segments.push(segment)
+          Labimotion::Segment.where(element_type: self.class.name, element_id: self.id, segment_klass_id: seg['segment_klass_id']).where.not(id: segment.id).destroy_all
         end
         next if segment.present?
 

data/lib/labimotion/version.rb

@@ -3,5 +3,5 @@
 ## Labimotion Version
 module Labimotion
   IS_RAILS5 = false
-  VERSION = '1.1.0'
+  VERSION = '1.1.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: labimotion
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.2
 platform: ruby
 authors:
 - Chia-Lin Lin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-12 00:00:00.000000000 Z
+date: 2024-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails