tbfajri/aso
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

fix division when member import

Browse Source
This commit is contained in:
Muhammad Fajar
2022-12-06 18:48:17 +07:00
parent 405ca24c6a
commit b26ccdd0e6
7 changed files with 261 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
Modules/Internal/Http/Controllers/Api/CorporateController.php
View File

@@ -26,18 +26,17 @@ class CorporateController extends Controller
public function index(Request $request)
{
$corporates = Corporate::query()
->when($request->search, function ($query, $search) {
return $query->where('name', 'LIKE', '%'.$search.'%')
->orWhere('code', 'LIKE', '%'.$search.'%');
})
->with('currentPolicy', 'subCorporates')
->withCount([
'employees',
'corporatePlans',
'corporateBenefits',
])
->where('type', 'corporate')
->paginate(10);
->when($request->search, function ($query, $search) {
return $query->where('name', 'LIKE', '%' . $search . '%')
->orWhere('code', 'LIKE', '%' . $search . '%');
})
->with('currentPolicy', 'subCorporates')
->withCount([
'employees',
'corporateBenefits',
])
->where('type', 'corporate')
->paginate(10);
return $corporates;
}
@@ -48,10 +47,10 @@ class CorporateController extends Controller
*/
public function create()
{
$corporateGroups = Corporate::whereNull('parent_id')->get()->map(function($corporate) {
$corporateGroups = Corporate::whereNull('parent_id')->get()->map(function ($corporate) {
return [
'value' => $corporate->id,
'label' => $corporate->name.' ('.$corporate->code.')',
'label' => $corporate->name . ' (' . $corporate->code . ')',
];
});
@@ -80,7 +79,7 @@ class CorporateController extends Controller
'policy_stop_service_percentage' => 'required_with:policy_code',
'policy_stop_service_net' => 'required_with:policy_code',
]);
try {
DB::beginTransaction();
$corporate_data = $request->all();
@@ -155,7 +154,7 @@ class CorporateController extends Controller
'policy_stop_service_percentage' => 'required_with:policy_code',
'policy_stop_service_net' => 'required_with:policy_code',
]);
try {
DB::beginTransaction();
@@ -199,7 +198,8 @@ class CorporateController extends Controller
//
}
public function activation(Request $request, $corporate_id) {
public function activation(Request $request, $corporate_id)
{
$request->validate([
'active' => 'required'
]);
@@ -223,16 +223,16 @@ class CorporateController extends Controller
'file' => 'required|file|mimes:xls,xlsx,csv,txt',
]);
// dd($request->toArray());
$file_name = now()->getPreciseTimestamp(3).'-'.$request->file('file')->getClientOriginalName();
$file_name = now()->getPreciseTimestamp(3) . '-' . $request->file('file')->getClientOriginalName();
$file = $request->file('file')->storeAs('temp', $file_name);
$corporate = Corporate::findOrFail($corporate_id);
$import = new ImportService();
$import->read(Storage::path('temp/'.$file_name));
$import->write(Storage::disk('public')->path('temp/result-'.$file_name), 'xsls');
$import->read(Storage::path('temp/' . $file_name));
$import->write(Storage::disk('public')->path('temp/result-' . $file_name), 'xsls');
foreach ($import->sheetsIterator() as $sheetIndex => $sheet) {
if ( !in_array($sheet->getName(), ['Plan', 'Benefit']) ) {
if (!in_array($sheet->getName(), ['Plan', 'Benefit'])) {
continue;
} else {
if ($sheetIndex == 1) { // Rename First Sheet to Writer
@@ -243,9 +243,9 @@ class CorporateController extends Controller
$nextWriterSheet->setName($sheet->getName());
}
if ( $sheet->getName() == 'Plan' ) {
if ($sheet->getName() == 'Plan') {
$headers_map_to_table_fields = Plan::$doc_headers_to_field_map;
} else if ( $sheet->getName() == 'Benefit' ) {
} else if ($sheet->getName() == 'Benefit') {
$headers_map_to_table_fields = Benefit::$doc_headers_to_field_map;
}
@@ -253,7 +253,6 @@ class CorporateController extends Controller
$result_headers = array_keys($headers_map_to_table_fields);
$result_headers = array_merge($result_headers, ['Ingest Code', 'Ingest Note']);
$import->addArrayToRow($result_headers);
}
$doc_headers_indexes = [];
@@ -261,8 +260,8 @@ class CorporateController extends Controller
if ($index == 1) { // First Row Must be Header
foreach ($row->getCells() as $index => $cell) {
$title = $cell->getValue();
$title = preg_replace( "/\r|\n/", " ", $title );
$title = preg_replace('/\xc2\xa0/', " ", $title );
$title = preg_replace("/\r|\n/", " ", $title);
$title = preg_replace('/\xc2\xa0/', " ", $title);
$title = rtrim($title);
$title = ltrim($title);
$doc_headers_indexes[$index] = $title;
@@ -278,9 +277,9 @@ class CorporateController extends Controller
try { // Process the Row Data
$corporateService = new CorporateService();
if ( $sheet->getName() == 'Plan' ) {
if ($sheet->getName() == 'Plan') {
$corporateService->handlePlanRow($corporate, $row_data);
} else if ( $sheet->getName() == 'Benefit' ) {
} else if ($sheet->getName() == 'Benefit') {
$corporateService->handleBenefitRow($corporate, $row_data);
}
@@ -289,7 +288,6 @@ class CorporateController extends Controller
'Ingest Code' => 200,
'Ingest Note' => 'Success',
]), $sheet->getName());
} catch (ImportRowException $e) {
// Write Data Validation Error to File
$import->addArrayToRow(array_merge($row_data, [
@@ -308,7 +306,7 @@ class CorporateController extends Controller
}
}
$import->reader->close();
Storage::delete('temp/'.$file_name);
Storage::delete('temp/' . $file_name);
$import->writer->close();
return [
@@ -316,8 +314,8 @@ class CorporateController extends Controller
// 'total_failed_row' => count($failed_plan_data),
// 'failed_row' => $failed_plan_data,
'result_file' => [
'url' => Storage::disk('public')->url('temp/result-'.$file_name),
'name' => 'result-'.$file_name,
'url' => Storage::disk('public')->url('temp/result-' . $file_name),
'name' => 'result-' . $file_name,
]
];
}

61
Modules/Internal/Http/Controllers/Api/CorporateMemberController.php
View File

@@ -27,22 +27,22 @@ class CorporateMemberController extends Controller
public function index(Request $request, $corporate_id)
{
$members = Member::query()
->filter($request->all())
// ->where('corporate_id', $corporate_id)
->whereHas('employeds', function ($employeds) use ($corporate_id) {
$employeds->where('corporate_id', $corporate_id);
})
->with([
'employeds',
'currentPolicy',
'claims' => function ($claim) {
return $claim->used();
}
])
->with('currentPlan')
->paginate()
->appends($request->all());
->filter($request->all())
// ->where('corporate_id', $corporate_id)
->whereHas('employeds', function ($employeds) use ($corporate_id) {
$employeds->where('corporate_id', $corporate_id);
})
->with([
'employeds',
'currentPolicy',
// 'claims' => function ($claim) {
// return $claim->used();
// }
])
->with('currentPlan')
->paginate()
->appends($request->all());
return $members;
}
@@ -111,17 +111,17 @@ class CorporateMemberController extends Controller
{
$request->validate([
'file' => 'required|file|mimes:xls,xlsx,csv,txt',
]);
]);
$corporate = Corporate::findOrFail($corporate_id)->load('currentPolicy');
$file_name = now()->getPreciseTimestamp(3).'-'.$request->file('file')->getClientOriginalName();
$file_name = now()->getPreciseTimestamp(3) . '-' . $request->file('file')->getClientOriginalName();
$file = $request->file('file')->storeAs('temp', $file_name);
$reader = ReaderEntityFactory::createReaderFromFile(Storage::path('temp/'.$file_name));
$reader->open(Storage::path('temp/'.$file_name));
$reader = ReaderEntityFactory::createReaderFromFile(Storage::path('temp/' . $file_name));
$reader->open(Storage::path('temp/' . $file_name));
$writer = WriterEntityFactory::createXLSXWriter();
$writer->openToFile(Storage::disk('public')->path('temp/result-'.$file_name));
$writer->openToFile(Storage::disk('public')->path('temp/result-' . $file_name));
$headers_map_to_table_fields = $this->memberEnrollmentService->doc_headers_to_field_map;
@@ -139,8 +139,8 @@ class CorporateMemberController extends Controller
foreach ($row->getCells() as $index => $cell) {
// Clear up the string and remove all spaces
$title = $cell->getValue();
$title = preg_replace( "/\r|\n/", " ", $title );
$title = preg_replace('/\xc2\xa0/', " ", $title );
$title = preg_replace("/\r|\n/", " ", $title);
$title = preg_replace('/\xc2\xa0/', " ", $title);
$title = rtrim($title);
$title = ltrim($title);
$doc_headers_indexes[$index] = $title;
@@ -157,7 +157,7 @@ class CorporateMemberController extends Controller
try {
// dd($new_member_data);
$rowResponse = $this->memberEnrollmentService->handleImportRow($corporate, $new_member_data);
// Write Success Result to File
$singleRow = WriterEntityFactory::createRow($this->memberEnrollmentService->makeResultRowWithResultFormat($rowResponse));
$writer->addRow($singleRow);
@@ -182,14 +182,13 @@ class CorporateMemberController extends Controller
$failed_member_data[] = ['row_number' => $index, 'error' => $e->getMessage()];
}
}
}
break; //only read first sheet
}
$reader->close();
$writer->close();
Storage::delete('temp/'.$file_name);
Storage::delete('temp/' . $file_name);
// throw(404);
return [
@@ -197,8 +196,8 @@ class CorporateMemberController extends Controller
'total_failed_row' => count($failed_member_data),
'failed_row' => $failed_member_data,
'result_file' => [
'url' => Storage::disk('public')->url('temp/result-'.$file_name),
'name' => 'result-'.$file_name,
'url' => Storage::disk('public')->url('temp/result-' . $file_name),
'name' => 'result-' . $file_name,
]
];
}

11
Modules/Internal/Http/Controllers/Api/DivisionController.php
View File

@@ -17,11 +17,11 @@ class DivisionController extends Controller
public function index(Request $request, $corporate_id)
{
$benefits = CorporateDivision::query()
->filter($request->all())
->where('corporate_id', $corporate_id)
->paginate(0)
->appends($request->all());
->filter($request->all())
->where('corporate_id', $corporate_id)
->paginate(0)
->appends($request->all());
return $benefits;
}
@@ -44,7 +44,6 @@ class DivisionController extends Controller
$request->validate([
'code' => [
'required',
Rule::unique('corporate_plans')->where('corporate_id', $corporate_id)
],
'name' => 'required'
]);