feat: questionnaire shape update

test/conftest.py

@@ -103,7 +103,10 @@ def _seed(db):
 			owner_contact_id=2,
 			security_contact_id=3,
 			status="approved",
-			intake_questionnaire={"question_two": "answer two"},
+			intake_questionnaire={
+				"metadata": {"version": 0, "submission_date": None},
+				"questions": {"question_two": "answer two"},
+			},
 		)
 	)
 	db.add(Service(name="Test Service", api_key="123456789"))

test/test_auth_general.py

@@ -32,7 +32,10 @@ async def test_get_org_auth_root_su(default_client: AsyncClient, db_session):
 			owner_contact_id=2,
 			security_contact_id=3,
 			status="approved",
-			intake_questionnaire={},
+			intake_questionnaire={
+				"metadata": {"version": 0, "submission_date": None},
+				"questions": {},
+			},
 		)
 	)
 	db_session.flush()

test/test_organisation.py

@@ -103,9 +103,13 @@ async def test_patch_org_questionnaire_partial_success(
 	assert data["status"] == "partial"
 	assert "intake_questionnaire" in data
 	assert isinstance(data["intake_questionnaire"], dict)
-	assert data["intake_questionnaire"]["question_one"] == "new answer one"
-	assert data["intake_questionnaire"]["question_two"] == "answer two"
-	assert data["intake_questionnaire"]["question_three"] is None
+	metadata = data["intake_questionnaire"]["metadata"]
+	assert metadata["version"] == 0
+	assert metadata["submission_date"] is None
+	questions = data["intake_questionnaire"]["questions"]
+	assert questions["question_one"] == "new answer one"
+	assert questions["question_two"] == "answer two"
+	assert questions["question_three"] is None
 
 
 @pytest.mark.parametrize(
@@ -172,9 +176,13 @@ async def test_patch_org_questionnaire_submit_success(
 	assert data["status"] == "submitted"
 	assert "intake_questionnaire" in data
 	assert isinstance(data["intake_questionnaire"], dict)
-	assert data["intake_questionnaire"]["question_one"] == "new answer one"
-	assert data["intake_questionnaire"]["question_two"] == "answer two"
-	assert data["intake_questionnaire"]["question_three"] is None
+	metadata = data["intake_questionnaire"]["metadata"]
+	assert metadata["version"] == 0
+	assert metadata["submission_date"] is not None
+	questions = data["intake_questionnaire"]["questions"]
+	assert questions["question_one"] == "new answer one"
+	assert questions["question_two"] == "answer two"
+	assert questions["question_three"] is None
 
 
 @pytest.mark.parametrize(

test/test_user.py

@@ -161,9 +161,12 @@ async def test_get_self_orgs_dynamic(default_client: AsyncClient):
 				"security_contact": {"email": "security@test.org", "id": 3},
 				"billing_contact": {"email": "billing@test.org", "id": 1},
 				"intake_questionnaire": {
-					"question_one": None,
-					"question_three": None,
-					"question_two": "answer two",
+					"questions": {
+						"question_one": None,
+						"question_three": None,
+						"question_two": "answer two",
+					},
+					"metadata": {"version": 0, "submission_date": None},
 				},
 			}
 		]