|
@@ -15,11 +15,12 @@ class AssociadoImportService
|
|
|
{
|
|
{
|
|
|
public function syncFromExcel(string $filePath): array
|
|
public function syncFromExcel(string $filePath): array
|
|
|
{
|
|
{
|
|
|
|
|
+
|
|
|
$import = new AssociadoImport();
|
|
$import = new AssociadoImport();
|
|
|
Excel::import($import, $filePath);
|
|
Excel::import($import, $filePath);
|
|
|
$rows = $import->rows ?? collect();
|
|
$rows = $import->rows ?? collect();
|
|
|
|
|
|
|
|
- $today = Carbon::today()->toDateString();
|
|
|
|
|
|
|
+ // $today = Carbon::today()->toDateString();
|
|
|
$expiryDate = Carbon::now()->endOfMonth()->toDateString();
|
|
$expiryDate = Carbon::now()->endOfMonth()->toDateString();
|
|
|
|
|
|
|
|
$existing = User::where('type', UserTypeEnum::ASSOCIADO)
|
|
$existing = User::where('type', UserTypeEnum::ASSOCIADO)
|
|
@@ -35,6 +36,7 @@ class AssociadoImportService
|
|
|
foreach ($rows as $row) {
|
|
foreach ($rows as $row) {
|
|
|
$registration = $row['registration'];
|
|
$registration = $row['registration'];
|
|
|
$name = $row['name'];
|
|
$name = $row['name'];
|
|
|
|
|
+ $admissionDate = $row['admission_date'] ?? null;
|
|
|
|
|
|
|
|
if (isset($seenRegistrations[$registration])) {
|
|
if (isset($seenRegistrations[$registration])) {
|
|
|
continue;
|
|
continue;
|
|
@@ -52,6 +54,11 @@ class AssociadoImportService
|
|
|
$changed = true;
|
|
$changed = true;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ if($user->admission_date?->toDateString() !== $admissionDate) {
|
|
|
|
|
+ $user->admission_date = $admissionDate;
|
|
|
|
|
+ $changed = true;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
if ($user->status !== UserStatusEnum::ACTIVE) {
|
|
if ($user->status !== UserStatusEnum::ACTIVE) {
|
|
|
$user->status = UserStatusEnum::ACTIVE;
|
|
$user->status = UserStatusEnum::ACTIVE;
|
|
|
$user->excluded_at = null;
|
|
$user->excluded_at = null;
|
|
@@ -74,7 +81,7 @@ class AssociadoImportService
|
|
|
'type' => UserTypeEnum::ASSOCIADO,
|
|
'type' => UserTypeEnum::ASSOCIADO,
|
|
|
'status' => UserStatusEnum::ACTIVE,
|
|
'status' => UserStatusEnum::ACTIVE,
|
|
|
'registration' => $registration,
|
|
'registration' => $registration,
|
|
|
- 'admission_date' => $today,
|
|
|
|
|
|
|
+ 'admission_date' => $admissionDate,
|
|
|
'expiry_date' => $expiryDate,
|
|
'expiry_date' => $expiryDate,
|
|
|
]);
|
|
]);
|
|
|
|
|
|