From e6e15392c37524885b35aa9edf1298df27cc2976 Mon Sep 17 00:00:00 2001 From: drdolgovvv Date: Mon, 15 Jun 2026 16:24:42 +0300 Subject: [PATCH] =?UTF-8?q?refactor:=20=D0=B2=D1=81=D1=8F=20=D0=BE=D1=81?= =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D0=B0=20=D0=BA=D0=BE=D0=B4=D0=B0=20=D0=B2=20?= =?UTF-8?q?=D0=BE=D1=82=D0=B4=D0=B5=D0=BB=D1=8C=D0=BD=D0=BE=D0=B9=20=D0=BF?= =?UTF-8?q?=D0=B0=D0=BF=D0=BA=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- {app => R/app}/forms.R | 2 +- {app => R/app}/logs.R | 6 +++--- {app => R/app}/tasks.R | 6 +++--- {modules => R/modules}/data_manipulations.R | 0 {modules => R/modules}/data_validation.R | 2 +- {modules => R/modules}/db.R | 4 ++-- {modules => R/modules}/global_options.R | 10 +++++----- {modules => R/modules}/scheme_generator.R | 2 +- {modules => R/modules}/utils.R | 2 +- {utils => R/utils}/init_login_db.r | 0 app.R | 18 +++++++++--------- 11 files changed, 26 insertions(+), 26 deletions(-) rename {app => R/app}/forms.R (97%) rename {app => R/app}/logs.R (98%) rename {app => R/app}/tasks.R (99%) rename {modules => R/modules}/data_manipulations.R (100%) rename {modules => R/modules}/data_validation.R (98%) rename {modules => R/modules}/db.R (99%) rename {modules => R/modules}/global_options.R (96%) rename {modules => R/modules}/scheme_generator.R (99%) rename {modules => R/modules}/utils.R (99%) rename {utils => R/utils}/init_login_db.r (100%) diff --git a/app/forms.R b/R/app/forms.R similarity index 97% rename from app/forms.R rename to R/app/forms.R index 406efc3..bbca8e2 100644 --- a/app/forms.R +++ b/R/app/forms.R @@ -1,6 +1,6 @@ options(box.path = here::here()) box::use( - modules/utils, + R/modules/utils, ) #' @export diff --git a/app/logs.R b/R/app/logs.R similarity index 98% rename from app/logs.R rename to R/app/logs.R index c8ec345..dc83e32 100644 --- a/app/logs.R +++ b/R/app/logs.R @@ -5,9 +5,9 @@ box::use( options(box.path = here::here()) box::use( - modules/db, - modules/utils, - app/forms + R/modules/db, + R/modules/utils, + R/app/forms ) #' @export diff --git a/app/tasks.R b/R/app/tasks.R similarity index 99% rename from app/tasks.R rename to R/app/tasks.R index 998fca2..1203923 100644 --- a/app/tasks.R +++ b/R/app/tasks.R @@ -5,9 +5,9 @@ box::use( options(box.path = here::here()) box::use( - modules/db, - modules/utils, - app/forms + R/modules/db, + R/modules/utils, + R/app/forms ) #' @export diff --git a/modules/data_manipulations.R b/R/modules/data_manipulations.R similarity index 100% rename from modules/data_manipulations.R rename to R/modules/data_manipulations.R diff --git a/modules/data_validation.R b/R/modules/data_validation.R similarity index 98% rename from modules/data_validation.R rename to R/modules/data_validation.R index 21d15f9..146ed7e 100644 --- a/modules/data_validation.R +++ b/R/modules/data_validation.R @@ -1,5 +1,5 @@ options(box.path = here::here()) -box::use(modules/data_manipulations[is_this_empty_value]) +box::use(R/modules/data_manipulations[is_this_empty_value]) #' @export init_val = function(scheme, ns) { diff --git a/modules/db.R b/R/modules/db.R similarity index 99% rename from modules/db.R rename to R/modules/db.R index 67bc71c..8c17d90 100644 --- a/modules/db.R +++ b/R/modules/db.R @@ -103,7 +103,7 @@ get_dummy_data = function(type) { get_dummy_df = function(forms_id_type_list) { options(box.path = here::here()) - box::use(modules/utils) + box::use(R/modules/utils) purrr::map( .x = forms_id_type_list, @@ -136,7 +136,7 @@ compare_existing_table_with_schema = function( } options(box.path = here::here()) - box::use(modules/utils) + box::use(R/modules/utils) # checking if db structure in form compatible with alrady writed data (in case on changig form) if (identical(colnames(DBI::dbReadTable(con, table_name)), all_ids_from_schema)) { diff --git a/modules/global_options.R b/R/modules/global_options.R similarity index 96% rename from modules/global_options.R rename to R/modules/global_options.R index 68ec8fd..50821ea 100644 --- a/modules/global_options.R +++ b/R/modules/global_options.R @@ -45,13 +45,13 @@ check_and_init_scheme = function() { cli::cli_inform(c("*" = "проверка схемы...")) options(box.path = here::here()) - box::use(modules/db[local_db_backup]) + box::use(R/modules/db[local_db_backup]) # список файлов, изменение которых, приведут к переинициализиации схемы files_to_watch <- c( "config.yml", - "modules/scheme_generator.R", - "modules/utils.R" + "R/modules/scheme_generator.R", + "R/modules/utils.R" ) # проверка существования отслеживаемых файлов @@ -111,8 +111,8 @@ init_scheme = function(scheme_file) { options(box.path = here::here()) box::use( - modules/db, - modules/scheme_generator[scheme_R6] + R/modules/db, + R/modules/scheme_generator[scheme_R6] ) db_path <- fs::path(config::get("form_app_configure_path"), "db") diff --git a/modules/scheme_generator.R b/R/modules/scheme_generator.R similarity index 99% rename from modules/scheme_generator.R rename to R/modules/scheme_generator.R index fd837ac..25c76cc 100644 --- a/modules/scheme_generator.R +++ b/R/modules/scheme_generator.R @@ -56,7 +56,7 @@ scheme_R6 <- R6::R6Class( # extract main key private$main_key_id <- self$get_key_id("main") - box::use(modules/utils) + box::use(R/modules/utils) private$bslib_rendered_ui <- bslib::navset_card_underline( id = "main", !!!utils$make_list_of_pages(private$schemes_list[["main"]], private$main_key_id), diff --git a/modules/utils.R b/R/modules/utils.R similarity index 99% rename from modules/utils.R rename to R/modules/utils.R index 6541065..6e53b1f 100644 --- a/modules/utils.R +++ b/R/modules/utils.R @@ -266,7 +266,7 @@ update_forms_with_data = function( ) { options(box.path = here::here()) - box::use(modules/data_manipulations[is_this_empty_value]) + box::use(R/modules/data_manipulations[is_this_empty_value]) # print("-----------------") # cli::cli_inform("form_id: {form_id} | form_type: {form_type}") diff --git a/utils/init_login_db.r b/R/utils/init_login_db.r similarity index 100% rename from utils/init_login_db.r rename to R/utils/init_login_db.r diff --git a/app.R b/app.R index b59fc9c..c597d8c 100644 --- a/app.R +++ b/app.R @@ -12,14 +12,14 @@ suppressPackageStartupMessages({ # SOURCE FILES ============================ box::purge_cache() box::use( - modules/utils, - modules/global_options, - modules/db, - modules/data_validation, - app/forms, - app/tasks, - app/logs, - modules/data_manipulations[is_this_empty_value] + R/modules/utils, + R/modules/global_options, + R/modules/db, + R/modules/data_validation, + R/app/forms, + R/app/tasks, + R/app/logs, + R/modules/data_manipulations[is_this_empty_value] ) # global settings: @@ -33,7 +33,7 @@ global_options$check_and_init_scheme() # global vars: box::use( - modules/global_options[AUTH_ENABLED] + R/modules/global_options[AUTH_ENABLED] ) enabled_schemes <- unlist(config::get()$form_schemes) enabled_schemes <- setNames(names(enabled_schemes), enabled_schemes)