Merge branch '0.3' into #114
This commit is contained in:
commit
ab7fdec499
@ -1,3 +1,4 @@
|
||||
import enum
|
||||
from inspect import signature, Parameter
|
||||
|
||||
from cpl_core.utils import String
|
||||
@ -28,6 +29,9 @@ class JSONProcessor:
|
||||
if isinstance(value, dict):
|
||||
value = JSONProcessor.process(parameter.annotation, value)
|
||||
|
||||
if issubclass(parameter.annotation, enum.Enum):
|
||||
value = parameter.annotation(value)
|
||||
|
||||
args.append(value)
|
||||
|
||||
elif parameter.default != Parameter.empty:
|
||||
|
@ -85,7 +85,7 @@ class AuthUserDTO(DtoABC):
|
||||
self._email = values['email']
|
||||
self._password = values['password']
|
||||
self._is_confirmed = values['isConfirmed']
|
||||
self._auth_role = values['authRole']
|
||||
self._auth_role = AuthRoleEnum(values['authRole'])
|
||||
|
||||
def to_dict(self) -> dict:
|
||||
return {
|
||||
|
@ -33,8 +33,8 @@ class UpdateAuthUserDTO(DtoABC):
|
||||
return self._change_password
|
||||
|
||||
def from_dict(self, values: dict):
|
||||
self._auth_user = values['authUser']
|
||||
self._new_auth_user = values['newAuthUser']
|
||||
self._auth_user = AuthUserDTO().from_dict(values['authUser'])
|
||||
self._new_auth_user = AuthUserDTO().from_dict(values['newAuthUser'])
|
||||
self._change_password = False if 'changePassword' not in values else bool(values['changePassword'])
|
||||
|
||||
def to_dict(self) -> dict:
|
||||
|
@ -1,9 +1,9 @@
|
||||
{
|
||||
"name": "kdb-web",
|
||||
"version": "0.3.dev70",
|
||||
"version": "0.3.0",
|
||||
"scripts": {
|
||||
"ng": "ng",
|
||||
"update-version": "ts-node -O '{\"module\": \"commonjs\"}' update-version.ts",
|
||||
"update-version": "ts-node-esm update-version.ts",
|
||||
"prestart": "npm run update-version",
|
||||
"start": "ng serve",
|
||||
"prebuild": "npm run update-version",
|
||||
@ -48,7 +48,6 @@
|
||||
"karma-coverage": "~2.2.0",
|
||||
"karma-jasmine": "~5.0.0",
|
||||
"karma-jasmine-html-reporter": "~1.7.0",
|
||||
"ts-node": "~8.3.0",
|
||||
"typescript": "~4.7.2"
|
||||
}
|
||||
}
|
@ -1,5 +1,10 @@
|
||||
/* To learn more about this file see: https://angular.io/config/tsconfig. */
|
||||
{
|
||||
"ts-node": {
|
||||
"compilerOptions": {
|
||||
"module": "CommonJS"
|
||||
}
|
||||
},
|
||||
"compileOnSave": false,
|
||||
"compilerOptions": {
|
||||
"baseUrl": "./",
|
||||
|
Loading…
Reference in New Issue
Block a user