Merge branch 'feature/WebAcceptRequest' into 'develop'

create and fix

See merge request witelgroup/rms_v2!169

app/Http/Controllers/V3/Dashboard/Harim/PanjareVahedController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\V3\Dashboard\Harim;
 
 use App\Http\Controllers\Controller;
+use App\Http\Requests\V3\Dashboard\Harim\PanjareVahed\GetAccessRouteRequest;
 use App\Http\Traits\ApiResponse;
 use App\Models\Harim;
 use Illuminate\Http\Request;
@@ -20,4 +21,12 @@ class PanjareVahedController extends Controller
 
         return $this->successResponse();
     }
+    public function getAccessRoute(GetAccessRouteRequest $request,Harim $harim)
+    {
+        Harim::update([
+            'panjarevahed_id' => $request->panjarevahed_id,
+            'polygon' => $request->polygon,
+        ]);
+        return $this->successResponse();
+    }
 }

app/Http/Controllers/V3/Dashboard/SafetyAndPrivacy/OperatorReport/AccessRoadActivityController.php

@@ -42,14 +42,17 @@ class AccessRoadActivityController extends Controller
     }
     public function countryExcelActivity(Request $request, OperatorService $operatorService): BinaryFileResponse
     {
-        $data = $operatorService->countryActivity($request);
+        $data = $operatorService->countryActivity(90);
         $name = 'گزارش نگهداری حریم راه برای راه دسترسی غیر مجاز ' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
         return Excel::download(new ExcelReport($data), $name);
     }
 
     public function provinceExcelActivity(Request $request, OperatorService $operatorService): BinaryFileResponse
     {
-        $data = $operatorService->provinceActivity($request);
+        $data = $operatorService->provinceActivity(
+            info_id: 90,
+            province_id: $request->input('province_id')
+        );
         $name = 'گزارش نگهداری حریم راه برای راه دسترسی غیر مجاز ' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
         return Excel::download(new AccessRoadReport($data, $request), $name);
     }

app/Http/Controllers/V3/Dashboard/SafetyAndPrivacy/OperatorReport/ConstructionActivityController.php

@@ -40,15 +40,20 @@ class ConstructionActivityController extends Controller
     }
     public function countryExcelActivity(Request $request, OperatorService $operatorService): BinaryFileResponse
     {
-        $data = $operatorService->countryActivity($request);
+        $data = $operatorService->countryActivity(89);
         $name = ' گزارش نگهداری حریم راه برای ساخت و ساز غیر مجاز' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
+
         return Excel::download(new ExcelReport($data), $name);
     }
 
     public function provinceExcelActivity(Request $request, OperatorService $operatorService): BinaryFileResponse
     {
-        $data = $operatorService->provinceActivity($request);
+        $data = $operatorService->provinceActivity(
+            info_id: 89,
+            province_id: $request->input('province_id')
+        );
         $name = ' گزارش نگهداری حریم راه برای ساخت و ساز غیر مجاز' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
+
         return Excel::download(new ConstructionReport($data, $request), $name);
     }
 }

app/Http/Controllers/V3/Dashboard/SafetyAndPrivacy/OperatorReport/UtilityPassingActivityController.php

@@ -41,15 +41,20 @@ class UtilityPassingActivityController extends Controller
     }
     public function countryExcelActivity(Request $request, OperatorService $operatorService): BinaryFileResponse
     {
-        $data = $operatorService->countryActivity($request);
+        $data = $operatorService->countryActivity(91);
+
         $name = 'گزارش نگهداری حریم راه برای عبور تاسیسات زیربنایی غیر مجاز ' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
         return Excel::download(new ExcelReport($data), $name);
     }
 
     public function provinceExcelActivity(Request $request, OperatorService $operatorService): BinaryFileResponse
     {
-        $data = $operatorService->provinceActivity($request);
+        $data = $operatorService->provinceActivity(
+            info_id: 91,
+            province_id: $request->input('province_id')
+        );
         $name = 'گزارش نگهداری حریم راه برای عبور تاسیسات زیربنایی غیر مجاز ' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
+
         return Excel::download(new UtilityPassingReport($data, $request), $name);
     }
 }

app/Http/Requests/V3/Dashboard/Harim/PanjareVahed/GetAccessRouteRequest.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Http\Requests\V3\Dashboard\Harim\PanjareVahed;
+
+use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Foundation\Http\FormRequest;
+
+class GetAccessRouteRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        return false;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, ValidationRule|array|string>
+     */
+    public function rules(): array
+    {
+        return [
+            'panjarevahed_id'=> 'required|string',
+            'polygon' => 'required|string',
+        ];
+    }
+}

app/Services/Cartables/SafetyAndPrivacy/OperatorService.php

@@ -37,88 +37,68 @@ class OperatorService
     public function countryActivity(int $info_id): array
     {
         return DB::select("
-            WITH combinations AS (
-                SELECT 
-                    axis_type_id,
-                    step
-                FROM (
-                    SELECT 1 AS axis_type_id UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5
-                ) a
-                CROSS JOIN (
-                    SELECT 1 AS step UNION ALL SELECT 2 UNION ALL SELECT 3
-                ) s
-            ),
-            provinces AS (
-                SELECT DISTINCT province_id FROM safety_and_privacy WHERE info_id = ?
-            ),
-            data AS (
-                SELECT 
-                    p.province_id,
-                    c.axis_type_id,
-                    c.step,
-                    COUNT(sp.id) AS total
-                FROM combinations c
-                CROSS JOIN provinces p
-                LEFT JOIN safety_and_privacy sp 
-                    ON sp.axis_type_id = c.axis_type_id
-                   AND sp.step = c.step
-                   AND sp.province_id = p.province_id
-                   AND sp.info_id = ?
-                GROUP BY p.province_id, c.axis_type_id, c.step
-            )
-            SELECT 
-                province_id,
+              WITH province_data AS (
+            SELECT
+                p.id AS province_id,
+                a.id AS axis_type_id,
+                SUM(CASE WHEN t.step = 1 THEN 1 ELSE 0 END) AS s1,
+                SUM(CASE WHEN t.step = 2 THEN 1 ELSE 0 END) AS c2,
+                SUM(CASE WHEN t.step = 3 THEN 1 ELSE 0 END) AS c3
+            FROM provinces p
+            CROSS JOIN axis_types a
+            LEFT JOIN safety_and_privacy t
+                ON p.id = t.province_id
+               AND a.id = t.axis_type_id
+               AND t.info_id = :infoId
+            GROUP BY p.id, a.id
+                )
+            SELECT * FROM province_data
+            UNION ALL
+            SELECT
+                -1 AS province_id,
                 axis_type_id,
-                step,
-                total,
-                SUM(total) OVER (PARTITION BY province_id) AS total_sum
-            FROM data
-            ORDER BY province_id, axis_type_id, step
-        ", [$info_id, $info_id]);
+                SUM(s1) AS s1,
+                SUM(c2) AS c2,
+                SUM(c3) AS c3
+            FROM province_data
+            GROUP BY axis_type_id
+            ORDER BY province_id, axis_type_id
+    ", [
+            'infoId' => $info_id,
+        ]);
     }
 
     public function provinceActivity(int $info_id, int $province_id): array
     {
         return DB::select("
-        WITH combinations AS (
-            SELECT axis_type_id, step
-            FROM (
-                SELECT 1 AS axis_type_id UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5
-            ) a
-            CROSS JOIN (
-                SELECT 1 AS step UNION ALL SELECT 2 UNION ALL SELECT 3
-            ) s
-        ),
-        edarat AS (
-            SELECT id AS edare_id
-            FROM edarate_shahri
-            WHERE province_id = :provinceId
-        ),
-        data AS (
-            SELECT 
-                e.edare_id,
-                c.axis_type_id,
-                c.step,
-                COUNT(sp.id) AS total
-            FROM combinations c
-            CROSS JOIN edarat e
-            LEFT JOIN safety_and_privacy sp 
-                ON sp.axis_type_id = c.axis_type_id
-               AND sp.step = c.step
-               AND sp.city_id = e.edare_id
-               AND sp.info_id = :infoId
-            GROUP BY e.edare_id, c.axis_type_id, c.step
-        )
-        SELECT 
-            e.edare_id,
-            d.axis_type_id,
-            d.step,
-            d.total,
-            SUM(d.total) OVER (PARTITION BY e.edare_id) AS total_sum
-        FROM data d
-        JOIN edarat e ON e.edare_id = d.edare_id
-        ORDER BY e.edare_id, d.axis_type_id, d.step
-    ",[
+            WITH edareh_data AS (
+                SELECT
+                    e.id AS edareh_id,
+                    a.id AS axis_type_id,
+                    SUM(CASE WHEN t.step = 1 THEN 1 ELSE 0 END) AS c1,
+                    SUM(CASE WHEN t.step = 2 THEN 1 ELSE 0 END) AS c2,
+                    SUM(CASE WHEN t.step = 3 THEN 1 ELSE 0 END) AS c3
+                FROM edarate_shahri e
+                CROSS JOIN axis_types a
+                LEFT JOIN safety_and_privacy t
+                    ON e.id = t.edare_shahri_id
+                   AND a.id = t.axis_type_id
+                   AND t.info_id = :infoId
+                WHERE e.province_id = :provinceId
+                GROUP BY e.id, a.id
+            )
+            SELECT * FROM edareh_data
+            UNION ALL
+            SELECT
+                -1 AS edareh_id,
+                axis_type_id,
+                SUM(s1) AS s1,
+                SUM(c2) AS c2,
+                SUM(c3) AS c3
+            FROM edareh_data
+            GROUP BY axis_type_id
+            ORDER BY edareh_id, axis_type_id
+    ", [
             'provinceId' => $province_id,
             'infoId'     => $info_id,
         ]);

routes/v3.php

@@ -10,6 +10,7 @@ use App\Http\Controllers\V3\Dashboard\Azmayesh\AzmayeshSampleController;
 use App\Http\Controllers\V3\Dashboard\Azmayesh\AzmayeshTypeController;
 use App\Http\Controllers\V3\Dashboard\Harim\GeneralManagerController;
 use App\Http\Controllers\V3\Dashboard\Harim\HarimOfficeController;
+use App\Http\Controllers\V3\Dashboard\Harim\PanjareVahedController;
 use App\Http\Controllers\V3\Dashboard\Harim\ProvinceOfficeController;
 use App\Http\Controllers\V3\Dashboard\Harim\TechnicalDeputyController;
 use App\Http\Controllers\V3\Dashboard\ItemsManagementController;
@@ -560,6 +561,12 @@ Route::prefix('harim')
                 Route::post('/confirm_guarantee_letter_need/{harim}', 'confirmGuaranteeLetterNeed')->name('confirmGuaranteeLetterNeed');
                 Route::get('/{harim}', 'show')->name('show');
             });
+        Route::prefix('panjarevahed')
+            ->name('panjarevahed.')
+            ->controller(PanjarevahedController::class)
+            ->group(function () {
+                Route::post('/get_access_route','getAccessRoute')->name('getAccessRoute');
+            });
     });
 
 Route::prefix('user_management')