From b61dc7711b1decb134a5061fec906a89fb8b5d27 Mon Sep 17 00:00:00 2001
From: Jad <jad.saad@aot-technologies.com>
Date: Fri, 7 Jul 2023 12:47:22 -0700
Subject: [PATCH] fix lint and unit test

---
 .../services/report_setting_service.py        |  2 +-
 met-api/tests/unit/api/test_report_setting.py | 34 +++++--------------
 2 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/met-api/src/met_api/services/report_setting_service.py b/met-api/src/met_api/services/report_setting_service.py
index 72a3337d3..dd058a23a 100644
--- a/met-api/src/met_api/services/report_setting_service.py
+++ b/met-api/src/met_api/services/report_setting_service.py
@@ -141,7 +141,7 @@ def update_report_setting(cls, survey_id, new_report_settings):
         """Update report setting."""
         survey = SurveyModel.find_by_id(survey_id)
         if not survey:
-                raise KeyError(f'No survey found for {survey_id}')
+            raise KeyError(f'No survey found for {survey_id}')
         for setting in new_report_settings:
             report_setting_id = setting.get('id', None)
             report_setting = ReportSettingModel.find_by_id(report_setting_id)
diff --git a/met-api/tests/unit/api/test_report_setting.py b/met-api/tests/unit/api/test_report_setting.py
index fee922718..00c655a17 100644
--- a/met-api/tests/unit/api/test_report_setting.py
+++ b/met-api/tests/unit/api/test_report_setting.py
@@ -16,41 +16,25 @@
 
 Test-Suite to ensure that the Report setting endpoint is working as expected.
 """
-import json
-
 from met_api.utils.enums import ContentType
-from tests.utilities.factory_scenarios import TestJwtClaims, TestSurveyInfo
-from tests.utilities.factory_utils import factory_auth_header, factory_survey_and_eng_model
-
-
-def test_create_report_setting(client, jwt, session):  # pylint:disable=unused-argument
-    """Assert that an report setting can be POSTed."""
-    headers = factory_auth_header(jwt=jwt, claims=TestJwtClaims.staff_admin_role)
-    survey, eng = factory_survey_and_eng_model(TestSurveyInfo.survey3)
-    data = {
-        'id': survey.id,
-        'form_json': survey.form_json,
-    }
-    rv = client.post('/api/reportsetting/', data=json.dumps(data),
-                     headers=headers, content_type=ContentType.JSON.value)
-    assert rv.status_code == 200
+from tests.utilities.factory_scenarios import TestJwtClaims, TestReportSettingInfo, TestSurveyInfo
+from tests.utilities.factory_utils import (
+    factory_auth_header, factory_survey_and_eng_model, factory_survey_report_setting_model)
 
 
 def test_get_report_setting(client, jwt, session):  # pylint:disable=unused-argument
     """Assert that report setting can be fetched."""
     headers = factory_auth_header(jwt=jwt, claims=TestJwtClaims.staff_admin_role)
-    survey, eng = factory_survey_and_eng_model(TestSurveyInfo.survey3)
+    survey, _ = factory_survey_and_eng_model(TestSurveyInfo.survey3)
 
-    data = {
-        'id': survey.id,
-        'form_json': survey.form_json,
+    report_setting_data = {
+        **TestReportSettingInfo.report_setting_1,
+        'survey_id': survey.id,
     }
-    rv = client.post('/api/reportsetting/', data=json.dumps(data),
-                     headers=headers, content_type=ContentType.JSON.value)
-    assert rv.status_code == 200
+    factory_survey_report_setting_model(report_setting_data)
 
     rv = client.get(
-        f'/api/reportsetting/{survey.id}',
+        f'/api/surveys/{survey.id}/reportsettings',
         headers=headers,
         content_type=ContentType.JSON.value
     )