Merge branch 'develop' into feature/test_registration_output_badges

Author: Ramyapatil712

api/osf_api.py

@@ -1196,7 +1196,6 @@ def update_file_metadata(session, file_guid):
  item_id=file_guid,
  )
 
-
 def get_registration_resource_id(registration_id):
  """This function returns the most recent resource id
  added to the given registration"""
@@ -1229,7 +1228,6 @@ def delete_registration_resource(registration_id):
 
  session.delete(url, item_type='resources')
 
-
 def create_registration_resource(registration_guid, resource_type):
  """This method creates new registration output resource for a given
  registration."""
@@ -1279,3 +1277,36 @@ def create_registration_resource(registration_guid, resource_type):
  item_id=resource_id,
  item_type='resources',
  )['data']
+
+
+def get_registration_resource_id(registration_id):
+ """This function returns the most recent resource id
+ added to the given registration"""
+ session = client.Session(
+ api_base_url=settings.API_DOMAIN,
+ auth=(settings.REGISTRATIONS_USER, settings.REGISTRATIONS_USER_PASSWORD),
+ )
+
+ url = '/v2/registrations/{}/resources/'.format(registration_id)
+ data = session.get(url)['data']
+ if data:
+ for i in range(0, len(data)):
+ date_created = data[i]['attributes']['date_created']
+ now = datetime.datetime.now()
+ current_date = now.strftime('%Y-%m-%d')
+ if current_date in date_created:
+ return data[i]['id']
+ break
+ return None
+
+
+def delete_registration_resource(registration_id):
+ """This function deletes the resource added to the given registration"""
+ session = client.Session(
+ api_base_url=settings.API_DOMAIN,
+ auth=(settings.REGISTRATIONS_USER, settings.REGISTRATIONS_USER_PASSWORD),
+ )
+ registration_resource_id = get_registration_resource_id(registration_id)
+ url = '/v2/resources/{}'.format(registration_resource_id)
+
+ session.delete(url, item_type='resources')

tests/test_registration_sidebar.py

@@ -140,6 +140,7 @@ def test_add_new_resource(
  )
  )
  # Verify and delete the resource if already exists
+
  resource_id = osf_api.get_registration_resource_id(
  registration_id=registration_guid
  )