diff --git a/drawings/request_center/database_schemes/requests_scheme.wsd b/drawings/request_center/database_schemes/requests_scheme.wsd index d9a1ed9..0029285 100644 --- a/drawings/request_center/database_schemes/requests_scheme.wsd +++ b/drawings/request_center/database_schemes/requests_scheme.wsd @@ -1,5 +1,30 @@ @startuml -!include schemes_setup.wsd +!include ./schemes_setup.wsd -@enduml \ No newline at end of file +' Выдавать фронтам кол-во комментариев вычисляемым полем + +$table("REQUEST", "request") { + $pk("ID") INTEGER NOT NULL + $fk("WORKFLOW") INTEGER NOT NULL + $column("CREATOR") INTEGER NOT NULL + $column("ASSIGNED") INTEGER NOT NULL + $enum_link("PRIORITY") VARCHAR + $column("NAME") VARCHAR + $column("DESCRIPTION") VARCHAR + $column("STEP") VARCHAR + $column("ASSIGNEE") VARCHAR + $column("LAST_CHANGE") DATE + $column("CREATED") DATE +} + +$type("REQUEST_PRIORITY", "request_priority") { + $enum_field("High") + $enum_field("Medium") + $enum_field("Low") +} + +request::PRIORITY -- request_priority + + +@enduml diff --git a/drawings/request_center/database_schemes/scheme.puml b/drawings/request_center/database_schemes/scheme.puml index e8345af..642b815 100644 --- a/drawings/request_center/database_schemes/scheme.puml +++ b/drawings/request_center/database_schemes/scheme.puml @@ -1,6 +1,7 @@ @startuml !include ./schemes_setup.wsd +!include ./requests_scheme.wsd $table("FIELD", "field") { $pk("ID") INTEGER NOT NULL @@ -25,16 +26,28 @@ $table("STEP", "step") { $column("NAME") VARCHAR $column("DESCRIPTION") TEXT $column("NEED_AGREEMENT") BOOLEAN + $column("STATUS") VARCHAR } $table("RESPONSIBLE", "responsible") { $pk("ID") INTEGER NOT NULL $fk("STEP_ID") INTEGER NOT NULL $column("ASSIGNATION_TYPE") VARCHAR - $column("EXECUTION_TYPE") VARCHAR - $column("USERS") INTEGER[] + $column("IS_PARALLEL_EXECUTION") BOOL + $column("AVAILABLE_USERS") []INT + $column("ASSIGNED_USERS") []INT } +$table("RESPONSIBLE_USER", "responsible_user") { + $pk("ID") INTEGER NOT NULL + $fk("RESPONSIBLE") INTEGER NOT NULL + $column("DONE") BOOL + $column("LAST_UPDATED") DATE +} + +responsible_user::RESPONSIBLE }|--o| responsible::ID + +!startsub WORKFLOW_TABLE $table("WORKFLOW", "workflow") { $pk("ID") INTEGER NOT NULL $column("NAME") VARCHAR @@ -42,7 +55,9 @@ $table("WORKFLOW", "workflow") { $enum_link("TYPE") VARCHAR $enum_link("STATUS") VARCHAR $column("DESCRIPTION") TEXT + $column("IS_TEMPLATE") BOOL } +!endsub $type("FIELD_TYPE", "field_type") { $enum_field("select") @@ -72,6 +87,12 @@ $type("WORKFLOW_STATUS", "workflow_status") { $enum_field("draft") } +$type("STEP_STATUS", "step_status") { + $enum_field("done") + $enum_field("in_progress") + $enum_field("todo") +} + field::TYPE -- field_type field::BLOCK_FIELD_ID }o--|| block_field::ID workflow::TYPE -- workflow_type @@ -81,5 +102,6 @@ block_field::STEP }o--|| step::ID block_field::TYPE -- block_field_type step::WORKFLOW_ID }|--|| workflow::ID responsible::STEP_ID ||--|| step::ID +step::STATUS -- step_status @enduml \ No newline at end of file diff --git a/ssh_connection_builder.py b/ssh_connection_builder.py index c073c52..c001d4f 100644 --- a/ssh_connection_builder.py +++ b/ssh_connection_builder.py @@ -300,3 +300,25 @@ class SSHSessionManager: port ).set_additional_connect_data({"secret": enable_password}).create_session() return self._builder.ssh_session() + + + + + + + + + + + + + + + + + + +class TestKek +TestKek which + TestKek +