v3.3.9 20241111 [Frontend Module] (#280)

Recent changelog: - [Helpers: Check to all related column while generate UUID](e45a339) - [Exceptions: Handler: Use more proper function to generate UUID](bc6fd68) - [Resources: kao-logic: Minor updates](ef1ded2)
Nicklas373 · Nov 11, 2024 · 4b42aae · 4b42aae
2 parents e610de8 + 05a0b80
commit 4b42aae
Show file tree

Hide file tree

Showing 17 changed files with 376 additions and 211 deletions.
diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
@@ -41,8 +41,8 @@ public function register(): void
 
     public function render($request, Throwable $exception)
     {
-        $uuid = AppHelper::Instance()->generateSingleUniqueUuid(appLogModel::class, 'processId');
-        $Muuid = AppHelper::Instance()->generateSingleUniqueUuid(appLogModel::class, 'groupId');
+        $uuid = AppHelper::Instance()->generateUniqueUuid(appLogModel::class, 'processId');
+        $Muuid = AppHelper::Instance()->generateUniqueUuid(appLogModel::class, 'groupId');
 
         appLogModel::create([
             'processId' => $uuid,

diff --git a/app/Helpers/AppHelper.php b/app/Helpers/AppHelper.php
@@ -2,8 +2,14 @@
 namespace App\Helpers;
 
 use App\Models\appLogModel;
+use App\Models\jobLogModel;
 use App\Models\notifyLogModel;
-use Carbon\Carbon;
+use App\Models\compressModel;
+use App\Models\cnvModel;
+use App\Models\htmlModel;
+use App\Models\mergeModel;
+use App\Models\splitModel;
+use App\Models\watermarkModel;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Log;
 use Ramsey\Uuid\Uuid;
@@ -29,32 +35,29 @@ function getCurrentTimeZone() {
         return $currentDateTime;
     }
 
-    function generateSingleUniqueUuid($customModel, $customColumn) {
-        $startProc = Carbon::now()->format('Y-m-d H:i:s');
-        $uniqueID = Uuid::uuid4();
-        // do {
-        //     $uniqueID = Uuid::uuid4();
-        // } while (
-        //     $customModel::where($customColumn, $uniqueID)->exists()
-        // );
-        $end = Carbon::now();
-        $duration = $end->diffInSeconds(Carbon::parse($startProc));
-        Log::Info('New single unique UUID has been generated with response time: '.$duration.' seconds');
-        return $uniqueID->toString();
-    }
-
     function generateUniqueUuid($customModel, $customColumn) {
-        $startProc = Carbon::now()->format('Y-m-d H:i:s');
         $uniqueID = Uuid::uuid4();
-        // do {
-        //     $uniqueID = Uuid::uuid4();
-        // } while (
-        //     appLogModel::where($customColumn, $uniqueID)->exists() ||
-        //     $customModel::where($customColumn, $uniqueID)->exists()
-        // );
-        $end = Carbon::now();
-        $duration = $end->diffInSeconds(Carbon::parse($startProc));
-        Log::Info('New unique UUID has been generated with response time: '.$duration.' seconds');
+        // 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()
+        //     );
+        // }
         return $uniqueID->toString();
     }
 

diff --git a/app/Models/cnvModel.php b/app/Models/cnvModel.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class cnvModel extends Model
+{
+    use HasFactory;
+
+    protected $connection = 'pgsql';
+    protected $table = 'pdfConvert';
+    protected $primaryKey = 'cnvId';
+    protected $keyType = 'string';
+
+    protected $fillable = [
+        'fileName',
+        'fileSize',
+        'container',
+        'imgExtract',
+        'result',
+        'isBatch',
+        'batchName',
+        'groupId',
+        'processId',
+        'procStartAt',
+        'procEndAt',
+        'procDuration'
+    ];
+}
diff --git a/app/Models/compressModel.php b/app/Models/compressModel.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class compressModel extends Model
+{
+    use HasFactory;
+
+    protected $connection = 'pgsql';
+    protected $primaryKey = 'compressId';
+    protected $table = 'pdfCompress';
+    protected $keyType = 'string';
+
+    protected $fillable = [
+        'fileName',
+        'fileSize',
+        'compFileSize',
+        'compMethod',
+        'result',
+        'isBatch',
+        'batchName',
+        'groupId',
+        'processId',
+        'procStartAt',
+        'procEndAt',
+        'procDuration'
+    ];
+}
diff --git a/app/Models/htmlModel.php b/app/Models/htmlModel.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class htmlModel extends Model
+{
+    use HasFactory;
+
+    protected $connection = 'pgsql';
+    protected $table = 'pdfHtml';
+    protected $primaryKey = 'htmlId';
+    protected $keyType = 'string';
+
+    protected $fillable = [
+        'urlName',
+        'urlMargin',
+        'urlOrientation',
+        'urlSinglePage',
+        'urlSize',
+        'result',
+        'groupId',
+        'processId',
+        'procStartAt',
+        'procEndAt',
+        'procDuration'
+    ];
+}
diff --git a/app/Models/mergeModel.php b/app/Models/mergeModel.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class mergeModel extends Model
+{
+    use HasFactory;
+
+    protected $connection = 'pgsql';
+    protected $table = 'pdfMerge';
+    protected $primaryKey = 'mergeId';
+    protected $keyType = 'string';
+
+    protected $fillable = [
+        'fileName',
+        'fileSize',
+        'result',
+        'isBatch',
+        'batchName',
+        'groupId',
+        'processId',
+        'procStartAt',
+        'procEndAt',
+        'procDuration'
+    ];
+}
diff --git a/app/Models/splitModel.php b/app/Models/splitModel.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class splitModel extends Model
+{
+    use HasFactory;
+
+    protected $connection = 'pgsql';
+    protected $table = 'pdfSplit';
+    protected $primaryKey = 'splitId';
+    protected $keyType = 'string';
+
+    protected $fillable = [
+        'fileName',
+        'fileSize',
+        'fromPage',
+        'toPage',
+        'customPage',
+        'fixedPage',
+        'fixedPageRange',
+        'mergePDF',
+        'action',
+        'result',
+        'isBatch',
+        'batchName',
+        'groupId',
+        'processId',
+        'procStartAt',
+        'procEndAt',
+        'procDuration'
+    ];
+}
diff --git a/app/Models/watermarkModel.php b/app/Models/watermarkModel.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class watermarkModel extends Model
+{
+    use HasFactory;
+
+    protected $connection = 'pgsql';
+    protected $table = 'pdfWatermark';
+    protected $primaryKey = 'watermarkId';
+    protected $keyType = 'string';
+
+    protected $fillable = [
+        'fileName',
+        'fileSize',
+        'watermarkFontFamily',
+        'watermarkFontStyle',
+        'watermarkFontSize',
+        'watermarkFontTransparency',
+        'watermarkImage',
+        'watermarkLayout',
+        'watermarkMosaic',
+        'watermarkRotation',
+        'watermarkStyle',
+        'watermarkText',
+        'watermarkPage',
+        'result',
+        'isBatch',
+        'batchName',
+        'groupId',
+        'processId',
+        'procStartAt',
+        'procEndAt',
+        'procDuration'
+    ];
+}
diff --git a/composer.lock b/composer.lock