seperate the logic into service reports

This commit is contained in:
2025-02-04 09:34:09 +03:30
parent d7990dd985
commit 967d0e6db8
13 changed files with 591 additions and 460 deletions

View File

@@ -32,132 +32,45 @@ class RoadItemsReportController extends Controller
]);
}
public function countryActivityPerSubItem(Request $request): JsonResponse
public function countryActivityPerSubItem(Request $request, RoadItemReportService $roadItemReportService): JsonResponse
{
$fromDate = $request->from_date ? $request->from_date . ' 00:00:00' : now()->startOfDay()->toDateTimeString();
$toDate = $request->date_to ? $request->date_to . ' 23:59:59' : now()->endOfDay()->toDateTimeString();
$item = $request->item;
$provinceRoadItemsPerSubItem = RoadItemsProject::query()->selectRaw('
sub_item AS t,
COUNT(*) AS c,
CAST(SUM(CASE WHEN sub_item_data > 0 THEN sub_item_data ELSE ABS(sub_item_data) END) AS UNSIGNED) AS s,
province_id AS p')
->where('item', '=', $item)
->whereBetween('activity_date_time', [$fromDate, $toDate])
->where('status', '=', 1)
->groupBy('province_id', 'sub_item')
->get();
$countryRoadItemsPerSubItem = RoadItemsProject::query()->selectRaw('
sub_item AS t,
COUNT(*) AS c,
CAST(SUM(CASE WHEN sub_item_data > 0 THEN sub_item_data ELSE ABS(sub_item_data) END) AS UNSIGNED) AS s,
-1 AS p')
->where('item', '=', $item)
->whereBetween('activity_date_time', [$fromDate, $toDate])
->where('status', '=', 1)
->groupBy('sub_item')
->get();
$activities = $provinceRoadItemsPerSubItem->push(...$countryRoadItemsPerSubItem);
$activities = $roadItemReportService->countryActivityPerSubItem($request);
$provinces = Province::all(['id', 'name_fa']);
$subItems = InfoItem::query()
->where('item', $item)
->where('item', $request->item)
->get(['id', 'item', 'item_str', 'sub_item_str', 'sub_item_unit', 'sub_item']);
return $this->successResponse([
'activities' => $activities,
'activities' => $activities['data'],
'sub_items' => $subItems,
'provinces' => $provinces,
]);
}
public function provinceActivityPerSubItem(Request $request): JsonResponse
public function provinceActivityPerSubItem(Request $request, RoadItemReportService $roadItemReportService): JsonResponse
{
$fromDate = $request->from_date ? $request->from_date . ' 00:00:00' : now()->startOfDay()->toDateTimeString();
$toDate = $request->date_to ? $request->date_to . ' 23:59:59' : now()->endOfDay()->toDateTimeString();
$item = $request->item;
$province = $request->province_id;
$activities = $roadItemReportService->provinceActivityPerSubItem($request);
$cityRoadItemsPerSubItem = RoadItemsProject::query()->selectRaw('
sub_item AS t,
COUNT(*) AS c,
CAST(SUM(CASE WHEN sub_item_data > 0 THEN sub_item_data ELSE ABS(sub_item_data) END) AS UNSIGNED) AS s,
province_id AS p,
edarat_id AS ci
')
->where('item', '=', $item)
->where('province_id', '=', $province)
->whereBetween('activity_date_time', [$fromDate, $toDate])
->where('status', '=', 1)
->groupBy('edarat_id', 'sub_item')
->get();
$edarateShahri = EdarateShahri::query()->where('province_id', '=', $request->province_id)->get(['id', 'name_fa']);
$provinceRoadItemsPerSubItem = RoadItemsProject::query()->selectRaw('
sub_item AS t,
COUNT(*) AS c,
CAST(SUM(CASE WHEN sub_item_data > 0 THEN sub_item_data ELSE ABS(sub_item_data) END) AS UNSIGNED) AS s,
province_id AS p,
-1 AS ci
')
->where('item', '=', $item)
->where('province_id', '=', $province)
->whereBetween('activity_date_time', [$fromDate, $toDate])
->where('status', '=', 1)
->groupBy('sub_item')
->get();
$edarateShahri = EdarateShahri::query()->where('province_id', '=', $province)->get(['id', 'name_fa']);
$activities = $cityRoadItemsPerSubItem->push(...$provinceRoadItemsPerSubItem);
$subItems = InfoItem::query()
->where('item', $item)
->where('item', $request->item)
->get(['id', 'item', 'item_str', 'sub_item_str', 'sub_item_unit', 'sub_item']);
return $this->successResponse([
'activities' => $activities,
'activities' => $activities['data'],
'edarateShahri' => $edarateShahri,
'sub_items' => $subItems,
]);
}
public function countryActivityPerItem(Request $request): JsonResponse
public function countryActivityPerItem(Request $request, RoadItemReportService $roadItemReportService): JsonResponse
{
if (auth()->check()) {
auth()->user()->addActivityComplete(1033);
}
$fromDate = $request->from_date ? $request->from_date . ' 00:00:00' : now()->startOfDay()->toDateTimeString();
$toDate = $request->date_to ? $request->date_to . ' 23:59:59' : now()->endOfDay()->toDateTimeString();
$user = auth()->user();
// $isSpecialUser = in_array($user->username, ['witel', 'drdanesh']);
$isSpecialUser = $user->hasPermissionTo("show-road-item-supervise-cartable");
$provinceId = $isSpecialUser ? null : $user->province_id;
$provinceActivity = RoadItemsProject::query()
->selectRaw('COUNT(*) AS s, province_id AS p, item AS i')
->where('status', 1)
->whereBetween('activity_date_time', [$fromDate, $toDate])
->when(!$isSpecialUser, function ($query) use ($provinceId) {
$query->where('province_id', $provinceId);
})
->groupBy('province_id', 'item');
$countryActivity = RoadItemsProject::query()
->selectRaw('COUNT(*) AS s, -1 AS p, item AS i')
->where('status', 1)
->whereBetween('activity_date_time', [$fromDate, $toDate])
->when(!$isSpecialUser, function ($query) use ($provinceId) {
$query->where('province_id', $provinceId);
})
->groupBy('item');
$activities = $provinceActivity
->unionAll($countryActivity)
->get();
$activities = $roadItemReportService->countryActivityPerItem($request);
$provinces = Province::all(['id', 'name_fa']);
return $this->successResponse([
@@ -166,37 +79,10 @@ class RoadItemsReportController extends Controller
]);
}
public function provinceActivityPerItem(Request $request): JsonResponse
public function provinceActivityPerItem(Request $request, RoadItemReportService $roadItemReportService): JsonResponse
{
$provinceId = $request->province_id;
$fromDate = $request->from_date ? $request->from_date . ' 00:00:00' : now()->startOfDay()->toDateTimeString();
$toDate = $request->date_to ? $request->date_to . ' 23:59:59' : now()->endOfDay()->toDateTimeString();
$edarehActivity = RoadItemsProject::query()
->selectRaw('
COUNT(*) AS s,
edarat_id AS c,
item AS i')
->where('status', '=', 1)
->whereBetween('activity_date_time', [$fromDate, $toDate])
->where('province_id', $provinceId)
->groupBy('item', 'edarat_id');
$cityActivity = RoadItemsProject::query()
->selectRaw('
COUNT(*) AS s,
-1 AS c,
item AS i')
->where('status', '=', 1)
->whereBetween('activity_date_time', [$fromDate, $toDate])
->where('province_id', $provinceId)
->groupBy('item');
$activities = $edarehActivity
->unionAll($cityActivity)
->get();
$edarateShahri = EdarateShahri::query()->where('province_id', '=', $provinceId)->get(['id', 'name_fa']);
$activities = $roadItemReportService->provinceActivityPerItem($request);
$edarateShahri = EdarateShahri::query()->where('province_id', '=', $request->province_id)->get(['id', 'name_fa']);
return $this->successResponse([
'activities' => $activities,
@@ -228,48 +114,35 @@ class RoadItemsReportController extends Controller
return $this->successResponse($data);
}
public function countryActivityExcelPerItem(Request $request): BinaryFileResponse
public function countryActivityExcelPerItem(Request $request, RoadItemReportService $roadItemReportService): BinaryFileResponse
{
auth()->user()->addActivityComplete(1034);
$name = 'گزارش کشوری از فعالیت روزانه و جاری - جدول 1 ' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
return Excel::download(new CountryActivityPerItemReport($request->fromDate, $request->toDate), $name);
$activities = $roadItemReportService->countryActivityPerItem($request);
return Excel::download(new CountryActivityPerItemReport($activities), $name);
}
public function provinceActivityExcelPerItem(Request $request): BinaryFileResponse
public function provinceActivityExcelPerItem(Request $request, RoadItemReportService $roadItemReportService): BinaryFileResponse
{
auth()->user()->addActivityComplete(1034);
$name = 'گزارش استانی از فعالیت روزانه و جاری - جدول 1 ' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
return Excel::download(new ProvinceActivityPerItemReport($request->fromDate, $request->toDate, $request->province), $name);
$activities = $roadItemReportService->provinceActivityPerItem($request);
return Excel::download(new ProvinceActivityPerItemReport($activities), $name);
}
public function countryActivityExcelPerSubItem(Request $request, RoadItemReportService $roadItemReportService): BinaryFileResponse
{
auth()->user()->addActivityComplete(1034);
$activities = $roadItemReportService->countryActivityPerSubItem(
$request->item,
$request->fromDate,
$request->toDate,
);
$name = "گزارش کشوری از فعالیت روزانه و جاری - جدول 2 " . verta()->now()->format('Y-m-d H-i') . '.xlsx';
$activities = $roadItemReportService->countryActivityPerSubItem($request);
return Excel::download(new CountryActivityPerSubItemReport($activities), $name);
}
public function provinceActivityExcelPerSubItem(Request $request, RoadItemReportService $roadItemReportService): BinaryFileResponse
{
auth()->user()->addActivityComplete(1034);
$activities = $roadItemReportService->provinceActivityPerSubItem(
$request->item,
$request->fromDate,
$request->toDate,
$request->province_id
);
$activities = $roadItemReportService->provinceActivityPerSubItem($request);
$name = "گزارش استانی از فعالیت روزانه و جاری - جدول 2 " . verta()->now()->format('Y-m-d H-i') . '.xlsx';
return Excel::download(new ProvinceActivityPerSubItemReport($activities), $name);
}
}