addressing @josenavas comments

Author: antgonza

qiita_db/metadata_template/base_metadata_template.py

@@ -1063,6 +1063,8 @@ def to_dataframe(self):
             df.where((pd.notnull(df)), None)
             df.set_index('sample_id', inplace=True, drop=True)
             id_column_name = 'qiita_%sid' % (self._table_prefix)
+            if id_column_name == 'qiita_sample_id':
+                id_column_name = 'qiita_study_id'
             df[id_column_name] = str(self.id)
 
             return df

qiita_db/metadata_template/test/test_sample_template.py

@@ -1820,7 +1820,7 @@ def test_to_dataframe(self):
                 'latitude': '42.42',
                 'longitude': '41.41',
                 'taxon_id': '9606',
-                'qiita_sample_id': str(new_id),
+                'qiita_study_id': str(new_id),
                 'scientific_name': 'homo sapiens'},
             '%s.Sample2' % new_id: {
                 'physical_specimen_location': 'location1',
@@ -1834,7 +1834,7 @@ def test_to_dataframe(self):
                 'latitude': '4.2',
                 'longitude': '1.1',
                 'taxon_id': '9606',
-                'qiita_sample_id': str(new_id),
+                'qiita_study_id': str(new_id),
                 'scientific_name': 'homo sapiens'},
             '%s.Sample3' % new_id: {
                 'physical_specimen_location': 'location1',
@@ -1848,7 +1848,7 @@ def test_to_dataframe(self):
                 'latitude': '4.8',
                 'longitude': '4.41',
                 'taxon_id': '9606',
-                'qiita_sample_id': str(new_id),
+                'qiita_study_id': str(new_id),
                 'scientific_name': 'homo sapiens'},
             }
         exp = pd.DataFrame.from_dict(exp_dict, orient='index', dtype=str)
@@ -1885,7 +1885,7 @@ def test_to_dataframe(self):
             'water_content_soil', 'elevation', 'temp', 'tot_nitro',
             'samp_salinity', 'altitude', 'env_biome', 'country', 'ph',
             'anonymized_name', 'tot_org_carb', 'description_duplicate',
-            'env_feature', 'scientific_name', 'qiita_sample_id'})
+            'env_feature', 'scientific_name', 'qiita_study_id'})
 
     def test_check_restrictions(self):
         obs = self.tester.check_restrictions(
@@ -2170,7 +2170,7 @@ def test_delete_sample(self):
 EXP_SAMPLE_TEMPLATE = (
     "sample_name\tcollection_timestamp\tdescription\tdna_extracted\t"
     "host_subject_id\tlatitude\tlongitude\tphysical_specimen_location\t"
-    "physical_specimen_remaining\tqiita_sample_id\tsample_type\t"
+    "physical_specimen_remaining\tqiita_study_id\tsample_type\t"
     "scientific_name\ttaxon_id\n"
     "{0}.Sample1\t05/29/2014 12:24:15\tTest Sample 1\ttrue\tNotIdentified\t"
     "42.42\t41.41\tlocation1\ttrue\t{0}\ttype1\thomo sapiens\t9606\n"
@@ -2182,7 +2182,7 @@ def test_delete_sample(self):
 EXP_SAMPLE_TEMPLATE_FEWER_SAMPLES = (
     "sample_name\tcollection_timestamp\tdescription\tdna_extracted\t"
     "host_subject_id\tlatitude\tlongitude\tphysical_specimen_location\t"
-    "physical_specimen_remaining\tqiita_sample_id\tsample_type\t"
+    "physical_specimen_remaining\tqiita_study_id\tsample_type\t"
     "scientific_name\ttaxon_id\n"
     "{0}.Sample1\t05/29/2014 12:24:15\tTest Sample 1\ttrue\tNotIdentified\t"
     "42.42\t41.41\tlocation1\ttrue\t{0}\ttype1\thomo sapiens\t9606\n"

qiita_pet/handlers/api_proxy/tests/test_sample_template.py

@@ -115,7 +115,7 @@ def test_sample_template_get_req(self):
             'host_subject_id': '1001:B4',
             'season_environment': 'winter',
             'temp': '15',
-            'qiita_sample_id': '1',
+            'qiita_study_id': '1',
             'country': 'GAZ:United States of America',
             'longitude': '68.5041623253',
             'tot_nitro': '1.41',
@@ -271,7 +271,7 @@ def test_sample_template_summary_get_req(self):
                     ('Not applicable', 1)],
                 'tot_nitro': [('1.3', 9), ('1.41', 9), ('1.51', 9)],
                 'depth': [('0.15', 27)],
-                'qiita_sample_id': [('1', 27)],
+                'qiita_study_id': [('1', 27)],
                 'anonymized_name': [
                     ('SKB1', 1), ('SKB2', 1), ('SKB3', 1), ('SKB4', 1),
                     ('SKB5', 1), ('SKB6', 1), ('SKB7', 1), ('SKB8', 1),