diff --git a/backend/metagenedb/api/catalog/views/test_gene.py b/backend/metagenedb/api/catalog/views/test_gene.py
index 09d36f0615202d31570a4c7a6e7f3c632019b883..fb136301e4bbbc0e1dc71f3cacce9a5fe18038e4 100644
--- a/backend/metagenedb/api/catalog/views/test_gene.py
+++ b/backend/metagenedb/api/catalog/views/test_gene.py
@@ -42,7 +42,7 @@ class TestGenes(TestCase):
class TestCountWindows(TestCase):
def setUp(self):
- self.window_col = "gene_length"
+ self.window_col = "length"
self.df = pd.DataFrame(
[22, 29, 35],
columns=[self.window_col]
diff --git a/backend/metagenedb/common/utils/parsers/igc.py b/backend/metagenedb/common/utils/parsers/igc.py
index 684b83b2f015fe8b656c5ab991d7e3f8fceba2db..296ed9b2803da02b298233a8b0c1e1e90a9d56d5 100644
--- a/backend/metagenedb/common/utils/parsers/igc.py
+++ b/backend/metagenedb/common/utils/parsers/igc.py
@@ -33,7 +33,7 @@ class IGCLineParser(object):
return {
'igc_id': gene_info[0],
'gene_id': gene_info[1],
- 'gene_length': gene_info[2],
+ 'length': gene_info[2],
'gene_completeness_status': gene_info[3],
'cohort_origin': gene_info[4],
'taxo_phylum': gene_info[5],
diff --git a/backend/metagenedb/common/utils/parsers/test_igc.py b/backend/metagenedb/common/utils/parsers/test_igc.py
index 9bfe4f4906925e98b465bcb203471734ea4e0a10..d71a7132e8bb6be14acb904c7773889cb1286c48 100644
--- a/backend/metagenedb/common/utils/parsers/test_igc.py
+++ b/backend/metagenedb/common/utils/parsers/test_igc.py
@@ -9,7 +9,7 @@ class TestIGCLineParser(TestCase):
raw_data = [
'gene_id',
'gene_name',
- 'gene_length',
+ 'length',
'gene_completeness_status',
'cohort_origin',
'taxo_phylum',
@@ -26,7 +26,7 @@ class TestIGCLineParser(TestCase):
expected_dict = {
'igc_id': raw_data[0],
'gene_id': raw_data[1],
- 'gene_length': raw_data[2],
+ 'length': raw_data[2],
'gene_completeness_status': raw_data[3],
'cohort_origin': raw_data[4],
'taxo_phylum': raw_data[5],
diff --git a/backend/scripts/populate_db/import_igc_data.py b/backend/scripts/populate_db/import_igc_data.py
index 5422b1f3006233e244c86c3ccba72f561214e18e..8298a55460c4a7a6aa2fdf7bad80b2f1de7ef92d 100755
--- a/backend/scripts/populate_db/import_igc_data.py
+++ b/backend/scripts/populate_db/import_igc_data.py
@@ -22,7 +22,7 @@ _LOGGER = logging.getLogger(__name__)
PHYLUM_COL = 'taxo_phylum'
GENUS_COL = 'taxo_genus'
-SELECTED_KEYS = ['gene_id', 'gene_length', 'kegg_ko', PHYLUM_COL, GENUS_COL]
+SELECTED_KEYS = ['gene_id', 'length', 'kegg_ko', PHYLUM_COL, GENUS_COL]
def parse_gene(raw_line, selected_keys=SELECTED_KEYS):
diff --git a/backend/scripts/populate_db/test_import_igc_data.py b/backend/scripts/populate_db/test_import_igc_data.py
index b5b03dc075dc28ae16cabaddb1592cf1a0028e64..2a834d676f57254ee316abb99d2ac83716401204 100644
--- a/backend/scripts/populate_db/test_import_igc_data.py
+++ b/backend/scripts/populate_db/test_import_igc_data.py
@@ -13,7 +13,7 @@ class TestParseGene(TestCase):
raw_data = [
'gene_id',
'gene_name',
- 'gene_length',
+ 'length',
'gene_completeness_status',
'cohort_origin',
'taxo_phylum',
@@ -34,7 +34,7 @@ class TestParseGene(TestCase):
"""
expected_dict = {
'gene_id': 'gene_name',
- 'gene_length': 'gene_length',
+ 'length': 'length',
'kegg_ko': 'kegg',
'taxo_phylum': 'taxo_phylum',
'taxo_genus': 'taxo_genus',
@@ -46,10 +46,10 @@ class TestParseGene(TestCase):
"""
This test should failed and need to be updated when SELECTED_KEYS are changed
"""
- selected_keys = ['gene_id', 'gene_length']
+ selected_keys = ['gene_id', 'length']
expected_dict = {
'gene_id': 'gene_name',
- 'gene_length': 'gene_length'
+ 'length': 'length'
}
tested_dict = parse_gene(self.raw_line, selected_keys=selected_keys)
self.assertDictEqual(tested_dict, expected_dict)
@@ -58,10 +58,10 @@ class TestParseGene(TestCase):
"""
Unknown key should be ignored
"""
- selected_keys = ['gene_id', 'gene_length', 'secret_code']
+ selected_keys = ['gene_id', 'length', 'secret_code']
expected_dict = {
'gene_id': 'gene_name',
- 'gene_length': 'gene_length'
+ 'length': 'length'
}
tested_dict = parse_gene(self.raw_line, selected_keys=selected_keys)
self.assertDictEqual(tested_dict, expected_dict)
@@ -72,15 +72,15 @@ class TestUpsertGene(APITestCase):
def test_insert_valid_gene_no_kegg(self):
valid_gene = {
'gene_id': 'test_gene01',
- 'gene_length': 3556
+ 'length': 3556
}
upsert_gene(valid_gene)
self.assertEqual(Gene.objects.all().count(), 1)
- def test_insert_invalid_gene_length(self):
+ def test_insert_invalid_length(self):
invalid_gene = {
'gene_id': 'test_gene01',
- 'gene_length': 'wrong_format'
+ 'length': 'wrong_format'
}
with self.assertRaises(ValidationError) as context: # noqa
upsert_gene(invalid_gene)
@@ -88,16 +88,16 @@ class TestUpsertGene(APITestCase):
def test_update_gene(self):
valid_gene = {
'gene_id': 'test_gene01',
- 'gene_length': 3556
+ 'length': 3556
}
updated_gene = {
'gene_id': 'test_gene01',
- 'gene_length': 356
+ 'length': 356
}
upsert_gene(valid_gene)
- self.assertEqual(Gene.objects.get(gene_id="test_gene01").gene_length, 3556)
+ self.assertEqual(Gene.objects.get(gene_id="test_gene01").length, 3556)
upsert_gene(updated_gene)
- self.assertEqual(Gene.objects.get(gene_id="test_gene01").gene_length, 356)
+ self.assertEqual(Gene.objects.get(gene_id="test_gene01").length, 356)
class TestSelectTaxonomy(TestCase):
@@ -114,13 +114,13 @@ class TestSelectTaxonomy(TestCase):
def test_both_unknown(self):
gene_dict = {
'gene_id': 'gene',
- 'gene_length': 135,
+ 'length': 135,
'taxo_phylum': 'unknown',
'taxo_genus': 'unknown'
}
expected_dict = {
'gene_id': 'gene',
- 'gene_length': 135
+ 'length': 135
}
tested_dict = select_taxonomy(gene_dict)
self.assertDictEqual(tested_dict, expected_dict)
diff --git a/frontend/src/views/Genes.vue b/frontend/src/views/Genes.vue
index 83b4e7c37bd82edc7c813296e016c92eba1599ea..65f36895d82a89de7436bba058405ebb4fda340e 100644
--- a/frontend/src/views/Genes.vue
+++ b/frontend/src/views/Genes.vue
@@ -22,7 +22,7 @@
>
<template v-slot:items="props">
<td>{{ props.item.gene_id }}</td>
- <td class="text-xs">{{ props.item.gene_length }}</td>
+ <td class="text-xs">{{ props.item.length }}</td>
<td class="text-xs"></td>
<td class="text-xs">{{ props.item.functions[0] }}</td>
</template>
@@ -48,7 +48,7 @@ export default {
sortable: false,
value: 'name',
},
- { text: 'Length', value: 'gene_length' },
+ { text: 'Length', value: 'length' },
{ text: 'Taxo', sortable: false },
{ text: 'Functions', value: 'functions', sortable: false },
],