Merge pull request #7 from CIAT-DAPA/develop

GAP-11 #major

Author: victor-993

README.md

@@ -93,6 +93,7 @@ Attributes:
 - species_name: `str` Name of the species of the accession. Optional.
 - crop: `Crop` Crop object, Crop to which the accession belongs. Mandatory.
 - landrace_group: `Group` Group object, Landrace group to which the accession belongs. Mandatory.
+- country: `Country` Country object, country to which the accession belongs. Mandatory.
 - institution_name: `str` Name of the institution that holds the accession. Optional.
 - source_database: `str` Name of the database where the accession was originally stored. Optional.
 - latitude: `float` Latitude of the geographical location where the accession was collected. Mandatory.

src/ormgap/models/accession.py

@@ -1,6 +1,7 @@
 from mongoengine import Document, StringField, ReferenceField, FloatField, DictField
 from .crop import Crop
 from .group import Group
+from .country import Country
 
 class Accession(Document):
 
@@ -19,6 +20,8 @@ class Accession(Document):
         Name of the institution that holds the accession. Optional.
     source_database: str
         Name of the database where the accession was originally stored. Optional.
+    country: Country
+        Country object, country to which the accession belongs. Mandatory.
     latitude: float
         Latitude of the geographical location where the accession was collected. Mandatory.
     longitude: float
@@ -46,6 +49,7 @@ class Accession(Document):
     landrace_group = ReferenceField(Group, required=True)
     institution_name = StringField(max_length=255)
     source_database = StringField(max_length=255)
+    country = ReferenceField(Country, required=True)
     latitude = FloatField(required=True)
     longitude = FloatField(required=True)
     accession_id = StringField(max_length=255)

src/tests/test_accession.py

@@ -10,6 +10,7 @@
 from ormgap.models.accession import Accession
 from ormgap.models.crop import Crop
 from ormgap.models.group import Group
+from ormgap.models.country import Country
 
 class AccessionTestCase(unittest.TestCase):
     @classmethod
@@ -21,12 +22,15 @@ def setUp(self):
         self.assertIsNotNone(self.crop.id)
         self.group = Group(group_name='Test Group', crop=self.crop, ext_id='12345').save()
         self.assertIsNotNone(self.group.id)
+        self.country = Country(iso_2='AR',  name='Argentina').save()
+        self.assertIsNotNone(self.country.id)
         self.accession = Accession(
             species_name='Test Species', 
             crop=self.crop, 
             landrace_group=self.group, 
             institution_name='ICARDA',
             source_database='GENESYS',
+            country=self.country,
             latitude=40.7128,
             longitude=-74.0060,
             accession_id='12345',
@@ -59,6 +63,13 @@ def test_get_accession_by_group(self):
         accession = accessions.first()
         self.assertEqual(self.group.id, accession.landrace_group.id)
 
+    def test_get_accession_by_country(self):
+        self.accession.save()
+        accessions =Accession.objects(country=self.country)
+        self.assertGreaterEqual(len(accessions), 1)
+        accession = accessions.first()
+        self.assertEqual(self.country.id, accession.country.id)
+
     def test_unique_ext_id(self):
         self.accession.save()
         accession = Accession(
@@ -69,12 +80,12 @@ def test_unique_ext_id(self):
             source_database='GENESYS',
             latitude=91, # Latitud inválida
             longitude=-181, # Longitud inválida
+            country= self.country,
             accession_id='12345',
             ext_id='123'
         )
         with self.assertRaises(Exception) as context:
             accession.save()
-        print(str(context.exception))
         self.assertTrue('Tried to save duplicate unique keys (E11000 Duplicate Key Error)' in str(context.exception))
 
     def test_get_accession_by_invalid_id(self):
@@ -102,6 +113,7 @@ def test_delete_accession(self):
     def tearDown(self):
         self.crop.delete()
         self.group.delete()
+        self.country.delete()
         Accession.objects.delete()
 
 if __name__ == '__main__':