Changed database model

api/schema.py

@@ -1,5 +1,7 @@
 from apiflask import Schema
 from apiflask.fields import Integer, String, Boolean, Field, Float
+from marshmallow import validate
+from marshmallow.fields import Email
 
 
 class BaseResponseSchema(Schema):
@@ -11,13 +13,13 @@ class BaseResponseSchema(Schema):
 class UsersSchema(Schema):
     admin = Boolean()
     password = String()
-    telegram_name = String()
-    user_id = Integer()
     username = String()
+    telegram_user_id = String()
+    email = Email()
 
 
 class AdminDataSchema(Schema):
-    username = String()
+    email = Email()
     admin = Boolean()
 
 
@@ -26,12 +28,23 @@ class TokenSchema(Schema):
 
 
 class LoginDataSchema(Schema):
+    email = Email()
+    password = String()
+
+
+class RegisterDataSchema(Schema):
+    email = Email()
     username = String()
     password = String()
 
 
+class UpdateUserDataSchema(Schema):
+    username = String(required=False)
+    password = String(required=False)
+
+
 class DeleteUserSchema(Schema):
-    username = String()
+    email = Email()
 
 
 class ChangePasswordSchema(Schema):
@@ -50,7 +63,7 @@ class KeywordSchema(Schema):
 class KeywordResponseSchema(Schema):
     keyword = String()
     s_id = Integer()
-    user_id = Integer()
+    email = Email()
 
 
 class SymbolSchema(Schema):
@@ -60,7 +73,7 @@ class SymbolSchema(Schema):
 class SymbolResponseSchema(Schema):
     symbol = String()
     s_id = Integer()
-    user_id = Integer()
+    email = Email()
 
 
 class PortfolioShareResponseSchema(Schema):
@@ -69,12 +82,30 @@ class PortfolioShareResponseSchema(Schema):
 
 
 class TransactionSchema(Schema):
-    user_id = Integer()
+    symbol = String()
+    time = String(validate=validate.Regexp(r"\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z"))
+    count = Integer()
+    price = Float()
+
+
+class TransactionResponseSchema(Schema):
+    email = Email()
     symbol = String()
     time = String()
     count = Integer()
     price = Float()
 
 
+class TelegramIdSchema(Schema):
+    telegram_user_id = String()
+
+
+class PortfolioResponseSchema(Schema):
+    symbol = String()
+    last_transaction = String()
+    count = Integer()
+    # price = Float()
+
+
 class DeleteSuccessfulSchema(Schema):
     pass