Skip to content

Dev #3229

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bernardhanna merged 2 commits into from
Jan 27, 2026
Merged

Dev #3229

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad11066
matchmalking bulk
bernardhanna Jan 27, 2026
a98a3a8
Merge pull request #3228 from codeeu/week4_26
bernardhanna Jan 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
137 changes: 108 additions & 29 deletions app/Imports/MatchmakingProfileImport.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,12 @@ public function model(array $row): ?Model
'Main email address',
]);

// Optional location field (if present)
$locationValue = $this->getRowValue($row, [
'location',
'Location',
]);

// Skip rows without essential data
if (empty($email) && empty($organisationName)) {
Log::warning('[MatchmakingProfileImport] Skipping row - missing email and organisation_name', $row);
Expand All @@ -342,6 +348,7 @@ public function model(array $row): ?Model
$lastName = $lastName ? trim($lastName) : null;
$jobTitle = $jobTitle ? trim($jobTitle) : null;
$mainEmailAddress = $mainEmailAddress ? trim($mainEmailAddress) : null;
$locationValue = $locationValue ? trim($locationValue) : null;

// Determine type - if organisation_name exists, it's an organisation, otherwise volunteer
$type = !empty($organisationName)
Expand Down Expand Up @@ -449,6 +456,13 @@ public function model(array $row): ?Model
]);
} else {
Log::info('[MatchmakingProfileImport] No country value found in row');
static $loggedKeys = false;
if (!$loggedKeys) {
$loggedKeys = true;
Log::info('[MatchmakingProfileImport] Row keys sample', [
'keys' => array_keys($row),
]);
}
}

// Parse website - ensure it has protocol
Expand Down Expand Up @@ -539,37 +553,101 @@ public function model(array $row): ?Model
'lower' => $lowerOrgName,
]);
}
} elseif ($type === MatchmakingProfile::TYPE_VOLUNTEER && !empty($email)) {
// For volunteers, check by email (case-insensitive, trimmed)
$trimmedEmail = trim($email);
$lowerEmail = mb_strtolower($trimmedEmail);

// First try with type constraint
$existingProfile = MatchmakingProfile::where('type', MatchmakingProfile::TYPE_VOLUNTEER)
->whereRaw('LOWER(TRIM(email)) = ?', [$lowerEmail])
->first();

// If not found, try without type constraint (in case type was set incorrectly)
if (!$existingProfile) {
$existingProfile = MatchmakingProfile::whereRaw('LOWER(TRIM(email)) = ?', [$lowerEmail])
->whereNotNull('email')
} elseif ($type === MatchmakingProfile::TYPE_VOLUNTEER) {
if (!empty($email)) {
// For volunteers, check by email (case-insensitive, trimmed)
$trimmedEmail = trim($email);
$lowerEmail = mb_strtolower($trimmedEmail);

// First try with type constraint
$existingProfile = MatchmakingProfile::where('type', MatchmakingProfile::TYPE_VOLUNTEER)
->whereRaw('LOWER(TRIM(email)) = ?', [$lowerEmail])
->first();
}

// Log for debugging
if ($existingProfile) {
Log::info('[MatchmakingProfileImport] Found existing volunteer', [
'id' => $existingProfile->id,
'existing_email' => $existingProfile->email,
'existing_type' => $existingProfile->type,
'import_email' => $email,
'import_type' => $type,
]);

// If not found, try without type constraint (in case type was set incorrectly)
if (!$existingProfile) {
$existingProfile = MatchmakingProfile::whereRaw('LOWER(TRIM(email)) = ?', [$lowerEmail])
->whereNotNull('email')
->first();
}

// Log for debugging
if ($existingProfile) {
Log::info('[MatchmakingProfileImport] Found existing volunteer by email', [
'id' => $existingProfile->id,
'existing_email' => $existingProfile->email,
'existing_type' => $existingProfile->type,
'import_email' => $email,
'import_type' => $type,
]);
} else {
Log::info('[MatchmakingProfileImport] No existing volunteer found by email', [
'searched_email' => $email,
'trimmed' => $trimmedEmail,
'lower' => $lowerEmail,
]);
}
} else {
Log::info('[MatchmakingProfileImport] No existing volunteer found', [
'searched_email' => $email,
'trimmed' => $trimmedEmail,
'lower' => $lowerEmail,
// Fallback: match by first + last name when email is missing
if (!empty($firstName) && !empty($lastName)) {
$first = mb_strtolower(trim($firstName));
$last = mb_strtolower(trim($lastName));

$existingProfile = MatchmakingProfile::where('type', MatchmakingProfile::TYPE_VOLUNTEER)
->whereRaw('LOWER(TRIM(first_name)) = ?', [$first])
->whereRaw('LOWER(TRIM(last_name)) = ?', [$last])
->first();

// If not found, try without type constraint (in case type was set incorrectly)
if (!$existingProfile) {
$existingProfile = MatchmakingProfile::whereRaw('LOWER(TRIM(first_name)) = ?', [$first])
->whereRaw('LOWER(TRIM(last_name)) = ?', [$last])
->first();
}

if ($existingProfile) {
Log::info('[MatchmakingProfileImport] Found existing volunteer by name', [
'id' => $existingProfile->id,
'existing_first_name' => $existingProfile->first_name,
'existing_last_name' => $existingProfile->last_name,
'import_first_name' => $firstName,
'import_last_name' => $lastName,
]);
} else {
Log::info('[MatchmakingProfileImport] No existing volunteer found by name', [
'searched_first_name' => $firstName,
'searched_last_name' => $lastName,
]);
}
} else {
Log::info('[MatchmakingProfileImport] Volunteer missing email and name; cannot match', [
'email' => $email,
'first_name' => $firstName,
'last_name' => $lastName,
'full_name' => $fullName,
]);
}
}
}

// If country is still missing, try to infer from location (CSV or existing profile)
if (empty($countryIso)) {
$fallbackLocation = $locationValue;
if (empty($fallbackLocation) && $existingProfile) {
$fallbackLocation = $existingProfile->location;
}

if (!empty($fallbackLocation)) {
$fallbackLocation = trim((string) $fallbackLocation);
if (strlen($fallbackLocation) === 2) {
$countryIso = strtoupper($fallbackLocation);
} else {
$cleanedLocation = $this->extractCountryName($fallbackLocation);
$countryIso = $this->findCountryIso($cleanedLocation);
}
Log::info('[MatchmakingProfileImport] Country fallback from location', [
'location' => $fallbackLocation,
'country_iso' => $countryIso,
]);
}
}
Expand All @@ -587,6 +665,7 @@ public function model(array $row): ?Model
'organisation_type' => $organisationType,
'organisation_mission' => $organisationMission,
'website' => $website,
'location' => $locationValue,
'country' => $countryIso, // This can be null to clear the field
'support_activities' => $supportActivities,
'interested_in_school_collaboration' => $interestedInCollaboration,
Expand Down
Loading