From e163f0698b7f92926c1fba2607bc1aa3ddee2465 Mon Sep 17 00:00:00 2001 From: IDONTSUDO Date: Thu, 28 Nov 2024 17:22:49 +0300 Subject: [PATCH] progress --- .../exec_calculations_instance_process_scenario.ts | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/server/src/features/calculations_instance/domain/exec_calculations_instance_process_scenario.ts b/server/src/features/calculations_instance/domain/exec_calculations_instance_process_scenario.ts index bc603d1..5bfadb2 100644 --- a/server/src/features/calculations_instance/domain/exec_calculations_instance_process_scenario.ts +++ b/server/src/features/calculations_instance/domain/exec_calculations_instance_process_scenario.ts @@ -6,20 +6,24 @@ import { MongoIdValidation } from "../../../core/validations/mongo_id_validation import { ProcessWatcherAndDatabaseUpdateService } from "../../datasets/domain/create_dataset_scenario"; import { CalculationInstanceDBModel, ICalculationInstance } from "../models/calculations_instance_database_model"; import { Result } from "../../../core/helpers/result"; +import { CreateFileUseCase } from "../../../core/usecases/create_file_usecase"; export class ExecCalculationInstanceProcessScenario extends CallbackStrategyWithIdQuery { idValidationExpression = new MongoIdValidation(); call = async (id: string): ResponseBase => (await new ReadByIdDataBaseModelUseCase(CalculationInstanceDBModel).call(id)).map( async (model) => { + const fileOutPath = model.instancePath.pathNormalize() + "/form.json"; return (await new IsHaveActiveProcessUseCase().call()).map(async () => { - const execCommand = `${model.script} --form '${JSON.stringify( - model.formBuilder - )}' --path ${model.instancePath.pathNormalize()}`; + const execCommand = `${model.script} --path ${model.instancePath.pathNormalize()} --form ${fileOutPath}`; + console.log(execCommand); + + await new CreateFileUseCase().call(fileOutPath, Buffer.from(JSON.stringify(model.formBuilder))); await CalculationInstanceDBModel.findById(id).updateOne({ processStatus: "RUN", lastProcessExecCommand: execCommand, }); + new ExecProcessUseCase().call( // @ts-expect-error `${model.project.rootDir}/`,