fix: add odk cred org schemas for db and pydantic

hotosm · Jan 23, 2024 · c8244ac · c8244ac
1 parent c74855e
commit c8244ac
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/backend/app/db/db_models.py b/src/backend/app/db/db_models.py
@@ -147,7 +147,9 @@ class DbOrganisation(Base):
     description = Column(String)
     url = Column(String)
     type = Column(Enum(OrganisationType), default=OrganisationType.FREE, nullable=False)
-    # subscription_tier = Column(Integer)
+    odk_central_url = Column(String)
+    odk_central_user = Column(String)
+    odk_central_password = Column(String)
 
     managers = relationship(
         DbUser,

diff --git a/src/backend/app/organisations/organisation_schemas.py b/src/backend/app/organisations/organisation_schemas.py
@@ -38,8 +38,17 @@ class OrganisationIn(BaseModel):
         Form(None, description="Organisation description")
     )
     url: Optional[HttpUrl] = Field(Form(None, description="Organisation website URL"))
+    odk_central_url: Optional[HttpUrl] = Field(
+        Form(None, description="Default ODK Central URL")
+    )
+    odk_central_user: Optional[str] = Field(
+        Form(None, description="Default ODK Central User")
+    )
+    odk_central_password: Optional[str] = Field(
+        Form(None, description="Default ODK Central Password")
+    )
 
-    @field_validator("url", mode="after")
+    @field_validator("url", "odk_central_url", mode="after")
     @classmethod
     def convert_url_to_str(cls, value: HttpUrl) -> str:
         """Convert Pydantic Url type to string.
@@ -78,3 +87,4 @@ class OrganisationOut(BaseModel):
     slug: Optional[str]
     url: Optional[str]
     type: OrganisationType
+    odk_central_url: Optional[str]