Merge pull request #199 from prefeitura-rio/frontend/patient-using-bi…

…g-query-data

Fix: JSON Serialization + new User field

app/datalake/utils.py

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
+import json
 import pandas as pd
 from typing import Callable
 from loguru import logger
 
-
 REGISTERED_FORMATTERS = {}
 
 
@@ -77,9 +77,9 @@ def flatten(
                 for key, value in flattened.items():
                     updated_record[f"{field}__{key}"] = value
             else:
-                updated_record[field] = str(content)
+                updated_record[field] = json.dumps(content)
         elif isinstance(content, list) and depth >= list_max_depth:
-            updated_record[field] = str(content)
+            updated_record[field] = json.dumps(content)
         else:
             updated_record[field] = content
 

app/models.py

@@ -267,6 +267,7 @@ class Meta:
 class User(Model):
     id = fields.IntField(pk=True)
     username = fields.CharField(max_length=255, unique=True)
+    role = fields.CharField(max_length=255, null=True)
     name = fields.CharField(max_length=255, null=True)
     cpf = fields.CharField(max_length=11, unique=True, null=True, validators=[CPFValidator()])
     email = fields.CharField(max_length=255, unique=True)

app/routers/frontend.py

@@ -31,6 +31,7 @@ async def get_user_info(
 
     return {
         "name": user.name,
+        "role": user.role,
         "email": user.email,
         "username": user.username,
         "cpf": cpf,

app/types/frontend.py

@@ -48,6 +48,7 @@ class UserInfo(BaseModel):
     cpf: Optional[str]
     username: Optional[str]
     email: Optional[str]
+    role: Optional[str]
 
 class Professional(BaseModel):
     name: str

migrations/app/25_20240816161616_update.py

@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+from tortoise import BaseDBAsyncClient
+
+
+async def upgrade(db: BaseDBAsyncClient) -> str:
+    return """
+        ALTER TABLE "user" ADD "role" VARCHAR(255);"""
+
+
+async def downgrade(db: BaseDBAsyncClient) -> str:
+    return """
+        ALTER TABLE "user" DROP COLUMN "role";"""