From cc8e7529db9a7abfd551e8131a3da25974a17343 Mon Sep 17 00:00:00 2001
From: Robert <Robert@TryingToScale.com>
Date: Thu, 22 Dec 2022 18:54:30 -0500
Subject: [PATCH] Fixed misc bugs...

---
 src/mockup/controllers/app/home_ctrl.php | 17 +++-------
 src/mockup/go_text_templates/ctrl.txt    |  9 +-----
 src/mockup/go_text_templates/logic.txt   | 37 ++++++++++++++++++++++
 src/mockup/go_text_templates/outputs.txt | 38 ++++++++++++----------
 src/mockup/go_text_templates/views.txt   |  2 ++
 src/mockup/logic/app/home_logic.php      | 37 ++++++++++++++++++++++
 src/mockup/outputs/app/home_out.php      | 40 ++++++++++++++----------
 7 files changed, 126 insertions(+), 54 deletions(-)
 create mode 100644 src/mockup/go_text_templates/logic.txt
 create mode 100644 src/mockup/logic/app/home_logic.php

diff --git a/src/mockup/controllers/app/home_ctrl.php b/src/mockup/controllers/app/home_ctrl.php
index f0a4c6d..c5fc18d 100644
--- a/src/mockup/controllers/app/home_ctrl.php
+++ b/src/mockup/controllers/app/home_ctrl.php
@@ -27,22 +27,13 @@ class home_ctrl {
       $view->render($this);
   }
   
-  public function name_demo_post() {      
+  public function name_demo_post() {  
+      \tts\main\registry::set('db', \tts\main\registry::get('di')->get_service('db_mocker') );
+      
       $input = \prj\mockup\inputs\app\home_in::name_demo();
 
-      \tts\main\registry::set('db', \tts\main\registry::get('di')->get_service('db_mocker') ); // Grabs DB
-      $model = new \prj\mockup\models\app\home_model(\tts\main\registry::get('db')); 
-      $model->init_name_demo_table(); // Create Table if NOT exists!
-      if ($model->is_valid($input)) {
-        $model->populate(100); // INSERT 100 random rows of data
-      }
+      \prj\mockup\logic\app\home_logic::name_demo($input);
       
-      $success = $model->save_new_user($input); // Save user from Users Request Data
-      // Only show users 12, if added new one
-      $input['model'] = ($success===true) ? 
-          $model->get_users(101) : 
-          $model->get_users(0);
-
       $output = \prj\mockup\outputs\app\home_out::name_demo($input);
       
       $view = new \tts\view();
diff --git a/src/mockup/go_text_templates/ctrl.txt b/src/mockup/go_text_templates/ctrl.txt
index 69f4305..20f4866 100644
--- a/src/mockup/go_text_templates/ctrl.txt
+++ b/src/mockup/go_text_templates/ctrl.txt
@@ -13,15 +13,8 @@ class {{.File}}_ctrl {
 
   public function {{.Method}}() {
     $input = \prj\{{.Root}}\inputs\{{.Subfolder}}\{{.File}}_in::{{.Method}}();
-    $model = new \prj\{{.Root}}\models\{{.Subfolder}}\{{.File}}_model(\tts\main\registry::get('db')); 
 
-    $model->init_demo_table(); // Create Table if NOT exists!
-    $model->populate(10); // INSERT 10 random rows of data
-
-    $success = $model->save_{{.Method}}($input); // Save data from Request Data
-    $input['model'] = ($success===true) ? 
-          $model->get_{{.Method}}(15) : 
-          $model->get_{{.Method}}(0);
+    \prj\{{.Root}}\logic\{{.Subfolder}}\{{.File}}_logic::{{.Method}}($input);
 
     $output = \prj\{{.Root}}\outputs\{{.Subfolder}}\{{.File}}_out::{{.Method}}($input);
     
diff --git a/src/mockup/go_text_templates/logic.txt b/src/mockup/go_text_templates/logic.txt
new file mode 100644
index 0000000..380d03f
--- /dev/null
+++ b/src/mockup/go_text_templates/logic.txt
@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+namespace prj\{{.Root}}\logic\{{.Subfolder}};
+
+use \tts\safer_io as SafeIO;
+
+class {{.File}}_logic {
+    
+    public static function {{.Method}}(array & $input): void {
+        $model = new \prj\{{.Root}}\models\{{.Subfolder}}\{{.File}}_model(\tts\main\registry::get('db')); 
+        
+        $submitted = true;
+        foreach(SafeIO::logic_sanitize($input) as $data) {
+            if (SafeIO::required_fields_were_NOT_all_submitted($data)) {
+                $submitted = false;
+                break;
+            }
+        }
+        
+        $input['submitted'] = $submitted;
+        
+        if ($submitted) {
+            $model->init_demo_table(); // Create Table if NOT exists!
+            $model->populate(10); // INSERT 10 random rows of data
+
+            $success = $model->save_index($input); // Save data from Request Data
+            $input['model'] = ($success===true) ? 
+                $model->get_index(15) : 
+                $model->get_index(0);
+        } else {
+            $input['model'] = $model->get_index(0);
+        }        
+    }
+    
+}
diff --git a/src/mockup/go_text_templates/outputs.txt b/src/mockup/go_text_templates/outputs.txt
index 778dacc..43b24f4 100644
--- a/src/mockup/go_text_templates/outputs.txt
+++ b/src/mockup/go_text_templates/outputs.txt
@@ -12,25 +12,31 @@ class {{.File}}_out {
         $ret['model'] = $input['model'];
         unset($input['model']); // Free up some space
         
-        $html_output = [];
-        $errors = [];
-        foreach(SafeIO::html_escape_and_sanitize($input) as $html) {
-            $key = $html['name'] ?? "";
-            $html_output[$key] = $html['html'];
-
-            if (\tts\common::get_count($html['errors'])) {
-                $errors[$key] = $html['errors'][$key];
+        $submitted = $input['submitted'] ?? false;
+        
+        if ($submitted) {
+            $html_output = [];
+            $errors = [];
+            foreach(SafeIO::html_escape_and_sanitize($input) as $html) {
+                $key = $html['name'] ?? "";
+                $html_output[$key] = $html['html'];
+
+                if (\tts\common::get_count($html['errors'])) {
+                    $errors[$key] = $html['errors'][$key];
+                }
             }
+
+            $age = $html_output['age'] ?? 0;        
+            $first_name = $html_output['first_name'] ?? "Unknown";
+            $last_name = $html_output['last_name'] ?? "Unknown";
+
+            $ret['main'] = (\tts\common::get_count($errors)) ? "" : "Hello, {$first_name} {$last_name}." . PHP_EOL;
+            $ret['errors'] = $errors;
+        } else {
+            $ret['main'] = "Welcome";
+            $ret['errors'] = [];
         }
         
-        $age = $html_output['age'] ?? 0;        
-        $first_name = $html_output['first_name'] ?? "Unknown";
-        $last_name = $html_output['last_name'] ?? "Unknown";
-        
-        $ret['main'] = (\tts\common::get_count($errors)) ? "" : "Hello {$first_name} {$last_name}, You are {$age} years old!" . PHP_EOL;
-        $ret['errors'] = $errors;
-        
-        
         unset($input); // Free up some space
         
         return $ret;
diff --git a/src/mockup/go_text_templates/views.txt b/src/mockup/go_text_templates/views.txt
index 2730558..333f224 100644
--- a/src/mockup/go_text_templates/views.txt
+++ b/src/mockup/go_text_templates/views.txt
@@ -11,6 +11,8 @@ $method_name_demo_post = "{{.Method}}";
 echo \prj\{{.Root}}\outputs\{{.Subfolder}}\{{.File}}_out::{{.Method}}_show_errors($output['errors']);
 ?>
 
+<?= $output['main'] ?>
+
 <br/><br/>
 <form method="post">
     <label for="fname">First Name: <input type="text" id="fname" name="first_name" size="15" /></label><br/>
diff --git a/src/mockup/logic/app/home_logic.php b/src/mockup/logic/app/home_logic.php
new file mode 100644
index 0000000..f9a0089
--- /dev/null
+++ b/src/mockup/logic/app/home_logic.php
@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+namespace prj\mockup\logic\app;
+
+use \tts\safer_io as SafeIO;
+
+class home_logic {
+    
+    public static function name_demo(array & $input): void {
+        $model = new \prj\mockup\models\app\home_model(\tts\main\registry::get('db')); 
+        
+        $submitted = true;
+        foreach(SafeIO::logic_sanitize($input) as $data) {
+            if (SafeIO::required_fields_were_NOT_all_submitted($data)) {
+                $submitted = false;
+                break;
+            }
+        }
+        
+        $input['submitted'] = $submitted;
+        
+        if ($submitted) {
+            $model->init_name_demo_table(); // Create Table if NOT exists!
+            $model->populate(10); // INSERT 10 random rows of data
+
+            $success = $model->save_new_user($input); // Save data from Request Data
+            $input['model'] = ($success===true) ? 
+                $model->get_users(15) : 
+                $model->get_users(0);
+        } else {
+            $input['model'] = $model->get_users(0);
+        }        
+    }
+    
+}
diff --git a/src/mockup/outputs/app/home_out.php b/src/mockup/outputs/app/home_out.php
index 73a0232..4607db3 100644
--- a/src/mockup/outputs/app/home_out.php
+++ b/src/mockup/outputs/app/home_out.php
@@ -12,30 +12,36 @@ class home_out {
         $ret['model'] = $input['model'];
         unset($input['model']); // Free up some space
         
-        $html_output = [];
-        $errors = [];
-        foreach(SafeIO::html_escape_and_sanitize($input) as $html) {
-            $key = $html['name'] ?? "";
-            $html_output[$key] = $html['html'];
-            
-            if (\tts\common::get_count($html['errors'])) {
-                $errors[$key] = $html['errors'][$key];
+        $submitted = $input['submitted'] ?? false;
+        
+        if ($submitted) {
+            $html_output = [];
+            $errors = [];
+            foreach(SafeIO::html_escape_and_sanitize($input) as $html) {
+                $key = $html['name'] ?? "";
+                $html_output[$key] = $html['html'];
+
+                if (\tts\common::get_count($html['errors'])) {
+                    $errors[$key] = $html['errors'][$key];
+                }
             }
+
+            $age = $html_output['age'] ?? 0;        
+            $first_name = $html_output['first_name'] ?? "Unknown";
+            $last_name = $html_output['last_name'] ?? "Unknown";
+
+            $ret['main'] = (\tts\common::get_count($errors)) ? "" : "Hello, {$first_name} {$last_name}, you are {$age} years old!" . PHP_EOL;
+            $ret['errors'] = $errors;
+        } else {
+            $ret['main'] = "Welcome";
+            $ret['errors'] = [];
         }
         
-        $age = $html_output['age'] ?? 0;        
-        $first_name = $html_output['first_name'] ?? "Unknown";
-        $last_name = $html_output['last_name'] ?? "Unknown";
-        
-        $ret['main'] = (\tts\common::get_count($errors)) ? "" : "Hello {$first_name} {$last_name}, You are {$age} years old!" . PHP_EOL;
-        $ret['errors'] = $errors;
-        
-        
         unset($input); // Free up some space
         
         return $ret;
     }
-    
+  
     public static function show_errors(array $errors): string {
         if ($errors) {
             $message = "Please correct the following errors: ";