labimotion 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55758d962c5628b469e7c55a72666411eb4f23a2e55a863b9b75baef02edd9d7
-  data.tar.gz: 46497569a5a844d76be344c12f73f156d2cf7fa2af98817d89e0335eaa17292c
+  metadata.gz: 1618c815a5e643e1defe701789af1eb30a3e7e2a166bf65d0b0657893099cd38
+  data.tar.gz: 66379371379950fb9666a7472954f9b54087b04095ce23444ce8c463c075e173
 SHA512:
-  metadata.gz: e22f4a946c2729b3ba8adfc702308b38f67fa6a5314eb12c375d0369fa84c0f49eec45984989f15cbc8dee70319f69650f2a67f9b0e988470964840db60dc326
-  data.tar.gz: 0ba7d3e49cad20b91e8d8edbaadba114a8bae0d72c07c8b65a74c712fc9b0823a12a9bf9d9d98b9e75dcc9ac14a7c5e8b856eeebeef942dd82a93b6fdedff788
+  metadata.gz: f735c423f7975f6155be3d129b9b3918b8c64b019e45c146e148cefd66f5184f62d982d117b6f1c863822446776d6f9a91ba5b4be479ad79457aa9629e903286
+  data.tar.gz: dbb7a6e448818ceceb32f885725167e99efa5bd2ef142e241c6c58f4a9dd74fa36713cf4e66434fed7cf74b3a64b1ef2830e5c2fc258cc8443216bb7e526baef

data/lib/labimotion/libs/attachment_handler.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+require 'labimotion/version'
+
+module Labimotion
+  ## ExportDataset
+  class AttachmentHandler
+    def self.copy(original_attach, element_id, element_type, current_user_id)
+      copy_attach = Attachment.new(
+        attachable_id: element_id,
+        attachable_type: element_type,
+        aasm_state: original_attach.aasm_state,
+        created_by: current_user_id,
+        created_for: current_user_id,
+        filename: original_attach.filename,
+      )
+      copy_attach.save
+
+      copy_io = original_attach.attachment_attacher.get.to_io
+      attacher = copy_attach.attachment_attacher
+      attacher.attach copy_io
+      copy_attach.file_path = copy_io.path
+      copy_attach.save
+
+      Usecases::Attachments::Copy.update_annotation(original_attach.id, copy_attach.id) if (original_attach.attachment_data && original_attach.attachment_data['derivatives'])
+      copy_attach
+    end
+
+  end
+end

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

@@ -9,9 +9,9 @@ module Labimotion
       before_save :check_identifier
     end
 
-      
+
     def check_identifier
-      self.identifier = identifier || SecureRandom.uuid
+      self.identifier = identifier || SecureRandom.uuid if self.has_attribute?(:identifier)
     end
 
     def create_klasses_revision(current_user)

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'labimotion/utils/utils'
+require 'labimotion/libs/attachment_handler'
 
 module Labimotion
   # Segmentable concern
@@ -29,7 +30,8 @@ module Labimotion
 
               att = Attachment.find_by(id: aid)
               att = Attachment.find_by(identifier: uid) if att.nil?
-              copied_att = att&.copy(attachable_type: Labimotion::Prop::SEGMENTPROPS, attachable_id: segment.id, transferred: true)
+              copied_att = Labimotion::AttachmentHandler.copy(att, segment.id, Labimotion::Prop::SEGMENTPROPS, args[:current_user_id])
+
               if copied_att.nil?
                 properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS][idx]['value']['files'].delete_at(fdx)
               else

data/lib/labimotion/version.rb

@@ -2,5 +2,5 @@
 
 ## Labimotion Version
 module Labimotion
-  VERSION = '1.3.1'
+  VERSION = '1.3.2'
 end

data/lib/labimotion.rb

@@ -62,6 +62,7 @@ module Labimotion
   autoload :ExportDataset, 'labimotion/libs/export_dataset'
   autoload :SampleAssociation, 'labimotion/libs/sample_association'
   autoload :PropertiesHandler, 'labimotion/libs/properties_handler'
+  autoload :AttachmentHandler, 'labimotion/libs/attachment_handler'
 
   ######## Utils
   autoload :Prop, 'labimotion/utils/prop'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: labimotion
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Chia-Lin Lin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-07 00:00:00.000000000 Z
+date: 2024-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -66,6 +66,7 @@ files:
 - lib/labimotion/helpers/sample_association_helpers.rb
 - lib/labimotion/helpers/search_helpers.rb
 - lib/labimotion/helpers/segment_helpers.rb
+- lib/labimotion/libs/attachment_handler.rb
 - lib/labimotion/libs/converter.rb
 - lib/labimotion/libs/export_dataset.rb
 - lib/labimotion/libs/export_element.rb