From 8cf194cb365f73dd17ea1ce85e129a40f178d181 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=9D=E5=B7=9D?= <sichanwong0527@gmail.com>
Date: Sun, 20 Nov 2022 17:23:28 +0800
Subject: [PATCH] changes

---
 AppIndicators/Models.py  | 9 ++++++---
 AppIndicators/Router.py  | 6 ++----
 AppIndicators/Schemas.py | 2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/AppIndicators/Models.py b/AppIndicators/Models.py
index 0c2f371..46d0998 100644
--- a/AppIndicators/Models.py
+++ b/AppIndicators/Models.py
@@ -2,9 +2,9 @@ from sqlalchemy import Column, String, Enum, ForeignKey
 from sqlalchemy.orm import relationship
 from sqlalchemy.dialects.mysql import LONGTEXT
 
-from .Schemas import NatureEnum
+from Schemas import NatureEnum
 
-from Utils.DataBase.SqlAlchemyUtils import Base
+from Utils.DataBase.SqlAlchemyUtils import Base, engine
 
 
 class Indicator(Base):
@@ -23,7 +23,7 @@ class Indicator(Base):
     def to_dict(self):
         _dict = {c.name: getattr(self, c.name, None) for c in self.__table__.columns}
         _dict.update({"category": self.category.__str__()})
-        _dict.update({"parameters": [param.to_dict() for param in self.parameters]})
+        _dict.update({"parameters": [param.to_dict() for param in list(self.parameters)]})
         return _dict
 
 
@@ -55,3 +55,6 @@ class IndicatorCategory(Base):
         _dict.update({"key": self.title})
         _dict.update({"value": self.id})
         return _dict
+
+
+Base.metadata.create_all(bind=engine)
diff --git a/AppIndicators/Router.py b/AppIndicators/Router.py
index a78fffc..99f8d3d 100644
--- a/AppIndicators/Router.py
+++ b/AppIndicators/Router.py
@@ -2,12 +2,10 @@ from fastapi import APIRouter, Depends, HTTPException
 from sqlalchemy.orm import Session
 from sqlalchemy.exc import IntegrityError
 
-from . import Crud, Models, Schemas
+from . import Crud, Schemas
 
 from Utils.AccessControl.AccessUtil import rbac
-from Utils.DataBase.SqlAlchemyUtils import get_db, engine
-
-Models.Base.metadata.create_all(bind=engine)
+from Utils.DataBase.SqlAlchemyUtils import get_db
 
 router = APIRouter(
     prefix="/api/index_store",
diff --git a/AppIndicators/Schemas.py b/AppIndicators/Schemas.py
index 07712cb..62c62e7 100644
--- a/AppIndicators/Schemas.py
+++ b/AppIndicators/Schemas.py
@@ -5,7 +5,7 @@ from typing import List, Optional
 
 # Regex
 ENameRegex = constr(regex="^[a-z0-9_]{1,}$")
-CNameRegex = constr(regex=r"^[\u4e00-\u9fa5a-zA-Z0-9（）\/]+$")
+CNameRegex = constr(regex=r"^[\u4e00-\u9fa5a-zA-Z0-9（）%\/]+$")
 
 
 # Enums