feat: questionnaire shape update

src/organisation/schemas.py

@@ -7,6 +7,7 @@ Models follow the nomenclature of:
 """
 
 from typing import Optional
+from datetime import datetime
 
 from pydantic import EmailStr, ConfigDict
 
@@ -21,12 +22,17 @@ from src.schemas import (
 from src.contact.schemas import ContactModel
 
 from src.organisation.constants import Status, ContactType
+from src.organisation.schemas_questionnaires import QuestionnaireQuestionsVersion0
+
+
+class QuestionnaireMetadata(CustomBaseModel):
+	version: int
+	submission_date: Optional[datetime] = None
 
 
 class Questionnaire(CustomBaseModel):
-	question_one: Optional[str] = None
-	question_two: Optional[str] = None
-	question_three: Optional[str] = None
+	metadata: QuestionnaireMetadata
+	questions: QuestionnaireQuestionsVersion0
 
 
 class ContactSummary(CustomBaseModel):
@@ -47,7 +53,7 @@ class OrgSchema(OrgIDMixin):
 
 class OrgPostOrgRequest(CustomBaseModel):
 	name: str
-	intake_questionnaire: Optional[Questionnaire] = None
+	intake_questionnaire: Optional[QuestionnaireQuestionsVersion0] = None
 
 
 class OrgPostOrgResponse(CustomBaseModel):
@@ -57,7 +63,7 @@ class OrgPostOrgResponse(CustomBaseModel):
 
 
 class OrgPatchQuestionnaireRequest(OrgIDMixin):
-	intake_questionnaire: Questionnaire
+	intake_questionnaire: QuestionnaireQuestionsVersion0
 	partial: bool