From 5a41f831584db3515c793a6841a3b6ee75b96448 Mon Sep 17 00:00:00 2001
From: Robert Rosca <32569096+RobertRosca@users.noreply.github.com>
Date: Tue, 12 Mar 2024 20:06:17 +0100
Subject: [PATCH] feat(models): move defaults out of base models

---
 src/zulip_write_only_proxy/models/base.py   |  4 ++--
 src/zulip_write_only_proxy/models/client.py | 15 +++++++++++----
 src/zulip_write_only_proxy/models/zulip.py  |  2 +-
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/zulip_write_only_proxy/models/base.py b/src/zulip_write_only_proxy/models/base.py
index 99b76a61..28cbbe14 100644
--- a/src/zulip_write_only_proxy/models/base.py
+++ b/src/zulip_write_only_proxy/models/base.py
@@ -1,11 +1,11 @@
 import datetime
 from abc import ABC
 
-from pydantic import BaseModel, Field
+from pydantic import BaseModel
 
 
 class Base(ABC, BaseModel):
-    created_at: datetime.datetime = Field(default_factory=datetime.datetime.now)
+    created_at: datetime.datetime
 
     @property
     def _key(self):
diff --git a/src/zulip_write_only_proxy/models/client.py b/src/zulip_write_only_proxy/models/client.py
index 5899952f..55edf54d 100644
--- a/src/zulip_write_only_proxy/models/client.py
+++ b/src/zulip_write_only_proxy/models/client.py
@@ -1,3 +1,4 @@
+import datetime
 import secrets
 from typing import IO, TYPE_CHECKING, Any
 
@@ -21,10 +22,16 @@
 class ScopedClientCreate(BaseModel):
     proposal_no: int
     stream: str | None = None
-    bot_name: str | None = None
-    bot_email: str | None = None
-    bot_key: str | None = None
     bot_site: str = "https://mylog.connect.xfel.eu/"
+    bot_id: int | None = None
+
+    token: SecretStr = Field(
+        default_factory=lambda: SecretStr(secrets.token_urlsafe()), init_var=False
+    )
+
+    created_at: datetime.datetime = Field(
+        default_factory=datetime.datetime.now, init_var=False
+    )
 
 
 class ScopedClient(Base):
@@ -33,7 +40,7 @@ class ScopedClient(Base):
     bot_name: str
     bot_id: int
     bot_site: HttpUrl
-    token: SecretStr = Field(default_factory=lambda: SecretStr(secrets.token_urlsafe()))
+    token: SecretStr
 
     # created_at - from base
     created_by: str
diff --git a/src/zulip_write_only_proxy/models/zulip.py b/src/zulip_write_only_proxy/models/zulip.py
index 81f05c69..e041bd05 100644
--- a/src/zulip_write_only_proxy/models/zulip.py
+++ b/src/zulip_write_only_proxy/models/zulip.py
@@ -20,7 +20,7 @@ class BotConfig(Base):
     id: int
     proposal_no: int
 
-    # created_at - from base
+    created_at: datetime | None = None
 
     @property
     def _key(self):