From 2efe128ea8801b33fbdc09b299c7a250edc5e01e Mon Sep 17 00:00:00 2001
From: kapsona777 <lasha.kapanadze.1@btu.edu.ge>
Date: Sat, 26 Oct 2024 16:47:28 +0400
Subject: [PATCH] analysis fix and importHistoryFunctionAdd

---
 public/userarea/apilogic/process_import.php | 38 ++++++++++++++-------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/public/userarea/apilogic/process_import.php b/public/userarea/apilogic/process_import.php
index e5c929a..e50adab 100644
--- a/public/userarea/apilogic/process_import.php
+++ b/public/userarea/apilogic/process_import.php
@@ -22,8 +22,8 @@ $jsonEntries = $stmt->fetchAll(PDO::FETCH_ASSOC);
 foreach ($jsonEntries as $entry) {
     $data = json_decode($entry['json_data'], true);
     $uuid = $entry['uuid']; 
-    $analysis = array();
-    $compounds = array();
+    $analysisArr = array();
+    $compoundsArr = array();
 
     // check for result_TestName
     foreach ($data['product']['reports'] as $report) {
@@ -48,14 +48,14 @@ foreach ($jsonEntries as $entry) {
                     $result = $stmt->fetchColumn();
                     if(!$result){
                         // add 0 to analysis array
-                        array_push($analysis, 0);
+                        array_push($analysisArr, 0);
                     }else{
                         // add 1 to analysis array
-                        array_push($analysis, 1);
+                        array_push($analysisArr, 1);
                     }
                 }else{
                     // add 1 to analysis array
-                    array_push($analysis, 1);
+                    array_push($analysisArr, 1);
                 }
             }
         }
@@ -87,14 +87,14 @@ foreach ($jsonEntries as $entry) {
                         $result = $stmt->fetchColumn();
                         if(!$result){
                             // add 0 to compounds array
-                            array_push($compounds, 0);
+                            array_push($compoundsArr, 0);
                         }else{
                             // add 1 to compounds array
-                            array_push($compounds, 1);
+                            array_push($compoundsArr, 1);
                         }
                     }else{
                         // add 1 to compounds array
-                        array_push($compounds, 1);
+                        array_push($compoundsArr, 1);
                     }
 
                 }
@@ -107,9 +107,9 @@ foreach ($jsonEntries as $entry) {
     if (!$labId) {
         markForIntervention($entry['id'], $pdo);
         continue;
-    }
+    } 
     
-    if(validateJson($data) && !in_array(0, $analysis) && !in_array(0, $compounds)){
+    if(validateJson($data) && !in_array(0, $analysisArr) && !in_array(0, $compoundsArr)){
         // Validate and insert product
         $productId = insertProduct($data['product'], $pdo, $uuid);
         
@@ -123,9 +123,9 @@ foreach ($jsonEntries as $entry) {
 
                     foreach ($part['analyses'] as $analysis) {
                         $result_TestName = $analysis['result_TestName'];
-                        $groupcode = $analysis['analysisgroupcode'];
+                        $analysisgroupcode = $analysis['analysisgroupcode'];
                         
-                        $query = "SELECT idanalysisvocabulary FROM analysisvocabulary WHERE analysiscode LIKE '$groupcode'";
+                        $query = "SELECT idanalysisvocabulary FROM analysisvocabulary WHERE analysiscode LIKE '$analysisgroupcode'";
                         $stmt = $pdo->prepare($query);
                         $res = $stmt->execute();
                         $res = $stmt->fetchColumn(); 
@@ -179,11 +179,23 @@ foreach ($jsonEntries as $entry) {
     } else {
         markForIntervention($entry['id'], $pdo);
     }
-    
+    importHistory($pdo, $uuid);
 }
 
 // Function definitions
 
+function importHistory($pdo, $uuid){
+    $query = "INSERT INTO template_import_his (created_at, importcode, f_status, user_id, importfilename) VALUES (:created_at, :importcode, :f_status, :user_id, :importfilename)";
+    $stmt = $pdo->prepare($query);
+    $stmt->execute([
+        'created_at' => date("Y-m-d H:i:s"),
+        'importcode' => $uuid,
+        'f_status' => 1,
+        'user_id' => 2,
+        'importfilename' => 'JSON API'
+    ]);
+}
+
 function validateJson($json){
     $checkData = json_encode($json);
     if(json_decode($checkData) !== null){