Merge pull request #975 from eciis/super-institution

Refact the method get_deciis
eciis · Apr 9, 2018 · 5716e9c · 5716e9c
2 parents 38e2c2f + f78ae96
commit 5716e9c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/backend/handlers/institution_followers_handler.py b/backend/handlers/institution_followers_handler.py
@@ -64,7 +64,7 @@ def delete(self, user, url_string):
         Utils._assert(institution.name == 'Ministério da Saúde',
                       "The institution can not be unfollowed", NotAuthorizedException)
 
-        Utils._assert(institution.name == 'Departamento do Complexo Industrial e Inovação em Saúde',
+        Utils._assert(institution.trusted,
                       "The institution can not be unfollowed", NotAuthorizedException)
 
         if(not type(institution) is Institution):

diff --git a/backend/test/institution_request_collection_handler_test.py b/backend/test/institution_request_collection_handler_test.py
@@ -34,6 +34,7 @@ def test_post(self, verify_token, send_invite):
         self.new_inst = mocks.create_institution()
         self.new_inst.name = "Departamento do Complexo Industrial e Inovação em Saúde"
         self.new_inst.acronym = "DECIIS"
+        self.new_inst.trusted = True
         self.new_inst.address = self.address
         self.new_inst.put()
 

diff --git a/backend/utils.py b/backend/utils.py
@@ -173,13 +173,9 @@ def get_health_ministry():
     query = Institution.query(Institution.name == "Ministério da Saúde", Institution.acronym == "MS")
     return query.get()
 
-"""TODO: Refactor this function to get the DECIIS Institution, making a get for 
-    the institution with that field trusted is equal to true.
-    And certificate that DECIIS is the unique institution trusted in system.
-    @author: Mayza Nunes 05/04/2018"""
 def get_deciis():
     """Get health ministry institution."""
-    query = Institution.query(Institution.name == "Departamento do Complexo Industrial e Inovação em Saúde", Institution.acronym == "DECIIS")
+    query = Institution.query(Institution.trusted == True)
     return query.get()
 
 def json_response(method):