From 819e87079e1b7f4db745e9eccfbeca883b85d982 Mon Sep 17 00:00:00 2001
From: Seth Call <sethcall@gmail.com>
Date: Mon, 30 Nov 2015 21:21:27 -0600
Subject: [PATCH] * click track import working

---
 ruby/lib/jam_ruby/jam_track_importer.rb | 19 +++++++++++++++++--
 ruby/lib/jam_ruby/models/jam_track.rb   |  2 +-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/ruby/lib/jam_ruby/jam_track_importer.rb b/ruby/lib/jam_ruby/jam_track_importer.rb
index d0ed07404..c31e9779a 100644
--- a/ruby/lib/jam_ruby/jam_track_importer.rb
+++ b/ruby/lib/jam_ruby/jam_track_importer.rb
@@ -53,7 +53,7 @@ module JamRuby
 
           if click_track.nil?
             click_track = JamTrackTrack.new
-            #track.original_filename = wav_file
+            click_track.original_filename = click_track_file[:original_filename]
             click_track.original_audio_s3_path = click_track_file[:original_filename]
             click_track.track_type = 'Click'
             click_track.part = 'Clicktrack'
@@ -1153,7 +1153,22 @@ module JamRuby
 
       end
 
-      sorted_tracks[sorted_tracks.length - 1].position = 1000
+      # get click/master tracks position re-set correctly
+
+      last_track = sorted_tracks[sorted_tracks.length - 1]
+      second_to_last = sorted_tracks[sorted_tracks.length - 2]
+
+      if last_track.track_type == 'Master'
+        last_track.position = 1000
+      elsif last_track.track_type == 'Click'
+        last_track.position = 10000
+      end
+
+      if second_to_last.track_type == 'Master'
+        second_to_last.position = 1000
+      elsif second_to_last.track_type == 'Click'
+        second_to_last.position = 10000
+      end
 
       sorted_tracks
     end
diff --git a/ruby/lib/jam_ruby/models/jam_track.rb b/ruby/lib/jam_ruby/models/jam_track.rb
index d5365c37e..26e3fc8b3 100644
--- a/ruby/lib/jam_ruby/models/jam_track.rb
+++ b/ruby/lib/jam_ruby/models/jam_track.rb
@@ -86,7 +86,7 @@ module JamRuby
     after_save :sync_reproduction_royalty
     after_save :sync_onboarding_exceptions
 
-    def increment_version
+    def increment_version!
       self.version = version.to_i + 1
       save!
     end