v3.5.7 20241116 [Backend Module] (#282)

Minor updates regarding error data not exists when first initialization generating UUID
Nicklas373 · Nov 16, 2024 · c94fdfa · c94fdfa
2 parents a1edc79 + 6d94ce1
commit c94fdfa
Show file tree

Hide file tree

Showing 3 changed files with 99 additions and 94 deletions.
diff --git a/app/Helpers/AppHelper.php b/app/Helpers/AppHelper.php
@@ -78,28 +78,31 @@ function getFtpResponse($download_file, $proc_file){
     }
 
     function generateUniqueUuid($customModel, $customColumn) {
-        $uniqueID = Uuid::uuid4();
-        // if ($customColumn !== 'processId') {
-        //     do {
-        //         $uniqueID = Uuid::uuid4();
-        //     } while (
-        //         $customModel::where($customColumn, $uniqueID)->exists()
-        //     );
-        // } else {
-        //     do {
-        //         $uniqueID = Uuid::uuid4();
-        //     } while (
-        //         appLogModel::where($customColumn, $uniqueID)->exists() ||
-        //         jobLogModel::where($customColumn, $uniqueID)->exists() ||
-        //         notifyLogModel::where($customColumn, $uniqueID)->exists() ||
-        //         compressModel::where($customColumn, $uniqueID)->exists() ||
-        //         cnvModel::where($customColumn, $uniqueID)->exists() ||
-        //         htmlModel::where($customColumn, $uniqueID)->exists() ||
-        //         mergeModel::where($customColumn, $uniqueID)->exists() ||
-        //         splitModel::where($customColumn, $uniqueID)->exists() ||
-        //         watermarkModel::where($customColumn, $uniqueID)->exists()
-        //     );
-        // }
+        if (appLogModel::count() >= 1) {
+            if ($customColumn !== 'processId') {
+                do {
+                    $uniqueID = Uuid::uuid4();
+                } while (
+                    $customModel::where($customColumn, $uniqueID)->exists()
+                );
+            } else {
+                do {
+                    $uniqueID = Uuid::uuid4();
+                } while (
+                    appLogModel::where($customColumn, $uniqueID)->exists() ||
+                    jobLogModel::where($customColumn, $uniqueID)->exists() ||
+                    notifyLogModel::where($customColumn, $uniqueID)->exists() ||
+                    compressModel::where($customColumn, $uniqueID)->exists() ||
+                    cnvModel::where($customColumn, $uniqueID)->exists() ||
+                    htmlModel::where($customColumn, $uniqueID)->exists() ||
+                    mergeModel::where($customColumn, $uniqueID)->exists() ||
+                    splitModel::where($customColumn, $uniqueID)->exists() ||
+                    watermarkModel::where($customColumn, $uniqueID)->exists()
+                );
+            }
+        } else {
+            $uniqueID = Uuid::uuid4();
+        }
         return $uniqueID->toString();
     }
 

diff --git a/app/Http/Controllers/Api/Misc/versionController.php b/app/Http/Controllers/Api/Misc/versionController.php
@@ -42,7 +42,7 @@ public function versioningCheck(Request $request) {
             $appServicesReferrerFE = $request->post('appServicesReferrer');
             $appMajorVersionBE = 3;
             $appMinorVersionBE = 5;
-            $appPatchVersionBE = 6;
+            $appPatchVersionBE = 7;
             $appVersioningBE = null;
             $appVersioningFE = null;
             $appServicesReferrerBE = "BE";