From 40e771f1f260a12029048c4a7a17ef194aad6fb1 Mon Sep 17 00:00:00 2001
From: User <y_zuev@mail.ru>
Date: Fri, 19 Jul 2024 13:38:34 +0300
Subject: [PATCH] 20240719#1

---
 README.md                                       |  2 +-
 application/config/nodes.php                    |  3 +--
 .../config/routes/{main => }/90-main.yaml       |  0
 application/config/routes/main/.gitkeep         |  0
 application/config/routes/main/routes.php       |  9 ---------
 application/config/routes/routes.php            | 17 +++++++++++++++++
 .../Repository/AbstractMysqlRepository.php      | 10 ++++------
 7 files changed, 23 insertions(+), 18 deletions(-)
 rename application/config/routes/{main => }/90-main.yaml (100%)
 create mode 100644 application/config/routes/main/.gitkeep
 delete mode 100644 application/config/routes/main/routes.php
 create mode 100644 application/config/routes/routes.php

diff --git a/README.md b/README.md
index d14b882..5241c6f 100644
--- a/README.md
+++ b/README.md
@@ -9,5 +9,5 @@ composer create-project rmphp/skeleton project-name
 ```
 
 ```bash
-composer create-project rmphp/skeleton:"^4.3" project-name
+composer create-project rmphp/skeleton:"^4.4" project-name
 ```
diff --git a/application/config/nodes.php b/application/config/nodes.php
index bfb7c92..e0ed3f8 100644
--- a/application/config/nodes.php
+++ b/application/config/nodes.php
@@ -9,6 +9,5 @@
 # ['key'=>'/', 'router'=>[]],
 
 return [
-	['key'=>'/', 'router'=>'application/config/routes/main/routes.php'],
+	['key'=>'/', 'router'=>'application/config/routes/routes.php'],
 ];
- 
\ No newline at end of file
diff --git a/application/config/routes/main/90-main.yaml b/application/config/routes/90-main.yaml
similarity index 100%
rename from application/config/routes/main/90-main.yaml
rename to application/config/routes/90-main.yaml
diff --git a/application/config/routes/main/.gitkeep b/application/config/routes/main/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/application/config/routes/main/routes.php b/application/config/routes/main/routes.php
deleted file mode 100644
index aac5a79..0000000
--- a/application/config/routes/main/routes.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-$routes = glob(__DIR__."/{*.yaml}", GLOB_BRACE);
-
-$routesCollection = array_map(function ($routesFile){
-	return file_get_contents($routesFile).PHP_EOL;
-}, $routes);
-
-return yaml_parse(implode($routesCollection));
\ No newline at end of file
diff --git a/application/config/routes/routes.php b/application/config/routes/routes.php
new file mode 100644
index 0000000..1151ccc
--- /dev/null
+++ b/application/config/routes/routes.php
@@ -0,0 +1,17 @@
+<?php
+
+if(getenv("APP_MODE") == "PROD" && file_exists(dirname(__DIR__,3).'/var/routes/routes')){
+	return unserialize(file_get_contents(dirname(__DIR__,3).'/var/routes/routes'));
+} else {
+	$routesCollection = array_map(function ($routesFile){
+		return file_get_contents($routesFile).PHP_EOL;
+	}, array_merge(glob(__DIR__."/*/{*.yaml}", GLOB_BRACE), glob(__DIR__."/{*.yaml}", GLOB_BRACE)));
+
+	$routes = yaml_parse(implode($routesCollection));
+
+	if(getenv("APP_MODE") == "PROD") {
+		if (!is_dir(dirname(__DIR__, 3).'/var/routes')) mkdir(dirname(__DIR__, 3).'/var/routes', 0777, true);
+		file_put_contents(dirname(__DIR__, 3).'/var/routes/routes', serialize($routes));
+	}
+	return $routes;
+}
diff --git a/application/src/Infrastructure/Repository/AbstractMysqlRepository.php b/application/src/Infrastructure/Repository/AbstractMysqlRepository.php
index 242d80e..59d3d7f 100644
--- a/application/src/Infrastructure/Repository/AbstractMysqlRepository.php
+++ b/application/src/Infrastructure/Repository/AbstractMysqlRepository.php
@@ -7,6 +7,8 @@ use Rmphp\Storage\Mysql\MysqlStorageInterface;
 
 abstract class AbstractMysqlRepository extends AbstractRepository {
 
+	public const DEBUG = false;
+
 	public function __construct(
 		public readonly MysqlStorageInterface $mysql
 	) {}
@@ -21,7 +23,7 @@ abstract class AbstractMysqlRepository extends AbstractRepository {
 		$in = $this->getProperties($object, function ($value){
 			return (is_string($value)) ? $this->mysql->escapeStr($value) : $value;
 		});
-		//dd($object, $in);
+		if(static::DEBUG) dd($object, $in, $table);
 		try {
 			if (!empty($object->getId()) && !empty($this->mysql->findById($table, $object->getId()))) {
 				$this->mysql->updateById($table, $in, $object->getId());
@@ -32,8 +34,4 @@ abstract class AbstractMysqlRepository extends AbstractRepository {
 			}
 		} catch (\Throwable $throwable) {throw new RepositoryException($throwable->getMessage());}
 	}
-
-
-
-
-}
\ No newline at end of file
+}