changes
This commit is contained in:
parent
1bb1b326df
commit
8cf194cb36
|
@ -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)
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue