Start getting single form info

Author: avdata99

ckanext/activityinfo/actions/activity_info.py

@@ -55,3 +55,29 @@ def act_info_get_forms(context, data_dict):
         'database': data['database']
     }
     return ret
+
+
+def act_info_get_form(context, data_dict):
+    '''
+    Action function to get a specific ActivityInfo form.
+    '''
+    toolkit.check_access('act_info_get_form', context, data_dict)
+    user = context.get('user')
+    database_id = data_dict.get('database_id')
+    form_id = data_dict.get('form_id')
+    if not database_id:
+        raise toolkit.ValidationError({'database_id': 'Missing value'})
+    if not form_id:
+        raise toolkit.ValidationError({'form_id': 'Missing value'})
+
+    log.debug(f"Getting ActivityInfo form {form_id} for database {database_id} and user {user}")
+    token = get_user_token(user)
+    aic = ActivityInfoClient(api_key=token)
+    try:
+        form = aic.get_form(database_id, form_id)
+    except HTTPError as e:
+        error = f"Error retrieving form {form_id} for database {database_id} and user {user}: {e}"
+        log.error(error)
+        raise ActivityInfoConnectionError(error)
+
+    return form

ckanext/activityinfo/auth/activity_info.py

@@ -26,3 +26,9 @@ def act_info_get_databases(context, data_dict):
 @require_activity_info_token_decorator
 def act_info_get_forms(context, data_dict):
     return {'success': True}
+
+
+@toolkit.auth_disallow_anonymous_access
+@require_activity_info_token_decorator
+def act_info_get_form(context, data_dict):
+    return {'success': True}

ckanext/activityinfo/blueprints/activity_info.py

@@ -38,7 +38,7 @@ def databases():
     return toolkit.render('activity_info/databases.html', extra_vars)
 
 
-@activityinfo_bp.route('/databases/<database_id>/forms')
+@activityinfo_bp.route('/database/<database_id>/forms')
 def forms(database_id):
     try:
         data = toolkit.get_action('act_info_get_forms')(
@@ -60,6 +60,31 @@ def forms(database_id):
     return toolkit.render('activity_info/forms.html', extra_vars)
 
 
+@activityinfo_bp.route('/database/<database_id>/form/<form_id>')
+def form(database_id, form_id):
+    try:
+        data = toolkit.get_action('act_info_get_form_details')(
+            context={'user': toolkit.c.user},
+            data_dict={
+                'database_id': database_id,
+                'form_id': form_id
+            }
+        )
+    except (ActivityInfoConnectionError, toolkit.ValidationError) as e:
+        message = f"Could not retrieve ActivityInfo form details: {e}"
+        log.error(message)
+        toolkit.h.flash_error(message)
+        return toolkit.redirect_to('activity_info.forms', database_id=database_id)
+
+    log.info(f"Retrieved {data}")
+    extra_vars = {
+        'form': data['form'],
+        'database_id': database_id,
+        'database': data['database'],
+    }
+    return toolkit.render('activity_info/form_details.html', extra_vars)
+
+
 @activityinfo_bp.route('/update-api-key', methods=['POST'])
 def update_api_key():
     """Create or update the current ActivityInfo API key for the logged-in user."""

ckanext/activityinfo/plugin.py

@@ -26,6 +26,7 @@ def get_actions(self):
         return {
             'act_info_get_databases': activity_info_actions.act_info_get_databases,
             'act_info_get_forms': activity_info_actions.act_info_get_forms,
+            'act_info_get_form': activity_info_actions.act_info_get_form,
         }
 
     # IAuthFunctions
@@ -34,6 +35,7 @@ def get_auth_functions(self):
         return {
             'act_info_get_databases': activity_info_auth.act_info_get_databases,
             'act_info_get_forms': activity_info_auth.act_info_get_forms,
+            'act_info_get_form': activity_info_auth.act_info_get_form,
         }
 
     # ITemplateHelpers

ckanext/activityinfo/tests/test_activityinfo_client.py

@@ -62,7 +62,7 @@ def test_get_databases(requests_mock_fixture, client):
 
 def test_get_database(requests_mock_fixture, client):
     db_id = "db1"
-    url = f"https://www.activityinfo.org/resources/databases/{db_id}"
+    url = f"https://www.activityinfo.org/resources/database/{db_id}"
     fake_response = {"databaseId": db_id, "resources": []}
     requests_mock_fixture.get(url, json=fake_response)
     result = client.get_database(db_id)
@@ -71,7 +71,7 @@ def test_get_database(requests_mock_fixture, client):
 
 def test_get_forms(requests_mock_fixture, client):
     db_id = "db1"
-    url = f"https://www.activityinfo.org/resources/databases/{db_id}"
+    url = f"https://www.activityinfo.org/resources/database/{db_id}"
     fake_response = {
         "databaseId": db_id,
         "resources": [
@@ -91,7 +91,7 @@ def test_get_forms(requests_mock_fixture, client):
 def test_get_form(requests_mock_fixture, client):
     db_id = "db1"
     form_id = "f1"
-    url = f"https://www.activityinfo.org/resources/databases/{db_id}/forms/{form_id}"
+    url = f"https://www.activityinfo.org/resources/database/{db_id}/forms/{form_id}"
     fake_response = {"id": form_id, "fields": []}
     requests_mock_fixture.get(url, json=fake_response)
     result = client.get_form(db_id, form_id)