-

.gen/objs.txt

@@ -1,19 +1,24 @@
-src/views/test-openapi-view/view.hpp
-src/views/test-openapi-view/view.cpp
-src/views/test-openapi-view/declarations.hpp
+src/views/register/view.hpp
+src/views/register/view.cpp
+src/views/register/declarations.hpp
+src/views/login/view.hpp
+src/views/login/view.cpp
+src/views/login/declarations.hpp
 src/utils/type_holder.hpp
 src/utils/tests_macros.hpp
 src/utils/shared_transaction.hpp
 src/utils/serialize/uuid/string.hpp
 src/utils/serialize/uuid/string.cpp
 src/utils/postgres_helper.hpp
+src/utils/pg_controller.hpp
 src/utils/perform_common_errors.hpp
 src/utils/perform_common_errors.cpp
 src/utils/parse/uuid/string.hpp
 src/utils/parse/uuid/string.cpp
 src/utils/meta.hpp
 src/utils/json_type.hpp
 src/utils/json_type.cpp
+src/utils/is_complete_type.hpp
 src/utils/formated_exception.hpp
 src/utils/convert/json_serialize.hpp
 src/utils/convert/json_parse.hpp
@@ -32,6 +37,7 @@ src/utils/convert/additional_properties.hpp
 src/utils/constexpr_string.hpp
 src/utils/constexpr_optional.hpp
 src/utils/component_list_fwd.hpp
+src/utils/component.hpp
 src/utils/compilers_macros.hpp
 src/utils/common_errors.hpp
 src/openapi/types/uuid_type.hpp
@@ -88,18 +94,20 @@ src/openapi/from_tuple/property.hpp
 src/openapi/from_tuple/optional.hpp
 src/openapi/from_tuple/default.hpp
 src/openapi/from_tuple/all.hpp
-src/openapi/doc/serialize/uuid.hpp
-src/openapi/doc/serialize/response.hpp
-src/openapi/doc/serialize/request.hpp
-src/openapi/doc/serialize/remove_requests.hpp
-src/openapi/doc/serialize/reflective.hpp
-src/openapi/doc/serialize/path.hpp
-src/openapi/doc/serialize/header.hpp
-src/openapi/doc/serialize/cookie.hpp
-src/openapi/doc/serialize/body.hpp
-src/openapi/doc/serialize/base.hpp
-src/openapi/doc/serialize/array.hpp
-src/openapi/doc/serialize/all.hpp
+src/openapi/doc/uuid.hpp
+src/openapi/doc/string.hpp
+src/openapi/doc/response.hpp
+src/openapi/doc/request.hpp
+src/openapi/doc/reflective.hpp
+src/openapi/doc/property.hpp
+src/openapi/doc/path.hpp
+src/openapi/doc/int.hpp
+src/openapi/doc/header.hpp
+src/openapi/doc/cookie.hpp
+src/openapi/doc/body.hpp
+src/openapi/doc/base.hpp
+src/openapi/doc/array.hpp
+src/openapi/doc/all.hpp
 src/openapi/base/uuid_traits.hpp
 src/openapi/base/uuid_property.hpp
 src/openapi/base/string_traits.hpp
@@ -129,6 +137,11 @@ src/openapi/as_tuple/optional.hpp
 src/openapi/as_tuple/default.hpp
 src/openapi/as_tuple/all.hpp
 src/openapi/all.hpp
+src/models/user_credentials/type.hpp
+src/models/user_credentials/postgres.hpp
+src/models/user/type.hpp
+src/models/user/postgres.hpp
+src/models/error_v1/type.hpp
 src/legacy/views/timetable/get/view.hpp
 src/legacy/views/timetable/get/view.cpp
 src/legacy/views/timetable/get/Responses.hpp
@@ -185,6 +198,7 @@ src/legacy/models/user_type/serialize.cpp
 src/legacy/models/user_type/postgre.hpp
 src/legacy/models/user_type/parse.hpp
 src/legacy/models/user_type/parse.cpp
+src/legacy/models/user_type/doc.hpp
 src/legacy/models/user_credentials/type.hpp
 src/legacy/models/user_credentials/postgre.hpp
 src/legacy/models/user_credentials/fwd.hpp
@@ -323,3 +337,11 @@ src/legacy/components/controllers/postgres/admin/controller.cpp
 src/http/legacy_handler_parsed.hpp
 src/http/handler_parsed.hpp
 src/http/ErrorV1.hpp
+src/controllers/user/controller_fwd.hpp
+src/controllers/user/controller.hpp
+src/controllers/user/controller.cpp
+src/controllers/token/controller_fwd.hpp
+src/controllers/token/controller.hpp
+src/controllers/token/controller.cpp
+src/codegen/sql.hpp
+src/codegen/sql.cpp

Makefile

@@ -2,7 +2,8 @@ CMAKE_COMMON_FLAGS ?= -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
 CMAKE_DEBUG_FLAGS ?= -DUSERVER_SANITIZE='addr ub'
 CMAKE_RELEASE_FLAGS ?=
 CMAKE_OS_FLAGS ?= -DUSERVER_FEATURE_CRYPTOPP_BLAKE2=0 -DUSERVER_FEATURE_REDIS_HI_MALLOC=1
-FORMAT_INCLUDES_FLAGS ?= userver boost gtest openapi utils
+FORMAT_INCLUDES_FLAGS ?= userver boost gtest openapi utils codegen
+GENERATE_SQL_QUERIES_FLAGS ?= src/sql src/codegen sql sql
 NPROCS ?= $(shell nproc)
 CLANG_FORMAT ?= clang-format-11
 
@@ -161,8 +162,9 @@ check-format-cpp:
 	@find service -name '*pp' -type f | xargs $(CLANG_FORMAT) -i --dry-run --Werror
 	@find src -name '*pp' -type f | xargs $(CLANG_FORMAT) -i --dry-run --Werror
 	@find utests -name '*pp' -type f | xargs $(CLANG_FORMAT) -i --dry-run --Werror
-.PHONY: gen
-gen:
+
+.PHONY: gen-sources
+gen-sources:
 	@rm -rf .gen
 	@mkdir -p .gen
 
@@ -183,6 +185,15 @@ gen:
 unite-api:
 	@python3 scripts/merge_yaml.py api/api.yaml united_api.yaml
 
+.PHONY: gen-queries
+gen-queries:
+	@python3 scripts/generate_sql_queries.py $(GENERATE_SQL_QUERIES_FLAGS)
+
+.PHONY: gen
+gen:
+	$(MAKE) gen-queries
+	$(MAKE) gen-sources
+
 # # Internal hidden targets that are used only in docker environment
 # --in-docker-start-debug --in-docker-start-release: --in-docker-start-%: install-%
 # 	@sed -i 's/config_vars.yaml/config_vars.docker.yaml/g' /home/user/.local/etc/timetable_vsu_backend/static_config.yaml

configs/static_config.yaml.in

@@ -56,10 +56,12 @@ components_manager:
         handler-login: 
             path: /login
             method: POST
+            load-enabled: false
             task_processor: main-task-processor
         handler-register: 
             path: /register
-            method: POST                
+            method: POST     
+            load-enabled: false           
             task_processor: main-task-processor  
         handler-timetable-get: 
             path: /timetable/get
@@ -101,8 +103,12 @@ components_manager:
             path: /group-stage/list
             method: POST
             task_processor: main-task-processor
-        test-login-view:
-            path: /test/login
+        login-view:
+            path: /login
+            method: POST
+            task_processor: main-task-processor
+        register-view:
+            path: /register
             method: POST
             task_processor: main-task-processor
         openapi-descriptor:
@@ -133,6 +139,12 @@ components_manager:
                 password: $root_password
                 id: $root_id
         token_controller: {}
+        new-token-controller: {}
+        new-user-controller:
+            root:
+                login: $root_login
+                password: $root_password
+                id: $root_id
         lesson_details_controller : {}
         teacher_controller : {}
         handler-ping:

service/main.cpp

@@ -1,6 +1,7 @@
 #include <openapi/http/openapi_descriptor_fwd.hpp>
 #include <userver/clients/dns/component.hpp>
 #include <userver/clients/http/component.hpp>
+#include <userver/components/component_list.hpp>
 #include <userver/components/minimal_server_component_list.hpp>
 #include <userver/formats/json/value.hpp>
 #include <userver/logging/log.hpp>
@@ -11,6 +12,9 @@
 #include <userver/utils/daemon_run.hpp>
 #include <utility>
 
+#include "controllers/token/controller_fwd.hpp"
+#include "controllers/user/controller.hpp"
+#include "controllers/user/controller_fwd.hpp"
 #include "legacy/components/controllers/postgres/admin/fwd.hpp"
 #include "legacy/components/controllers/postgres/faculty/fwd.hpp"
 #include "legacy/components/controllers/postgres/group_stage/fwd.hpp"
@@ -31,7 +35,8 @@
 #include "legacy/views/teacher/request/approve/new/view.hpp"
 #include "legacy/views/teacher/request/list/view.hpp"
 #include "legacy/views/timetable/get/view.hpp"
-#include "views/test-openapi-view/view.hpp"
+#include "views/login/view.hpp"
+#include "views/register/view.hpp"
 
 void AppendPgControllers(userver::components::ComponentList& component_list)
 {
@@ -43,12 +48,13 @@ void AppendPgControllers(userver::components::ComponentList& component_list)
     teacher::Append(component_list);
     faculty::Append(component_list);
     group_stage::Append(component_list);
+    controllers::token::Append(component_list);
+    controllers::user::Append(component_list);
 }
 
-void AppendViews(userver::components::ComponentList& component_list)
+void AppendLegacyViews(userver::components::ComponentList& component_list)
 {
     using namespace legacy::views;
-    using namespace views;
     login::Append(component_list);
     register_::Append(component_list);
     timetable::get::Append(component_list);
@@ -61,7 +67,13 @@ void AppendViews(userver::components::ComponentList& component_list)
     teacher::requests::approve::new_::Append(component_list);
     faculty::list::Append(component_list);
     group::stage::list::Append(component_list);
-    test::login::Append(component_list);
+}
+
+void AppendViews(userver::components::ComponentList& component_list)
+{
+    using namespace views;
+    login::Append(component_list);
+    Register::Append(component_list);
 }
 
 int main(int argc, char* argv[])
@@ -77,7 +89,7 @@ int main(int argc, char* argv[])
     openapi::http::AppendOpenApiDescriptor(component_list);
     service_template::AppendHello(component_list);
     AppendPgControllers(component_list);
+    AppendLegacyViews(component_list);
     AppendViews(component_list);
-
     return userver::utils::DaemonMain(argc, argv, component_list);
 }

src/openapi/all.hpp

@@ -2,7 +2,7 @@
 
 #include <openapi/as_tuple/all.hpp>
 #include <openapi/base/all.hpp>
-#include <openapi/doc/serialize/all.hpp>
+#include <openapi/doc/all.hpp>
 #include <openapi/from_tuple/all.hpp>
 #include <openapi/http/all.hpp>
 #include <openapi/json/all.hpp>

src/openapi/base/array_property.hpp

@@ -13,7 +13,7 @@ struct ArrayProperty : public PropertyBase<std::vector<T>, Traits>
 };
 
 template <typename T, typename Traits>
-struct Property<std::vector<T>, Traits> : public ArrayProperty<T, Traits>
+struct types::Property<std::vector<T>, Traits> : public ArrayProperty<T, Traits>
 {
 };
 

src/openapi/base/object_property.hpp

@@ -14,7 +14,7 @@ requires checks::is_reflective_v<T> struct ObjectProperty
 };
 
 template <typename T, typename Traits>
-requires checks::is_reflective_v<T> struct Property<T, Traits>
+requires checks::is_reflective_v<T> struct types::Property<T, Traits>
     : public ObjectProperty<T, Traits>
 {
 };

src/openapi/base/optional_property.hpp

@@ -9,7 +9,8 @@ struct OptionalProperty : public PropertyBase<std::optional<T>, Traits>
 };
 
 template <typename T, typename Traits>
-struct Property<std::optional<T>, Traits> : public OptionalProperty<T, Traits>
+struct types::Property<std::optional<T>, Traits>
+    : public OptionalProperty<T, Traits>
 {
 };
 

src/openapi/base/property_base.hpp

@@ -35,11 +35,16 @@ struct PropertyBase
     }
 
     template <class Arg>
-    value_type& operator=(Arg&& arg)
+    auto& operator=(Arg&& arg)
     {
         value = std::forward<Arg>(arg);
         return value;
     }
+    auto& operator=(value_type rhs)
+    {
+        value = std::move(rhs);
+        return *this;
+    }
     value_type& operator()()
     {
         return value;
@@ -60,9 +65,13 @@ concept IsProperty = requires
                       T>;
 };
 
+namespace types
+{
 template <typename T, typename Traits = EmptyTraits>
-struct Property
+struct Property : PropertyBase<T, Traits>
 {
 };
 
+}  // namespace types
+
 }  // namespace openapi

src/openapi/base/string_property.hpp

@@ -12,7 +12,7 @@ struct StringProperty : public PropertyBase<std::string, Traits>
 };
 
 template <typename Traits>
-struct Property<std::string, Traits> : public StringProperty<Traits>
+struct types::Property<std::string, Traits> : public StringProperty<Traits>
 {
 };
 

src/openapi/base/uuid_property.hpp

@@ -62,7 +62,7 @@ struct UuidProperty : PropertyBase<boost::uuids::uuid, Traits>
 };
 
 template <typename Traits>
-struct Property<boost::uuids::uuid, Traits> : UuidProperty<Traits>
+struct types::Property<boost::uuids::uuid, Traits> : UuidProperty<Traits>
 {
 };
 }  // namespace openapi